From 9dc7715ad307ed604ad4f9077e1655d3ef8be395 Mon Sep 17 00:00:00 2001 From: zhaoqifeng Date: Tue, 1 Nov 2022 15:46:50 +0800 Subject: [PATCH 01/11] =?UTF-8?q?=E5=85=9A=E5=91=98=E7=9B=B8=E5=85=B3?= =?UTF-8?q?=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/App.vue | 20 +++++++ .../communityParty/members/crateForm.vue | 59 +++++++++++++++---- .../communityParty/members/detailForm.vue | 16 ++++- .../modules/communityParty/members/index.vue | 16 ++++- 4 files changed, 99 insertions(+), 12 deletions(-) diff --git a/src/App.vue b/src/App.vue index 7acbfab9d..c0bb9fb65 100644 --- a/src/App.vue +++ b/src/App.vue @@ -194,4 +194,24 @@ export default { flex-direction: column; justify-content: center; } + +::-webkit-scrollbar { + // display: none; + width: 8px; + height: 8px; + background-color: #EBEEF5; +} +::-webkit-scrollbar-thumb { + box-shadow: inset 0 0 6px rgba(0, 0, 0, .3); + -webkit-box-shadow: inset 0 0 6px rgba(243, 236, 236, 0.3); + background-color: #ccc; + border-radius: 8px; +} +::-webkit-scrollbar-track { + box-shadow: inset 0 0 6px rgba(0,0,0, .2); + /*滚动条的轨道*/ + border-radius: 8px; + background: rgba(255, 255, 255, 1); +} + diff --git a/src/views/modules/communityParty/members/crateForm.vue b/src/views/modules/communityParty/members/crateForm.vue index 2ea133d1b..60c3c04de 100644 --- a/src/views/modules/communityParty/members/crateForm.vue +++ b/src/views/modules/communityParty/members/crateForm.vue @@ -146,16 +146,52 @@ clearable> - - - +
+ + + + + + + +
+
+ + + + + + + + + +
-
+
+ 入党时所在党支部: + {{ info.rdsszzb?info.rdsszzb:'--'}} +
+
+ 组织关系转入社区时间: + {{ info.zzgxzrsqsj?info.zzgxzrsqsj:'--' }} +
+
+ +
+
+ 是否请长假: + {{ info.isQcj==='1'?'是':'否'}} +
备注: {{ info.remark? info.remark:'--' }} diff --git a/src/views/modules/communityParty/members/index.vue b/src/views/modules/communityParty/members/index.vue index f5a710ed3..80255c7f2 100644 --- a/src/views/modules/communityParty/members/index.vue +++ b/src/views/modules/communityParty/members/index.vue @@ -114,6 +114,7 @@
+
+ + + + + + @@ -138,8 +151,8 @@ start-placeholder="开始时间" end-placeholder="结束时间"> - +
Date: Wed, 2 Nov 2022 09:15:25 +0800 Subject: [PATCH 02/11] =?UTF-8?q?=E5=85=9A=E5=91=98=E7=9B=B8=E5=85=B3?= =?UTF-8?q?=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/components/editResi.vue | 4 ++-- src/views/components/resiForm.vue | 4 ++-- src/views/modules/communityParty/members/crateForm.vue | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/src/views/components/editResi.vue b/src/views/components/editResi.vue index a25951546..0e14e714b 100644 --- a/src/views/components/editResi.vue +++ b/src/views/components/editResi.vue @@ -265,7 +265,7 @@ @@ -1019,13 +976,6 @@ export default { .min-w180 { min-width: 170px; } - -.div_tuomin { - position: absolute; - top: 0; - right: 40px; - z-index: 1000; -} + + + + diff --git a/src/views/modules/visual/communityParty/community.vue b/src/views/modules/visual/communityParty/community.vue index 885906dba..acff5028d 100644 --- a/src/views/modules/visual/communityParty/community.vue +++ b/src/views/modules/visual/communityParty/community.vue @@ -886,7 +886,7 @@ export default { //mapInfo, polygonArray, polIconUrlArray, iconArrays, iconUrlArray const polIconUrlArray = [ - 'https://elink-esua-epdc.oss-cn-qingdao.aliyuncs.com/epmet/test/20211116/a219130b6bc74b0b80b5ddb0fce0892a.png' + 'http://10.2.2.50/epmet-oss-01/20220923/79cd2d034f594df2b144a31076f83248.png' ] console.log('this.unitTableData', this.unitTableData) this.$refs.cmap.loadMap(this.agencyInfo, this.parentPolygon, polIconUrlArray, this.unitTableData, this.iconUrlArray, null) diff --git a/src/views/modules/visual/communityParty/gridParty.vue b/src/views/modules/visual/communityParty/gridParty.vue index ca77115b2..37b50a192 100644 --- a/src/views/modules/visual/communityParty/gridParty.vue +++ b/src/views/modules/visual/communityParty/gridParty.vue @@ -183,7 +183,7 @@ export default { loadMap () { if (this.isfirstInit) { const polIconUrlArray = [ - 'https://elink-esua-epdc.oss-cn-qingdao.aliyuncs.com/epmet/test/20211116/a219130b6bc74b0b80b5ddb0fce0892a.png' + 'http://10.2.2.50/epmet-oss-01/20220923/79cd2d034f594df2b144a31076f83248.png' ] this.$refs.map.loadMap(this.agencyInfo, this.parentPolygon, polIconUrlArray, this.unitMapList, this.iconUrlArray, null,) } else { diff --git a/src/views/modules/visual/components/screen-map/index.vue b/src/views/modules/visual/components/screen-map/index.vue index c8be1659f..a9b3a3fad 100644 --- a/src/views/modules/visual/components/screen-map/index.vue +++ b/src/views/modules/visual/components/screen-map/index.vue @@ -190,9 +190,9 @@ const vueGis = { //policon图标样式 polIconUrlArray: [ - 'https://elink-esua-epdc.oss-cn-qingdao.aliyuncs.com/epmet/test/20211116/a219130b6bc74b0b80b5ddb0fce0892a.png', - 'https://elink-esua-epdc.oss-cn-qingdao.aliyuncs.com/epmet/test/20211116/a775d15e62374350b80e5cdf1912a4eb.png', - 'https://elink-esua-epdc.oss-cn-qingdao.aliyuncs.com/epmet/test/20211116/884efcf6d6b44224a7fda599dd1b14cb.png' + 'http://10.2.2.50/epmet-oss-01/20220923/79cd2d034f594df2b144a31076f83248.png', + 'http://10.2.2.50/epmet-oss-01/20220923/dd51bf949fb14b6aac205adef1695f74.png', + 'http://10.2.2.50/epmet-oss-01/20220923/d09770eeee65439a840df2c5b7c80bb4.png' ], //icon图标样式 iconUrlArray: [], diff --git a/src/views/modules/visual/plugin/power/components/screen-org-map.vue b/src/views/modules/visual/plugin/power/components/screen-org-map.vue index f7e9bb875..07c218820 100644 --- a/src/views/modules/visual/plugin/power/components/screen-org-map.vue +++ b/src/views/modules/visual/plugin/power/components/screen-org-map.vue @@ -51,9 +51,9 @@ let iconLayer; // icon标注图层 var centerPointGlobal = [120.38945519, 36.0722275] const iconArray = [ - 'https://elink-esua-epdc.oss-cn-qingdao.aliyuncs.com/epmet/test/20211116/a219130b6bc74b0b80b5ddb0fce0892a.png', - 'https://elink-esua-epdc.oss-cn-qingdao.aliyuncs.com/epmet/test/20211116/a775d15e62374350b80e5cdf1912a4eb.png', - 'https://elink-esua-epdc.oss-cn-qingdao.aliyuncs.com/epmet/test/20211116/884efcf6d6b44224a7fda599dd1b14cb.png' + 'http://10.2.2.50/epmet-oss-01/20220923/79cd2d034f594df2b144a31076f83248.png', + 'http://10.2.2.50/epmet-oss-01/20220923/dd51bf949fb14b6aac205adef1695f74.png', + 'http://10.2.2.50/epmet-oss-01/20220923/d09770eeee65439a840df2c5b7c80bb4.png' ] const textColorArray = [ 'rgba(236, 69, 4, 0.66)', @@ -66,9 +66,9 @@ let polygonColorArray = [ 'rgba(183, 185, 0, 0.16)' ]; let iconUrlArray = [ - 'https://elink-esua-epdc.oss-cn-qingdao.aliyuncs.com/epmet/test/20211116/a219130b6bc74b0b80b5ddb0fce0892a.png', - 'https://elink-esua-epdc.oss-cn-qingdao.aliyuncs.com/epmet/test/20211116/a775d15e62374350b80e5cdf1912a4eb.png', - 'https://elink-esua-epdc.oss-cn-qingdao.aliyuncs.com/epmet/test/20211116/884efcf6d6b44224a7fda599dd1b14cb.png' + 'http://10.2.2.50/epmet-oss-01/20220923/79cd2d034f594df2b144a31076f83248.png', + 'http://10.2.2.50/epmet-oss-01/20220923/dd51bf949fb14b6aac205adef1695f74.png', + 'http://10.2.2.50/epmet-oss-01/20220923/d09770eeee65439a840df2c5b7c80bb4.png' ]; //变电站标注的文字样式 var createTextStyle = function (feature) { @@ -529,7 +529,7 @@ export default { // imgSize: [32, 32], scale: 0.5, // src: "/img/largeScreen/icon_camra.png" - // src: "https://elink-esua-epdc.oss-cn-qingdao.aliyuncs.com/epmet/test/20211116/a219130b6bc74b0b80b5ddb0fce0892a.png" + // src: "http://10.2.2.50/epmet-oss-01/20220923/79cd2d034f594df2b144a31076f83248.png" src: iconUrlArray[oneIcon.values_.colorIndex] }) }); diff --git a/src/views/modules/workSys/dataOpenConfig.vue b/src/views/modules/workSys/dataOpenConfig.vue index 54bcfba5a..e8bdad7a5 100644 --- a/src/views/modules/workSys/dataOpenConfig.vue +++ b/src/views/modules/workSys/dataOpenConfig.vue @@ -76,6 +76,16 @@ :inline="true" :model="formData"> + + {{selRow.deptName}} + + + {{selRow.dataName}} + @@ -147,6 +157,7 @@ export default { scopeList: [], dataSyncConfigId: '', + selRow:{} } }, @@ -188,7 +199,8 @@ export default { async getOrgList () { - const url = '/gov/org/customeragency/my-subagency-list' + // const url = '/gov/org/customeragency/my-subagency-list' + const url = '/gov/org/customeragency/agencylist' let params = {}; @@ -295,6 +307,7 @@ export default { // 编辑 customerId,parentCategoryId,dateform editShow (row) { + this.selRow=row this.dataSyncConfigId = row.id this.orgIdArray = [] diff --git a/src/views/pages/login.vue b/src/views/pages/login.vue index 5c6743163..8e39a89e2 100644 --- a/src/views/pages/login.vue +++ b/src/views/pages/login.vue @@ -257,13 +257,7 @@ export default { localStorage.setItem("userType", "work"); localStorage.setItem("token", res.data.token); - let href = localStorage.getItem("thePageAtExit"); - if (href) { - localStorage.removeItem("thePageAtExit"); - location.href = href; - } else { - this.$router.replace({ name: "index" }); - } + this.$router.replace({ name: "index" }); }) .catch(() => { this.endLoading(); diff --git a/src/views/pages/yantai-index.vue b/src/views/pages/yantai-index.vue new file mode 100644 index 000000000..7dcac702f --- /dev/null +++ b/src/views/pages/yantai-index.vue @@ -0,0 +1,209 @@ + + + + diff --git a/src/views/pages/yantai-login-transit-sdt.vue b/src/views/pages/yantai-login-transit-sdt.vue new file mode 100644 index 000000000..d78c9ff86 --- /dev/null +++ b/src/views/pages/yantai-login-transit-sdt.vue @@ -0,0 +1,93 @@ + + + + + + + diff --git a/src/views/pages/yantai-login-transit.vue b/src/views/pages/yantai-login-transit.vue new file mode 100644 index 000000000..e506f6b55 --- /dev/null +++ b/src/views/pages/yantai-login-transit.vue @@ -0,0 +1,99 @@ + + + + + + + diff --git a/src/views/pages/yantai-login.vue b/src/views/pages/yantai-login.vue new file mode 100644 index 000000000..27fdb8aba --- /dev/null +++ b/src/views/pages/yantai-login.vue @@ -0,0 +1,435 @@ + + + + +