Browse Source

Merge branch 'dev-行程上报烟台1122' into dev

dev-用户反馈
jiangyy 3 years ago
parent
commit
91f1fd6219
  1. 4
      .env.development
  2. 15
      src/utils/dai-map.js
  3. 1
      src/utils/tdt-wp-zw.js
  4. 1084
      src/views/modules/base/epidemic/travelYantai/travelYantai.vue
  5. 313
      src/views/modules/base/epidemic/travelYantai/travelYantaiDetail.vue
  6. 1069
      src/views/modules/base/epidemic/travelYantai/travelYantaiForm.vue
  7. 2
      src/views/modules/visual/command/index.vue
  8. 2
      src/views/modules/visual/plugin/power/components/screen-org-tree.vue

4
.env.development

@ -8,7 +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
# VUE_APP_NODE_ENV=dev_sdtdt
VUE_APP_NODE_ENV=dev
#项目根路径
VUE_APP_PUBLIC_PATH=epmet-oper

15
src/utils/dai-map.js

@ -49,9 +49,13 @@ export function searchNearby(map, keyword) {
lng,
lat,
address,
resultList: data.map((item) => {
resultList: data.map((item, index) => {
const {
location: { lat, lng },
} = item;
item.lonlat = lng + " " + lat;
item.name = item.name || "";
item.hotPointID = "hotPointID" + index;
return item;
}),
},
@ -93,7 +97,10 @@ export function searchNearby(map, keyword) {
lng,
lat,
address: address + name,
resultList: data,
resultList: data.map((item, index) => {
item.hotPointID = "hotPointID" + index;
return item;
}),
},
});
} else {
@ -129,9 +136,11 @@ export function searchNearby(map, keyword) {
lng,
lat,
address: address + name,
resultList: result.features.map((item) => {
resultList: result.features.map((item, index) => {
const { lng, lat } = item;
item.lonlat = lng + " " + lat;
item.name = item.name || "";
item.hotPointID = "hotPointID" + index;
return item;
}),
},

1
src/utils/tdt-wp-zw.js

@ -6,6 +6,7 @@ let vec =
if (window.SITE_CONFIG["nodeEnv"] == "dev_sdtdt") {
vec =
"http://service.sdmap.gov.cn/tileservice/sdpubmap?SERVICE=WMTS&REQUEST=GetTile&VERSION=1.0.0&LAYER=sdvec&STYLE=default&TILEMATRIXSET=c&TILEMATRIX={z}&TILEROW={x}&TILECOL={y}&FORMAT=image%2Fpng&tk=e758167d5b90c351b70a979c0820840c";
vec = 'http://wprd02.is.autonavi.com/appmaptile?lang=zh_cn&size=1&style=7&x={x}&y={y}&z={z}';
}
export default {

1084
src/views/modules/base/epidemic/travelYantai/travelYantai.vue

File diff suppressed because it is too large

313
src/views/modules/base/epidemic/travelYantai/travelYantaiDetail.vue

@ -0,0 +1,313 @@
<template>
<div>
<div class="dialog-h-content scroll-h">
<div v-if="view_real_data"
class="div_tuomin">
<el-button size="mini"
class="diy-button--search"
@click="handleTuomin">显示脱敏信息</el-button>
</div>
<div v-if="initLoading"
class="m-row">
<div class="m-info">
<div class="info-prop">
<span class="info-title-3">姓名</span>
<span>{{ formData.name||'--' }}</span>
</div>
<div class="info-prop">
<span class="info-title-3">手机号</span>
<span>{{ formData.showMobile||'--' }}</span>
</div>
<div class="info-prop">
<span class="info-title-3">证件号</span>
<span>{{ formData.showIdCard||'--' }}</span>
</div>
<div class="info-prop">
<span class="info-title-3">现居地</span>
<span>{{ formData.presentAddress||'--' }}</span>
</div>
<div class="info-prop">
<span class="info-title-3">详细地址</span>
<span>{{ formData.detailAddress||'--' }}</span>
</div>
<div class="info-prop">
<span class="info-title-3">来自地区</span>
<span>{{ formData.sourceAddress||'--' }}</span>
</div>
<div class="info-prop">
<span class="info-title-3">详细地址</span>
<span>{{ formData.comeAreaFull||'--' }}</span>
</div>
<div class="info-prop">
<span class="info-title-3">来到本地时间</span>
<span>{{ formData.arriveDate||'--' }}</span>
</div>
<div class="info-prop">
<span class="info-title-3">返回方式</span>
<span>{{ formData.comeMode||'--' }}</span>
</div>
<div class="info-prop">
<span class="info-title-3">班次</span>
<span>{{ formData.shift||'--' }}</span>
</div>
<div class="info-prop">
<span class="info-title-3">48小时核酸</span>
<span>{{ formData.carryHesuanProof||'--' }}</span>
</div>
<div class="info-prop">
<span class="info-title-3">健康码异常</span>
<span>{{ formData.healthCodeAbnormal||'--' }}</span>
</div>
<div class="info-prop">
<span class="info-title-3">行程码异常</span>
<span>{{ formData.travelCodeAbnormal||'--' }}</span>
</div>
<div class="info-prop">
<span class="info-title-3">核酸检测报告异常</span>
<span>{{ formData.detectionAbnormal||'--' }}</span>
</div>
<div class="info-prop">
<span class="info-title-3">两码一报告状态</span>
<span>{{ formData.twoCodeOneReportStatus||'--' }}</span>
</div>
<div class="info-prop">
<span class="info-title-3">是否有外地旅居史</span>
<span>{{ formData.nonlocalResidenceHistory||'--' }}</span>
</div>
<div class="info-prop">
<span class="info-title-3">途径地区</span>
<span>{{ formData.viaAddressShow||'--' }}</span>
</div>
<div class="info-prop">
<span class="info-title-3">同行人</span>
<span>{{ formData.travelPersonnel||'--' }}</span>
</div>
<div class="info-prop">
<span class="info-title-3">户籍地</span>
<span>{{ formData.registeredResidenceCity||'--' }}</span>
</div>
<div class="info-prop">
<span class="info-title-3">户籍详细地址</span>
<span>{{ formData.registeredResidenceAddress||'--' }}</span>
</div>
<div class="info-prop">
<span class="info-title-3">是否带车</span>
<span>{{ formData.carryVehicle||'--' }}</span>
</div>
<div class="info-prop">
<span class="info-title-3">带车车牌号</span>
<span>{{ formData.carryVehicleNumber||'--' }}</span>
</div>
<div class="info-prop">
<span class="info-title-3">车辆颜色</span>
<span>{{ formData.carryVehicleNumberColor||'--' }}</span>
</div>
<div class="info-prop">
<span class="info-title-3">目的地交通场站</span>
<span>{{ formData.destinationStation||'--' }}</span>
</div>
<div class="info-prop">
<span class="info-title-3">入鲁时间</span>
<span>{{ formData.arriveLuTime||'--' }}</span>
</div>
<div v-if="!formData.travelCodeImg"
class="info-prop">
<span class="info-title-3">行程码</span>
<span>{{ '--' }}</span>
</div>
<div class="info-prop"
v-if="formData.travelCodeImg">
<span class="info-title-3">行程码</span>
<div class="info-pics">
<img style="width:80px;height:80px"
:src="formData.travelCodeImg"
@click="watchImg(formData.travelCodeImg)">
</div>
</div>
<div class="info-prop">
<span class="info-title-3">离开本地时间</span>
<span>{{ formData.invalidTime||'--' }}</span>
</div>
<div class="info-prop">
<span class="info-title-3">备注</span>
<span>{{ formData.remark||'--' }}</span>
</div>
</div>
</div>
</div>
<div class="div-btn">
<el-button size="small"
@click="handleCancle"> </el-button>
<!-- <el-button v-if="formType != 'detail'"
size="small"
type="primary"
:disabled="btnDisable"
@click="handleComfirm('ref_form')"> </el-button> -->
</div>
</div>
</template>
<script>
import { Loading } from 'element-ui' // Loading
import { requestPost } from '@/js/dai/request'
import { dateFormats } from '@/utils/index'
import { isCard, isMobile } from '@/utils/validate'
let loading //
export default {
data () {
return {
initLoading: false,
selId: '',
formData: {},
}
},
components: {},
async mounted () {
const { user } = this.$store.state
this.agencyId = user.agencyId
},
destroyed () {
},
methods: {
async initForm (row) {
console.log('row----', row)
this.formData.agencyId = this.agencyId
this.selId = row.id
await this.loadFormData(row.id)
this.initLoading = true
},
async handleTuomin () {
const url = "/data/aggregator/epmetuser/detailByType";
const { data, code, msg } = await requestPost(url, {
id: this.selId,
type: "routeFollow",
});
if (code === 0) {
this.$set(this.formData, 'showMobile', data.mobile)
this.$set(this.formData, 'showIdCard', data.idCard)
} else {
this.$message.error(msg);
}
},
async loadFormData (id) {
const url = '/epmetuser/tripreport/yt-detail '
let params = {
id,
}
const { data, code, msg } = await requestPost(url, params)
if (code === 0) {
console.log('deda-------', data)
this.formData = { ...data, channel: [], content: '' }
if (data.userType == 'icresi') this.isFromResi = true
this.formData.viaAddressShow = ''
if (this.formData.viaProvince) {
this.formData.viaAddressShow = this.formData.viaAddressShow + this.formData.viaProvince
}
if (this.formData.viaCity) {
this.formData.viaAddressShow = this.formData.viaAddressShow + '-' + this.formData.viaCity
}
if (this.formData.viaCounty) {
this.formData.viaAddressShow = this.formData.viaAddressShow + '-' + this.formData.viaCounty
}
} else {
this.$message.error(msg)
}
},
watchImg (src) {
window.open(src);
},
handleCancle () {
// this.resetData()
this.$emit('dialogCancle')
},
resetData () {
},
//
startLoading () {
loading = Loading.service({
lock: true, //
text: '正在加载……', //
background: 'rgba(0,0,0,.7)' //
})
},
//
endLoading () {
// clearTimeout(timer);
if (loading) {
loading.close()
}
}
},
props: {
view_real_data: {//
type: Boolean,
default: false,
}
},
}
</script>
<style lang="scss" scoped>
@import "@/assets/scss/modules/management/detail-main.scss";
.div_tuomin {
position: absolute;
top: 0;
right: 40px;
z-index: 1000;
}
</style>

1069
src/views/modules/base/epidemic/travelYantai/travelYantaiForm.vue

File diff suppressed because it is too large

2
src/views/modules/visual/command/index.vue

@ -289,7 +289,7 @@ export default {
cptCard,
ScreenLoading,
gridMap:
mapType == "tdzw" && SITE_CONFIG["nodeEnv"] == "dev_sdtdt"
mapType == "tdzw" && SITE_CONFIG["nodeEnv"] == "dev_sdtdt1"
? gridMapOl
: gridMap,
sidemenu1,

2
src/views/modules/visual/plugin/power/components/screen-org-tree.vue

@ -275,7 +275,7 @@ export default {
justify-content: center;
margin: 0 7px;
&-info {
width: 300px;
width: 400px;
height: 80px;
background: url('../../../../../../assets/img/plugins/dangwei-by.png') no-repeat;
background-size: 100% 100%;

Loading…
Cancel
Save