From 5b70ba4a74870e233008565bca59b0be3aae9c40 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=AA=86=E4=B9=90?= <342503599@qq.com> Date: Fri, 26 Aug 2022 18:04:34 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E6=B7=B1=E5=9F=BA=E5=9D=91(=E5=9F=BA?= =?UTF-8?q?=E5=9D=91=E9=85=8D=E7=BD=AE):=E6=B7=BB=E5=8A=A0=E5=B9=B3?= =?UTF-8?q?=E9=9D=A2=E5=9B=BE=E7=BC=96=E8=BE=91=E4=BB=A5=E5=8F=8A=E4=B8=80?= =?UTF-8?q?=E4=BA=9B=E7=BB=86=E8=8A=82=E5=A4=84=E7=90=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/assets/images/menu/saosao_active.png | Bin 0 -> 1866 bytes src/assets/js/api/deepFoundationPitManage.js | 2 + src/assets/js/http.js | 4 +- .../deepFoundationPitManage/dataConfig.vue | 155 +++++++++++------- .../deepFoundationPitManage/monitorData.vue | 11 +- .../projectFront/inspecPoint/inspection.vue | 2 +- 6 files changed, 108 insertions(+), 66 deletions(-) create mode 100644 src/assets/images/menu/saosao_active.png diff --git a/src/assets/images/menu/saosao_active.png b/src/assets/images/menu/saosao_active.png new file mode 100644 index 0000000000000000000000000000000000000000..27ebcce495500a40e6549c097ea2c4ce5392c5dd GIT binary patch literal 1866 zcmV-Q2etT#P)#U+2u3xepAJwD-=;nKS3(cRt=FJYg{N?9kyH7$+H6@JkEi zm;I9pjh~P`;-{2oI8%oGNQZRTk9Gh40~0=<9N-IoVC8W#(746TOs$I@ZdAyY>X4xJ>n_UfiR@`m*Ti^Tr z3saM{)Dv(kNKg29oFHZ)?lKoxiSSfkRq&?=$Ma)U!Y5u1?@mwCMWqdx;{k5^$t?PS zhQS+gGY6i4HGzmIT`bl+YtQ)keIDWH%nYqW47vf%`^RkZ2LwiTM9mx*0R(3PH#UD% zuqzmibk6n8RtgEdzh@Q`F-Spc-g;95{NB1YgP9CADr|9U%@UD@NqODhs zdlwFLlZ-PVZD=rLtc#X!wSsFEQG=|CIX7&|t05@WWJny>oT?~R6I z&Wv(!CCe%V*x)!{zStS)XpS=n^d(-DFW)~^E}PvIT~&iUUpBWJyss-NuWdtZRJq$P zIW)M=dmW0xRCZ8sls8AC^mNc_C*c|BYCNMK;@@F$l5lBVp?n7o{Cq73AwsMjGTqt$Z4FgRs;Ug?$QMgSQlCRZnu^N>tC-*03lNDVM!|Bzpv9Ys zOvzL6{D~;?ybE-!?=%~j^Yqax8nvuaxsn%!XJ=fZC8&z*Y>7KgDZgr34G7Ycs!zB75y<18ABRv&ng zxV|_8s@J+hYP0>-Hbz)0U~fHbv{h@YC&GGHC00=_ov>J-Pj7e&`cidpFYwxtbVh}S z39#$|CKD`Kg0FrC{#*lg?*hGXyrey@Wh$vEv|KUYxH=zcFGwXaul$(Ie{c_Q=CBYN zCCU{n{h{XX?4c_^0e3di;_JsvX@$Z>lfM{Dffr(=d*Nr_gRcIn2^gynP_nVHv_!J8qB7}< zG)VZNM#%IpYAz>lub2JbR!yU66pPB-PYN0S`eYjrDBX?R$2oy_ezM{h=fk>lrY;r< z<7{doMR7ZJcXgi2`6`MrJy{@OS?-zAGjYpt)nJ(D@*kQ0y2Drf^2sci{CKJl$mK>u zotvhi5SDqHsL23|(e%AGP!sg74IJURfYucZ#$e&fkh)KHo;Q_LYI{aD+w^02NQ1(1 zr(%*5<|D21pXQd=cy=(tT5BmZl|rgZ7D5|a^wUK9Bfn@^)KMkPoz}H+xE(AG7WdP- zU$~}hq+x8585avF^Q^gARX>feIysTCS{%;&_O|SWMh!{0yf~M?&F~K141mlDTHS0- zA08oyxVX*kbH21Ecsx_wr^NPLz88jUjUQntyhj0pr2doF1(**V z;y1&yy)0WZ&CPHTtI~n%+^S6lRXHyh{QATQZ;4y~S3nuRctNKpaN1Y7GoH{_UH_4j zdkm5QGA}>E9cy+%Rd@aVAF+ZlzJ9oci$@n}{c$q<2VO<@q}@c>$N&HU07*qoM6N<$ Eg5*AWiU0rr literal 0 HcmV?d00001 diff --git a/src/assets/js/api/deepFoundationPitManage.js b/src/assets/js/api/deepFoundationPitManage.js index 1d8d867a..c234e26f 100644 --- a/src/assets/js/api/deepFoundationPitManage.js +++ b/src/assets/js/api/deepFoundationPitManage.js @@ -25,6 +25,8 @@ export const selectDeepExcavationCurrentDataApi = data => post('xmgl/deepExcavat // 添加基坑平面图 export const addDeepExcavationPlaneFigureApi = data => post('xmgl/deepExcavationPlaneFigure/add', data); +// 编辑基坑平面图 +export const editDeepExcavationPlaneFigureApi = data => post('xmgl/deepExcavationPlaneFigure/edit', data); // 删除基坑平面图 export const deleteDeepExcavationPlaneFigureApi = data => post('xmgl/deepExcavationPlaneFigure/delete', data); // 列表查询基坑平面图 diff --git a/src/assets/js/http.js b/src/assets/js/http.js index 2451a129..74dd0c14 100644 --- a/src/assets/js/http.js +++ b/src/assets/js/http.js @@ -40,8 +40,8 @@ if (process.env.NODE_ENV == 'development') { // axios.defaults.baseURL = 'http://124.71.178.44:100/' // 河南 // tag: 本地 // axios.defaults.baseURL = 'http://192.168.34.174:6023/' // 老大本地 - axios.defaults.baseURL = 'http://192.168.34.125:6023/' //杨意本地 http/1.1 - // axios.defaults.baseURL = 'http://192.168.34.216:6023/' // 邱平毅本地 + // axios.defaults.baseURL = 'http://192.168.34.125:6023/' //杨意本地 http/1.1 + axios.defaults.baseURL = 'http://192.168.34.216:6023/' // 邱平毅本地 // axios.defaults.baseURL = 'http://192.168.34.231:6023/'; //杨思瑞本地 // axios.defaults.baseURL = 'http://47.97.202.104:6023/'; // axios.defaults.baseURL = 'http://139.9.66.234:8/'; diff --git a/src/views/projectFront/deepFoundationPitManage/dataConfig.vue b/src/views/projectFront/deepFoundationPitManage/dataConfig.vue index bf66a7a1..afd9faaa 100644 --- a/src/views/projectFront/deepFoundationPitManage/dataConfig.vue +++ b/src/views/projectFront/deepFoundationPitManage/dataConfig.vue @@ -489,7 +489,7 @@ ? $t('message.deepFoundConfig.warning'):scope.row.alarmState == 1 ? $t('message.deepFoundConfig.alarm'):scope.row.alarmState == 3 ? $t('message.deepFoundConfig.control'):""}} - --> + --> @@ -799,7 +799,7 @@ > @@ -812,7 +812,7 @@ > @@ -867,13 +867,21 @@
{{item.planeFigureName}} + + {{$t('message.deepFoundConfig.remove')}} + > +
@@ -934,7 +942,7 @@

传感器编号：{{item2.sensorSn}}

传感器名称：{{item2.sensorTypeName == null ? '无' : item2.sensorTypeName }}

采集时间：{{item2.receiveTime == null ? '无' : item2.receiveTime}}

- --> + -->

+

+ {{$t('message.deepFoundConfig.cancel')}} {{$t('message.deepFoundConfig.confirm')}} - {{$t('message.deepFoundConfig.cancel')}}
@@ -1093,6 +1102,7 @@ import { selectDeepExcavationCurrentDataListApi, selectDeepExcavationCurrentDataApi, addDeepExcavationPlaneFigureApi, + editDeepExcavationPlaneFigureApi, selectDeepExcavationPlaneFigureListApi, selectDeepExcavationPlaneFigureCoordinateApi, selectDeepExcavationAllMeasurePointListApi, @@ -1321,7 +1331,10 @@ export default { removeType: "", total: 0, pageNo: 1, - pageSize: 10 + pageSize: 10, + title: "", + dialogType: 1, // 1添加 2 编辑 + id: "" }; }, created() { @@ -1468,44 +1481,7 @@ export default { }; this.$refs["testPointImgForm"].resetFields(); }, - // 删除布置图 - deleteDeepImg(val) { - // deleteDeepExcavationPlaneFigureApi({id: val.id}).then(res=>{ - // if(res.code == 200){ - // this.$message.success('删除成功！') - // this.activeImgUrl = '' - // this.pointList = [] - // this.selectDeepExcavationPlaneFigureList() - // } - // }) - this.removeType = 1; - this.removeData = val; - this.deleteInfo = true; - }, - submitImgConfig() { - this.$refs["testPointImgForm"].validate(valid => { - if (valid) { - let data = { - planeFigureName: this.testPointImgForm.planeFigureName, - pointIds: this.testPointImgForm.pointIds.join(","), - imageUrl: this.testPointImgForm.fileList[0].url, - projectSn: this.projectSn, - deepExcavationId: this.deepExcavationId - }; - console.log(data); - addDeepExcavationPlaneFigureApi(data).then(res => { - console.log(res); - if (res.code == 200) { - this.$message.success( - this.$t("message.deepFoundConfig.addSuccess") - ); - this.selectDeepExcavationPlaneFigureList(); - this.showAddImg = false; - } - }); - } - }); - }, + // 列表查询所有测点 selectDeepExcavationAllMeasurePointList() { selectDeepExcavationAllMeasurePointListApi({ @@ -1517,17 +1493,81 @@ export default { } }); }, + // 添加布置图 openAddImgDialog() { + this.title = "添加平面图"; + this.dialogType = 1; this.showAddImg = true; this.selectDeepExcavationAllMeasurePointList(); }, + // 编辑布置图 + editDeepimg(val) { + console.log("编辑", val); + this.title = "编辑平面图"; + this.dialogType = 2; + this.showAddImg = true; + this.id = val.id; + this.selectDeepExcavationAllMeasurePointList(); + this.testPointImgForm.planeFigureName = val.planeFigureName; + this.testPointImgForm.pointIds = val.pointIds.split(","); + this.testPointImgForm.fileList = [{ url: val.imageUrl }]; + }, + // 添加编辑保存 + submitImgConfig() { + this.$refs["testPointImgForm"].validate(valid => { + if (valid) { + let data = { + planeFigureName: this.testPointImgForm.planeFigureName, + pointIds: this.testPointImgForm.pointIds.join(","), + imageUrl: this.testPointImgForm.fileList[0].url, + projectSn: this.projectSn, + deepExcavationId: this.deepExcavationId + }; + console.log(data); + if (this.dialogType == 1) { + addDeepExcavationPlaneFigureApi(data).then(res => { + console.log(res); + if (res.code == 200) { + this.$message.success( + this.$t("message.deepFoundConfig.addSuccess") + ); + this.selectDeepExcavationPlaneFigureList(); + this.showAddImg = false; + } + }); + } else { + (data.id = this.id), + editDeepExcavationPlaneFigureApi(data).then(res => { + // console.log("--------编辑成功了吗", res); + if (res.code == 200) { + this.$message.success("编辑成功"); + this.showAddImg = false; + this.testPointImgForm.pointIds = []; + console.log('编辑旺盛之后',this.testPointImgForm.pointIds) + let val = { + id: res.result.id, + deepExcavationId: res.result.deepExcavationId + }; + this.selectDeepExcavationPlaneFigureCoordinate(val); + } + }); + } + } + }); + }, + // 删除布置图 + deleteDeepImg(val) { + this.removeType = 1; + this.removeData = val; + this.deleteInfo = true; + }, // 获取点位位置信息 selectDeepExcavationPlaneFigureCoordinate(val) { selectDeepExcavationPlaneFigureCoordinateApi({ planeFigureId: val.id, deepExcavationId: val.deepExcavationId }).then(res => { - console.log('点点点',res); + console.log("点点点", res); if (res.code == 200) { res.result.forEach(item => { item.status = "block"; @@ -1541,7 +1581,6 @@ export default { // keyName: obj[key] // }); // } - item.detailList = arr; }); this.pointList = res.result; @@ -1568,7 +1607,7 @@ export default { }; selectDeepExcavationPlaneFigureListApi(data).then(res => { if (res.code == 200) { - console.log(res); + console.log("布点图的信息", res); this.deepImgList = res.result; if (this.deepImgList.length > 0) { this.checkImg(this.deepImgList[0], 0); @@ -1653,10 +1692,9 @@ export default { data.deepExcavationId = this.deepExcavationId; // 深基坑id // console.log(data) // data.sensorList = this.testPointForm - console.log("新增参数", data); - + // console.log("新增参数", data); addDeepExcavationMeasurePointApi(data).then(res => { - console.log("新增成功没", res); + // console.log("新增成功没", res); if (res.code == 200 && res.success) { // 新增成功！ this.$message.success( @@ -1677,6 +1715,7 @@ export default { let data = {}; // this.testPointForm = val data.measurePointNumber = val.measurePointNumber; + data.relaId = val.relaId getDetailDeepExcavationApi(data).then(res => { console.log("--------------查询的结果", res.result); res.result.sensorList.map(item => { @@ -2150,7 +2189,7 @@ export default { pageNo: this.pageNo, pageSize: this.pageSize }; - console.log('参数',data) + console.log("参数", data); selectMeasurePointListApi(data).then(res => { console.log(res); if (res.code == 200) { @@ -2168,7 +2207,7 @@ export default { this.pageNo = val; this.selectMeasurePointList(); }, - + // 获取基坑布置图图片大小 getNaturalSize(callback) { let Domlement = this.$refs["map"]; diff --git a/src/views/projectFront/deepFoundationPitManage/monitorData.vue b/src/views/projectFront/deepFoundationPitManage/monitorData.vue index ac6f9c8d..fe0448d5 100644 --- a/src/views/projectFront/deepFoundationPitManage/monitorData.vue +++ b/src/views/projectFront/deepFoundationPitManage/monitorData.vue @@ -626,7 +626,7 @@ export default { options: [], getSensorList: [], // 传感器列表 checkList: "", - checkList2: {}, + checkList2: "", firstSelect: "", dateTime: [], searchDate: 1, @@ -1641,6 +1641,7 @@ export default { console.log("当前点击行的值", val); this.relaId = val.id; this.checkList = ""; + this.checkList2 = ""; // let arr = [] // for(let key in JSON.parse(val.dataField)){ // arr.push({ @@ -1731,14 +1732,14 @@ export default { }, checkNum(val) { this.firstSelect = val; - console.log("当前选择", val); + // console.log("当前选择", val); getSensorListApi({ measurePointNumber: this.firstSelect }).then(res => { if (res.code == 200 && res.result) { - console.log("---------", res); + // console.log("---------", res); this.getSensorList = res.result; - if (this.getSensorList.length != 0) { + if (this.getSensorList.length != 0) { this.checkList2 = this.getSensorList[0].sensorSn; - this.getEchartsData(); + this.getEchartsData(this.checkList2); } } }); diff --git a/src/views/projectFront/inspecPoint/inspection.vue b/src/views/projectFront/inspecPoint/inspection.vue index d6a40023..0de3f494 100644 --- a/src/views/projectFront/inspecPoint/inspection.vue +++ b/src/views/projectFront/inspecPoint/inspection.vue @@ -34,7 +34,7 @@
- 下载 + 下载
From 212c59d51d4aac85f5ee4f83d460929b00c9bafc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=AA=86=E4=B9=90?= <342503599@qq.com> Date: Fri, 26 Aug 2022 18:17:39 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E5=8D=87=E9=99=8D=E6=9C=BA=E7=B3=BB?= =?UTF-8?q?=E7=BB=9F(=E6=8A=A5=E8=AD=A6=E4=BF=A1=E6=81=AF):=E6=8A=A5?= =?UTF-8?q?=E8=AD=A6=E7=8A=B6=E6=80=81=E6=9B=B4=E6=94=B9=E6=A0=B7=E5=BC=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/store/index.js | 8 +-- src/views/projectFront/lifter/alarmInfo.vue | 61 ++++++++++++++++----- 2 files changed, 52 insertions(+), 17 deletions(-) diff --git a/src/store/index.js b/src/store/index.js index 5cafa864..0f8baa6f 100644 --- a/src/store/index.js +++ b/src/store/index.js @@ -45,8 +45,8 @@ export default new Vuex.Store({ // UPLOADURL:'http://10.0.1.43:6023/upload/image',//测试 // FILEURL:'http://10.0.1.43:6023/image/',//测试 BASEURL: baseUrl ? baseUrl : window.location.protocol + '//' + window.location.host + '/', // - // UPLOADURL: window.location.protocol + '//' + window.location.host + '/upload/image', // - // FILEURL: window.location.protocol + '//' + window.location.host + '/image/', //测试 // tag: 本地测试接口 + UPLOADURL: window.location.protocol + '//' + window.location.host + '/upload/image', // + FILEURL: window.location.protocol + '//' + window.location.host + '/image/', //测试 // tag: 本地测试接口 /* 2022-05-16 */ // tag: 部署河南项目时，需要打开这两行代码 // UPLOADURL: 'http://124.71.178.44:100/upload/image', @@ -56,8 +56,8 @@ export default new Vuex.Store({ // UPLOADURL: 'http://192.168.34.125:6023/upload/image', // FILEURL: 'http://192.168.34.125:6023/image/', // 邱平毅的 - UPLOADURL: 'http://192.168.34.216:6023/upload/image', - FILEURL: 'http://192.168.34.216:6023/image/', + // UPLOADURL: 'http://192.168.34.216:6023/upload/image', + // FILEURL: 'http://192.168.34.216:6023/image/', // UPLOADURL:'http://'+"61.190.32.219:9050"+'/upload/image',//正式 // FILEURL:'http://'+"61.190.32.219:9050"+'/image/',//正式 diff --git a/src/views/projectFront/lifter/alarmInfo.vue b/src/views/projectFront/lifter/alarmInfo.vue index b137db6e..01af5cc3 100644 --- a/src/views/projectFront/lifter/alarmInfo.vue +++ b/src/views/projectFront/lifter/alarmInfo.vue @@ -98,14 +98,20 @@ @@ -141,46 +156,63 @@