diff --git a/package.json b/package.json index f53bc1e..5b8832d 100644 --- a/package.json +++ b/package.json @@ -5,7 +5,7 @@ "author": "", "private": true, "scripts": { - "dev": "webpack-dev-server --inline --progress --config build/webpack.dev.conf.js --host 192.168.0.247", + "dev": "webpack-dev-server --inline --progress --config build/webpack.dev.conf.js --host 192.168.0.105", "start": "npm run dev", "unit": "jest --config test/unit/jest.conf.js --coverage", "e2e": "node test/e2e/runner.js", diff --git a/src/assets/map/gangkou_index/buttom/ico29.png b/src/assets/map/gangkou_index/buttom/ico29.png new file mode 100644 index 0000000..090a8af Binary files /dev/null and b/src/assets/map/gangkou_index/buttom/ico29.png differ diff --git a/src/assets/map/gangkou_index/buttom/ico29_on.png b/src/assets/map/gangkou_index/buttom/ico29_on.png new file mode 100644 index 0000000..23c82f5 Binary files /dev/null and b/src/assets/map/gangkou_index/buttom/ico29_on.png differ diff --git a/src/assets/map/menjin/img3.png b/src/assets/map/menjin/img3.png new file mode 100644 index 0000000..22091c1 Binary files /dev/null and b/src/assets/map/menjin/img3.png differ diff --git a/src/assets/map/menjin/img4.png b/src/assets/map/menjin/img4.png new file mode 100644 index 0000000..8332cb8 Binary files /dev/null and b/src/assets/map/menjin/img4.png differ diff --git a/src/views/classMessage/classMessage/components/edit.vue b/src/views/classMessage/classMessage/components/edit.vue index fe31e5a..826a42c 100644 --- a/src/views/classMessage/classMessage/components/edit.vue +++ b/src/views/classMessage/classMessage/components/edit.vue @@ -121,7 +121,7 @@ size="mini" @click="getUserInfo(row)">查看 - 更换头像 + 更换头像 - + - + @@ -52,7 +59,12 @@ - + - - - - - +
{{ '温馨提示：1、输入名称、电话、身份证号按回车或让输入框失去焦点即可搜索。2、双击人员列可直接添加' }}
搜索条件 - + + + + + + + + + + + + + + + + @@ -102,59 +141,68 @@ tooltip-effect="dark" height="450px" border - fit highlight-current-row + @row-dblclick="clickAddSelect" @selection-change="updateSelect" - > - - - - + + + + + + + - - - - - + + - + @@ -162,44 +210,56 @@ - +
-
已选择人员数量：{{ ($refs.multipleTable && $refs.multipleTable.selection)?$refs.multipleTable.selection.length:0 }}
+
已选择人员数量：{{ + (selectPeopleList && selectPeopleList.length) ? selectPeopleList.length : 0 + }} +
已选择人员名称：
- + - - + + + + +
取 消 - 确 定 - 导出excel - 班级结业 - 导出结业证书 + {{ fullscreenFlag ? '取消全屏' : '全 屏' }} + 确 定
+ + + diff --git a/src/views/classMessage/classMessage/components/list.vue b/src/views/classMessage/classMessage/components/list.vue index 2ef7dfd..42591ea 100644 --- a/src/views/classMessage/classMessage/components/list.vue +++ b/src/views/classMessage/classMessage/components/list.vue @@ -71,12 +71,19 @@ {{ row.CLASS_STATUS === '0'?'待开班':(row.CLASS_STATUS === '1'?'已开班':'完成') }} - + @@ -193,6 +200,11 @@ export default { this.isShow = true this.$refs.edit.init({ CLASS_MESSAGE_ID: ID }) }, + handleInit(ID) { + this.title = '详情' + this.isShow = false + this.$refs.initClass.init({ CLASS_MESSAGE_ID: ID }) + }, handleDelete(id) { this.$confirm('确定要删除吗?', { confirmButtonText: '确定', diff --git a/src/views/dangerousWork/blindboard/components/corpInfo.vue b/src/views/dangerousWork/blindboard/components/corpInfo.vue new file mode 100644 index 0000000..c36d20a --- /dev/null +++ b/src/views/dangerousWork/blindboard/components/corpInfo.vue @@ -0,0 +1,128 @@ + + + diff --git a/src/views/dangerousWork/blindboard/components/detail.vue b/src/views/dangerousWork/blindboard/components/detail.vue new file mode 100644 index 0000000..be0f3a0 --- /dev/null +++ b/src/views/dangerousWork/blindboard/components/detail.vue @@ -0,0 +1,265 @@ + + + + + diff --git a/src/views/dangerousWork/blindboard/components/list.vue b/src/views/dangerousWork/blindboard/components/list.vue new file mode 100644 index 0000000..0869e3b --- /dev/null +++ b/src/views/dangerousWork/blindboard/components/list.vue @@ -0,0 +1,321 @@ + + diff --git a/src/views/dangerousWork/blindboard/index.vue b/src/views/dangerousWork/blindboard/index.vue new file mode 100644 index 0000000..060b772 --- /dev/null +++ b/src/views/dangerousWork/blindboard/index.vue @@ -0,0 +1,23 @@ + + diff --git a/src/views/dangerousWork/breakground/components/corpInfo.vue b/src/views/dangerousWork/breakground/components/corpInfo.vue new file mode 100644 index 0000000..975c20a --- /dev/null +++ b/src/views/dangerousWork/breakground/components/corpInfo.vue @@ -0,0 +1,128 @@ + + + diff --git a/src/views/dangerousWork/breakground/components/detail.vue b/src/views/dangerousWork/breakground/components/detail.vue new file mode 100644 index 0000000..4f31131 --- /dev/null +++ b/src/views/dangerousWork/breakground/components/detail.vue @@ -0,0 +1,283 @@ + + + + + diff --git a/src/views/dangerousWork/breakground/components/list.vue b/src/views/dangerousWork/breakground/components/list.vue new file mode 100644 index 0000000..e651f7a --- /dev/null +++ b/src/views/dangerousWork/breakground/components/list.vue @@ -0,0 +1,371 @@ + + diff --git a/src/views/dangerousWork/breakground/index.vue b/src/views/dangerousWork/breakground/index.vue new file mode 100644 index 0000000..d2b781b --- /dev/null +++ b/src/views/dangerousWork/breakground/index.vue @@ -0,0 +1,23 @@ + + diff --git a/src/views/dangerousWork/circuit/components/corpInfo.vue b/src/views/dangerousWork/circuit/components/corpInfo.vue new file mode 100644 index 0000000..eefa197 --- /dev/null +++ b/src/views/dangerousWork/circuit/components/corpInfo.vue @@ -0,0 +1,128 @@ + + + diff --git a/src/views/dangerousWork/circuit/components/detail.vue b/src/views/dangerousWork/circuit/components/detail.vue new file mode 100644 index 0000000..d253af5 --- /dev/null +++ b/src/views/dangerousWork/circuit/components/detail.vue @@ -0,0 +1,279 @@ + + + + + diff --git a/src/views/dangerousWork/circuit/components/list.vue b/src/views/dangerousWork/circuit/components/list.vue new file mode 100644 index 0000000..b2562a7 --- /dev/null +++ b/src/views/dangerousWork/circuit/components/list.vue @@ -0,0 +1,365 @@ + + diff --git a/src/views/dangerousWork/circuit/index.vue b/src/views/dangerousWork/circuit/index.vue new file mode 100644 index 0000000..0c0ba5e --- /dev/null +++ b/src/views/dangerousWork/circuit/index.vue @@ -0,0 +1,23 @@ + + diff --git a/src/views/dangerousWork/electricity/components/corpInfo.vue b/src/views/dangerousWork/electricity/components/corpInfo.vue new file mode 100644 index 0000000..bce1003 --- /dev/null +++ b/src/views/dangerousWork/electricity/components/corpInfo.vue @@ -0,0 +1,128 @@ + + + diff --git a/src/views/dangerousWork/electricity/components/detail.vue b/src/views/dangerousWork/electricity/components/detail.vue new file mode 100644 index 0000000..f1d6d8e --- /dev/null +++ b/src/views/dangerousWork/electricity/components/detail.vue @@ -0,0 +1,269 @@ + + + + + diff --git a/src/views/dangerousWork/electricity/components/list.vue b/src/views/dangerousWork/electricity/components/list.vue new file mode 100644 index 0000000..3a81dd2 --- /dev/null +++ b/src/views/dangerousWork/electricity/components/list.vue @@ -0,0 +1,314 @@ + + diff --git a/src/views/dangerousWork/electricity/index.vue b/src/views/dangerousWork/electricity/index.vue new file mode 100644 index 0000000..45fe6f7 --- /dev/null +++ b/src/views/dangerousWork/electricity/index.vue @@ -0,0 +1,32 @@ + + + + + diff --git a/src/views/dangerousWork/highwork/components/corpInfo.vue b/src/views/dangerousWork/highwork/components/corpInfo.vue new file mode 100644 index 0000000..9c4b976 --- /dev/null +++ b/src/views/dangerousWork/highwork/components/corpInfo.vue @@ -0,0 +1,128 @@ + + + diff --git a/src/views/dangerousWork/highwork/components/detail.vue b/src/views/dangerousWork/highwork/components/detail.vue new file mode 100644 index 0000000..a83db7f --- /dev/null +++ b/src/views/dangerousWork/highwork/components/detail.vue @@ -0,0 +1,274 @@ + + + + + diff --git a/src/views/dangerousWork/highwork/components/list.vue b/src/views/dangerousWork/highwork/components/list.vue new file mode 100644 index 0000000..e3bfd92 --- /dev/null +++ b/src/views/dangerousWork/highwork/components/list.vue @@ -0,0 +1,352 @@ + + diff --git a/src/views/dangerousWork/highwork/index.vue b/src/views/dangerousWork/highwork/index.vue new file mode 100644 index 0000000..1a54661 --- /dev/null +++ b/src/views/dangerousWork/highwork/index.vue @@ -0,0 +1,27 @@ + + + + + diff --git a/src/views/dangerousWork/hoisting/components/corpInfo.vue b/src/views/dangerousWork/hoisting/components/corpInfo.vue new file mode 100644 index 0000000..ddf3ce4 --- /dev/null +++ b/src/views/dangerousWork/hoisting/components/corpInfo.vue @@ -0,0 +1,128 @@ + + + diff --git a/src/views/dangerousWork/hoisting/components/detail.vue b/src/views/dangerousWork/hoisting/components/detail.vue new file mode 100644 index 0000000..5d4c98f --- /dev/null +++ b/src/views/dangerousWork/hoisting/components/detail.vue @@ -0,0 +1,305 @@ + + + + + diff --git a/src/views/dangerousWork/hoisting/components/list.vue b/src/views/dangerousWork/hoisting/components/list.vue new file mode 100644 index 0000000..46a6403 --- /dev/null +++ b/src/views/dangerousWork/hoisting/components/list.vue @@ -0,0 +1,350 @@ + + diff --git a/src/views/dangerousWork/hoisting/index.vue b/src/views/dangerousWork/hoisting/index.vue new file mode 100644 index 0000000..07fac1c --- /dev/null +++ b/src/views/dangerousWork/hoisting/index.vue @@ -0,0 +1,35 @@ + + + + + + diff --git a/src/views/dangerousWork/hotwork/components/hotwork/hotwork_list/components/detail_cfd.vue b/src/views/dangerousWork/hotwork/components/hotwork/hotwork_list/components/detail_cfd.vue index 0422aaa..1549ecd 100644 --- a/src/views/dangerousWork/hotwork/components/hotwork/hotwork_list/components/detail_cfd.vue +++ b/src/views/dangerousWork/hotwork/components/hotwork/hotwork_list/components/detail_cfd.vue @@ -75,6 +75,22 @@ 动火作业实施时间 {{ pd.WORK_START_DATE }}至{{ pd.WORK_END_DATE }}止 + + 动火是否完成 + + 已完成 + + 动火是否完成 + + 已清理 + + + + 是否存在遗留火种 + + 无遗留火种 + + @@ -146,13 +162,25 @@ + + + + + + + + + +
接受交底人 -
- 签字： - - {{ item.ACCEPT_CONFESS_USER_SIGNER_TIME }} +
+
+ 签字： + + {{ item.APPROVAL_SIGNATURE_TIME.split(',')[0] }} +
监护人 @@ -175,7 +203,7 @@
-
作业负责人意见：{{ pd.CONFIRM_CONTENT }}
+
作业负责人意见：{{ pd.CONFIRM_CONTENT === '无' ? '同意' : pd.CONFIRM_CONTENT }}
签字： @@ -185,7 +213,7 @@
-
项目主管部门负责人意见：{{ pd.BELONGING_OPINIONS }}
+
项目主管部门负责人意见：{{ pd.BELONGING_OPINIONS === '' ? '同意' : pd.BELONGING_OPINIONS }}
签字： @@ -195,7 +223,7 @@
-
所在单位意见：{{ pd.LEADER_CONTENT }}
+
属地监管单位意见：{{ pd.LEADER_CONTENT === '无' ? '同意' : pd.LEADER_CONTENT }}
签字： @@ -205,7 +233,7 @@
-
安全管理部门意见：{{ pd.AUDIT_CONTENT }}
+
安全管理部门意见：{{ pd.AUDIT_CONTENT === '无' ? '同意' : pd.AUDIT_CONTENT }}
签字： @@ -215,7 +243,7 @@
-
动火审批人意见：{{ pd.APPROVE_CONTENT }}
+
动火审批人意见：{{ pd.APPROVE_CONTENT === '无' ? '同意' : pd.APPROVE_CONTENT }}
签字： @@ -225,7 +253,7 @@
-
动火前验票负责人：{{ pd.MONITOR_CONTENT }}
+
动火前验票负责人：{{ pd.MONITOR_CONTENT === '无' ? '同意' : pd.MONITOR_CONTENT }}
签字： @@ -235,7 +263,7 @@
-
完工验收：{{ pd.ACCEPT_CONTENT }}
+
完工验收：{{ pd.ACCEPT_CONTENT === '无' ? '同意' : pd.ACCEPT_CONTENT }}
签字： @@ -267,6 +295,7 @@ export default { imgList: [], imgList1: [], otherProtectiveMeasures: [], + acceptConfessList: [], confessList: [] } }, @@ -312,23 +341,37 @@ export default { this.confessList.push(item) } }) - for (let i = 0; i < data.measuresList.length; i++) { - // 将字符串转成数组 - const PROTECTIVE_MEASURES = data.measuresList[i].PROTECTIVE_MEASURES.split('') - for (let j = 1; j <= 3; j++) { - // 判断字符串是否存在 - if (this.findCharIndex(PROTECTIVE_MEASURES, '（', j) !== -1) { - // 给字符串后面添加上需要的数据 - PROTECTIVE_MEASURES.splice( - this.findCharIndex(PROTECTIVE_MEASURES, '（', j) + 1, - 0, - data.measuresList[i]['ANSWER' + j] - ) - } + // data.pd.acceptConfessList.forEach(item => { + // if (item.APPROVAL_SIGNATURE_TIME !== undefined && item.APPROVAL_SIGNATURE_TIME.trim() !== '') { + // this.acceptConfessList.push(item) + // } + // }) + data.pd.acceptConfessList.forEach(item => { + // 将 APPROVAL_SIGNATURE 转换为数组 + if (item.APPROVAL_SIGNATURE) { + item.APPROVAL_SIGNATURE = item.APPROVAL_SIGNATURE.split(';') } - // 将数组转回字符串 - data.measuresList[i].PROTECTIVE_MEASURES = PROTECTIVE_MEASURES.join('') - } + if (item.APPROVAL_SIGNATURE_TIME !== undefined && item.APPROVAL_SIGNATURE_TIME.trim() !== '') { + this.acceptConfessList.push(item) + } + }) + // for (let i = 0; i < data.measuresList.length; i++) { + // // 将字符串转成数组 + // const PROTECTIVE_MEASURES = data.measuresList[i].PROTECTIVE_MEASURES.split('') + // for (let j = 1; j <= 3; j++) { + // // 判断字符串是否存在 + // if (this.findCharIndex(PROTECTIVE_MEASURES, '（', j) !== -1) { + // // 给字符串后面添加上需要的数据 + // PROTECTIVE_MEASURES.splice( + // this.findCharIndex(PROTECTIVE_MEASURES, '（', j) + 1, + // 0, + // data.measuresList[i]['ANSWER' + j] + // ) + // } + // } + // // 将数组转回字符串 + // data.measuresList[i].PROTECTIVE_MEASURES = PROTECTIVE_MEASURES.join('') + // } this.measuresList = data.measuresList // 参数map this.gasList = data.gasList // 参数map if (this.pd.WORK_LEVEL === '二级') { diff --git a/src/views/dangerousWork/hotwork/components/hotwork/hotwork_list/components/list_cfd.vue b/src/views/dangerousWork/hotwork/components/hotwork/hotwork_list/components/list_cfd.vue index a138821..66d0292 100644 --- a/src/views/dangerousWork/hotwork/components/hotwork/hotwork_list/components/list_cfd.vue +++ b/src/views/dangerousWork/hotwork/components/hotwork/hotwork_list/components/list_cfd.vue @@ -52,14 +52,14 @@ + + + - + + +
+ + + + 搜索 + 重置 +
+
@@ -264,6 +281,7 @@ import menjinCzks from './components/menjinCzks.vue' import renyuanCzks from './components/renyuanCzks.vue' import renyuanCmt from './components/renyuanCmt.vue' import menjin from './components/menjin.vue' +import menjinOld from './components/menjin_old.vue' import menjinCfd from './components/menjinCfd.vue' import menjinCmt from './components/menjinCmt.vue' import xiaofang from './components/xiaofang.vue' @@ -320,6 +338,7 @@ export default { fengongsiIndex, caofeidianIndex, layoutMenu, + menjinOld, menjin, menjinCfd, menjinCmt, @@ -473,6 +492,26 @@ export default { checkImg: require('../../assets/map/gangkou_index/buttom/ico1_on.png'), type: 'CAR', containAuthorization: [], + eliminateAuthorization: ['035958e685cf4850bc40151c5e0617a6'] + }, + { + label: '人员', + dialog_width: '800px', + check: false, + img: require('../../assets/map/gangkou_index/buttom/ico1.png'), + checkImg: require('../../assets/map/gangkou_index/buttom/ico1_on.png'), + type: 'PERSON', + containAuthorization: ['035958e685cf4850bc40151c5e0617a6'], + eliminateAuthorization: [] + }, + { + label: '车辆', + dialog_width: '600px', + check: false, + img: require('../../assets/map/gangkou_index/buttom/ico2.png'), + checkImg: require('../../assets/map/gangkou_index/buttom/ico2_on.png'), + type: 'CAR', + containAuthorization: ['035958e685cf4850bc40151c5e0617a6'], eliminateAuthorization: [] }, { @@ -725,6 +764,16 @@ export default { checkImg: require('../../assets/map/gangkou_index/buttom/ico21_on.png'), containAuthorization: [], eliminateAuthorization: [] + }, + { + label: '人员轨迹', + dialog_width: '1200px', + check: false, + type: 'peopleTrajectory', + img: require('../../assets/map/gangkou_index/buttom/ico29.png'), + checkImg: require('../../assets/map/gangkou_index/buttom/ico29_on.png'), + containAuthorization: [], + eliminateAuthorization: [] } // { // label: '车辆定位', @@ -1165,7 +1214,9 @@ export default { linkPort: '8093', VIIDPort: '8088' }, - trajectoryEntityCollection: {} + trajectoryEntityCollection: {}, + isPeopleTrajectory:false, + peopleTrajectoryValue:'' } }, mounted() { @@ -1464,35 +1515,36 @@ export default { // var cartesian = this.getCatesian3FromPX(movement.position) }, Cesium.ScreenSpaceEventType.LEFT_CLICK) viewer.cesiumWidget.screenSpaceEventHandler.removeInputAction(Cesium.ScreenSpaceEventType.RIGHT_DOUBLE_CLICK) - viewer.cesiumWidget.screenSpaceEventHandler.removeInputAction(Cesium.ScreenSpaceEventType.RIGHT_CLICK) + // viewer.cesiumWidget.screenSpaceEventHandler.removeInputAction(Cesium.ScreenSpaceEventType.RIGHT_CLICK) document.addEventListener('contextmenu', function(event) { event.preventDefault() }) - this.handler.setInputAction(movement => { - const pick = viewer.scene.pick(movement.position) - if (Cesium.defined(pick) && (pick.id.id)) { - if (!pick.id._monitoItems) { - this.removeTrajectory() - return - } - const point_type = pick.id._monitoItems.data.point_type - const point_id = pick.id._monitoItems.data.id - const corpInfoId = pick.id._monitoItems.data.corpInfoId - if (point_type === '标记点peoplePositionOne') { - this.removeTrajectory() - this.addTrajectory(point_id, corpInfoId) - } - } else { - this.removeTrajectory() - } - }, Cesium.ScreenSpaceEventType.RIGHT_CLICK) + // this.handler.setInputAction(movement => { + // const pick = viewer.scene.pick(movement.position) + // if (Cesium.defined(pick) && (pick.id.id)) { + // if (!pick.id._monitoItems) { + // this.removeTrajectory() + // return + // } + // const point_type = pick.id._monitoItems.data.point_type + // const point_id = pick.id._monitoItems.data.id + // const corpInfoId = pick.id._monitoItems.data.corpInfoId + // if (point_type === '标记点peoplePositionOne') { + // this.removeTrajectory() + // this.addTrajectory(point_id, corpInfoId) + // } + // } else { + // this.removeTrajectory() + // } + // }, Cesium.ScreenSpaceEventType.RIGHT_CLICK) }, - addTrajectory(point_id, corpInfoId) { + addTrajectory() { + this.removeTrajectory() requestFN( '/map/getPersonTrace', { - id: point_id, - corpId: corpInfoId + id: this.peopleTrajectoryValue, + corpId: this.CORP_INFO_ID } ).then((data) => { if (data.list) { @@ -1954,6 +2006,7 @@ export default { this.bottomOptionsList[i].list[j].check = false } } + this.isPeopleTrajectory = false } }, clearAllBottomOptionsItemsEntityCollection() { @@ -2068,10 +2121,22 @@ export default { } this.carLocArr = [] } + if(urlType === 'peopleTrajectory'){ + this.isPeopleTrajectory = false + } if (this.gangkouActive === '00003' && this.CORP_INFO_ID === '035958e685cf4850bc40151c5e0617a6' && urlType === 'peoplePosition') { this.doUnSubscribe() this.clearMqttPoint('+/UwbBQ/') this.removeTrajectory() + for (let i = 0; i < this.bottomOptionsList[pindex].list.length; i++) { + if(this.bottomOptionsList[pindex].list[i].type === 'peopleTrajectory'){ + if(this.bottomOptionsList[pindex].list[i].check){ + this.bottomOptionsList[pindex].list[i].check = false + this.isPeopleTrajectory = false + break + } + } + } } if (this.gangkouActive === '00003' && this.CORP_INFO_ID === '21590a00ea5e462e9ee44dd332dddc26' && urlType === 'peoplePosition') { this.clearRYDWPoint('+/UwbBQ/') @@ -2089,6 +2154,23 @@ export default { } }) } else { + if(urlType === 'peopleTrajectory'){ + let flag = false + for (let i = 0; i < this.bottomOptionsList[pindex].list.length; i++) { + if(this.bottomOptionsList[pindex].list[i].type === 'peoplePosition'){ + if(!this.bottomOptionsList[pindex].list[i].check){ + flag = true + break + } + } + } + if(flag){ + this.$message.warning('请先选择人员定位！！！') + return + }else{ + this.isPeopleTrajectory = true + } + } // 选中 this.bottomOptionsList[pindex].list[index].check = true if (this.gangkouActive === '00004') { @@ -3604,9 +3686,51 @@ export default { transform: translateY(0); } } + .people_trajectory{ + position: absolute; + top: -60px; + left: 0; + width: 400px; + padding: 10px; + background-image: linear-gradient(to right, rgb(31 62 129 / 57%) 0%, rgb(17 93 255 / 40%) 50%, rgb(31 62 129 / 57%) 100%); + .search_btn{ + background-color: #1563e3; + color: #fff; + border-color: #1563e3; + } + .reset_btn{ + background-color: #558be5; + color: #fff; + border-color: #558be5; + } + } diff --git a/src/views/map/js/dragentity.js b/src/views/map/js/dragentity.js index eedf0d3..0532a93 100644 --- a/src/views/map/js/dragentity.js +++ b/src/views/map/js/dragentity.js @@ -53,6 +53,8 @@ const img8_0 = require('../../../assets/map/gangkou_index/point/ico23.png') const img8_1 = require('../../../assets/map/gangkou_index/point/ico24.png') const img8_2 = require('../../../assets/map/gangkou_index/point/ico25.png') const img8_3 = require('../../../assets/map/gangkou_index/point/ico26.png') +const GGimg1 = require('../../../assets/map/gangkou_index/point/ico1.png') +const GGimg2 = require('../../../assets/map/gangkou_index/point/ico2.png') const imgMap = { img0_0, img0_1, img0_2, @@ -116,15 +118,61 @@ export default class DragEntity { } } if (value.point_type.indexOf('标记点') !== -1) { - billboard = { - image: imgMap['img' + value.icon_type], - height: 36, - width: 30, - verticalOrigin: Cesium.VerticalOrigin.BOTTOM, - horizontalOrigin: Cesium.HorizontalOrigin.CENTER, - heightReference: Cesium.HeightReference.CLAMP_TO_GROUND, - disableDepthTestDistance: Number.POSITIVE_INFINITY + console.info('====' ) + console.info(value ) + console.info('====' ) + if (value.label == '人员' && value.corpInfoId == '035958e685cf4850bc40151c5e0617a6'){ + billboard = { + image: GGimg1, + height: 36, + width: 30, + verticalOrigin: Cesium.VerticalOrigin.BOTTOM, + horizontalOrigin: Cesium.HorizontalOrigin.CENTER, + heightReference: Cesium.HeightReference.CLAMP_TO_GROUND, + disableDepthTestDistance: Number.POSITIVE_INFINITY + } + }else if (value.label == '车辆' && value.corpInfoId == '035958e685cf4850bc40151c5e0617a6'){ + billboard = { + image: GGimg2, + height: 36, + width: 30, + verticalOrigin: Cesium.VerticalOrigin.BOTTOM, + horizontalOrigin: Cesium.HorizontalOrigin.CENTER, + heightReference: Cesium.HeightReference.CLAMP_TO_GROUND, + disableDepthTestDistance: Number.POSITIVE_INFINITY + } + }else if (value.label == '摄像头' && value.corpInfoId == '035958e685cf4850bc40151c5e0617a6'){ + billboard = { + image: imgMap['img0_2' ], + height: 36, + width: 30, + verticalOrigin: Cesium.VerticalOrigin.BOTTOM, + horizontalOrigin: Cesium.HorizontalOrigin.CENTER, + heightReference: Cesium.HeightReference.CLAMP_TO_GROUND, + disableDepthTestDistance: Number.POSITIVE_INFINITY + } + }else if (value.label == '摄像头' ){ + billboard = { + image: imgMap['img0_2' ], + height: 36, + width: 30, + verticalOrigin: Cesium.VerticalOrigin.BOTTOM, + horizontalOrigin: Cesium.HorizontalOrigin.CENTER, + heightReference: Cesium.HeightReference.CLAMP_TO_GROUND, + disableDepthTestDistance: Number.POSITIVE_INFINITY + } + }else{ + billboard = { + image: imgMap['img' + value.icon_type], + height: 36, + width: 30, + verticalOrigin: Cesium.VerticalOrigin.BOTTOM, + horizontalOrigin: Cesium.HorizontalOrigin.CENTER, + heightReference: Cesium.HeightReference.CLAMP_TO_GROUND, + disableDepthTestDistance: Number.POSITIVE_INFINITY + } } + } // 曹妃甸使用 if (value.gangkou === '00004') { diff --git a/src/views/map/js/ry_dragentity.js b/src/views/map/js/ry_dragentity.js index f63fb12..3a65fbb 100644 --- a/src/views/map/js/ry_dragentity.js +++ b/src/views/map/js/ry_dragentity.js @@ -30,6 +30,16 @@ export default class DragEntity { heightReference: Cesium.HeightReference.CLAMP_TO_GROUND, disableDepthTestDistance: Number.POSITIVE_INFINITY }, + label: { + text: point.id, + font: '13px sans-serif', + pixelOffset: new Cesium.Cartesian2(0, -55), + showBackground: true, + // eslint-disable-next-line new-cap + backgroundColor: new Cesium.Color.fromCssColorString('rgba(20, 58, 142, 1)'), + backgroundPadding: new Cesium.Cartesian2(7, 5), + disableDepthTestDistance: Number.POSITIVE_INFINITY + }, orientation: new Cesium.VelocityOrientationProperty(point.property), monitoItems: { diff --git a/src/views/threeSystems/lawsRegulations/components/editTextLibrary.vue b/src/views/threeSystems/lawsRegulations/components/editTextLibrary.vue index 757be5c..57990cd 100644 --- a/src/views/threeSystems/lawsRegulations/components/editTextLibrary.vue +++ b/src/views/threeSystems/lawsRegulations/components/editTextLibrary.vue @@ -326,7 +326,7 @@ export default { SPECIFICATION_TYPES: [''], CATEGORY_LIST: [''], STATUS: '', - ASSOCIATION: '0', + ASSOCIATION: '4', types: [], specification_types: [], category_list: [], diff --git a/src/views/threeSystems/lawsRegulations/components/list.vue b/src/views/threeSystems/lawsRegulations/components/list.vue index bff4c88..3b82100 100644 --- a/src/views/threeSystems/lawsRegulations/components/list.vue +++ b/src/views/threeSystems/lawsRegulations/components/list.vue @@ -288,7 +288,7 @@ export default { STATUS: this.form.STATUS, TYPE: this.form.TYPE_NAME, DATE: this.form.DATE, - TEXT_NAME: this.TEXT_NAME, + TEXT_NAME: this.form.TEXT_NAME, ASSOCIATION: '4', CORPINFO_ID: '0', MIGRATION_FLAG: '1' diff --git a/src/views/xgf/coerceCheckIn/components/list.vue b/src/views/xgf/coerceCheckIn/components/list.vue new file mode 100644 index 0000000..4a9307c --- /dev/null +++ b/src/views/xgf/coerceCheckIn/components/list.vue @@ -0,0 +1,257 @@ + + + + diff --git a/src/views/xgf/coerceCheckIn/index.vue b/src/views/xgf/coerceCheckIn/index.vue new file mode 100644 index 0000000..45be1d5 --- /dev/null +++ b/src/views/xgf/coerceCheckIn/index.vue @@ -0,0 +1,21 @@ + + + + + diff --git a/src/views/xgf/coerceIntakeLog/components/list.vue b/src/views/xgf/coerceIntakeLog/components/list.vue new file mode 100644 index 0000000..5da5d12 --- /dev/null +++ b/src/views/xgf/coerceIntakeLog/components/list.vue @@ -0,0 +1,102 @@ + + + + diff --git a/src/views/xgf/coerceIntakeLog/index.vue b/src/views/xgf/coerceIntakeLog/index.vue new file mode 100644 index 0000000..45be1d5 --- /dev/null +++ b/src/views/xgf/coerceIntakeLog/index.vue @@ -0,0 +1,21 @@ + + + + + diff --git a/src/views/xgf/flow/components/sendUtil.vue b/src/views/xgf/flow/components/sendUtil.vue index 914808c..a9d8bc3 100644 --- a/src/views/xgf/flow/components/sendUtil.vue +++ b/src/views/xgf/flow/components/sendUtil.vue @@ -1,6 +1,13 @@