From 3e9053766c26adb43f25b7d734c02bc6561bf920 Mon Sep 17 00:00:00 2001 From: jiangyy Date: Wed, 26 Oct 2022 15:57:47 +0800 Subject: [PATCH 01/28] 11 --- .../ninePlaces/places/places.vue | 121 +++++++++++++++++- .../ninePlaces/places/placesDetail.vue | 6 +- .../ninePlaces/places/placesForm.vue | 81 +++++++++--- 3 files changed, 184 insertions(+), 24 deletions(-) diff --git a/src/views/modules/communityService/ninePlaces/places/places.vue b/src/views/modules/communityService/ninePlaces/places/places.vue index f97837131..89e039c28 100644 --- a/src/views/modules/communityService/ninePlaces/places/places.vue +++ b/src/views/modules/communityService/ninePlaces/places/places.vue @@ -45,6 +45,17 @@ + + + + + + + + + + + + @@ -90,6 +116,10 @@ 新增 + 导出 + + { + console.log("res----dddd", res); + // this.download(res.data, title + '.xls') + if (res.headers["content-disposition"]) { + let fileName = window.decodeURI( + res.headers["content-disposition"].split(";")[1].split("=")[1] + ); + console.log("filename", fileName); + let blob = new Blob([res.data], { + type: "application/vnd.ms-excel", + }); + var url = window.URL.createObjectURL(blob); + var aLink = document.createElement("a"); + aLink.style.display = "none"; + aLink.href = url; + aLink.setAttribute("download", fileName); + document.body.appendChild(aLink); + aLink.click(); + document.body.removeChild(aLink); //下载完成移除元素 + window.URL.revokeObjectURL(url); //释放掉blob对象 + } else this.$message.error("下载失败"); + }) + .catch((err) => { + console.log("err", err); + return this.$message.error("网络错误"); + }); + }, + // 下载文件 + download (data, fileName) { + if (!data) { + return; + } + + var csvData = new Blob([data]); + + if (window.navigator && window.navigator.msSaveOrOpenBlob) { + window.navigator.msSaveOrOpenBlob(csvData, fileName); + } + // for Non-IE (chrome, firefox etc.) + else { + var a = document.createElement("a"); + document.body.appendChild(a); + a.style = "display: none"; + var url = window.URL.createObjectURL(csvData); + a.href = url; + a.download = fileName; + a.click(); + a.remove(); + window.URL.revokeObjectURL(url); + } + }, diaClose () { @@ -456,16 +569,18 @@ export default { //重置搜索条件 resetSearch () { this.formData = { + placeCategory: '',//0九小场所、1企事业单位 placeOrgName: '',//场所名称 mobile: '',//联系电话 - scale: '',//场所规模【 0:10人以下 1:10-20人 2:21-40人 3:41-100人 4:100人以上】 + // scale: '',//场所规模【 0:10人以下 1:10-20人 2:21-40人 3:41-100人 4:100人以上】 + scaleTotal: '', gridId: '',//场所区域【网格Id】 ninePlaceVal: '',//场所类型【九小场所Value值】 isPage: true,//是否分页(是:true 否:false) 有这个参数是给新增巡查记录时用的，默认是 } this.pageSize = 10 this.pageNo = 0 - this.loadTable() + // this.loadTable() }, diff --git a/src/views/modules/communityService/ninePlaces/places/placesDetail.vue b/src/views/modules/communityService/ninePlaces/places/placesDetail.vue index 7aab0f801..2a828d80e 100644 --- a/src/views/modules/communityService/ninePlaces/places/placesDetail.vue +++ b/src/views/modules/communityService/ninePlaces/places/placesDetail.vue @@ -8,6 +8,10 @@ 场所类型： {{ formData.ninePlaceName||'--' }} +
+ 场所类别： + {{ formData.placeCategory ||'--' }} +
场所区域： @@ -25,7 +29,7 @@
规模： - {{ formData.scaleName||'--' }} + {{ formData.scaleTotal||'--' }}
负责人： diff --git a/src/views/modules/communityService/ninePlaces/places/placesForm.vue b/src/views/modules/communityService/ninePlaces/places/placesForm.vue index ae7bb8e0c..e5d816dde 100644 --- a/src/views/modules/communityService/ninePlaces/places/placesForm.vue +++ b/src/views/modules/communityService/ninePlaces/places/placesForm.vue @@ -6,11 +6,25 @@ :inline="true" :model="formData" :rules="dataRule" + label-width="150px" :disabled="formType === 'detail'" class="form"> + + + + + + - + --> + + + + Date: Wed, 26 Oct 2022 17:27:21 +0800 Subject: [PATCH 02/28] 111 --- src/assets/scss/pages/staffRegister.scss | 168 +++++++ src/router/index.js | 9 + .../ninePlaces/places/places.vue | 2 +- src/views/pages/staffRegister.vue | 441 ++++++++++++++++++ 4 files changed, 619 insertions(+), 1 deletion(-) create mode 100644 src/assets/scss/pages/staffRegister.scss create mode 100644 src/views/pages/staffRegister.vue diff --git a/src/assets/scss/pages/staffRegister.scss b/src/assets/scss/pages/staffRegister.scss new file mode 100644 index 000000000..d9ce9aac4 --- /dev/null +++ b/src/assets/scss/pages/staffRegister.scss @@ -0,0 +1,168 @@ +.bg-caiji { + + // background-color: rgba(189, 214, 255, 0.89); + height: 100%; + width: 100vw; + padding: 20px; + + .title { + text-align: center; + font-size: 20px; + } + + .main { + padding-top: 20px; + // font-size: 40px; + + .div_tab{ + display: flex; + justify-content: center; + + .div_option{ + text-align: center; + color:#3e8ef7; + height:35px; + width:150px; + line-height: 35px; + padding:0 0; + border:1px solid #3e8ef7 ; + } + + .option_left{ + border-radius: 5px 0 0 5px; + } + .option_right{ + border-radius: 0 5px 5px 0; + } + + .option_select{ + color:#ffffff; + background-color:#3e8ef7 ; + } + } + + .content { + margin-top:10px; + border-radius: 5px; + background-color: rgba(255, 255, 255, 0.787); + + .member_title { + padding: 10px; + font-size: 14px; + } + } + .content1 { + margin-top: 20px; + } + + .line { + border: 1px solid #e4e4e48e; + } + } + + .div-btn { + margin-top: 30px; + padding-bottom: 20px; + display: flex; + justify-content: center; + + .btn { + width: 150px; + font-size: 16px; + } + } +} + +.picker_content { + color: rgb(59, 59, 59); +} + +.bg-caiji-success { + background: url("../../assets/img/caiji-bc.png") no-repeat; + background-size: 100% 100%; + height: 100vh; + width: 100vw; + text-align: center; + + .title { + // background-color: rgba(189, 214, 255, 0.89); + padding-top:30px; + font-size: 18px; + font-family: PingFang SC; + font-weight: 800; + color: #333333; + display: flex; + height:25px; + align-items: center; + justify-content: center; + + >img{ + width:27px; + height:25px; + } + .title_name{ + margin-left:5px; + margin-top:5px; + } + } + + .div_tip{ + text-align: center; + margin-top:35px; + font-size: 18px; + font-family: PingFang SC; + font-weight: 800; + color: #2E78E2; + line-height: 26px; + } + + .div_content{ + + margin:20px 10px 30px 10px; + padding:20px 16px; + background: #FFFFFF; + border-radius: 10px; + font-size: 16px; + font-family: Source Han Serif SC; + font-weight: 400; + color: #333333; + + text-align: left; + + .content_long{ + display: flex; + justify-content: left; + align-items: flex-start; + + .content_title{ + min-width: 85px; + // flex:0 0 85px; + flex-shrink: 0; + text-align: right; + } + } + + .marginT10{ + margin-top:10px; + } + } + + .main { + margin-top: 100px; + display: flex; + flex-direction: column; + align-items: center; + justify-content: center; + + .icon-success { + font-size: 40px; + // width: 20px; + // height: 20px; + } + + .success-content { + margin-top: 10px; + font-size: 25px; + } + } +} diff --git a/src/router/index.js b/src/router/index.js index de595a814..d4c051b97 100644 --- a/src/router/index.js +++ b/src/router/index.js @@ -62,6 +62,15 @@ export const pageRoutes = [ title: "居民信息填报", }, }, + { + path: "/staffRegister", + props: true, + name: "staffRegister", + component: () => import("@/views/pages/staffRegister"), + meta: { + title: "员工登记", + }, + }, ]; // 模块路由(基于主入口布局页面) diff --git a/src/views/modules/communityService/ninePlaces/places/places.vue b/src/views/modules/communityService/ninePlaces/places/places.vue index 89e039c28..20f51f65a 100644 --- a/src/views/modules/communityService/ninePlaces/places/places.vue +++ b/src/views/modules/communityService/ninePlaces/places/places.vue @@ -414,7 +414,7 @@ export default { async handleExport () { let title = "员工登记码"; - const url = "/epmetuser/icVaccine/export"; + const url = "/gov/org/enterprise/qrCodeExport"; await this.$http({ method: "POST", diff --git a/src/views/pages/staffRegister.vue b/src/views/pages/staffRegister.vue new file mode 100644 index 000000000..cf70bc34e --- /dev/null +++ b/src/views/pages/staffRegister.vue @@ -0,0 +1,441 @@ + + + + From 9c66f0d3a8e62ad79f46389297f91033db785324 Mon Sep 17 00:00:00 2001 From: zhaoyongnian <541231643@qq.com> Date: Thu, 27 Oct 2022 11:05:29 +0800 Subject: [PATCH 03/28] =?UTF-8?q?=E4=BC=98=E5=8C=96=E6=A0=B7=E5=BC=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/modules/plugins/change/changedeath.vue | 4 +++- src/views/modules/plugins/change/changerelocation.vue | 4 +++- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/src/views/modules/plugins/change/changedeath.vue b/src/views/modules/plugins/change/changedeath.vue index d82ec3e3c..bfe0f7014 100644 --- a/src/views/modules/plugins/change/changedeath.vue +++ b/src/views/modules/plugins/change/changedeath.vue @@ -249,7 +249,9 @@ export default { From 4c38e1bd8eded715e216ced47a624e3d651ea7f4 Mon Sep 17 00:00:00 2001 From: jiangyy Date: Thu, 27 Oct 2022 15:03:37 +0800 Subject: [PATCH 05/28] =?UTF-8?q?=E6=A0=BC=E5=BC=8F=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/assets/scss/pages/staffRegister.scss | 6 +++--- src/views/pages/staffRegister.vue | 3 ++- src/views/pages/staffRegisterSuccess.vue | 4 ++-- 3 files changed, 7 insertions(+), 6 deletions(-) diff --git a/src/assets/scss/pages/staffRegister.scss b/src/assets/scss/pages/staffRegister.scss index d9ce9aac4..85683800c 100644 --- a/src/assets/scss/pages/staffRegister.scss +++ b/src/assets/scss/pages/staffRegister.scss @@ -126,8 +126,8 @@ font-family: Source Han Serif SC; font-weight: 400; color: #333333; - text-align: left; + .content_long{ display: flex; @@ -135,8 +135,8 @@ align-items: flex-start; .content_title{ - min-width: 85px; - // flex:0 0 85px; + // min-width: 85px; + flex:0 0 115px; flex-shrink: 0; text-align: right; } diff --git a/src/views/pages/staffRegister.vue b/src/views/pages/staffRegister.vue index 2fcf393dc..88b038565 100644 --- a/src/views/pages/staffRegister.vue +++ b/src/views/pages/staffRegister.vue @@ -124,6 +124,7 @@ {{formData.ymjzCountName}}
-
最近一次核酸检测时间：
+
核酸检测时间：
{{formData.latestNatTime}}
@@ -143,5 +143,5 @@ export default { From 8f59c9d3e49c0f90ca4eacfe6688980e64000963 Mon Sep 17 00:00:00 2001 From: jiangyy Date: Thu, 27 Oct 2022 16:28:36 +0800 Subject: [PATCH 06/28] 11 --- src/router/index.js | 37 +++++++++++++++++++++++++++++++------ 1 file changed, 31 insertions(+), 6 deletions(-) diff --git a/src/router/index.js b/src/router/index.js index de595a814..9ba8abf56 100644 --- a/src/router/index.js +++ b/src/router/index.js @@ -6,6 +6,7 @@ import store from "@/js/store"; Vue.use(Router); +const CUSTOMER = process.env.VUE_APP_CUSTOMER; // 页面路由(独立页面) export const pageRoutes = [ { @@ -26,7 +27,11 @@ export const pageRoutes = [ }, { path: "/login", - component: () => import("@/views/pages/login"), + component: () => { + return CUSTOMER == "yantai" + ? import("@/views/pages/yantai-login") + : import("@/views/pages/login"); + }, name: "login", meta: { title: "登录", @@ -35,7 +40,11 @@ export const pageRoutes = [ { path: "/", name: "index", - component: () => import("@/views/pages/index"), + component: () => { + return CUSTOMER == "yantai" + ? import("@/views/pages/yantai-index") + : import("@/views/pages/index"); + }, }, { path: "/indexWork", @@ -138,6 +147,18 @@ function cookApiDataItem(item) { // }); return item; } +// 把按钮都化为页面内部的权限 +function cookApiDataItem2(item) { + let { children } = item; + if (children && Array.isArray(children) && children.length > 0) { + let btns = item.children.filter((item) => item.type == 1); + item.btns = btns; + item.children = item.children + .filter((val) => val.type == 0) + .map((val) => cookApiDataItem2(val)); + } + return item; +} // 模块路由(基于主入口布局页面) 可视化数据 export const moduleShujuRoutes = { @@ -145,7 +166,10 @@ export const moduleShujuRoutes = { component: () => import("@/views/main-shuju/main"), name: "main-shuju", redirect: { - path: "/main-shuju/visual-basicinfo-basicInfoMain", + path: + CUSTOMER == "yantai" && process.env.VUE_APP_NODE_ENV == "prod" + ? "/main-shuju/i-1536625421829599234" + : "/main-shuju/visual-basicinfo-basicInfoMain", }, meta: { title: "主入口布局", @@ -282,9 +306,9 @@ router.beforeEach((to, from, next) => { name: "login", }); } - window.SITE_CONFIG["menuList"] = res.data.map((item) => - cookApiDataItem(item) - ); + window.SITE_CONFIG["menuList"] = res.data + .map((item) => cookApiDataItem2(item)) + .map((item) => cookApiDataItem(item)); fnAddDynamicMenuRoutes(window.SITE_CONFIG["menuList"]); // next({ ...to, replace: true }) next({ @@ -338,6 +362,7 @@ function fnAddDynamicMenuRoutes(menuList = [], routes = []) { ...window.SITE_CONFIG["contentTabDefault"], menuId: menuList[i].id, title: menuList[i].name, + btns: menuList[i].btns || [], }, }; // eslint-disable-next-line From d5fc7d8fefb5e114b99ba188baeeee81f0a59109 Mon Sep 17 00:00:00 2001 From: jiangyy Date: Fri, 28 Oct 2022 09:13:33 +0800 Subject: [PATCH 07/28] 11 --- src/router/index.js | 12 ++---------- 1 file changed, 2 insertions(+), 10 deletions(-) diff --git a/src/router/index.js b/src/router/index.js index 9ba8abf56..3bb61539f 100644 --- a/src/router/index.js +++ b/src/router/index.js @@ -27,11 +27,7 @@ export const pageRoutes = [ }, { path: "/login", - component: () => { - return CUSTOMER == "yantai" - ? import("@/views/pages/yantai-login") - : import("@/views/pages/login"); - }, + component: () => import("@/views/pages/login"), name: "login", meta: { title: "登录", @@ -40,11 +36,7 @@ export const pageRoutes = [ { path: "/", name: "index", - component: () => { - return CUSTOMER == "yantai" - ? import("@/views/pages/yantai-index") - : import("@/views/pages/index"); - }, + component: () => import("@/views/pages/index"), }, { path: "/indexWork", From 01a21c79ff493f8f600d6464a7c3ea48de16f57b Mon Sep 17 00:00:00 2001 From: jiangyy Date: Fri, 28 Oct 2022 10:33:46 +0800 Subject: [PATCH 08/28] =?UTF-8?q?=E5=91=98=E5=B7=A5=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../epidemic/unitEpid/staffEpidDetail.vue | 204 +++++ .../base/epidemic/unitEpid/staffEpidList.vue | 842 ++++++++++++++++++ .../ninePlaces/places/places.vue | 121 +-- .../ninePlaces/places/placesDetail.vue | 6 +- .../ninePlaces/places/placesForm.vue | 77 +- src/views/modules/cpts/base/index.vue | 550 ++++++------ .../shequzhili/tuceng/anquan/xuncha/index.vue | 108 ++- 7 files changed, 1411 insertions(+), 497 deletions(-) create mode 100644 src/views/modules/base/epidemic/unitEpid/staffEpidDetail.vue create mode 100644 src/views/modules/base/epidemic/unitEpid/staffEpidList.vue diff --git a/src/views/modules/base/epidemic/unitEpid/staffEpidDetail.vue b/src/views/modules/base/epidemic/unitEpid/staffEpidDetail.vue new file mode 100644 index 000000000..69224e2a8 --- /dev/null +++ b/src/views/modules/base/epidemic/unitEpid/staffEpidDetail.vue @@ -0,0 +1,204 @@ + + + + + + + + + + + diff --git a/src/views/modules/base/epidemic/unitEpid/staffEpidList.vue b/src/views/modules/base/epidemic/unitEpid/staffEpidList.vue new file mode 100644 index 000000000..3533da1b2 --- /dev/null +++ b/src/views/modules/base/epidemic/unitEpid/staffEpidList.vue @@ -0,0 +1,842 @@ + + + + + + diff --git a/src/views/modules/communityService/ninePlaces/places/places.vue b/src/views/modules/communityService/ninePlaces/places/places.vue index 20f51f65a..f97837131 100644 --- a/src/views/modules/communityService/ninePlaces/places/places.vue +++ b/src/views/modules/communityService/ninePlaces/places/places.vue @@ -45,17 +45,6 @@ - - - - - - - - - - - - @@ -116,10 +90,6 @@ 新增 - 导出 - - { - console.log("res----dddd", res); - // this.download(res.data, title + '.xls') - if (res.headers["content-disposition"]) { - let fileName = window.decodeURI( - res.headers["content-disposition"].split(";")[1].split("=")[1] - ); - console.log("filename", fileName); - let blob = new Blob([res.data], { - type: "application/vnd.ms-excel", - }); - var url = window.URL.createObjectURL(blob); - var aLink = document.createElement("a"); - aLink.style.display = "none"; - aLink.href = url; - aLink.setAttribute("download", fileName); - document.body.appendChild(aLink); - aLink.click(); - document.body.removeChild(aLink); //下载完成移除元素 - window.URL.revokeObjectURL(url); //释放掉blob对象 - } else this.$message.error("下载失败"); - }) - .catch((err) => { - console.log("err", err); - return this.$message.error("网络错误"); - }); - }, - // 下载文件 - download (data, fileName) { - if (!data) { - return; - } - - var csvData = new Blob([data]); - - if (window.navigator && window.navigator.msSaveOrOpenBlob) { - window.navigator.msSaveOrOpenBlob(csvData, fileName); - } - // for Non-IE (chrome, firefox etc.) - else { - var a = document.createElement("a"); - document.body.appendChild(a); - a.style = "display: none"; - var url = window.URL.createObjectURL(csvData); - a.href = url; - a.download = fileName; - a.click(); - a.remove(); - window.URL.revokeObjectURL(url); - } - }, diaClose () { @@ -569,18 +456,16 @@ export default { //重置搜索条件 resetSearch () { this.formData = { - placeCategory: '',//0九小场所、1企事业单位 placeOrgName: '',//场所名称 mobile: '',//联系电话 - // scale: '',//场所规模【 0:10人以下 1:10-20人 2:21-40人 3:41-100人 4:100人以上】 - scaleTotal: '', + scale: '',//场所规模【 0:10人以下 1:10-20人 2:21-40人 3:41-100人 4:100人以上】 gridId: '',//场所区域【网格Id】 ninePlaceVal: '',//场所类型【九小场所Value值】 isPage: true,//是否分页(是:true 否:false) 有这个参数是给新增巡查记录时用的，默认是 } this.pageSize = 10 this.pageNo = 0 - // this.loadTable() + this.loadTable() }, diff --git a/src/views/modules/communityService/ninePlaces/places/placesDetail.vue b/src/views/modules/communityService/ninePlaces/places/placesDetail.vue index 2a828d80e..7aab0f801 100644 --- a/src/views/modules/communityService/ninePlaces/places/placesDetail.vue +++ b/src/views/modules/communityService/ninePlaces/places/placesDetail.vue @@ -8,10 +8,6 @@ 场所类型： {{ formData.ninePlaceName||'--' }} -
- 场所类别： - {{ formData.placeCategory ||'--' }} -
场所区域： @@ -29,7 +25,7 @@
规模： - {{ formData.scaleTotal||'--' }} + {{ formData.scaleName||'--' }}
负责人： diff --git a/src/views/modules/communityService/ninePlaces/places/placesForm.vue b/src/views/modules/communityService/ninePlaces/places/placesForm.vue index e5d816dde..068a57a18 100644 --- a/src/views/modules/communityService/ninePlaces/places/placesForm.vue +++ b/src/views/modules/communityService/ninePlaces/places/placesForm.vue @@ -6,25 +6,11 @@ :inline="true" :model="formData" :rules="dataRule" - label-width="150px" :disabled="formType === 'detail'" class="form"> - - - - - - - - - - -
-
- +
+
- + - 查询 - 重置 + 查询 + 重置
-
+
- 新增 - - 下载模板 - - - 导入 + 新增 + + 下载模板 + + + 导入 - 导出 - 批量删除 - + 导出 + 导出员工登记码 + 批量删除 +
- - @@ -255,7 +259,7 @@ export default { const url = "/gov/org/icGroupPeopleRegister/delete" // const url = "http://yapi.elinkservice.cn/mock/245/epmetuser/icNat/del" - let params = [...row.id] + let params = [row.id] const { data, code, msg } = await requestPost(url, params) @@ -316,7 +320,7 @@ export default { computed: { tableHeight () { - return this.$store.state.inIframe ? this.clientHeight - 420 + this.iframeHeight : this.clientHeight - 420 + return this.$store.state.inIframe ? this.clientHeight - 320 + this.iframeHeight : this.clientHeight - 320 }, diff --git a/src/views/modules/base/epidemic/unitEpid/staffEpidDetail.vue b/src/views/modules/base/epidemic/unitEpid/staffEpidDetail.vue index 4281cf926..c2ee17cf9 100644 --- a/src/views/modules/base/epidemic/unitEpid/staffEpidDetail.vue +++ b/src/views/modules/base/epidemic/unitEpid/staffEpidDetail.vue @@ -1,8 +1,17 @@ @@ -199,7 +203,7 @@ :close-on-click-modal="false" :close-on-press-escape="false" :title="'详情'" - width="850px" + width="1350px" top="5vh" class="dialog-h" @closed="diaDetailClose"> @@ -386,7 +390,7 @@ export default { const url = "/gov/org/icEmployeeRegister/delete" // const url = "http://yapi.elinkservice.cn/mock/245/epmetuser/icNat/del" - let params = [...row.registerId] + let params = [row.registerId] const { data, code, msg } = await requestPost(url, params) @@ -450,7 +454,7 @@ export default { computed: { tableHeight () { - return this.$store.state.inIframe ? this.clientHeight - 420 + this.iframeHeight : this.clientHeight - 420 + return this.$store.state.inIframe ? this.clientHeight - 370 + this.iframeHeight : this.clientHeight - 370 }, From 09447cf5ce213ef0e57a3990e93f56355ebc11f6 Mon Sep 17 00:00:00 2001 From: dai <851733175@qq.com> Date: Fri, 28 Oct 2022 17:31:37 +0800 Subject: [PATCH 13/28] =?UTF-8?q?=E7=BB=A7=E7=BB=AD=E5=89=8D=E8=BF=9B=20?= =?UTF-8?q?=E8=B0=83=E6=95=B4=E7=89=88=E6=9C=AC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- package.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/package.json b/package.json index 799ec0ed1..ca1e141d6 100644 --- a/package.json +++ b/package.json @@ -16,9 +16,9 @@ "et:list": "gulp themes" }, "dependencies": { - "@antv/l7": "2.9.14", - "@antv/l7-draw": "3.0.5", - "@antv/l7-maps": "2.9.14", + "@antv/l7": "^2.9.24", + "@antv/l7-draw": "^3.0.5", + "@antv/l7-maps": "^2.9.14", "@riophae/vue-treeselect": "^0.4.0", "@tinymce/tinymce-vue": "^3.2.8", "async-validator": "^4.2.5", From 9d545feec2058ae0656d837dc0f54641c93c4af4 Mon Sep 17 00:00:00 2001 From: jiangyy Date: Mon, 31 Oct 2022 09:46:31 +0800 Subject: [PATCH 14/28] =?UTF-8?q?=E6=A0=B7=E5=BC=8F=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/assets/scss/pages/staffRegister.scss | 2 +- src/views/pages/staffRegister.vue | 13 ++++++++++--- src/views/pages/staffRegisterSuccess.vue | 3 +-- 3 files changed, 12 insertions(+), 6 deletions(-) diff --git a/src/assets/scss/pages/staffRegister.scss b/src/assets/scss/pages/staffRegister.scss index 85683800c..21f41a4d0 100644 --- a/src/assets/scss/pages/staffRegister.scss +++ b/src/assets/scss/pages/staffRegister.scss @@ -136,7 +136,7 @@ .content_title{ // min-width: 85px; - flex:0 0 115px; + flex:0 0 125px; flex-shrink: 0; text-align: right; } diff --git a/src/views/pages/staffRegister.vue b/src/views/pages/staffRegister.vue index 88b038565..0c9f903c3 100644 --- a/src/views/pages/staffRegister.vue +++ b/src/views/pages/staffRegister.vue @@ -109,6 +109,7 @@ closeOnClickModal="true" position="bottom"> @@ -124,6 +125,7 @@ 提交成功
请截图保存，方便核验人员查看
-
+
企业名称：
{{placeOrgName}}
From 0c4b0f937ac1dbe6d5ea501ad12170604c4ee771 Mon Sep 17 00:00:00 2001 From: jiangyy Date: Mon, 31 Oct 2022 09:55:24 +0800 Subject: [PATCH 15/28] 11 --- src/views/pages/staffRegisterSuccess.vue | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/views/pages/staffRegisterSuccess.vue b/src/views/pages/staffRegisterSuccess.vue index 1af45575e..917c5b94f 100644 --- a/src/views/pages/staffRegisterSuccess.vue +++ b/src/views/pages/staffRegisterSuccess.vue @@ -9,7 +9,8 @@
提交成功
请截图保存，方便核验人员查看
-
+
企业名称：
{{placeOrgName}}
From 8495528a5284d0d0a483b572a218cb99d1bbef1f Mon Sep 17 00:00:00 2001 From: jiangyy Date: Mon, 31 Oct 2022 10:48:10 +0800 Subject: [PATCH 16/28] 11 --- src/views/modules/cpts/base/cpts/edit.vue | 462 ++++++++---------- .../shequzhili/tuceng/anquan/xuncha/index.vue | 30 +- 2 files changed, 231 insertions(+), 261 deletions(-) diff --git a/src/views/modules/cpts/base/cpts/edit.vue b/src/views/modules/cpts/base/cpts/edit.vue index f3989e228..aff0551d4 100644 --- a/src/views/modules/cpts/base/cpts/edit.vue +++ b/src/views/modules/cpts/base/cpts/edit.vue @@ -1,273 +1,237 @@ diff --git a/src/views/modules/base/epidemic/unitEpid/staffEpidList.vue b/src/views/modules/base/epidemic/unitEpid/staffEpidList.vue index 8e7d3654a..f7fcb29eb 100644 --- a/src/views/modules/base/epidemic/unitEpid/staffEpidList.vue +++ b/src/views/modules/base/epidemic/unitEpid/staffEpidList.vue @@ -178,10 +178,10 @@ class="div-table-button--delete " size="small" @click="handleDelete(scope.row)">删除 - 删除 + @click="handleDelete(scope.row)">删除 --> diff --git a/src/views/pages/staffRegister.vue b/src/views/pages/staffRegister.vue index 8f102348d..74a6e8c1b 100644 --- a/src/views/pages/staffRegister.vue +++ b/src/views/pages/staffRegister.vue @@ -35,8 +35,9 @@ v-model="formData.mobile">
@@ -288,6 +289,7 @@ export default { }); } } else { + return false this.submit() } @@ -356,7 +358,22 @@ export default { aletMessage = '请填写证件号' return aletMessage + } else { + + let reg = new RegExp("[\\u4E00-\\u9FFF]+", "g"); + if (escape(this.formData.idCard).indexOf("%u") > 0 || escape(this.formData.idCard).indexOf("%u") == 0) { + aletMessage = '证件号不能填写中文' + return aletMessage + } + + if (this.formData.idCard.length > 18) { + aletMessage = '请填写正确的证件号' + return aletMessage + } } + + + if (!this.formData.ymjzCount) {// aletMessage = '请选择疫苗接种次数' return aletMessage From 72518f6cae2bf0471fa58e9dbbb70774f957a78c Mon Sep 17 00:00:00 2001 From: jiangyy Date: Mon, 31 Oct 2022 14:57:59 +0800 Subject: [PATCH 19/28] 11 --- src/views/pages/staffRegister.vue | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/views/pages/staffRegister.vue b/src/views/pages/staffRegister.vue index 74a6e8c1b..b0cafb8da 100644 --- a/src/views/pages/staffRegister.vue +++ b/src/views/pages/staffRegister.vue @@ -362,12 +362,12 @@ export default { let reg = new RegExp("[\\u4E00-\\u9FFF]+", "g"); if (escape(this.formData.idCard).indexOf("%u") > 0 || escape(this.formData.idCard).indexOf("%u") == 0) { - aletMessage = '证件号不能填写中文' + aletMessage = '请输入正确的身份证号或者护照号' return aletMessage } if (this.formData.idCard.length > 18) { - aletMessage = '请填写正确的证件号' + aletMessage = '请输入正确的身份证号或者护照号' return aletMessage } } From a88f256a96aa060f682b252e39a8efe35e2e862d Mon Sep 17 00:00:00 2001 From: jiangyy Date: Mon, 31 Oct 2022 15:39:05 +0800 Subject: [PATCH 20/28] =?UTF-8?q?=E5=AE=BD=E5=BA=A6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/pages/staffRegister.vue | 3 +++ 1 file changed, 3 insertions(+) diff --git a/src/views/pages/staffRegister.vue b/src/views/pages/staffRegister.vue index b0cafb8da..a4c9872f3 100644 --- a/src/views/pages/staffRegister.vue +++ b/src/views/pages/staffRegister.vue @@ -456,6 +456,9 @@ export default { text-align: right; margin-right: 20px; } +.my-field /deep/ .mint-cell-title { + width: 110px; +} /deep/ .mint-popup-bottom { height: 300px; From 6e18aa4b3532768d9fa7fa9cf7f74ccd9c8869ab Mon Sep 17 00:00:00 2001 From: jiangyy Date: Mon, 31 Oct 2022 16:27:42 +0800 Subject: [PATCH 21/28] 11 --- src/views/pages/staffRegister.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/views/pages/staffRegister.vue b/src/views/pages/staffRegister.vue index a4c9872f3..97db79617 100644 --- a/src/views/pages/staffRegister.vue +++ b/src/views/pages/staffRegister.vue @@ -289,7 +289,7 @@ export default { }); } } else { - return false + this.submit() } From c0e635788c6f5e2030a4400891e6791d1cf1f89b Mon Sep 17 00:00:00 2001 From: zhangyuan Date: Mon, 31 Oct 2022 17:01:33 +0800 Subject: [PATCH 22/28] =?UTF-8?q?=E6=9D=A5=E8=AE=BF=E6=97=B6=E9=97=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/modules/base/visitor.vue | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/src/views/modules/base/visitor.vue b/src/views/modules/base/visitor.vue index 669f812c0..9b0c92598 100644 --- a/src/views/modules/base/visitor.vue +++ b/src/views/modules/base/visitor.vue @@ -95,6 +95,13 @@ +
Date: Mon, 31 Oct 2022 17:48:41 +0800 Subject: [PATCH 23/28] =?UTF-8?q?=E7=94=A8ol=E5=81=9A=E4=BA=86=E4=B8=80?= =?UTF-8?q?=E4=B8=AAdemo=EF=BC=8C=E6=94=B9=E4=BA=86=E4=B8=80=E4=B8=AAbug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/utils/dai-map.js | 15 +- src/views/modules/cpts/base/cpts/edit.vue | 561 +++++---- .../modules/visual/command/cpts/map-ol.vue | 1081 +++++++++++++++++ src/views/modules/visual/command/cpts/map.vue | 20 - src/views/modules/visual/command/index.vue | 4 +- src/views/modules/workSys/mapConfig.vue | 51 +- 6 files changed, 1414 insertions(+), 318 deletions(-) create mode 100644 src/views/modules/visual/command/cpts/map-ol.vue diff --git a/src/utils/dai-map.js b/src/utils/dai-map.js index 785c521f8..0edd0fa9c 100644 --- a/src/utils/dai-map.js +++ b/src/utils/dai-map.js @@ -40,7 +40,8 @@ export function searchNearby(map, keyword) { let { data } = result; if (Array.isArray(data) && data.length > 0) { const { - location: { lat, lng, address }, + location: { lat, lng }, + address, } = data[0]; reslove({ msg: "success", @@ -48,7 +49,11 @@ export function searchNearby(map, keyword) { lng, lat, address, - resultList: data, + resultList: data.map((item) => { + item.lonlat = lng + " " + lat; + item.name = item.name || ""; + return item; + }), }, }); } else { @@ -124,7 +129,11 @@ export function searchNearby(map, keyword) { lng, lat, address: address + name, - resultList: result.features, + resultList: result.features.map((item) => { + item.lonlat = lng + " " + lat; + item.name = item.name || ""; + return item; + }), }, }); } else { diff --git a/src/views/modules/cpts/base/cpts/edit.vue b/src/views/modules/cpts/base/cpts/edit.vue index 61b36ae4f..77ef87175 100644 --- a/src/views/modules/cpts/base/cpts/edit.vue +++ b/src/views/modules/cpts/base/cpts/edit.vue @@ -1,209 +1,238 @@ @@ -384,12 +426,9 @@ export default { }, }, - data () { + data() { return { iniLoaded: false, - searchOptions: [], - searchValue: '', - resultList: [], loading: false, btnDisable: false, @@ -401,25 +440,27 @@ export default { uploadUrl: window.SITE_CONFIG["apiURL"] + "/oss/file/uploadqrcodeV2", customerId: localStorage.getItem("customerId"), - addressItem: {} + // 做搜索地址用 + searchAddressOptions: [], + searchAddressKeyword: "", }; }, computed: {}, watch: { editParams: { - handler () { + handler() { this.computeFmData(); }, deep: true, }, }, - async mounted () { + async mounted() { this.initForm(); }, methods: { - async initForm () { + async initForm() { this.iniFmData(); if (this.formId && this.formType != "add") { @@ -427,11 +468,11 @@ export default { } }, - computeFmData () { + computeFmData() { console.log(this.fmData); }, - iniFmData () { + iniFmData() { const { editParams, fmData, editParamsDiv } = this; editParams.forEach((item, index) => { if (typeof item.value == "function") { @@ -487,7 +528,6 @@ export default { this.$nextTick(async () => { await nextTick(300); - this.addressItem = item this.initMap(item); }); } @@ -504,7 +544,7 @@ export default { this.iniLoaded = true; }, - handleClickHtmlNode (e) { + handleClickHtmlNode(e) { //在判断事件目标节点的时候，考虑到兼容性应该统一转换成大写或小写进行判断 if (e.target.localName.toLowerCase() === "a") { // 通过判端目标节点以后，就能在这里对其进行操作啦。 @@ -513,7 +553,7 @@ export default { } }, - async getFmOptions (index, url, params, cookFn) { + async getFmOptions(index, url, params, cookFn) { const { data, code, msg } = await requestPost(url, { ...params, }); @@ -526,13 +566,13 @@ export default { } }, - handleChangeCascader (vals, item) { + handleChangeCascader(vals, item) { this.fmData[item["keyName"]] = vals; if (typeof item.handleChangeFn == "function") { item.handleChangeFn(vals, item, this); } }, - handleChangeSelect (vals, item) { + handleChangeSelect(vals, item) { console.log(vals, item); this.fmData[item["keyName"]] = vals; if (typeof item.handleChangeFn == "function") { @@ -540,14 +580,14 @@ export default { } }, - beforeImgUpload (file, item) { + beforeImgUpload(file, item) { if (typeof item.beforeImgUpload == "function") { if (!item.beforeImgUpload(file, item, this)) return false; } return true; }, - handleImgRemove (file, item) { + handleImgRemove(file, item) { console.log("handleImgRemove", file); let url = file.response ? file.response.data.url : file.url; if (url) { @@ -569,7 +609,7 @@ export default { } }, - handleImgExceed (res, item) { + handleImgExceed(res, item) { console.log(res); // this.$message({ // type: "warning", @@ -577,7 +617,7 @@ export default { // }); }, - handleImgSuccess (res, file, item) { + handleImgSuccess(res, file, item) { console.log("handleImgSuccess", res); if (res.code === 0 && res.msg === "success") { let { fmData } = this; @@ -613,12 +653,12 @@ export default { } }, - handleImgError (res, file, item) { + handleImgError(res, file, item) { console.log(res); }, // 地图初始化函数，本例取名为init，开发者可根据实际情况定义 - initMap (item) { + initMap(item) { let { latitude, longitude } = this.$store.state.user; map = new daiMap( @@ -639,9 +679,7 @@ export default { map.setMarker(latitude, longitude); }, - - - async handleSearchMap (item) { + async handleSearchMap(item) { const { msg, data } = await map.searchNearby(this.fmData[item.keyName]); if (msg == "success") { const { lat, lng } = data; @@ -654,72 +692,63 @@ export default { } }, - async handleMoveCenter (item, e) { + async handleMoveCenter(item, e) { console.log("handleMoveCenter", e); //修改地图中心点 const { lat, lng } = map.getCenter(); - this.fmData[item.supKeys[0]] = lng; - this.fmData[item.supKeys[1]] = lat; + this.fmData[item.supKeys[0]] = parseFloat(lng); + this.fmData[item.supKeys[1]] = parseFloat(lat); map.setMarker(lat, lng); let { msg, data } = await map.getAddress(lat, lng); if (msg == "success") { this.fmData[item.keyName] = data.address; - this.searchValue = data.address - this.searchOptions = [] + this.searchAddressOptions = []; } }, - async remoteMethod (query) { - - if (query !== '') { + async remoteMethod(query) { + if (query !== "") { this.loading = true; const { msg, data } = await map.searchNearby(query); this.loading = false; - this.resultList = [] + console.log("搜索结果", data); if (msg == "success" && data.resultList && data.resultList.length > 0) { - - if (data.resultList && data.resultList.length > 0) { - this.resultList = data.resultList - this.searchOptions = this.resultList.map(item => { - return { value: `${item.hotPointID}`, label: `${item.address + item.name}` }; - - }); - } + this.searchAddressOptions = data.resultList.map((item, index) => { + return { + ...item, + value: `${item.lonlat + item.address}`, + label: `${item.address + item.name}`, + }; + }); } else { - this.searchOptions = [ + this.searchAddressOptions = [ { - value: '0', - label: '未检索到结果' - } - ] + value: "0", + label: "未检索到结果", + }, + ]; } } else { - this.searchOptions = []; + this.searchAddressOptions = []; } }, - handleClickKey (index) { - let selPosition = this.resultList[index] - let lonlat = selPosition.lonlat.split(" ") + handleClickKey(item, fmItem) { + console.log("搜索结果", item); + let lonlat = item.lonlat.split(" "); map.setCenter(lonlat[1], lonlat[0]); map.setMarker(lonlat[1], lonlat[0]); - - - this.fmData[this.addressItem.supKeys[0]] = lonlat[1]; - this.fmData[this.addressItem.supKeys[1]] = lonlat[0]; - // this.formData.latitude = lonlat[1]; - // this.formData.longitude = lonlat[0]; - // this.formData.address = selPosition.address + selPosition.name - this.fmData[this.addressItem.keyName] = selPosition.address + selPosition.name + this.fmData[fmItem.supKeys[0]] = parseFloat(lonlat[1]); + this.fmData[fmItem.supKeys[1]] = parseFloat(lonlat[0]); + this.fmData[fmItem.keyName] = item.label; }, - - async getInfo () { + async getInfo() { let url = this.infoUrl; if (!url) return; const { idName, formId } = this; @@ -739,6 +768,12 @@ export default { if (editConfig && typeof editConfig.cookInfoFn == "function") { data = editConfig.cookInfoFn(data); } + + if (data.latitude && data.longitude) { + data.latitude = parseFloat(data.latitude); + data.longitude = parseFloat(data.longitude); + } + this.fmData = { ...this.fmData, ...data, @@ -760,12 +795,12 @@ export default { } }, - watchImg (src) { + watchImg(src) { window.open(src); }, // 过滤文本 - dormatHtml (content) { + dormatHtml(content) { if ( content.startsWith( "\n\n\n\n\n" @@ -777,7 +812,7 @@ export default { return content; }, - cookBeforeSubmit (data) { + cookBeforeSubmit(data) { Object.keys(data).forEach((k) => { if (typeof data[k] == "string") { data[k] = this.dormatHtml(data[k]); @@ -786,7 +821,7 @@ export default { return data; }, - async handleComfirm () { + async handleComfirm() { this.btnDisable = true; setTimeout(() => { this.btnDisable = false; @@ -818,7 +853,7 @@ export default { }); }, - async submit () { + async submit() { const { editConfig, fmData, formType, editFixedParams } = this; if ( typeof editConfig.beforeSubmit == "function" && @@ -858,7 +893,7 @@ export default { } }, - handleCancle () { + handleCancle() { this.$emit("close"); }, }, diff --git a/src/views/modules/visual/command/cpts/map-ol.vue b/src/views/modules/visual/command/cpts/map-ol.vue new file mode 100644 index 000000000..355973b3a --- /dev/null +++ b/src/views/modules/visual/command/cpts/map-ol.vue @@ -0,0 +1,1081 @@ + + + + + diff --git a/src/views/modules/visual/command/cpts/map.vue b/src/views/modules/visual/command/cpts/map.vue index ba7472e8a..216a75316 100644 --- a/src/views/modules/visual/command/cpts/map.vue +++ b/src/views/modules/visual/command/cpts/map.vue @@ -64,26 +64,6 @@ let searchMarker; let searchBgLayer; let tdtSearchMap; -function reversePix(pixelsTemp) { - //蓝色 - for (var i = 0; i < pixelsTemp.length; i += 4) { - var r = pixelsTemp[i]; - var g = pixelsTemp[i + 1]; - var b = pixelsTemp[i + 2]; - //运用图像学公式，设置灰度值 - var grey = r * 0.3 + g * 0.59 + b * 0.11; - //将rgb的值替换为灰度值 - pixelsTemp[i] = grey; - pixelsTemp[i + 1] = grey; - pixelsTemp[i + 2] = grey; - - //基于灰色，设置为蓝色，这几个数值是我自己试出来的，可以根据需求调整 - pixelsTemp[i] = 55 - pixelsTemp[i]; - pixelsTemp[i + 1] = 255 - pixelsTemp[i + 1]; - pixelsTemp[i + 2] = 305 - pixelsTemp[i + 2]; - } -} - export default { name: "l7", inject: ["refresh"], diff --git a/src/views/modules/visual/command/index.vue b/src/views/modules/visual/command/index.vue index 4971f977d..fd33754a7 100644 --- a/src/views/modules/visual/command/index.vue +++ b/src/views/modules/visual/command/index.vue @@ -234,6 +234,7 @@ import { requestPost } from "@/js/dai/request"; import People from "@/views/modules/visual/basicinfo/people"; import cptCard from "@/views/modules/visual/cpts/card"; import gridMap from "@/views/modules/visual/command/cpts/map"; +import gridMapOl from "@/views/modules/visual/command/cpts/map-ol"; import sidemenu1 from "@/views/modules/visual/command/cpts/yantai-sidemenu1"; import sidemenu2 from "@/views/modules/visual/command/cpts/yantai-sidemenu2"; import sidemenuLeft from "@/views/modules/visual/command/cpts/sidemenu-left"; @@ -243,6 +244,7 @@ import eventInfo from "@/views/modules/visual/command/cpts/eventInfo"; import serviceInfo from "@/views/modules/visual/command/cpts/serviceInfo"; import demandInfo from "@/views/modules/visual/command/cpts/demandInfo"; import qsydw from "@/views/modules/visual/command/cpts/qsydw"; +import { mapType } from "@/utils/dai-map"; let loading; //加载动画 @@ -286,7 +288,7 @@ export default { People, cptCard, ScreenLoading, - gridMap, + gridMap: mapType == "tdzw" ? gridMapOl : gridMap, sidemenu1, sidemenu2, sidemenuLeft, diff --git a/src/views/modules/workSys/mapConfig.vue b/src/views/modules/workSys/mapConfig.vue index 662ad1776..96f209a03 100644 --- a/src/views/modules/workSys/mapConfig.vue +++ b/src/views/modules/workSys/mapConfig.vue @@ -736,37 +736,6 @@ const vueGis = { const resolutions = getResolutions(); - //切片名 - // const matrixIds = [ - // "7", // EPSG:4490: - // "8", - // "9", - // "10", - // "11", - // "12", - // "13", - // "14", - // "15", - // "16", - // "17", - // "18", - // ]; - - // const resolutions = [ - // (0.025399998 * 4622334) / (96 * 111000), - // (0.025399998 * 2311166.84) / (96 * 111000), - // (0.025399998 * 1155583.42) / (96 * 111000), - // (0.025399998 * 577791.71) / (96 * 111000), - // (0.025399998 * 288895.85) / (96 * 111000), - // (0.025399998 * 144447.93) / (96 * 111000), - // (0.025399998 * 72223.96) / (96 * 111000), - // (0.025399998 * 36111.98) / (96 * 111000), - // (0.025399998 * 18055.99) / (96 * 111000), - // (0.025399998 * 9028) / (96 * 111000), - // (0.025399998 * 4514) / (96 * 111000), - // (0.025399998 * 2257) / (96 * 111000), - // ]; - console.log("========= getProjection", getProjection("EPSG:4490")); let url = "http://59.206.203.34/tileservice/SDPubMap"; @@ -791,6 +760,26 @@ const vueGis = { style: "default", tilematrixset: "c", // wrapX: true, + tileLoadFunction(imageTile, src) { + // 使用滤镜 将白色修改为深色 + let img = new Image(); + // img.crossOrigin = '' + // 设置图片不从缓存取，从缓存取可能会出现跨域，导致加载失败 + img.setAttribute("crossOrigin", "anonymous"); + img.onload = function () { + let canvas = document.createElement("canvas"); + let w = img.width; + let h = img.height; + canvas.width = w; + canvas.height = h; + let context = canvas.getContext("2d"); + context.filter = + "grayscale(92%) invert(100%) sepia(20%) hue-rotate(140deg) saturate(2000%) brightness(70%) contrast(80%)"; + context.drawImage(img, 0, 0, w, h, 0, 0, w, h); + imageTile.getImage().src = canvas.toDataURL("image/png"); + }; + img.src = src; + }, }), }); From d4f5de4c12c50778c9bed0d24bf696655fe9fbe7 Mon Sep 17 00:00:00 2001 From: zhaoyongnian <541231643@qq.com> Date: Tue, 1 Nov 2022 09:29:05 +0800 Subject: [PATCH 24/28] =?UTF-8?q?=E5=88=97=E8=A1=A8=E5=9B=BE=E7=89=87?= =?UTF-8?q?=E7=82=B9=E5=87=BB=E6=94=BE=E5=A4=A7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/modules/visual/shundeju/screen-table.vue | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-) diff --git a/src/views/modules/visual/shundeju/screen-table.vue b/src/views/modules/visual/shundeju/screen-table.vue index 041d687b3..70ac561a6 100644 --- a/src/views/modules/visual/shundeju/screen-table.vue +++ b/src/views/modules/visual/shundeju/screen-table.vue @@ -31,12 +31,17 @@ :style="tableContentStyle[indexs]" >
- + /> --> + +
{{ value[item.coulmn] }} @@ -181,6 +186,7 @@ export default { false, false, ], + previewImgList: [] }; }, watch: { @@ -215,6 +221,10 @@ export default { }, handleClickRow(val) { this.$emit('row', val) + }, + clickImg (url) { + this.previewImgList = [] + this.previewImgList.push(url) } }, }; From 19f41cf09b5263e0bbeecd8bbe0293bdbda1799c Mon Sep 17 00:00:00 2001 From: zhaoyongnian <541231643@qq.com> Date: Tue, 1 Nov 2022 09:39:56 +0800 Subject: [PATCH 25/28] =?UTF-8?q?=E5=B1=8F=E8=94=BD=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/modules/plugins/rent/rentcontractreview.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/views/modules/plugins/rent/rentcontractreview.vue b/src/views/modules/plugins/rent/rentcontractreview.vue index a9714c134..2654fdaec 100644 --- a/src/views/modules/plugins/rent/rentcontractreview.vue +++ b/src/views/modules/plugins/rent/rentcontractreview.vue @@ -197,7 +197,7 @@ From 61c8cdef376da012467554d298934ceab37b8b60 Mon Sep 17 00:00:00 2001 From: zhaoyongnian <541231643@qq.com> Date: Tue, 1 Nov 2022 10:01:00 +0800 Subject: [PATCH 26/28] =?UTF-8?q?=E6=94=BE=E5=A4=A7=E7=85=A7=E7=89=87?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../modules/visual/shundeju/screen-table.vue | 53 ++++++++++++++----- 1 file changed, 41 insertions(+), 12 deletions(-) diff --git a/src/views/modules/visual/shundeju/screen-table.vue b/src/views/modules/visual/shundeju/screen-table.vue index 70ac561a6..5340f14a0 100644 --- a/src/views/modules/visual/shundeju/screen-table.vue +++ b/src/views/modules/visual/shundeju/screen-table.vue @@ -31,17 +31,13 @@ :style="tableContentStyle[indexs]" >
- - - + @click="clickItem(value[item.coulmn])" + />
{{ value[item.coulmn] }} @@ -71,6 +67,10 @@
+
+ + 预览失败 +
@@ -186,7 +186,8 @@ export default { false, false, ], - previewImgList: [] + showImg: false, + imgUrl:'' }; }, watch: { @@ -222,10 +223,14 @@ export default { handleClickRow(val) { this.$emit('row', val) }, - clickImg (url) { - this.previewImgList = [] - this.previewImgList.push(url) - } + clickItem (url) { + this.imgUrl = url + this.showImg = true + }, + closePreview () { + this.imgUrl = '' + this.showImg = false + }, }, }; @@ -353,4 +358,28 @@ export default { } } } +.preview { + position: fixed; + z-index: 999; + top: 0%; + left: 0%; + width: 100%; + height: 100%; + background-color: rgba(0,0,0,0.7); + display: flex; + align-items: center; + justify-content: center; + .close-img { + cursor: pointer; + position: absolute; + z-index: 1000; + top: 10%; + right: 10%; + } + .show-img { + width: 70%; + height: 70%; + object-fit: contain; + } + } From 208b54118aa7fdc657b6d8b91e8f6386251dff42 Mon Sep 17 00:00:00 2001 From: dai <851733175@qq.com> Date: Tue, 1 Nov 2022 15:09:07 +0800 Subject: [PATCH 27/28] =?UTF-8?q?=E4=B8=B4=E6=97=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .env.development | 3 +- package.json | 8 +- .../modules/visual/command/cpts/map-ol.vue | 140 ++++++++++++------ 3 files changed, 101 insertions(+), 50 deletions(-) diff --git a/.env.development b/.env.development index 246fa1ea8..d1c8a3e7c 100644 --- a/.env.development +++ b/.env.development @@ -8,6 +8,7 @@ VUE_APP_API_SERVER = http://192.168.1.140/api # VUE_APP_API_SERVER = https://epmet-dev.elinkservice.cn:41080/api # VUE_APP_API_SERVER = https://epmet-dev.elinkservice.cn/api -VUE_APP_NODE_ENV=dev_sdtdt +# VUE_APP_NODE_ENV=dev_sdtdt +VUE_APP_NODE_ENV=dev #项目根路径 VUE_APP_PUBLIC_PATH=epmet-oper \ No newline at end of file diff --git a/package.json b/package.json index ca1e141d6..a4640d6db 100644 --- a/package.json +++ b/package.json @@ -16,9 +16,9 @@ "et:list": "gulp themes" }, "dependencies": { - "@antv/l7": "^2.9.24", - "@antv/l7-draw": "^3.0.5", - "@antv/l7-maps": "^2.9.14", + "@antv/l7": "2.9.24", + "@antv/l7-draw": "3.0.5", + "@antv/l7-maps": "2.9.14", "@riophae/vue-treeselect": "^0.4.0", "@tinymce/tinymce-vue": "^3.2.8", "async-validator": "^4.2.5", @@ -112,4 +112,4 @@ "not ie <= 10" ] } -} +} \ No newline at end of file diff --git a/src/views/modules/visual/command/cpts/map-ol.vue b/src/views/modules/visual/command/cpts/map-ol.vue index 355973b3a..0959d17f8 100644 --- a/src/views/modules/visual/command/cpts/map-ol.vue +++ b/src/views/modules/visual/command/cpts/map-ol.vue @@ -58,6 +58,7 @@ import VectorSource from "ol/source/Vector.js"; import GeoJSON from "ol/format/GeoJSON.js"; import { Polygon } from "ol/geom"; import Feature from "ol/Feature"; +import { click, pointerMove } from "ol/events/condition.js"; let myMap; let scene; @@ -191,39 +192,6 @@ export default { return []; } - const styles = [ - new Style({ - fill: new Fill({ - color: "rgba(255, 100, 60, 0.5)", - }), - stroke: new Stroke({ - color: "rgba(220, 150, 120, 0.9)", - lineDash: [10, 20], - width: 2, - }), - }), - new Style({ - fill: new Fill({ - color: "rgba(43, 231, 253, 0.3)", - }), - stroke: new Stroke({ - color: "rgba(33, 201, 223, 0.8)", - lineDash: [10, 20], - width: 2, - }), - }), - new Style({ - fill: new Fill({ - color: "rgba(255, 255, 50, 0.3)", - }), - stroke: new Stroke({ - color: "rgba(200, 200, 50, 0.9)", - lineDash: [10, 20], - width: 2, - }), - }), - ]; - const polygons = [ ...srcGridData.children .filter((item) => item.coordinates.length > 0) @@ -243,10 +211,7 @@ export default { 2 ).filter((item) => item.length == 2), ]), - style: styles[index % styles.length], }); - console.log(index % styles.length); - f.setStyle(styles[index % styles.length]); return f; }), ]; @@ -382,7 +347,7 @@ export default { }, methods: { - iniMap() { + async iniMap() { const { darkStyle, lightStyle, srcGridData } = this; if (!srcGridData) return false; @@ -496,15 +461,17 @@ export default { // console.log(transform(e.coordinate, 'EPSG:3857', 'EPSG:4326')); }); + await nextTick(); + this.iniGridArea(myMap); + myMap.on("loadend", async () => { - console.log("--------地图加载完毕"); + console.log("--------地图加载新东西完毕"); // if (mapType == "td") { // this.iniMapBase(scene); // } else if (mapType == "tdzw") { // this.iniMapBase2(scene); // } - this.iniGridArea(myMap); // this.iniMapDot(scene); // this.iniMapDot2(scene); // await nextTick(0); @@ -515,18 +482,101 @@ export default { iniGridArea(map) { const { darkStyle, lightStyle, polygonData, polygonDotData } = this; + console.log("--------------初始化网格"); + + const polygonSource = new VectorSource({ + features: polygonData, + }); + polygonLayer = new VectorLayer({ - title: "网格多边形", - source: new VectorSource({ - features: polygonData, - }), - opacity: 0.8, + title: "gridArea", + source: polygonSource, + opacity: 1, className: "", - zIndex: 1, + zIndex: 10, background: "", }); + polygonLayer.getSource().on("featuresloadstart", async (evt) => { + console.log("===============featuresloadstart", evt); + + await nextTick(); + polygonLayer + .getSource() + .getFeatures() + .forEach((item, index) => { + const baseStyles = [ + new Style({ + fill: new Fill({ + color: "rgba(255, 100, 60, 0.5)", + }), + stroke: new Stroke({ + color: "rgba(220, 150, 120, 0.9)", + width: 2, + }), + }), + new Style({ + fill: new Fill({ + color: "rgba(43, 231, 253, 0.3)", + }), + stroke: new Stroke({ + color: "rgba(33, 201, 223, 0.8)", + width: 2, + }), + }), + new Style({ + fill: new Fill({ + color: "rgba(255, 255, 50, 0.3)", + }), + stroke: new Stroke({ + color: "rgba(200, 200, 50, 0.9)", + width: 2, + }), + }), + ]; + + setInterval(() => { + let currStyle = item.getStyle(); + if (!Array.isArray(currStyle)) { + item.setStyle([ + baseStyles[index % baseStyles.length], + new Style({ + stroke: new Stroke({ + color: [0, 0, 0, 0.5], + width: 2, + lineDash: [6, 12], + lineDashOffset: 0, + }), + }), + ]); + } else { + let currStroke = currStyle[1].getStroke(); + let lineDashOffset = currStroke.getLineDashOffset(); + currStroke.setLineDashOffset( + lineDashOffset == 16 ? 0 : lineDashOffset + 2 + ); + item.setStyle(currStyle); + } + }, 100); + }); + }); + + let clickSelect = new Select({ + condition: click, + layers: [polygonLayer], + }); + clickSelect.on("select", (e) => { + let fet = e.selected[0]; + console.log("点击我了", fet.getProperties()); + // let props = fet.getProperties().properties; + // this.$emit("clickAgency", props); + // if (props.level == "grid") { + // this.handleClickDot({ ...props, placeType: "grid" }, props.center); + // } + }); + map.addLayer(polygonLayer); + map.addInteraction(clickSelect); }, updateGridArea() {}, From 75fe55071f935c5b84dcbc319bc1d3361a19b976 Mon Sep 17 00:00:00 2001 From: dai <851733175@qq.com> Date: Tue, 1 Nov 2022 15:51:48 +0800 Subject: [PATCH 28/28] =?UTF-8?q?=E8=BF=94=E7=92=9E=E5=BD=92=E7=9C=9F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- package.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/package.json b/package.json index a4640d6db..799ec0ed1 100644 --- a/package.json +++ b/package.json @@ -16,7 +16,7 @@ "et:list": "gulp themes" }, "dependencies": { - "@antv/l7": "2.9.24", + "@antv/l7": "2.9.14", "@antv/l7-draw": "3.0.5", "@antv/l7-maps": "2.9.14", "@riophae/vue-treeselect": "^0.4.0", @@ -112,4 +112,4 @@ "not ie <= 10" ] } -} \ No newline at end of file +}