diff --git a/.history/package_20231113165156.json b/.history/package_20231113165156.json new file mode 100644 index 000000000..595c62276 --- /dev/null +++ b/.history/package_20231113165156.json @@ -0,0 +1,119 @@ +{ + "name": "appsys", + "private": true, + "version": "2.3.0", + "type": "module", + "scripts": { + "dev": "vite ", + "build:prod": "vite build --mode production &&vue-tsc --noEmit", + "prepare": "husky install", + "lint:eslint": "eslint --fix --ext .ts,.js,.vue ./src ", + "lint:prettier": "prettier --write \"**/*.{js,cjs,ts,json,tsx,css,less,scss,vue,html,md}\"", + "lint:stylelint": "stylelint \"**/*.{css,scss,vue}\" --fix", + "lint:lint-staged": "lint-staged", + "commit": "git-cz", + "build": "webpack" + }, + "config": { + "commitizen": { + "path": "node_modules/cz-git" + } + }, + "lint-staged": { + "*.{js,ts}": [ + "eslint --fix", + "prettier --write" + ], + "*.{cjs,json}": [ + "prettier --write" + ], + "*.{vue,html}": [ + "eslint --fix", + "prettier --write", + "stylelint --fix" + ], + "*.{scss,css}": [ + "stylelint --fix", + "prettier --write" + ], + "*.md": [ + "prettier --write" + ] + }, + "dependencies": { + "@element-plus/icons": "^0.0.11", + "@element-plus/icons-vue": "^2.1.0", + "@vitejs/plugin-vue": "^4.2.3", + "@vueuse/core": "^10.1.2", + "@wangeditor/editor": "^5.1.23", + "@wangeditor/editor-for-vue": "5.1.10", + "@wecom/jssdk": "^1.3.2", + "axios": "^1.4.0", + "build": "^0.1.4", + "clipboard": "^2.0.11", + "echarts": "^5.4.3", + "element-plus": "^2.3.12", + "js-beautify": "^1.14.8", + "js-md5": "^0.7.3", + "md5": "^2.3.0", + "nprogress": "^0.2.0", + "path-browserify": "^1.0.1", + "path-to-regexp": "^6.2.0", + "pinia": "^2.0.33", + "quill": "^1.3.7", + "screenfull": "^6.0.0", + "ts-md5": "^1.3.1", + "vue": "^3.3.4", + "vue-i18n": "9.2.2", + "vue-quill-editor": "^3.0.6", + "vue-router": "^4.2.0", + "vuedraggable": "^4.1.0", + "vuedraggable-es": "^4.1.1", + "wangeditor": "^4.7.15", + "webpack": "^5.88.2" + }, + "devDependencies": { + "@commitlint/cli": "^17.6.3", + "@commitlint/config-conventional": "^17.6.3", + "@iconify-json/ep": "^1.1.10", + "@types/md5": "^2.3.2", + "@types/nprogress": "^0.2.0", + "@types/path-browserify": "^1.0.0", + "@typescript-eslint/eslint-plugin": "^5.59.6", + "@typescript-eslint/parser": "^5.59.6", + "autoprefixer": "^10.4.14", + "commitizen": "^4.3.0", + "cz-git": "^1.6.1", + "eslint": "^8.40.0", + "eslint-config-prettier": "^8.8.0", + "eslint-plugin-prettier": "^4.2.1", + "eslint-plugin-vue": "^9.13.0", + "fast-glob": "^3.2.11", + "husky": "^8.0.3", + "lint-staged": "^13.2.2", + "postcss": "^8.4.23", + "postcss-html": "^1.5.0", + "postcss-scss": "^4.0.6", + "prettier": "^2.8.8", + "sass": "^1.58.3", + "stylelint": "^15.5.0", + "stylelint-config-html": "^1.1.0", + "stylelint-config-recess-order": "^4.0.0", + "stylelint-config-recommended-scss": "11.0.0 ", + "stylelint-config-recommended-vue": "^1.4.0", + "stylelint-config-standard": "^33.0.0", + "stylelint-config-standard-scss": "^9.0.0", + "typescript": "^5.0.4", + "unocss": "^0.51.13", + "unplugin-auto-import": "^0.15.3", + "unplugin-icons": "^0.16.1", + "unplugin-vue-components": "^0.24.1", + "vite": "^4.3.5", + "vite-plugin-svg-icons": "^2.0.1", + "vue-tsc": "^1.6.5 ", + "webpack-cli": "^5.1.4" + }, + "repository": "", + "author": "", + "license": "MIT" +} diff --git a/.history/package_20231113165157.json b/.history/package_20231113165157.json new file mode 100644 index 000000000..664bb2571 --- /dev/null +++ b/.history/package_20231113165157.json @@ -0,0 +1,119 @@ +{ + "name": "appsys", + "private": true, + "version": "2.3.0", + "type": "module", + "scripts": { + "dev": "vite serve --mode development", + "build:prod": "vite build --mode production &&vue-tsc --noEmit", + "prepare": "husky install", + "lint:eslint": "eslint --fix --ext .ts,.js,.vue ./src ", + "lint:prettier": "prettier --write \"**/*.{js,cjs,ts,json,tsx,css,less,scss,vue,html,md}\"", + "lint:stylelint": "stylelint \"**/*.{css,scss,vue}\" --fix", + "lint:lint-staged": "lint-staged", + "commit": "git-cz", + "build": "webpack" + }, + "config": { + "commitizen": { + "path": "node_modules/cz-git" + } + }, + "lint-staged": { + "*.{js,ts}": [ + "eslint --fix", + "prettier --write" + ], + "*.{cjs,json}": [ + "prettier --write" + ], + "*.{vue,html}": [ + "eslint --fix", + "prettier --write", + "stylelint --fix" + ], + "*.{scss,css}": [ + "stylelint --fix", + "prettier --write" + ], + "*.md": [ + "prettier --write" + ] + }, + "dependencies": { + "@element-plus/icons": "^0.0.11", + "@element-plus/icons-vue": "^2.1.0", + "@vitejs/plugin-vue": "^4.2.3", + "@vueuse/core": "^10.1.2", + "@wangeditor/editor": "^5.1.23", + "@wangeditor/editor-for-vue": "5.1.10", + "@wecom/jssdk": "^1.3.2", + "axios": "^1.4.0", + "build": "^0.1.4", + "clipboard": "^2.0.11", + "echarts": "^5.4.3", + "element-plus": "^2.3.12", + "js-beautify": "^1.14.8", + "js-md5": "^0.7.3", + "md5": "^2.3.0", + "nprogress": "^0.2.0", + "path-browserify": "^1.0.1", + "path-to-regexp": "^6.2.0", + "pinia": "^2.0.33", + "quill": "^1.3.7", + "screenfull": "^6.0.0", + "ts-md5": "^1.3.1", + "vue": "^3.3.4", + "vue-i18n": "9.2.2", + "vue-quill-editor": "^3.0.6", + "vue-router": "^4.2.0", + "vuedraggable": "^4.1.0", + "vuedraggable-es": "^4.1.1", + "wangeditor": "^4.7.15", + "webpack": "^5.88.2" + }, + "devDependencies": { + "@commitlint/cli": "^17.6.3", + "@commitlint/config-conventional": "^17.6.3", + "@iconify-json/ep": "^1.1.10", + "@types/md5": "^2.3.2", + "@types/nprogress": "^0.2.0", + "@types/path-browserify": "^1.0.0", + "@typescript-eslint/eslint-plugin": "^5.59.6", + "@typescript-eslint/parser": "^5.59.6", + "autoprefixer": "^10.4.14", + "commitizen": "^4.3.0", + "cz-git": "^1.6.1", + "eslint": "^8.40.0", + "eslint-config-prettier": "^8.8.0", + "eslint-plugin-prettier": "^4.2.1", + "eslint-plugin-vue": "^9.13.0", + "fast-glob": "^3.2.11", + "husky": "^8.0.3", + "lint-staged": "^13.2.2", + "postcss": "^8.4.23", + "postcss-html": "^1.5.0", + "postcss-scss": "^4.0.6", + "prettier": "^2.8.8", + "sass": "^1.58.3", + "stylelint": "^15.5.0", + "stylelint-config-html": "^1.1.0", + "stylelint-config-recess-order": "^4.0.0", + "stylelint-config-recommended-scss": "11.0.0 ", + "stylelint-config-recommended-vue": "^1.4.0", + "stylelint-config-standard": "^33.0.0", + "stylelint-config-standard-scss": "^9.0.0", + "typescript": "^5.0.4", + "unocss": "^0.51.13", + "unplugin-auto-import": "^0.15.3", + "unplugin-icons": "^0.16.1", + "unplugin-vue-components": "^0.24.1", + "vite": "^4.3.5", + "vite-plugin-svg-icons": "^2.0.1", + "vue-tsc": "^1.6.5 ", + "webpack-cli": "^5.1.4" + }, + "repository": "", + "author": "", + "license": "MIT" +} diff --git a/.history/src/api/opk/type_20231108110600.ts b/.history/src/api/opk/type_20231108110600.ts new file mode 100644 index 000000000..fe764c48a --- /dev/null +++ b/.history/src/api/opk/type_20231108110600.ts @@ -0,0 +1,158 @@ +export interface postinfp{ + id?:number, + number?: string, + name?:string, + superior?:number, + organizationtype?: number, + abbreviation?: string, + time?: number, + state?: number, + wechatorganizationid?: number, + superiorsun?: string, + schoole?: number, + kingdeeid?: string, + ispower?: number, + sort?: number, + classname?: string, + level?: number, + isman?: number, + status?: boolean, + child?: null, + type?:number; +} +export interface tarData{ + page?:number; + pageSize?:number; + name?:string; + dimension?:string; + attribute?:string; + orgidlist?:Array; +} +export interface addlist{ + name?:string; + share?:number; + acceptdepartmentid?:Array; + userlist?:Array; + dimension?:string; + nature?:number; + unit?:string; + cycle?:number; + cycleattr?:Number; + scoringmethod?:number; + visiblerangegroup?:Array; + visiblerangedepart?:Array; +} +export interface deltarget{ + id?:String; + state?:number; + istrue?:number; +} +export interface getgroupData{ + id?:number; + all:number; +} +export interface edittarget{ + acceptdepartmentid?:Array + cycle?:Number; + cycleattr:number; + dimension:string; + id:string; + name:string; + nature:number; + scoringmethod:Number; + unit:string; + userlist:Array +} +export interface position{ + page?:number; + pagesize?:number; + organization?:string; +} +export interface getgroup{ + id?:number; + level?:number; +} +export interface organd{ + all?:number; + id?:string; + levelL:number; +} +export interface postsss{ + attribute?:string; + dimension?:string; + page?:number; + pageSize?:number; + title?:string; + postidlist?:Array; +} +export interface addposttar{ + title?:string; + dimension?: String; + unit?:String; + type?: number; + scoringmethod?: number; + cycle?:number; + cycleattr?: number; + departmentPostOther?:Array + otherposttarget?:Array; + +} +export interface searchorgpos{ + name?:string; + id?:string; +} +export interface setposttarget{ + id?:string; + state?:number; + istrue?:number; +} +export interface table_base_post_target{ + id?:string; +} +export interface getdetails{ + targetid: string; + inspect: Array; + postlist: Array; + cycle:Number; +} +export interface neweditposttarget{ + title?:string; + dimension?: String; + unit?:String; + type?: number; + scoringmethod?: Number; + cycle?:Number; + cycleattr?: Number; + otherposttarget?:Array; + id:string; +} +export interface get_organdpost_ary{ + id: string; +} +export interface look_work_flowcont{ + id:string; +} +export interface quantechart{ + AccMethod?:Array; + targetid?:Array; + year?:Array; + analysisangle?:number; + org?:Array; + timeattribute?:Array +} +export interface gettarget{ + page:number; + pagesize:number; +} +export interface getquantechartorgandyear{ + targetid:Array; +} +export interface summaryplanrecord{ + department:string; + month:Number; + targetid:string; + year:Number; +} +export interface get_post_target{ + id:string; +} diff --git a/.history/src/api/opk/type_20231108110652.ts b/.history/src/api/opk/type_20231108110652.ts new file mode 100644 index 000000000..ac7c6a64c --- /dev/null +++ b/.history/src/api/opk/type_20231108110652.ts @@ -0,0 +1,158 @@ +export interface postinfp{ + id?:number, + number?: string, + name?:string, + superior?:number, + organizationtype?: number, + abbreviation?: string, + time?: number, + state?: number, + wechatorganizationid?: number, + superiorsun?: string, + schoole?: number, + kingdeeid?: string, + ispower?: number, + sort?: number, + classname?: string, + level?: number, + isman?: number, + status?: boolean, + child?: null, + type?:number; +} +export interface tarData{ + page?:number; + pageSize?:number; + name?:string; + dimension?:string; + attribute?:string; + orgidlist?:Array; +} +export interface addlist{ + name?:string; + share?:number; + acceptdepartmentid?:Array; + userlist?:Array; + dimension?:string; + nature?:number; + unit?:string; + cycle?:number; + cycleattr?:Number; + scoringmethod?:number; + visiblerangegroup?:Array; + visiblerangedepart?:Array; +} +export interface deltarget{ + id?:String; + state?:number; + istrue?:number; +} +export interface getgroupData{ + id?:number; + all:number; +} +export interface edittarget{ + acceptdepartmentid?:Array + cycle?:Number; + cycleattr:number; + dimension:string; + id:string; + name:string; + nature:number; + scoringmethod:Number; + unit:string; + userlist:Array +} +export interface position{ + page?:number; + pagesize?:number; + organization?:string; +} +export interface getgroup{ + id?:number; + level?:number; +} +export interface organd{ + all?:number; + id?:string; + levelL:number; +} +export interface postsss{ + attribute?:string; + dimension?:string; + page?:number; + pageSize?:number; + title?:string; + postidlist?:Array; +} +export interface addposttar{ + title?:string; + dimension?: String; + unit?:String; + type?: number; + scoringmethod?: number; + cycle?:number; + cycleattr?: number; + departmentPostOther?:Array + otherposttarget?:Array; + +} +export interface searchorgpos{ + name?:string; + orgid?:string; +} +export interface setposttarget{ + id?:string; + state?:number; + istrue?:number; +} +export interface table_base_post_target{ + id?:string; +} +export interface getdetails{ + targetid: string; + inspect: Array; + postlist: Array; + cycle:Number; +} +export interface neweditposttarget{ + title?:string; + dimension?: String; + unit?:String; + type?: number; + scoringmethod?: Number; + cycle?:Number; + cycleattr?: Number; + otherposttarget?:Array; + id:string; +} +export interface get_organdpost_ary{ + id: string; +} +export interface look_work_flowcont{ + id:string; +} +export interface quantechart{ + AccMethod?:Array; + targetid?:Array; + year?:Array; + analysisangle?:number; + org?:Array; + timeattribute?:Array +} +export interface gettarget{ + page:number; + pagesize:number; +} +export interface getquantechartorgandyear{ + targetid:Array; +} +export interface summaryplanrecord{ + department:string; + month:Number; + targetid:string; + year:Number; +} +export interface get_post_target{ + id:string; +} diff --git a/.history/src/api/opk/type_20231109114748.ts b/.history/src/api/opk/type_20231109114748.ts new file mode 100644 index 000000000..1cb28d6d4 --- /dev/null +++ b/.history/src/api/opk/type_20231109114748.ts @@ -0,0 +1,159 @@ +export interface postinfp{ + id?:number, + number?: string, + name?:string, + superior?:number, + organizationtype?: number, + abbreviation?: string, + time?: number, + state?: number, + wechatorganizationid?: number, + superiorsun?: string, + schoole?: number, + kingdeeid?: string, + ispower?: number, + sort?: number, + classname?: string, + level?: number, + isman?: number, + status?: boolean, + child?: null, + type?:number; +} +export interface tarData{ + page?:number; + pageSize?:number; + name?:string; + dimension?:string; + attribute?:string; + orgidlist?:Array; +} +export interface addlist{ + name?:string; + share?:number; + acceptdepartmentid?:Array; + userlist?:Array; + dimension?:string; + nature?:number; + unit?:string; + cycle?:number; + cycleattr?:Number; + scoringmethod?:number; + visiblerangegroup?:Array; + visiblerangedepart?:Array; +} +export interface deltarget{ + id?:String; + state?:number; + istrue?:number; +} +export interface getgroupData{ + id?:number; + all:number; +} +export interface edittarget{ + acceptdepartmentid?:Array + cycle?:Number; + cycleattr:number; + dimension:string; + id:string; + name:string; + nature:number; + scoringmethod:Number; + unit:string; + userlist:Array +} +export interface position{ + page?:number; + pagesize?:number; + organization?:string; +} +export interface getgroup{ + id?:number; + level?:number; +} +export interface organd{ + all?:number; + id?:string; + levelL:number; +} +export interface postsss{ + attribute?:string; + dimension?:string; + page?:number; + pageSize?:number; + title?:string; + postidlist?:Array; +} +export interface addposttar{ + title?:string; + dimension?: String; + unit?:String; + type?: number; + scoringmethod?: number; + cycle?:number; + cycleattr?: number; + departmentPostOther?:Array + otherposttarget?:Array; + +} +export interface searchorgpos{ + name?:string; + orgid?:string; +} +export interface setposttarget{ + id?:string; + state?:number; + istrue?:number; +} +export interface table_base_post_target{ + id?:string; +} +export interface getdetails{ + targetid: string; + inspect: Array; + postlist: Array; + cycle:Number; +} +export interface neweditposttarget{ + title?:string; + dimension?: String; + unit?:String; + type?: number; + scoringmethod?: Number; + cycle?:Number; + cycleattr?: Number; + otherposttarget?:Array; + id:string; + visiblegroup:"",visiblerange:"" +} +export interface get_organdpost_ary{ + id: string; +} +export interface look_work_flowcont{ + id:string; +} +export interface quantechart{ + AccMethod?:Array; + targetid?:Array; + year?:Array; + analysisangle?:number; + org?:Array; + timeattribute?:Array +} +export interface gettarget{ + page:number; + pagesize:number; +} +export interface getquantechartorgandyear{ + targetid:Array; +} +export interface summaryplanrecord{ + department:string; + month:Number; + targetid:string; + year:Number; +} +export interface get_post_target{ + id:string; +} diff --git a/.history/src/api/opk/type_20231109114753.ts b/.history/src/api/opk/type_20231109114753.ts new file mode 100644 index 000000000..e2854aeaf --- /dev/null +++ b/.history/src/api/opk/type_20231109114753.ts @@ -0,0 +1,160 @@ +export interface postinfp{ + id?:number, + number?: string, + name?:string, + superior?:number, + organizationtype?: number, + abbreviation?: string, + time?: number, + state?: number, + wechatorganizationid?: number, + superiorsun?: string, + schoole?: number, + kingdeeid?: string, + ispower?: number, + sort?: number, + classname?: string, + level?: number, + isman?: number, + status?: boolean, + child?: null, + type?:number; +} +export interface tarData{ + page?:number; + pageSize?:number; + name?:string; + dimension?:string; + attribute?:string; + orgidlist?:Array; +} +export interface addlist{ + name?:string; + share?:number; + acceptdepartmentid?:Array; + userlist?:Array; + dimension?:string; + nature?:number; + unit?:string; + cycle?:number; + cycleattr?:Number; + scoringmethod?:number; + visiblerangegroup?:Array; + visiblerangedepart?:Array; +} +export interface deltarget{ + id?:String; + state?:number; + istrue?:number; +} +export interface getgroupData{ + id?:number; + all:number; +} +export interface edittarget{ + acceptdepartmentid?:Array + cycle?:Number; + cycleattr:number; + dimension:string; + id:string; + name:string; + nature:number; + scoringmethod:Number; + unit:string; + userlist:Array +} +export interface position{ + page?:number; + pagesize?:number; + organization?:string; +} +export interface getgroup{ + id?:number; + level?:number; +} +export interface organd{ + all?:number; + id?:string; + levelL:number; +} +export interface postsss{ + attribute?:string; + dimension?:string; + page?:number; + pageSize?:number; + title?:string; + postidlist?:Array; +} +export interface addposttar{ + title?:string; + dimension?: String; + unit?:String; + type?: number; + scoringmethod?: number; + cycle?:number; + cycleattr?: number; + departmentPostOther?:Array + otherposttarget?:Array; + +} +export interface searchorgpos{ + name?:string; + orgid?:string; +} +export interface setposttarget{ + id?:string; + state?:number; + istrue?:number; +} +export interface table_base_post_target{ + id?:string; +} +export interface getdetails{ + targetid: string; + inspect: Array; + postlist: Array; + cycle:Number; +} +export interface neweditposttarget{ + title?:string; + dimension?: String; + unit?:String; + type?: number; + scoringmethod?: Number; + cycle?:Number; + cycleattr?: Number; + otherposttarget?:Array; + id:string; + visiblegroup:""; + visiblerange:"" +} +export interface get_organdpost_ary{ + id: string; +} +export interface look_work_flowcont{ + id:string; +} +export interface quantechart{ + AccMethod?:Array; + targetid?:Array; + year?:Array; + analysisangle?:number; + org?:Array; + timeattribute?:Array +} +export interface gettarget{ + page:number; + pagesize:number; +} +export interface getquantechartorgandyear{ + targetid:Array; +} +export interface summaryplanrecord{ + department:string; + month:Number; + targetid:string; + year:Number; +} +export interface get_post_target{ + id:string; +} diff --git a/.history/src/api/opk/type_20231109114757.ts b/.history/src/api/opk/type_20231109114757.ts new file mode 100644 index 000000000..4147512b2 --- /dev/null +++ b/.history/src/api/opk/type_20231109114757.ts @@ -0,0 +1,160 @@ +export interface postinfp{ + id?:number, + number?: string, + name?:string, + superior?:number, + organizationtype?: number, + abbreviation?: string, + time?: number, + state?: number, + wechatorganizationid?: number, + superiorsun?: string, + schoole?: number, + kingdeeid?: string, + ispower?: number, + sort?: number, + classname?: string, + level?: number, + isman?: number, + status?: boolean, + child?: null, + type?:number; +} +export interface tarData{ + page?:number; + pageSize?:number; + name?:string; + dimension?:string; + attribute?:string; + orgidlist?:Array; +} +export interface addlist{ + name?:string; + share?:number; + acceptdepartmentid?:Array; + userlist?:Array; + dimension?:string; + nature?:number; + unit?:string; + cycle?:number; + cycleattr?:Number; + scoringmethod?:number; + visiblerangegroup?:Array; + visiblerangedepart?:Array; +} +export interface deltarget{ + id?:String; + state?:number; + istrue?:number; +} +export interface getgroupData{ + id?:number; + all:number; +} +export interface edittarget{ + acceptdepartmentid?:Array + cycle?:Number; + cycleattr:number; + dimension:string; + id:string; + name:string; + nature:number; + scoringmethod:Number; + unit:string; + userlist:Array +} +export interface position{ + page?:number; + pagesize?:number; + organization?:string; +} +export interface getgroup{ + id?:number; + level?:number; +} +export interface organd{ + all?:number; + id?:string; + levelL:number; +} +export interface postsss{ + attribute?:string; + dimension?:string; + page?:number; + pageSize?:number; + title?:string; + postidlist?:Array; +} +export interface addposttar{ + title?:string; + dimension?: String; + unit?:String; + type?: number; + scoringmethod?: number; + cycle?:number; + cycleattr?: number; + departmentPostOther?:Array + otherposttarget?:Array; + +} +export interface searchorgpos{ + name?:string; + orgid?:string; +} +export interface setposttarget{ + id?:string; + state?:number; + istrue?:number; +} +export interface table_base_post_target{ + id?:string; +} +export interface getdetails{ + targetid: string; + inspect: Array; + postlist: Array; + cycle:Number; +} +export interface neweditposttarget{ + title?:string; + dimension?: String; + unit?:String; + type?: number; + scoringmethod?: Number; + cycle?:Number; + cycleattr?: Number; + otherposttarget?:Array; + id:string; + visiblegroup:""; + visiblerange:st +} +export interface get_organdpost_ary{ + id: string; +} +export interface look_work_flowcont{ + id:string; +} +export interface quantechart{ + AccMethod?:Array; + targetid?:Array; + year?:Array; + analysisangle?:number; + org?:Array; + timeattribute?:Array +} +export interface gettarget{ + page:number; + pagesize:number; +} +export interface getquantechartorgandyear{ + targetid:Array; +} +export interface summaryplanrecord{ + department:string; + month:Number; + targetid:string; + year:Number; +} +export interface get_post_target{ + id:string; +} diff --git a/.history/src/api/opk/type_20231109114758.ts b/.history/src/api/opk/type_20231109114758.ts new file mode 100644 index 000000000..602e04aba --- /dev/null +++ b/.history/src/api/opk/type_20231109114758.ts @@ -0,0 +1,160 @@ +export interface postinfp{ + id?:number, + number?: string, + name?:string, + superior?:number, + organizationtype?: number, + abbreviation?: string, + time?: number, + state?: number, + wechatorganizationid?: number, + superiorsun?: string, + schoole?: number, + kingdeeid?: string, + ispower?: number, + sort?: number, + classname?: string, + level?: number, + isman?: number, + status?: boolean, + child?: null, + type?:number; +} +export interface tarData{ + page?:number; + pageSize?:number; + name?:string; + dimension?:string; + attribute?:string; + orgidlist?:Array; +} +export interface addlist{ + name?:string; + share?:number; + acceptdepartmentid?:Array; + userlist?:Array; + dimension?:string; + nature?:number; + unit?:string; + cycle?:number; + cycleattr?:Number; + scoringmethod?:number; + visiblerangegroup?:Array; + visiblerangedepart?:Array; +} +export interface deltarget{ + id?:String; + state?:number; + istrue?:number; +} +export interface getgroupData{ + id?:number; + all:number; +} +export interface edittarget{ + acceptdepartmentid?:Array + cycle?:Number; + cycleattr:number; + dimension:string; + id:string; + name:string; + nature:number; + scoringmethod:Number; + unit:string; + userlist:Array +} +export interface position{ + page?:number; + pagesize?:number; + organization?:string; +} +export interface getgroup{ + id?:number; + level?:number; +} +export interface organd{ + all?:number; + id?:string; + levelL:number; +} +export interface postsss{ + attribute?:string; + dimension?:string; + page?:number; + pageSize?:number; + title?:string; + postidlist?:Array; +} +export interface addposttar{ + title?:string; + dimension?: String; + unit?:String; + type?: number; + scoringmethod?: number; + cycle?:number; + cycleattr?: number; + departmentPostOther?:Array + otherposttarget?:Array; + +} +export interface searchorgpos{ + name?:string; + orgid?:string; +} +export interface setposttarget{ + id?:string; + state?:number; + istrue?:number; +} +export interface table_base_post_target{ + id?:string; +} +export interface getdetails{ + targetid: string; + inspect: Array; + postlist: Array; + cycle:Number; +} +export interface neweditposttarget{ + title?:string; + dimension?: String; + unit?:String; + type?: number; + scoringmethod?: Number; + cycle?:Number; + cycleattr?: Number; + otherposttarget?:Array; + id:string; + visiblegroup:""; + visiblerange:string +} +export interface get_organdpost_ary{ + id: string; +} +export interface look_work_flowcont{ + id:string; +} +export interface quantechart{ + AccMethod?:Array; + targetid?:Array; + year?:Array; + analysisangle?:number; + org?:Array; + timeattribute?:Array +} +export interface gettarget{ + page:number; + pagesize:number; +} +export interface getquantechartorgandyear{ + targetid:Array; +} +export interface summaryplanrecord{ + department:string; + month:Number; + targetid:string; + year:Number; +} +export interface get_post_target{ + id:string; +} diff --git a/.history/src/api/opk/type_20231109114802.ts b/.history/src/api/opk/type_20231109114802.ts new file mode 100644 index 000000000..08e6ce96c --- /dev/null +++ b/.history/src/api/opk/type_20231109114802.ts @@ -0,0 +1,160 @@ +export interface postinfp{ + id?:number, + number?: string, + name?:string, + superior?:number, + organizationtype?: number, + abbreviation?: string, + time?: number, + state?: number, + wechatorganizationid?: number, + superiorsun?: string, + schoole?: number, + kingdeeid?: string, + ispower?: number, + sort?: number, + classname?: string, + level?: number, + isman?: number, + status?: boolean, + child?: null, + type?:number; +} +export interface tarData{ + page?:number; + pageSize?:number; + name?:string; + dimension?:string; + attribute?:string; + orgidlist?:Array; +} +export interface addlist{ + name?:string; + share?:number; + acceptdepartmentid?:Array; + userlist?:Array; + dimension?:string; + nature?:number; + unit?:string; + cycle?:number; + cycleattr?:Number; + scoringmethod?:number; + visiblerangegroup?:Array; + visiblerangedepart?:Array; +} +export interface deltarget{ + id?:String; + state?:number; + istrue?:number; +} +export interface getgroupData{ + id?:number; + all:number; +} +export interface edittarget{ + acceptdepartmentid?:Array + cycle?:Number; + cycleattr:number; + dimension:string; + id:string; + name:string; + nature:number; + scoringmethod:Number; + unit:string; + userlist:Array +} +export interface position{ + page?:number; + pagesize?:number; + organization?:string; +} +export interface getgroup{ + id?:number; + level?:number; +} +export interface organd{ + all?:number; + id?:string; + levelL:number; +} +export interface postsss{ + attribute?:string; + dimension?:string; + page?:number; + pageSize?:number; + title?:string; + postidlist?:Array; +} +export interface addposttar{ + title?:string; + dimension?: String; + unit?:String; + type?: number; + scoringmethod?: number; + cycle?:number; + cycleattr?: number; + departmentPostOther?:Array + otherposttarget?:Array; + +} +export interface searchorgpos{ + name?:string; + orgid?:string; +} +export interface setposttarget{ + id?:string; + state?:number; + istrue?:number; +} +export interface table_base_post_target{ + id?:string; +} +export interface getdetails{ + targetid: string; + inspect: Array; + postlist: Array; + cycle:Number; +} +export interface neweditposttarget{ + title?:string; + dimension?: String; + unit?:String; + type?: number; + scoringmethod?: Number; + cycle?:Number; + cycleattr?: Number; + otherposttarget?:Array; + id:string; + visiblegroup:string; + visiblerange:string +} +export interface get_organdpost_ary{ + id: string; +} +export interface look_work_flowcont{ + id:string; +} +export interface quantechart{ + AccMethod?:Array; + targetid?:Array; + year?:Array; + analysisangle?:number; + org?:Array; + timeattribute?:Array +} +export interface gettarget{ + page:number; + pagesize:number; +} +export interface getquantechartorgandyear{ + targetid:Array; +} +export interface summaryplanrecord{ + department:string; + month:Number; + targetid:string; + year:Number; +} +export interface get_post_target{ + id:string; +} diff --git a/.history/src/main_20231116082902.ts b/.history/src/main_20231116082902.ts new file mode 100644 index 000000000..85389ffc1 --- /dev/null +++ b/.history/src/main_20231116082902.ts @@ -0,0 +1,31 @@ +import { createApp } from 'vue'; +import App from './App.vue'; +import router from '@/router'; +import { setupStore } from '@/store'; +import { setupDirective } from '@/directive'; + +import ElementPlus from 'element-plus' +import zhCn from 'element-plus/es/locale/lang/zh-cn' + +import '@/permission'; + +// 本地SVG图标 +import 'virtual:svg-icons-register'; + +// 国际化 +import i18n from '@/lang/index'; + +// 样式 +import 'element-plus/theme-chalk/dark/css-vars.css'; +import '@/styles/index.scss'; +import 'uno.css'; +const app = createApp(App); +// 全局注册 自定义指令(directive) +setupDirective(app); +// 全局注册 状态管理(store) +setupStore(app); +app.use(router).use(i18n).use(ElementPlus, { + locale: zhCn +}).use(AKDesign).mount('#app'); + + diff --git a/.history/src/main_20231116082906.ts b/.history/src/main_20231116082906.ts new file mode 100644 index 000000000..3a8b7ab40 --- /dev/null +++ b/.history/src/main_20231116082906.ts @@ -0,0 +1,39 @@ +import { createApp } from 'vue'; +import App from './App.vue'; +import router from '@/router'; +import { setupStore } from '@/store'; +import { setupDirective } from '@/directive'; + +import ElementPlus from 'element-plus' +import zhCn from 'element-plus/es/locale/lang/zh-cn' + +import '@/permission'; + +// 本地SVG图标 +import 'virtual:svg-icons-register'; + +// 国际化 +import i18n from '@/lang/index'; + +// 样式 +import 'element-plus/theme-chalk/dark/css-vars.css'; +import '@/styles/index.scss'; +import 'uno.css'; +const app = createApp(App); +// 全局注册 自定义指令(directive) +setupDirective(app); +// 全局注册 状态管理(store) +setupStore(app); +import * as ElementPlusIconsVue from '@element-plus/icons-vue' + +import AKDesign from '@/views/sysworkflow/codepage/index' + +for (const [key, component] of Object.entries(ElementPlusIconsVue)) { + app.component(key, component) +} + +app.use(router).use(i18n).use(ElementPlus, { + locale: zhCn +}).use(AKDesign).mount('#app'); + + diff --git a/.history/src/views/opk/asd/news/bb_20231108094856.vue b/.history/src/views/opk/asd/news/bb_20231108094856.vue new file mode 100644 index 000000000..34b117577 --- /dev/null +++ b/.history/src/views/opk/asd/news/bb_20231108094856.vue @@ -0,0 +1,265 @@ + + + + diff --git a/.history/src/views/opk/asd/news/bb_20231108094858.vue b/.history/src/views/opk/asd/news/bb_20231108094858.vue new file mode 100644 index 000000000..b1dcef596 --- /dev/null +++ b/.history/src/views/opk/asd/news/bb_20231108094858.vue @@ -0,0 +1,265 @@ + + + + diff --git a/.history/src/views/opk/asd/news/bb_20231108094902.vue b/.history/src/views/opk/asd/news/bb_20231108094902.vue new file mode 100644 index 000000000..bebdff00f --- /dev/null +++ b/.history/src/views/opk/asd/news/bb_20231108094902.vue @@ -0,0 +1,265 @@ + + + + diff --git a/.history/src/views/opk/asd/news/bb_20231108094907.vue b/.history/src/views/opk/asd/news/bb_20231108094907.vue new file mode 100644 index 000000000..9e05f1320 --- /dev/null +++ b/.history/src/views/opk/asd/news/bb_20231108094907.vue @@ -0,0 +1,265 @@ + + + + diff --git a/.history/src/views/opk/asd/news/bb_20231108094912.vue b/.history/src/views/opk/asd/news/bb_20231108094912.vue new file mode 100644 index 000000000..5fa7dc8bd --- /dev/null +++ b/.history/src/views/opk/asd/news/bb_20231108094912.vue @@ -0,0 +1,265 @@ + + + + diff --git a/.history/src/views/opk/asd/news/bb_20231108094923.vue b/.history/src/views/opk/asd/news/bb_20231108094923.vue new file mode 100644 index 000000000..44028438c --- /dev/null +++ b/.history/src/views/opk/asd/news/bb_20231108094923.vue @@ -0,0 +1,265 @@ + + + + diff --git a/.history/src/views/opk/asd/news/bb_20231108094924.vue b/.history/src/views/opk/asd/news/bb_20231108094924.vue new file mode 100644 index 000000000..bff472245 --- /dev/null +++ b/.history/src/views/opk/asd/news/bb_20231108094924.vue @@ -0,0 +1,265 @@ + + + + diff --git a/.history/src/views/opk/asd/news/bb_20231108094929.vue b/.history/src/views/opk/asd/news/bb_20231108094929.vue new file mode 100644 index 000000000..96c32e262 --- /dev/null +++ b/.history/src/views/opk/asd/news/bb_20231108094929.vue @@ -0,0 +1,265 @@ + + + + diff --git a/.history/src/views/opk/asd/news/bb_20231108095106.vue b/.history/src/views/opk/asd/news/bb_20231108095106.vue new file mode 100644 index 000000000..720d77d2e --- /dev/null +++ b/.history/src/views/opk/asd/news/bb_20231108095106.vue @@ -0,0 +1,265 @@ + + + + diff --git a/.history/src/views/opk/asd/news/bb_20231108095136.vue b/.history/src/views/opk/asd/news/bb_20231108095136.vue new file mode 100644 index 000000000..0ecb1039f --- /dev/null +++ b/.history/src/views/opk/asd/news/bb_20231108095136.vue @@ -0,0 +1,265 @@ + + + + diff --git a/.history/src/views/opk/asd/news/bb_20231108095141.vue b/.history/src/views/opk/asd/news/bb_20231108095141.vue new file mode 100644 index 000000000..29fcaf7ef --- /dev/null +++ b/.history/src/views/opk/asd/news/bb_20231108095141.vue @@ -0,0 +1,265 @@ + + + + diff --git a/.history/src/views/opk/asd/news/bb_20231108095201.vue b/.history/src/views/opk/asd/news/bb_20231108095201.vue new file mode 100644 index 000000000..0ecb1039f --- /dev/null +++ b/.history/src/views/opk/asd/news/bb_20231108095201.vue @@ -0,0 +1,265 @@ + + + + diff --git a/.history/src/views/opk/asd/news/bb_20231108095206.vue b/.history/src/views/opk/asd/news/bb_20231108095206.vue new file mode 100644 index 000000000..29fcaf7ef --- /dev/null +++ b/.history/src/views/opk/asd/news/bb_20231108095206.vue @@ -0,0 +1,265 @@ + + + + diff --git a/.history/src/views/opk/asd/news/bb_20231108095209.vue b/.history/src/views/opk/asd/news/bb_20231108095209.vue new file mode 100644 index 000000000..d8c03bf7b --- /dev/null +++ b/.history/src/views/opk/asd/news/bb_20231108095209.vue @@ -0,0 +1,265 @@ + + + + diff --git a/.history/src/views/opk/asd/news/bb_20231108095326.vue b/.history/src/views/opk/asd/news/bb_20231108095326.vue new file mode 100644 index 000000000..0ad800ab7 --- /dev/null +++ b/.history/src/views/opk/asd/news/bb_20231108095326.vue @@ -0,0 +1,265 @@ + + + + diff --git a/.history/src/views/opk/asd/news/bb_20231108095329.vue b/.history/src/views/opk/asd/news/bb_20231108095329.vue new file mode 100644 index 000000000..d3fad152d --- /dev/null +++ b/.history/src/views/opk/asd/news/bb_20231108095329.vue @@ -0,0 +1,265 @@ + + + + diff --git a/.history/src/views/opk/asd/news/bb_20231108095330.vue b/.history/src/views/opk/asd/news/bb_20231108095330.vue new file mode 100644 index 000000000..58d0a0c89 --- /dev/null +++ b/.history/src/views/opk/asd/news/bb_20231108095330.vue @@ -0,0 +1,265 @@ + + + + diff --git a/.history/src/views/opk/asd/news/bb_20231108095331.vue b/.history/src/views/opk/asd/news/bb_20231108095331.vue new file mode 100644 index 000000000..57f0018d2 --- /dev/null +++ b/.history/src/views/opk/asd/news/bb_20231108095331.vue @@ -0,0 +1,265 @@ + + + + diff --git a/.history/src/views/opk/asd/news/bb_20231108095333.vue b/.history/src/views/opk/asd/news/bb_20231108095333.vue new file mode 100644 index 000000000..ade375d65 --- /dev/null +++ b/.history/src/views/opk/asd/news/bb_20231108095333.vue @@ -0,0 +1,265 @@ + + + + diff --git a/.history/src/views/opk/asd/news/bb_20231108095351.vue b/.history/src/views/opk/asd/news/bb_20231108095351.vue new file mode 100644 index 000000000..6873da878 --- /dev/null +++ b/.history/src/views/opk/asd/news/bb_20231108095351.vue @@ -0,0 +1,265 @@ + + + + diff --git a/.history/src/views/opk/asd/news/bb_20231108095353.vue b/.history/src/views/opk/asd/news/bb_20231108095353.vue new file mode 100644 index 000000000..8ad2e9b13 --- /dev/null +++ b/.history/src/views/opk/asd/news/bb_20231108095353.vue @@ -0,0 +1,265 @@ + + + + diff --git a/.history/src/views/opk/asd/news/bb_20231108095358.vue b/.history/src/views/opk/asd/news/bb_20231108095358.vue new file mode 100644 index 000000000..5e993455e --- /dev/null +++ b/.history/src/views/opk/asd/news/bb_20231108095358.vue @@ -0,0 +1,265 @@ + + + + diff --git a/.history/src/views/opk/asd/news/bb_20231108095415.vue b/.history/src/views/opk/asd/news/bb_20231108095415.vue new file mode 100644 index 000000000..1e42e2303 --- /dev/null +++ b/.history/src/views/opk/asd/news/bb_20231108095415.vue @@ -0,0 +1,265 @@ + + + + diff --git a/.history/src/views/opk/asd/news/bb_20231108095416.vue b/.history/src/views/opk/asd/news/bb_20231108095416.vue new file mode 100644 index 000000000..c3e772a54 --- /dev/null +++ b/.history/src/views/opk/asd/news/bb_20231108095416.vue @@ -0,0 +1,265 @@ + + + + diff --git a/.history/src/views/opk/asd/news/bb_20231108095423.vue b/.history/src/views/opk/asd/news/bb_20231108095423.vue new file mode 100644 index 000000000..6e35f76e8 --- /dev/null +++ b/.history/src/views/opk/asd/news/bb_20231108095423.vue @@ -0,0 +1,265 @@ + + + + diff --git a/.history/src/views/opk/asd/news/bb_20231108095440.vue b/.history/src/views/opk/asd/news/bb_20231108095440.vue new file mode 100644 index 000000000..1e795ca09 --- /dev/null +++ b/.history/src/views/opk/asd/news/bb_20231108095440.vue @@ -0,0 +1,265 @@ + + + + diff --git a/.history/src/views/opk/asd/news/bb_20231108095441.vue b/.history/src/views/opk/asd/news/bb_20231108095441.vue new file mode 100644 index 000000000..8bd4b458d --- /dev/null +++ b/.history/src/views/opk/asd/news/bb_20231108095441.vue @@ -0,0 +1,265 @@ + + + + diff --git a/.history/src/views/opk/asd/news/bb_20231108095447.vue b/.history/src/views/opk/asd/news/bb_20231108095447.vue new file mode 100644 index 000000000..18a38c4cb --- /dev/null +++ b/.history/src/views/opk/asd/news/bb_20231108095447.vue @@ -0,0 +1,265 @@ + + + + diff --git a/.history/src/views/opk/asd/news/bb_20231108160410.vue b/.history/src/views/opk/asd/news/bb_20231108160410.vue new file mode 100644 index 000000000..4743cc658 --- /dev/null +++ b/.history/src/views/opk/asd/news/bb_20231108160410.vue @@ -0,0 +1,265 @@ + + + + diff --git a/.history/src/views/opk/asd/news/bb_20231108160411.vue b/.history/src/views/opk/asd/news/bb_20231108160411.vue new file mode 100644 index 000000000..3a57f8342 --- /dev/null +++ b/.history/src/views/opk/asd/news/bb_20231108160411.vue @@ -0,0 +1,265 @@ + + + + diff --git a/.history/src/views/opk/asd/news/bb_20231108160414.vue b/.history/src/views/opk/asd/news/bb_20231108160414.vue new file mode 100644 index 000000000..4c551fa8c --- /dev/null +++ b/.history/src/views/opk/asd/news/bb_20231108160414.vue @@ -0,0 +1,265 @@ + + + + diff --git a/.history/src/views/opk/asd/news/bb_20231108160503.vue b/.history/src/views/opk/asd/news/bb_20231108160503.vue new file mode 100644 index 000000000..99de13bf8 --- /dev/null +++ b/.history/src/views/opk/asd/news/bb_20231108160503.vue @@ -0,0 +1,265 @@ + + + + diff --git a/.history/src/views/opk/asd/news/bb_20231108160511.vue b/.history/src/views/opk/asd/news/bb_20231108160511.vue new file mode 100644 index 000000000..dceb35222 --- /dev/null +++ b/.history/src/views/opk/asd/news/bb_20231108160511.vue @@ -0,0 +1,265 @@ + + + + diff --git a/.history/src/views/opk/asd/news/bb_20231108160520.vue b/.history/src/views/opk/asd/news/bb_20231108160520.vue new file mode 100644 index 000000000..4c551fa8c --- /dev/null +++ b/.history/src/views/opk/asd/news/bb_20231108160520.vue @@ -0,0 +1,265 @@ + + + + diff --git a/.history/src/views/opk/asd/news/bb_20231108160609.vue b/.history/src/views/opk/asd/news/bb_20231108160609.vue new file mode 100644 index 000000000..a622fa053 --- /dev/null +++ b/.history/src/views/opk/asd/news/bb_20231108160609.vue @@ -0,0 +1,265 @@ + + + + diff --git a/.history/src/views/opk/asd/news/bb_20231108160611.vue b/.history/src/views/opk/asd/news/bb_20231108160611.vue new file mode 100644 index 000000000..746c09263 --- /dev/null +++ b/.history/src/views/opk/asd/news/bb_20231108160611.vue @@ -0,0 +1,265 @@ + + + + diff --git a/.history/src/views/opk/asd/news/bb_20231108160616.vue b/.history/src/views/opk/asd/news/bb_20231108160616.vue new file mode 100644 index 000000000..13b994c37 --- /dev/null +++ b/.history/src/views/opk/asd/news/bb_20231108160616.vue @@ -0,0 +1,265 @@ + + + + diff --git a/.history/src/views/opk/asd/news/bb_20231108160634.vue b/.history/src/views/opk/asd/news/bb_20231108160634.vue new file mode 100644 index 000000000..0708abf4a --- /dev/null +++ b/.history/src/views/opk/asd/news/bb_20231108160634.vue @@ -0,0 +1,265 @@ + + + + diff --git a/.history/src/views/opk/asd/news/bb_20231108160649.vue b/.history/src/views/opk/asd/news/bb_20231108160649.vue new file mode 100644 index 000000000..0708abf4a --- /dev/null +++ b/.history/src/views/opk/asd/news/bb_20231108160649.vue @@ -0,0 +1,265 @@ + + + + diff --git a/.history/src/views/opk/asd/news/bb_20231108160654.vue b/.history/src/views/opk/asd/news/bb_20231108160654.vue new file mode 100644 index 000000000..b18a60e6e --- /dev/null +++ b/.history/src/views/opk/asd/news/bb_20231108160654.vue @@ -0,0 +1,265 @@ + + + + diff --git a/.history/src/views/opk/asd/news/bb_20231108160705.vue b/.history/src/views/opk/asd/news/bb_20231108160705.vue new file mode 100644 index 000000000..4c551fa8c --- /dev/null +++ b/.history/src/views/opk/asd/news/bb_20231108160705.vue @@ -0,0 +1,265 @@ + + + + diff --git a/.history/src/views/opk/asd/news/bb_20231108160711.vue b/.history/src/views/opk/asd/news/bb_20231108160711.vue new file mode 100644 index 000000000..bc50effee --- /dev/null +++ b/.history/src/views/opk/asd/news/bb_20231108160711.vue @@ -0,0 +1,265 @@ + + + + diff --git a/.history/src/views/opk/asd/news/bb_20231108160735.vue b/.history/src/views/opk/asd/news/bb_20231108160735.vue new file mode 100644 index 000000000..4c551fa8c --- /dev/null +++ b/.history/src/views/opk/asd/news/bb_20231108160735.vue @@ -0,0 +1,265 @@ + + + + diff --git a/.history/src/views/opk/asd/news/bb_20231108160812.vue b/.history/src/views/opk/asd/news/bb_20231108160812.vue new file mode 100644 index 000000000..f45720a81 --- /dev/null +++ b/.history/src/views/opk/asd/news/bb_20231108160812.vue @@ -0,0 +1,265 @@ + + + + diff --git a/.history/src/views/opk/asd/news/bb_20231108160820.vue b/.history/src/views/opk/asd/news/bb_20231108160820.vue new file mode 100644 index 000000000..26a9c57b6 --- /dev/null +++ b/.history/src/views/opk/asd/news/bb_20231108160820.vue @@ -0,0 +1,265 @@ + + + + diff --git a/.history/src/views/opk/asd/news/bb_20231108160831.vue b/.history/src/views/opk/asd/news/bb_20231108160831.vue new file mode 100644 index 000000000..59d6392ef --- /dev/null +++ b/.history/src/views/opk/asd/news/bb_20231108160831.vue @@ -0,0 +1,265 @@ + + + + diff --git a/.history/src/views/opk/asd/news/bb_20231108160837.vue b/.history/src/views/opk/asd/news/bb_20231108160837.vue new file mode 100644 index 000000000..103257486 --- /dev/null +++ b/.history/src/views/opk/asd/news/bb_20231108160837.vue @@ -0,0 +1,265 @@ + + + + diff --git a/.history/src/views/opk/asd/news/bb_20231108160839.vue b/.history/src/views/opk/asd/news/bb_20231108160839.vue new file mode 100644 index 000000000..941ef0e83 --- /dev/null +++ b/.history/src/views/opk/asd/news/bb_20231108160839.vue @@ -0,0 +1,265 @@ + + + + diff --git a/.history/src/views/opk/asd/news/bb_20231108160856.vue b/.history/src/views/opk/asd/news/bb_20231108160856.vue new file mode 100644 index 000000000..ca4e4566f --- /dev/null +++ b/.history/src/views/opk/asd/news/bb_20231108160856.vue @@ -0,0 +1,265 @@ + + + + diff --git a/.history/src/views/opk/asd/news/bb_20231108160905.vue b/.history/src/views/opk/asd/news/bb_20231108160905.vue new file mode 100644 index 000000000..457b9212a --- /dev/null +++ b/.history/src/views/opk/asd/news/bb_20231108160905.vue @@ -0,0 +1,265 @@ + + + + diff --git a/.history/src/views/opk/asd/news/bb_20231108160917.vue b/.history/src/views/opk/asd/news/bb_20231108160917.vue new file mode 100644 index 000000000..be19d0dea --- /dev/null +++ b/.history/src/views/opk/asd/news/bb_20231108160917.vue @@ -0,0 +1,265 @@ + + + + diff --git a/.history/src/views/opk/asd/news/bb_20231108160925.vue b/.history/src/views/opk/asd/news/bb_20231108160925.vue new file mode 100644 index 000000000..ec9e0a1ad --- /dev/null +++ b/.history/src/views/opk/asd/news/bb_20231108160925.vue @@ -0,0 +1,265 @@ + + + + diff --git a/.history/src/views/opk/asd/news/bb_20231108160933.vue b/.history/src/views/opk/asd/news/bb_20231108160933.vue new file mode 100644 index 000000000..1c2d782fe --- /dev/null +++ b/.history/src/views/opk/asd/news/bb_20231108160933.vue @@ -0,0 +1,265 @@ + + + + diff --git a/.history/src/views/opk/asd/news/bb_20231109110154.vue b/.history/src/views/opk/asd/news/bb_20231109110154.vue new file mode 100644 index 000000000..5c2be61f8 --- /dev/null +++ b/.history/src/views/opk/asd/news/bb_20231109110154.vue @@ -0,0 +1,265 @@ + + + + diff --git a/.history/src/views/opk/asd/news/bb_20231109110200.vue b/.history/src/views/opk/asd/news/bb_20231109110200.vue new file mode 100644 index 000000000..a27967806 --- /dev/null +++ b/.history/src/views/opk/asd/news/bb_20231109110200.vue @@ -0,0 +1,265 @@ + + + + diff --git a/.history/src/views/opk/asd/news/bb_20231109110208.vue b/.history/src/views/opk/asd/news/bb_20231109110208.vue new file mode 100644 index 000000000..d81b72d8c --- /dev/null +++ b/.history/src/views/opk/asd/news/bb_20231109110208.vue @@ -0,0 +1,265 @@ + + + + diff --git a/.history/src/views/opk/asd/news/bb_20231109110229.vue b/.history/src/views/opk/asd/news/bb_20231109110229.vue new file mode 100644 index 000000000..ed4b03fab --- /dev/null +++ b/.history/src/views/opk/asd/news/bb_20231109110229.vue @@ -0,0 +1,265 @@ + + + + diff --git a/.history/src/views/opk/asd/news/bb_20231109110233.vue b/.history/src/views/opk/asd/news/bb_20231109110233.vue new file mode 100644 index 000000000..317325da0 --- /dev/null +++ b/.history/src/views/opk/asd/news/bb_20231109110233.vue @@ -0,0 +1,265 @@ + + + + diff --git a/.history/src/views/opk/asd/news/bb_20231109110241.vue b/.history/src/views/opk/asd/news/bb_20231109110241.vue new file mode 100644 index 000000000..7bb2e8010 --- /dev/null +++ b/.history/src/views/opk/asd/news/bb_20231109110241.vue @@ -0,0 +1,268 @@ + + + + diff --git a/.history/src/views/opk/asd/news/bb_20231109110252.vue b/.history/src/views/opk/asd/news/bb_20231109110252.vue new file mode 100644 index 000000000..01a62fc95 --- /dev/null +++ b/.history/src/views/opk/asd/news/bb_20231109110252.vue @@ -0,0 +1,268 @@ + + + + diff --git a/.history/src/views/opk/asd/news/bb_20231109110257.vue b/.history/src/views/opk/asd/news/bb_20231109110257.vue new file mode 100644 index 000000000..8052f3b86 --- /dev/null +++ b/.history/src/views/opk/asd/news/bb_20231109110257.vue @@ -0,0 +1,268 @@ + + + + diff --git a/.history/src/views/opk/asd/news/bb_20231109110302.vue b/.history/src/views/opk/asd/news/bb_20231109110302.vue new file mode 100644 index 000000000..42aac39f4 --- /dev/null +++ b/.history/src/views/opk/asd/news/bb_20231109110302.vue @@ -0,0 +1,268 @@ + + + + diff --git a/.history/src/views/opk/asd/news/bb_20231109110310.vue b/.history/src/views/opk/asd/news/bb_20231109110310.vue new file mode 100644 index 000000000..4a316e9f8 --- /dev/null +++ b/.history/src/views/opk/asd/news/bb_20231109110310.vue @@ -0,0 +1,268 @@ + + + + diff --git a/.history/src/views/opk/asd/news/bb_20231109110324.vue b/.history/src/views/opk/asd/news/bb_20231109110324.vue new file mode 100644 index 000000000..a1268cea9 --- /dev/null +++ b/.history/src/views/opk/asd/news/bb_20231109110324.vue @@ -0,0 +1,268 @@ + + + + diff --git a/.history/src/views/opk/asd/news/bb_20231110135213.vue b/.history/src/views/opk/asd/news/bb_20231110135213.vue new file mode 100644 index 000000000..2fcb99799 --- /dev/null +++ b/.history/src/views/opk/asd/news/bb_20231110135213.vue @@ -0,0 +1,268 @@ + + + + diff --git a/.history/src/views/opk/asd/news/bb_20231110135241.vue b/.history/src/views/opk/asd/news/bb_20231110135241.vue new file mode 100644 index 000000000..19957b380 --- /dev/null +++ b/.history/src/views/opk/asd/news/bb_20231110135241.vue @@ -0,0 +1,268 @@ + + + + diff --git a/.history/src/views/opk/asd/news/bb_20231110135352.vue b/.history/src/views/opk/asd/news/bb_20231110135352.vue new file mode 100644 index 000000000..01e67922b --- /dev/null +++ b/.history/src/views/opk/asd/news/bb_20231110135352.vue @@ -0,0 +1,268 @@ + + + + diff --git a/.history/src/views/opk/asd/news/bb_20231110135358.vue b/.history/src/views/opk/asd/news/bb_20231110135358.vue new file mode 100644 index 000000000..b796244e1 --- /dev/null +++ b/.history/src/views/opk/asd/news/bb_20231110135358.vue @@ -0,0 +1,268 @@ + + + + diff --git a/.history/src/views/opk/asd/news/bb_20231110135412.vue b/.history/src/views/opk/asd/news/bb_20231110135412.vue new file mode 100644 index 000000000..23cdd807a --- /dev/null +++ b/.history/src/views/opk/asd/news/bb_20231110135412.vue @@ -0,0 +1,269 @@ + + + + diff --git a/.history/src/views/opk/asd/news/bb_20231110135421.vue b/.history/src/views/opk/asd/news/bb_20231110135421.vue new file mode 100644 index 000000000..e24fa7523 --- /dev/null +++ b/.history/src/views/opk/asd/news/bb_20231110135421.vue @@ -0,0 +1,270 @@ + + + + diff --git a/.history/src/views/opk/asd/news/bb_20231110135425.vue b/.history/src/views/opk/asd/news/bb_20231110135425.vue new file mode 100644 index 000000000..e171e455f --- /dev/null +++ b/.history/src/views/opk/asd/news/bb_20231110135425.vue @@ -0,0 +1,270 @@ + + + + diff --git a/.history/src/views/opk/asd/news/bb_20231110135426.vue b/.history/src/views/opk/asd/news/bb_20231110135426.vue new file mode 100644 index 000000000..577e16441 --- /dev/null +++ b/.history/src/views/opk/asd/news/bb_20231110135426.vue @@ -0,0 +1,270 @@ + + + + diff --git a/.history/src/views/opk/asd/news/bb_20231110135446.vue b/.history/src/views/opk/asd/news/bb_20231110135446.vue new file mode 100644 index 000000000..0426c4eab --- /dev/null +++ b/.history/src/views/opk/asd/news/bb_20231110135446.vue @@ -0,0 +1,271 @@ + + + + diff --git a/.history/src/views/opk/asd/news/bb_20231110135449.vue b/.history/src/views/opk/asd/news/bb_20231110135449.vue new file mode 100644 index 000000000..7a63164a3 --- /dev/null +++ b/.history/src/views/opk/asd/news/bb_20231110135449.vue @@ -0,0 +1,271 @@ + + + + diff --git a/.history/src/views/opk/asd/news/bb_20231110135500.vue b/.history/src/views/opk/asd/news/bb_20231110135500.vue new file mode 100644 index 000000000..723836a6a --- /dev/null +++ b/.history/src/views/opk/asd/news/bb_20231110135500.vue @@ -0,0 +1,272 @@ + + + + diff --git a/.history/src/views/opk/asd/news/bb_20231110135518.vue b/.history/src/views/opk/asd/news/bb_20231110135518.vue new file mode 100644 index 000000000..b1a9416b8 --- /dev/null +++ b/.history/src/views/opk/asd/news/bb_20231110135518.vue @@ -0,0 +1,273 @@ + + + + diff --git a/.history/src/views/opk/asd/news/bb_20231110135522.vue b/.history/src/views/opk/asd/news/bb_20231110135522.vue new file mode 100644 index 000000000..a2844718d --- /dev/null +++ b/.history/src/views/opk/asd/news/bb_20231110135522.vue @@ -0,0 +1,273 @@ + + + + diff --git a/.history/src/views/opk/asd/news/bb_20231115141944.vue b/.history/src/views/opk/asd/news/bb_20231115141944.vue new file mode 100644 index 000000000..6325008de --- /dev/null +++ b/.history/src/views/opk/asd/news/bb_20231115141944.vue @@ -0,0 +1,273 @@ + + + + diff --git a/.history/src/views/opk/asd/news/bb_20231115141947.vue b/.history/src/views/opk/asd/news/bb_20231115141947.vue new file mode 100644 index 000000000..c651eb8b0 --- /dev/null +++ b/.history/src/views/opk/asd/news/bb_20231115141947.vue @@ -0,0 +1,273 @@ + + + + diff --git a/.history/src/views/opk/yui/new/bb_20231018105849.vue b/.history/src/views/opk/asd/news/cc_20231108095543.vue similarity index 53% rename from .history/src/views/opk/yui/new/bb_20231018105849.vue rename to .history/src/views/opk/asd/news/cc_20231108095543.vue index 9bb7db088..41721ff62 100644 --- a/.history/src/views/opk/yui/new/bb_20231018105849.vue +++ b/.history/src/views/opk/asd/news/cc_20231108095543.vue @@ -5,13 +5,12 @@ --> diff --git a/.history/src/views/opk/yui/new/bb_20231018110054.vue b/.history/src/views/opk/asd/news/cc_20231108095550.vue similarity index 53% rename from .history/src/views/opk/yui/new/bb_20231018110054.vue rename to .history/src/views/opk/asd/news/cc_20231108095550.vue index c8728a262..269dc3516 100644 --- a/.history/src/views/opk/yui/new/bb_20231018110054.vue +++ b/.history/src/views/opk/asd/news/cc_20231108095550.vue @@ -5,13 +5,12 @@ --> diff --git a/.history/src/views/opk/yui/new/bb_20231018110058.vue b/.history/src/views/opk/asd/news/cc_20231108095551.vue similarity index 53% rename from .history/src/views/opk/yui/new/bb_20231018110058.vue rename to .history/src/views/opk/asd/news/cc_20231108095551.vue index ba3419833..d734742ae 100644 --- a/.history/src/views/opk/yui/new/bb_20231018110058.vue +++ b/.history/src/views/opk/asd/news/cc_20231108095551.vue @@ -5,13 +5,12 @@ --> diff --git a/.history/src/views/opk/yui/new/bb_20231018110100.vue b/.history/src/views/opk/asd/news/cc_20231108095553.vue similarity index 53% rename from .history/src/views/opk/yui/new/bb_20231018110100.vue rename to .history/src/views/opk/asd/news/cc_20231108095553.vue index e99db362b..f61835028 100644 --- a/.history/src/views/opk/yui/new/bb_20231018110100.vue +++ b/.history/src/views/opk/asd/news/cc_20231108095553.vue @@ -5,13 +5,12 @@ --> diff --git a/.history/src/views/opk/asd/news/cc_20231108095602.vue b/.history/src/views/opk/asd/news/cc_20231108095602.vue new file mode 100644 index 000000000..99deb4988 --- /dev/null +++ b/.history/src/views/opk/asd/news/cc_20231108095602.vue @@ -0,0 +1,218 @@ + + + + diff --git a/.history/src/views/opk/asd/news/cc_20231108095607.vue b/.history/src/views/opk/asd/news/cc_20231108095607.vue new file mode 100644 index 000000000..c52659d03 --- /dev/null +++ b/.history/src/views/opk/asd/news/cc_20231108095607.vue @@ -0,0 +1,218 @@ + + + + diff --git a/.history/src/views/opk/asd/news/cc_20231108095610.vue b/.history/src/views/opk/asd/news/cc_20231108095610.vue new file mode 100644 index 000000000..2f51ce3fb --- /dev/null +++ b/.history/src/views/opk/asd/news/cc_20231108095610.vue @@ -0,0 +1,218 @@ + + + + diff --git a/.history/src/views/opk/asd/news/cc_20231108095620.vue b/.history/src/views/opk/asd/news/cc_20231108095620.vue new file mode 100644 index 000000000..85cc748c5 --- /dev/null +++ b/.history/src/views/opk/asd/news/cc_20231108095620.vue @@ -0,0 +1,218 @@ + + + + diff --git a/.history/src/views/opk/asd/news/cc_20231108095621.vue b/.history/src/views/opk/asd/news/cc_20231108095621.vue new file mode 100644 index 000000000..38c511fb8 --- /dev/null +++ b/.history/src/views/opk/asd/news/cc_20231108095621.vue @@ -0,0 +1,218 @@ + + + + diff --git a/.history/src/views/opk/asd/news/cc_20231108095626.vue b/.history/src/views/opk/asd/news/cc_20231108095626.vue new file mode 100644 index 000000000..7d013dbf9 --- /dev/null +++ b/.history/src/views/opk/asd/news/cc_20231108095626.vue @@ -0,0 +1,218 @@ + + + + diff --git a/.history/src/views/opk/asd/news/cc_20231108095657.vue b/.history/src/views/opk/asd/news/cc_20231108095657.vue new file mode 100644 index 000000000..f1c56c35f --- /dev/null +++ b/.history/src/views/opk/asd/news/cc_20231108095657.vue @@ -0,0 +1,218 @@ + + + + diff --git a/.history/src/views/opk/asd/news/cc_20231108095703.vue b/.history/src/views/opk/asd/news/cc_20231108095703.vue new file mode 100644 index 000000000..1a99b53b1 --- /dev/null +++ b/.history/src/views/opk/asd/news/cc_20231108095703.vue @@ -0,0 +1,218 @@ + + + + diff --git a/.history/src/views/opk/asd/news/cc_20231108095706.vue b/.history/src/views/opk/asd/news/cc_20231108095706.vue new file mode 100644 index 000000000..8cb3bffd1 --- /dev/null +++ b/.history/src/views/opk/asd/news/cc_20231108095706.vue @@ -0,0 +1,218 @@ + + + + diff --git a/.history/src/views/opk/asd/news/cc_20231108095709.vue b/.history/src/views/opk/asd/news/cc_20231108095709.vue new file mode 100644 index 000000000..8b16a8f1b --- /dev/null +++ b/.history/src/views/opk/asd/news/cc_20231108095709.vue @@ -0,0 +1,218 @@ + + + + diff --git a/.history/src/views/opk/asd/news/cc_20231108095712.vue b/.history/src/views/opk/asd/news/cc_20231108095712.vue new file mode 100644 index 000000000..570715ef3 --- /dev/null +++ b/.history/src/views/opk/asd/news/cc_20231108095712.vue @@ -0,0 +1,218 @@ + + + + diff --git a/.history/src/views/opk/asd/news/cc_20231109110500.vue b/.history/src/views/opk/asd/news/cc_20231109110500.vue new file mode 100644 index 000000000..ab20fe137 --- /dev/null +++ b/.history/src/views/opk/asd/news/cc_20231109110500.vue @@ -0,0 +1,218 @@ + + + + diff --git a/.history/src/views/opk/asd/news/cc_20231109110507.vue b/.history/src/views/opk/asd/news/cc_20231109110507.vue new file mode 100644 index 000000000..d0dfcd904 --- /dev/null +++ b/.history/src/views/opk/asd/news/cc_20231109110507.vue @@ -0,0 +1,218 @@ + + + + diff --git a/.history/src/views/opk/asd/news/cc_20231109110512.vue b/.history/src/views/opk/asd/news/cc_20231109110512.vue new file mode 100644 index 000000000..cad7a90d1 --- /dev/null +++ b/.history/src/views/opk/asd/news/cc_20231109110512.vue @@ -0,0 +1,220 @@ + + + + diff --git a/.history/src/views/opk/asd/news/cc_20231109110515.vue b/.history/src/views/opk/asd/news/cc_20231109110515.vue new file mode 100644 index 000000000..377f1a9a1 --- /dev/null +++ b/.history/src/views/opk/asd/news/cc_20231109110515.vue @@ -0,0 +1,220 @@ + + + + diff --git a/.history/src/views/opk/asd/news/cc_20231109110522.vue b/.history/src/views/opk/asd/news/cc_20231109110522.vue new file mode 100644 index 000000000..acf61de13 --- /dev/null +++ b/.history/src/views/opk/asd/news/cc_20231109110522.vue @@ -0,0 +1,221 @@ + + + + diff --git a/.history/src/views/opk/asd/news/cc_20231109110529.vue b/.history/src/views/opk/asd/news/cc_20231109110529.vue new file mode 100644 index 000000000..6e13a7b19 --- /dev/null +++ b/.history/src/views/opk/asd/news/cc_20231109110529.vue @@ -0,0 +1,221 @@ + + + + diff --git a/.history/src/views/opk/asd/news/cc_20231109110535.vue b/.history/src/views/opk/asd/news/cc_20231109110535.vue new file mode 100644 index 000000000..1db3b8104 --- /dev/null +++ b/.history/src/views/opk/asd/news/cc_20231109110535.vue @@ -0,0 +1,221 @@ + + + + diff --git a/.history/src/views/opk/asd/news/cc_20231109110540.vue b/.history/src/views/opk/asd/news/cc_20231109110540.vue new file mode 100644 index 000000000..a909db324 --- /dev/null +++ b/.history/src/views/opk/asd/news/cc_20231109110540.vue @@ -0,0 +1,221 @@ + + + + diff --git a/.history/src/views/opk/asd/news/cc_20231109110553.vue b/.history/src/views/opk/asd/news/cc_20231109110553.vue new file mode 100644 index 000000000..fc7163a19 --- /dev/null +++ b/.history/src/views/opk/asd/news/cc_20231109110553.vue @@ -0,0 +1,221 @@ + + + + diff --git a/.history/src/views/opk/asd/news/cc_20231109110602.vue b/.history/src/views/opk/asd/news/cc_20231109110602.vue new file mode 100644 index 000000000..a909db324 --- /dev/null +++ b/.history/src/views/opk/asd/news/cc_20231109110602.vue @@ -0,0 +1,221 @@ + + + + diff --git a/.history/src/views/opk/asd/news/cc_20231109110615.vue b/.history/src/views/opk/asd/news/cc_20231109110615.vue new file mode 100644 index 000000000..05723d72f --- /dev/null +++ b/.history/src/views/opk/asd/news/cc_20231109110615.vue @@ -0,0 +1,221 @@ + + + + diff --git a/.history/src/views/opk/asd/news/cc_20231109110623.vue b/.history/src/views/opk/asd/news/cc_20231109110623.vue new file mode 100644 index 000000000..31ca4f0f7 --- /dev/null +++ b/.history/src/views/opk/asd/news/cc_20231109110623.vue @@ -0,0 +1,221 @@ + + + + diff --git a/.history/src/views/opk/asd/news/cc_20231110080240.vue b/.history/src/views/opk/asd/news/cc_20231110080240.vue new file mode 100644 index 000000000..93583ec3c --- /dev/null +++ b/.history/src/views/opk/asd/news/cc_20231110080240.vue @@ -0,0 +1,221 @@ + + + + diff --git a/.history/src/views/opk/asd/news/cc_20231110080248.vue b/.history/src/views/opk/asd/news/cc_20231110080248.vue new file mode 100644 index 000000000..250b94c5a --- /dev/null +++ b/.history/src/views/opk/asd/news/cc_20231110080248.vue @@ -0,0 +1,221 @@ + + + + diff --git a/.history/src/views/opk/asd/news/cc_20231110080302.vue b/.history/src/views/opk/asd/news/cc_20231110080302.vue new file mode 100644 index 000000000..5146cbac0 --- /dev/null +++ b/.history/src/views/opk/asd/news/cc_20231110080302.vue @@ -0,0 +1,221 @@ + + + + diff --git a/.history/src/views/opk/asd/news/cc_20231110080324.vue b/.history/src/views/opk/asd/news/cc_20231110080324.vue new file mode 100644 index 000000000..5fc97e3ee --- /dev/null +++ b/.history/src/views/opk/asd/news/cc_20231110080324.vue @@ -0,0 +1,221 @@ + + + + diff --git a/.history/src/views/opk/asd/news/cc_20231110080345.vue b/.history/src/views/opk/asd/news/cc_20231110080345.vue new file mode 100644 index 000000000..2c1cd55f3 --- /dev/null +++ b/.history/src/views/opk/asd/news/cc_20231110080345.vue @@ -0,0 +1,221 @@ + + + + diff --git a/.history/src/views/opk/asd/news/cc_20231110080357.vue b/.history/src/views/opk/asd/news/cc_20231110080357.vue new file mode 100644 index 000000000..cb7011104 --- /dev/null +++ b/.history/src/views/opk/asd/news/cc_20231110080357.vue @@ -0,0 +1,221 @@ + + + + diff --git a/.history/src/views/opk/asd/news/dialog_20231016163820.vue b/.history/src/views/opk/asd/news/dialog_20231016163820.vue deleted file mode 100644 index d81bd86cc..000000000 --- a/.history/src/views/opk/asd/news/dialog_20231016163820.vue +++ /dev/null @@ -1,222 +0,0 @@ - - - - - - - - \ No newline at end of file diff --git a/.history/src/views/opk/asd/news/dialog_20231016163824.vue b/.history/src/views/opk/asd/news/dialog_20231016163824.vue deleted file mode 100644 index d33069c5b..000000000 --- a/.history/src/views/opk/asd/news/dialog_20231016163824.vue +++ /dev/null @@ -1,222 +0,0 @@ - - - - - - - - \ No newline at end of file diff --git a/.history/src/views/opk/asd/news/dialog_20231016164915.vue b/.history/src/views/opk/asd/news/dialog_20231016164915.vue deleted file mode 100644 index e69de29bb..000000000 diff --git a/.history/src/views/opk/asd/news/dialog_20231016164939.vue b/.history/src/views/opk/asd/news/dialog_20231016164939.vue deleted file mode 100644 index e69de29bb..000000000 diff --git a/.history/src/views/opk/asd/news/dialog_20231016164946.vue b/.history/src/views/opk/asd/news/dialog_20231016164946.vue deleted file mode 100644 index e69de29bb..000000000 diff --git a/.history/src/views/opk/asd/news/dialog_20231016164951.vue b/.history/src/views/opk/asd/news/dialog_20231016164951.vue deleted file mode 100644 index e69de29bb..000000000 diff --git a/.history/src/views/opk/asd/news/dialog_20231018095841.vue b/.history/src/views/opk/asd/news/dialog_20231018095841.vue deleted file mode 100644 index 0e9c21d23..000000000 --- a/.history/src/views/opk/asd/news/dialog_20231018095841.vue +++ /dev/null @@ -1,222 +0,0 @@ - - - - - - - - \ No newline at end of file diff --git a/.history/src/views/opk/asd/news/dialog_20231018135515.vue b/.history/src/views/opk/asd/news/dialog_20231018135515.vue deleted file mode 100644 index 60cbfd3c0..000000000 --- a/.history/src/views/opk/asd/news/dialog_20231018135515.vue +++ /dev/null @@ -1,222 +0,0 @@ - - - - - - - - \ No newline at end of file diff --git a/.history/src/views/opk/asd/news/dialog_20231016165027.vue b/.history/src/views/opk/asd/news/dialog_20231109133831.vue similarity index 91% rename from .history/src/views/opk/asd/news/dialog_20231016165027.vue rename to .history/src/views/opk/asd/news/dialog_20231109133831.vue index a2a2d4167..c171267e9 100644 --- a/.history/src/views/opk/asd/news/dialog_20231016165027.vue +++ b/.history/src/views/opk/asd/news/dialog_20231109133831.vue @@ -4,7 +4,8 @@ @ 备注: -->