From 66afc311cd25bc8f0e715657aca659c611b544b6 Mon Sep 17 00:00:00 2001 From: jiangyy Date: Fri, 28 Jul 2023 16:15:11 +0800 Subject: [PATCH] =?UTF-8?q?=E6=95=B4=E4=BD=93=E5=B8=83=E5=B1=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .env.development | 2 + .env.production | 3 + .env.production.sit | 2 + .env.production.uat | 2 + src/api/index.js | 14 ++ .../icon/{左@2x.png => contentLeft.png} | Bin .../icon/{右@2x.png => contentRight.png} | Bin ...群服务中心@2x.png => dlzz-dqff.png} | Bin .../{党员中心户@2x.png => dlzz-dyzx.png} | Bin .../{楼院党小组@2x.png => dlzz-lyxz.png} | Bin .../icon/{驿站@2x.png => dlzz-yz.png} | Bin ...标题by@2x.png => title-content-half.png} | Bin .../{小标题by@2x.png => title-content.png} | Bin src/components/screen-dropdown-menu/index.vue | 20 +- src/components/screen-title/index.vue | 68 +++++ src/store/getter.js | 32 +-- src/store/modules/shibeiScreen.js | 32 ++- src/style/global.scss | 16 ++ src/utils/config.js | 2 +- src/views/agencySelect copy.vue | 236 ------------------ src/views/agencySelect.vue | 148 +++++++---- src/views/index.vue | 11 +- src/views/screenCenter/screenCenter.vue | 23 ++ src/views/screenContent.vue | 57 +++++ src/views/screenHeader copy.vue | 91 ------- src/views/screenLeft/left1.vue | 135 ++++++++++ src/views/screenLeft/left2.vue | 24 ++ src/views/screenLeft/left3.vue | 33 +++ src/views/screenLeft/screenLeft.vue | 35 +++ src/views/screenRight/right1.vue | 32 +++ src/views/screenRight/right2.vue | 38 +++ src/views/screenRight/right3.vue | 59 +++++ src/views/screenRight/screenRight.vue | 35 +++ 33 files changed, 731 insertions(+), 419 deletions(-) create mode 100644 .env.development create mode 100644 .env.production create mode 100644 .env.production.sit create mode 100644 .env.production.uat rename src/assets/icon/{左@2x.png => contentLeft.png} (100%) rename src/assets/icon/{右@2x.png => contentRight.png} (100%) rename src/assets/icon/{党群服务中心@2x.png => dlzz-dqff.png} (100%) rename src/assets/icon/{党员中心户@2x.png => dlzz-dyzx.png} (100%) rename src/assets/icon/{楼院党小组@2x.png => dlzz-lyxz.png} (100%) rename src/assets/icon/{驿站@2x.png => dlzz-yz.png} (100%) rename src/assets/icon/{标题by@2x.png => title-content-half.png} (100%) rename src/assets/icon/{小标题by@2x.png => title-content.png} (100%) create mode 100644 src/components/screen-title/index.vue delete mode 100644 src/views/agencySelect copy.vue create mode 100644 src/views/screenContent.vue delete mode 100644 src/views/screenHeader copy.vue diff --git a/.env.development b/.env.development new file mode 100644 index 0000000..0a4721d --- /dev/null +++ b/.env.development @@ -0,0 +1,2 @@ +NODE_ENV=development +VUE_APP_SCREEN=dev diff --git a/.env.production b/.env.production new file mode 100644 index 0000000..9086788 --- /dev/null +++ b/.env.production @@ -0,0 +1,3 @@ +NODE_ENV=production + +VUE_APP_SCREEN=prod diff --git a/.env.production.sit b/.env.production.sit new file mode 100644 index 0000000..d555da5 --- /dev/null +++ b/.env.production.sit @@ -0,0 +1,2 @@ +NODE_ENV=production +VUE_APP_SCREEN=prod:sit diff --git a/.env.production.uat b/.env.production.uat new file mode 100644 index 0000000..04f9e9f --- /dev/null +++ b/.env.production.uat @@ -0,0 +1,2 @@ +NODE_ENV=production +VUE_APP_SCREEN=prod:uat \ No newline at end of file diff --git a/src/api/index.js b/src/api/index.js index e69de29..c859bed 100644 --- a/src/api/index.js +++ b/src/api/index.js @@ -0,0 +1,14 @@ +import request from 'utils/request' +import config from 'utils/config' + +const baseURL = config.screenBaseUrl + +// 获取下拉框组织机构tree +export function getOrgTree() { + return request({ + baseURL, + url: '/shibei/data/report/screen/agency/tree', + method: 'POST', + data: {} + }) +} diff --git a/src/assets/icon/左@2x.png b/src/assets/icon/contentLeft.png similarity index 100% rename from src/assets/icon/左@2x.png rename to src/assets/icon/contentLeft.png diff --git a/src/assets/icon/右@2x.png b/src/assets/icon/contentRight.png similarity index 100% rename from src/assets/icon/右@2x.png rename to src/assets/icon/contentRight.png diff --git a/src/assets/icon/党群服务中心@2x.png b/src/assets/icon/dlzz-dqff.png similarity index 100% rename from src/assets/icon/党群服务中心@2x.png rename to src/assets/icon/dlzz-dqff.png diff --git a/src/assets/icon/党员中心户@2x.png b/src/assets/icon/dlzz-dyzx.png similarity index 100% rename from src/assets/icon/党员中心户@2x.png rename to src/assets/icon/dlzz-dyzx.png diff --git a/src/assets/icon/楼院党小组@2x.png b/src/assets/icon/dlzz-lyxz.png similarity index 100% rename from src/assets/icon/楼院党小组@2x.png rename to src/assets/icon/dlzz-lyxz.png diff --git a/src/assets/icon/驿站@2x.png b/src/assets/icon/dlzz-yz.png similarity index 100% rename from src/assets/icon/驿站@2x.png rename to src/assets/icon/dlzz-yz.png diff --git a/src/assets/icon/标题by@2x.png b/src/assets/icon/title-content-half.png similarity index 100% rename from src/assets/icon/标题by@2x.png rename to src/assets/icon/title-content-half.png diff --git a/src/assets/icon/小标题by@2x.png b/src/assets/icon/title-content.png similarity index 100% rename from src/assets/icon/小标题by@2x.png rename to src/assets/icon/title-content.png diff --git a/src/components/screen-dropdown-menu/index.vue b/src/components/screen-dropdown-menu/index.vue index b41d0ab..39102a7 100644 --- a/src/components/screen-dropdown-menu/index.vue +++ b/src/components/screen-dropdown-menu/index.vue @@ -1,6 +1,6 @@ @@ -92,6 +92,7 @@ export default { diff --git a/src/store/getter.js b/src/store/getter.js index 1c442c4..e940cda 100644 --- a/src/store/getter.js +++ b/src/store/getter.js @@ -1,26 +1,14 @@ const getter = { - scale: state => state.basic.scale, - agencyId: state => state.anningScreen.agencyId, - monthId: state => state.anningScreen.monthId, - shibeiScale: state => state.shibeiScreen.shibeiScale, - shibeiAId: state => state.shibeiScreen.shibeiAId, - shibeiAgencyType: state => state.shibeiScreen.shibeiAgencyType, - shibeiMapCenter: state => state.shibeiScreen.shibeiMapCenter, - projectBoxVisible: state => state.shibeiScreen.projectBoxVisible, - projectId: state => state.shibeiScreen.projectId, - standardScale: state => state.standardScreen.standardScale, - standardAId: state => state.standardScreen.standardAId, - standardAgencyType: state => state.standardScreen.standardAgencyType, - standardMapCenter: state => state.standardScreen.standardMapCenter, - standardProjectBoxVisible: state => state.standardScreen.standardProjectBoxVisible, - standardProjectId: state => state.standardScreen.standardProjectId, - luzhouScale: state => state.luzhouScreen.luzhouScale, - luzhouAId: state => state.luzhouScreen.luzhouAId, - luzhouAgencyType: state => state.luzhouScreen.luzhouAgencyType, - luzhouMapCenter: state => state.luzhouScreen.luzhouMapCenter, - changjiangScale: state => state.changjiangScreen.changjiangScale, - changjiangDeptId: state => state.changjiangScreen.changjiangDeptId, - changjiangDeptName: state => state.changjiangScreen.changjiangDeptName + scale: (state) => state.basic.scale, + agencyId: (state) => state.anningScreen.agencyId, + monthId: (state) => state.anningScreen.monthId, + shibeiScale: (state) => state.shibeiScreen.shibeiScale, + shibeiAId: (state) => state.shibeiScreen.shibeiAId, + shibeiName: (state) => state.shibeiScreen.shibeiName, + shibeiAgencyType: (state) => state.shibeiScreen.shibeiAgencyType, + shibeiMapCenter: (state) => state.shibeiScreen.shibeiMapCenter, + projectBoxVisible: (state) => state.shibeiScreen.projectBoxVisible, + projectId: (state) => state.shibeiScreen.projectId } export default getter diff --git a/src/store/modules/shibeiScreen.js b/src/store/modules/shibeiScreen.js index 8f4f0e3..1a1f4bd 100644 --- a/src/store/modules/shibeiScreen.js +++ b/src/store/modules/shibeiScreen.js @@ -3,6 +3,7 @@ export default { shibeiScale: 1, shibeiAId: '1175270520603930625', // shibeiAId: '66f3987a8ea0261a6693689689f9e56b', + shibeiName: '市北区委', shibeiAgencyType: 'district', shibeiMapCenter: [120.364165, 36.103091], // shibeiMapCenter: [120.312565, 36.021688], @@ -10,46 +11,53 @@ export default { projectId: '' // 难点堵点项目id }, mutations: { - set_shibeiScale (state, shibeiScale) { + set_shibeiScale(state, shibeiScale) { state = Object.assign(state, { shibeiScale }) }, // 组织机构id - set_shibeiAgencyId (state, agencyId) { + set_shibeiAgencyId(state, agencyId) { state.shibeiAId = agencyId }, + // 组织机构名称 + set_shibeiAgencyName(state, agencyName) { + state.shibeiName = agencyName + }, // 组织机构类型（街道-district，社区-community， 网格-grid） - set_shibeiAgencyType (state, shibeiAgencyType) { + set_shibeiAgencyType(state, shibeiAgencyType) { state.shibeiAgencyType = shibeiAgencyType }, - set_shibeiMapCenter (state, shibeiMapCenter) { + set_shibeiMapCenter(state, shibeiMapCenter) { state.shibeiMapCenter = shibeiMapCenter }, // 难点堵点项目详情弹窗visible - set_projectBoxVisible (state, projectBoxVisible) { + set_projectBoxVisible(state, projectBoxVisible) { state.projectBoxVisible = projectBoxVisible }, // 难点堵点项目id - set_projectId (state, projectId) { + set_projectId(state, projectId) { state.projectId = projectId } }, actions: { - SET_SHIBEISCALE ({ commit }, shibeiScale) { + SET_SHIBEISCALE({ commit }, shibeiScale) { commit('set_shibeiScale', shibeiScale) }, - SET_SHIBEIAGENCYID ({ commit }, agencyId) { + SET_SHIBEIAGENCYID({ commit }, agencyId) { commit('set_shibeiAgencyId', agencyId) }, - SET_SHIBEIAGENCYTYPE ({ commit }, agencyType) { + SET_SHIBEIAGENCYNAME({ commit }, agencyName) { + commit('set_shibeiAgencyName', agencyName) + }, + SET_SHIBEIAGENCYTYPE({ commit }, agencyType) { commit('set_shibeiAgencyType', agencyType) }, - SET_SHIBEIMAPCENTER ({ commit }, shibeiMapCenter) { + SET_SHIBEIMAPCENTER({ commit }, shibeiMapCenter) { commit('set_shibeiMapCenter', shibeiMapCenter) }, - SET_PROJECTBOXVISIBLE ({ commit }, projectBoxVisible) { + SET_PROJECTBOXVISIBLE({ commit }, projectBoxVisible) { commit('set_projectBoxVisible', projectBoxVisible) }, - SET_PROJECTID ({ commit }, projectId) { + SET_PROJECTID({ commit }, projectId) { commit('set_projectId', projectId) } } diff --git a/src/style/global.scss b/src/style/global.scss index 58ed834..daa35b6 100644 --- a/src/style/global.scss +++ b/src/style/global.scss @@ -1,4 +1,20 @@ // 维护全局通用样式 +.bg-content{ + width: 620px; + height: 972px; + border: 1px solid; + border-image: linear-gradient(0deg, #4ba3da, #0097d6) 10 10; + background: linear-gradient(0deg, #006a90 0%, #00354b 100%); + box-sizing: border-box; +} + + + + +/** +旧 +**/ + /**************去掉标签默认样式******************/ i { font-style: normal; diff --git a/src/utils/config.js b/src/utils/config.js index e54e897..052f0fa 100644 --- a/src/utils/config.js +++ b/src/utils/config.js @@ -9,7 +9,7 @@ export default { function getScreenBaseUrl() { // 需要区分 客户端生产环境、web端生产环境、本地开发环境 if (process.env.VUE_APP_SCREEN === 'dev') { - return '/screenBaseUrl' + return 'http://192.168.1.58:10001' } else if ( process.env.VUE_APP_SCREEN === 'prod' || process.env.NODE_ENV === 'production' diff --git a/src/views/agencySelect copy.vue b/src/views/agencySelect copy.vue deleted file mode 100644 index b6327c2..0000000 --- a/src/views/agencySelect copy.vue +++ /dev/null @@ -1,236 +0,0 @@ - - - - - diff --git a/src/views/agencySelect.vue b/src/views/agencySelect.vue index 1a588a8..59c2659 100644 --- a/src/views/agencySelect.vue +++ b/src/views/agencySelect.vue @@ -1,7 +1,7 @@