diff --git a/.env.development b/.env.development index 353690269..be04f184b 100644 --- a/.env.development +++ b/.env.development @@ -8,7 +8,8 @@ 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 VUE_APP_CUSTOMER=yantai \ No newline at end of file diff --git a/src/assets/scss/pages/staffRegister.scss b/src/assets/scss/pages/staffRegister.scss new file mode 100644 index 000000000..21f41a4d0 --- /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 125px; + 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 ec3552213..233c371cf 100644 --- a/src/router/index.js +++ b/src/router/index.js @@ -91,6 +91,24 @@ export const pageRoutes = [ title: "居民信息填报", }, }, + { + path: "/staffRegister", + props: true, + name: "staffRegister", + component: () => import("@/views/pages/staffRegister"), + meta: { + title: "员工登记", + }, + }, + { + path: "/staffRegisterSuccess", + props: true, + name: "staffRegisterSuccess", + component: () => import("@/views/pages/staffRegisterSuccess"), + meta: { + title: "员工登记", + }, + }, ]; // 模块路由(基于主入口布局页面) 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/base/epidemic/unitEpid/crowdEpidList.vue b/src/views/modules/base/epidemic/unitEpid/crowdEpidList.vue new file mode 100644 index 000000000..a813c70d1 --- /dev/null +++ b/src/views/modules/base/epidemic/unitEpid/crowdEpidList.vue @@ -0,0 +1,342 @@ + + + + + + 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..c2ee17cf9 --- /dev/null +++ b/src/views/modules/base/epidemic/unitEpid/staffEpidDetail.vue @@ -0,0 +1,254 @@ + + + + + + + + + + + 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..f7fcb29eb --- /dev/null +++ b/src/views/modules/base/epidemic/unitEpid/staffEpidList.vue @@ -0,0 +1,476 @@ + + + + + + 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 @@ +
{{ fmData[item.keyName] || "--" }} + {{item.attach}}
@@ -203,7 +204,6 @@ - @@ -387,9 +388,6 @@ export default { data () { return { iniLoaded: false, - searchOptions: [], - searchValue: '', - resultList: [], loading: false, btnDisable: false, @@ -401,7 +399,9 @@ export default { uploadUrl: window.SITE_CONFIG["apiURL"] + "/oss/file/uploadqrcodeV2", customerId: localStorage.getItem("customerId"), - addressItem: {} + // 做搜索地址用 + searchAddressOptions: [], + searchAddressKeyword: "", }; }, computed: {}, @@ -487,7 +487,6 @@ export default { this.$nextTick(async () => { await nextTick(300); - this.addressItem = item this.initMap(item); }); } @@ -639,9 +638,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 +651,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 +727,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, diff --git a/src/views/modules/cpts/base/index.vue b/src/views/modules/cpts/base/index.vue index 71face8d1..685e21816 100644 --- a/src/views/modules/cpts/base/index.vue +++ b/src/views/modules/cpts/base/index.vue @@ -1,315 +1,256 @@