From 3ea56e80bf7b7b3650a280ccd5b697f5fdef8854 Mon Sep 17 00:00:00 2001 From: "aoli.qu" <408346101@qq.com> Date: Wed, 18 Oct 2023 22:44:18 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- package-lock.json | 6 + package.json | 5 +- .../echart/bottom/bottomLeftChart/chart.vue | 306 ++- .../echart/bottom/bottomLeftChart/index.vue | 16 +- .../centerLeft/centerLeft1Chart/chart.vue | 131 +- .../centerLeft/centerLeft1Chart/index.vue | 6 +- .../centerLeft/centerLeft2Chart/chart.vue | 45 +- .../centerLeft/centerLeft2Chart/index.vue | 4 +- .../centerRight/centerRight1Chart/chart.vue | 140 +- .../centerRight/centerRight1Chart/index.vue | 12 +- .../centerRight/centerRight2Chart/chart.vue | 31 +- .../centerRight/centerRight2Chart/index.vue | 4 +- src/main.js | 5 + src/router/generator-routers.js | 10 +- src/views/bigScreen/bottomLeft.vue | 2 +- src/views/bigScreen/bottomRight.vue | 331 +-- src/views/bigScreen/center.vue | 15 +- src/views/bigScreen/index.vue | 40 +- src/views/exception/developing.vue | 21 + src/views/honor/HonorAdd.vue | 6 +- src/views/honor/HonorDetail.vue | 76 +- src/views/honor/HonorList.vue | 4 +- src/views/honor/HonorShow.vue | 160 ++ src/views/honor/css/index.css | 2071 +++++++++++++++++ src/views/honor/img/1.jpg | Bin 0 -> 360895 bytes src/views/honor/img/2.jpg | Bin 0 -> 96748 bytes src/views/honor/img/3.jpg | Bin 0 -> 177440 bytes src/views/honor/img/4.jpg | Bin 0 -> 99114 bytes src/views/honor/img/5.jpg | Bin 0 -> 569337 bytes src/views/index/dataSupportList.vue | 268 ++- src/views/index/welcome.vue | 4 +- src/views/person/ServiceAdd.vue | 45 +- src/views/person/ServiceDetail.vue | 37 +- src/views/person/ServiceList.vue | 2 +- src/views/person/SupportAdd.vue | 51 +- src/views/person/SupportDetail.vue | 47 +- src/views/room/RoomCheckinAdd.vue | 3 - 37 files changed, 3259 insertions(+), 645 deletions(-) create mode 100644 src/views/exception/developing.vue create mode 100644 src/views/honor/HonorShow.vue create mode 100644 src/views/honor/css/index.css create mode 100644 src/views/honor/img/1.jpg create mode 100644 src/views/honor/img/2.jpg create mode 100644 src/views/honor/img/3.jpg create mode 100644 src/views/honor/img/4.jpg create mode 100644 src/views/honor/img/5.jpg diff --git a/package-lock.json b/package-lock.json index 5e467e3..a02903b 100644 --- a/package-lock.json +++ b/package-lock.json @@ -16148,6 +16148,12 @@ } } }, + "swiper": { + "version": "3.4.0", + "resolved": "https://registry.npmjs.org/swiper/-/swiper-3.4.0.tgz", + "integrity": "sha512-OE4bzIsNgxGhH44gzo6BndJwDmdEA8wIzMWc4c1EqHKPP/dz6iA/cj6DNGiTn1tDyUnaQx9jZnFCCmevcL8aTg==", + "dev": true + }, "symbol-tree": { "version": "3.2.4", "resolved": "https://registry.npmjs.org/symbol-tree/-/symbol-tree-3.2.4.tgz", diff --git a/package.json b/package.json index f08cc63..0cd2625 100644 --- a/package.json +++ b/package.json @@ -77,10 +77,11 @@ "git-revision-webpack-plugin": "^3.0.6", "less": "^3.0.4", "less-loader": "^5.0.0", - "sass": "^1.25.0", - "sass-loader": "^8.0.2", "opencollective": "^1.0.3", "opencollective-postinstall": "^2.0.2", + "sass": "^1.25.0", + "sass-loader": "^8.0.2", + "swiper": "^3.4.0", "vue-svg-icon-loader": "^2.1.1", "vue-template-compiler": "^2.6.10", "webpack": "^4.44.2", diff --git a/src/components/echart/bottom/bottomLeftChart/chart.vue b/src/components/echart/bottom/bottomLeftChart/chart.vue index e7a3ada..dcaef34 100644 --- a/src/components/echart/bottom/bottomLeftChart/chart.vue +++ b/src/components/echart/bottom/bottomLeftChart/chart.vue @@ -1,150 +1,198 @@ diff --git a/src/components/echart/bottom/bottomLeftChart/index.vue b/src/components/echart/bottom/bottomLeftChart/index.vue index 906a529..b7cf205 100644 --- a/src/components/echart/bottom/bottomLeftChart/index.vue +++ b/src/components/echart/bottom/bottomLeftChart/index.vue @@ -11,14 +11,14 @@ export default { return { cdata: { category: [ - '下堡坪村', - '蛟龙寺村', - '九山村', - '马宗岭村', - '赵勉河村', - '秀水村', - '磨坪村', - '十八湾村' + {value:'下堡坪村', id:1}, + {value:'蛟龙寺村', id:2}, + {value:'九山村', id:3}, + {value:'马宗岭村', id:4}, + {value:'赵勉河村', id:5}, + {value:'秀水村', id:6}, + {value:'磨坪村', id:7}, + {value:'十八湾村', id:8} ], lineData: [ 15, diff --git a/src/components/echart/centerLeft/centerLeft1Chart/chart.vue b/src/components/echart/centerLeft/centerLeft1Chart/chart.vue index dd3d90e..a625b48 100644 --- a/src/components/echart/centerLeft/centerLeft1Chart/chart.vue +++ b/src/components/echart/centerLeft/centerLeft1Chart/chart.vue @@ -1,61 +1,55 @@ + + diff --git a/src/views/bigScreen/center.vue b/src/views/bigScreen/center.vue index 8102343..4c44860 100644 --- a/src/views/bigScreen/center.vue +++ b/src/views/bigScreen/center.vue @@ -1,5 +1,5 @@ diff --git a/src/views/index/welcome.vue b/src/views/index/welcome.vue index cc609ee..5a382c7 100644 --- a/src/views/index/welcome.vue +++ b/src/views/index/welcome.vue @@ -21,14 +21,14 @@ export default { data () { return {} }, - beforeRouteEnter (to, from, next) { + /* beforeRouteEnter (to, from, next) { next(vm => { const code = vm.$store.state.user && vm.$store.state.user.currentRole.code if (code === 'student') { vm.$router.replace({ path: '/bigScreen' }) } }) - }, + }, */ computed: { ...mapState({ currentRole: state => state.user.currentRole diff --git a/src/views/person/ServiceAdd.vue b/src/views/person/ServiceAdd.vue index 8d78047..6d6c735 100644 --- a/src/views/person/ServiceAdd.vue +++ b/src/views/person/ServiceAdd.vue @@ -35,14 +35,6 @@ - - - - - - - - @@ -52,6 +44,26 @@ + + + + + + + + + + + + + {{ item.name }} + + + + { this.maritalStatusData = res.data }) + // 岗位状况 + dictionaryDropDown({ + dictionaryCode: '0050' + }).then(res => { + this.jobsData = res.data + }) }, // 返回 goback () { diff --git a/src/views/person/ServiceDetail.vue b/src/views/person/ServiceDetail.vue index b866772..9f43c6b 100644 --- a/src/views/person/ServiceDetail.vue +++ b/src/views/person/ServiceDetail.vue @@ -35,14 +35,6 @@ - - - - - - - - @@ -50,8 +42,30 @@ + + + + + + + + + + + + + {{ item.name }} + + + + + { this.maritalStatusData = res.data }) + // 婚姻状况 + dictionaryDropDown({ + dictionaryCode: '0050' + }).then(res => { + this.jobsData = res.data + }) }, // 返回 goback () { diff --git a/src/views/person/ServiceList.vue b/src/views/person/ServiceList.vue index 0535308..4e03d33 100644 --- a/src/views/person/ServiceList.vue +++ b/src/views/person/ServiceList.vue @@ -78,7 +78,7 @@ export default { }, { title: '岗位', - dataIndex: 'jobs' + dataIndex: 'jobsName' }, { title: '操作', diff --git a/src/views/person/SupportAdd.vue b/src/views/person/SupportAdd.vue index 2bc9539..ec7f68c 100644 --- a/src/views/person/SupportAdd.vue +++ b/src/views/person/SupportAdd.vue @@ -108,6 +108,24 @@