From 1b6ddc6c80df9daf2ea7d94c0c0b42ca25d56090 Mon Sep 17 00:00:00 2001 From: yjl <1490736767@qq.com> Date: Tue, 14 Mar 2023 16:58:48 +0800 Subject: [PATCH] =?UTF-8?q?=E4=B8=AD=E5=BB=BA=E5=9B=9B=E5=A4=A7=E5=B1=8F-?= =?UTF-8?q?=E8=B4=A8=E9=87=8F=E7=AE=A1=E7=90=86=E6=8E=A5=E5=8F=A3=E8=B0=83?= =?UTF-8?q?=E6=95=B4=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/assets/js/api/zhongjianFourth.js | 2 +- src/assets/js/http.js | 6 +- .../fourEngin/quality/leftTop.vue | 33 +- .../deepFoundationPitManage/dataConfig.vue | 1849 +++++++++-------- .../deepFoundationPitManage/monitorData.vue | 1533 ++++++++------ .../projectFront/towerCrane/basicInfo.vue | 2 +- 6 files changed, 1926 insertions(+), 1499 deletions(-) diff --git a/src/assets/js/api/zhongjianFourth.js b/src/assets/js/api/zhongjianFourth.js index ea6a8837..00896989 100644 --- a/src/assets/js/api/zhongjianFourth.js +++ b/src/assets/js/api/zhongjianFourth.js @@ -90,7 +90,7 @@ export const getPersonnelSituationApi = data => get('/xmgl/workerInfo/getPersonn /* --------------质量管理------------ */ // 质量巡检 -export const getQualityAcceptanceApi = data => get('/xmgl/qualityInspectionRecord/getQualityAcceptanceAndRectificationNum',data) +export const getQualityAcceptanceApi = data => get('xmgl/qualityInspectionRecord/getAllAndWeekData',data) export const getLimitListBySubdivisionApi = data => get('/xmgl/qualityInspectionRecord/limitListBySubdivision',data) export const getLimitOrderBySurveyingDateApi = data => get('/xmgl/measuredRealQuantity/limitOrderBySurveyingDate',data) export const getLimitOrderByAcceptanceDateApi = data => get('/xmgl/subdivisionAcceptance/limitOrderByAcceptanceDate',data) diff --git a/src/assets/js/http.js b/src/assets/js/http.js index 60233db3..910967a9 100644 --- a/src/assets/js/http.js +++ b/src/assets/js/http.js @@ -41,8 +41,8 @@ if (process.env.NODE_ENV == 'development') { // axios.defaults.baseURL = 'http://192.168.34.117:6023/' // 杨杰本地 // axios.defaults.baseURL = 'http://139.9.66.234:6324/' // 河南春笋 - // axios.defaults.baseURL ='http://124.71.67.160:8088/' //中建四局线上 - axios.defaults.baseURL ='http://182.90.224.147:100/' //演示平台/ + axios.defaults.baseURL ='http://124.71.67.160:8088/' //中建四局线上 + // axios.defaults.baseURL ='http://182.90.224.147:100/' //演示平台/ // axios.defaults.baseURL = 'http://192.168.34.125:6023/' //杨意本地 http/1.1 // axios.defaults.baseURL ='http://47.97.202.104:6023/' //金林湾线上 // axios.defaults.baseURL = 'http://192.168.34.231:6023/'; //杨思瑞本地 @@ -74,7 +74,7 @@ if (process.env.NODE_ENV == 'development') { // axios.defaults.baseURL = 'http://183.234.150.152:9090/' //华发 huaxin 123456789 // axios.defaults.baseURL = 'http://182.90.224.147:18170' //瑞士恒通线上 // axios.defaults.baseURL = 'http://58.250.210.9:9090' //深汕线上 - // axios.defaults.baseURL = 'http://192.168.34.221:8200' //郭圣雄本地 + // axios.defaults.baseURL = 'http://192.168.34.221:8088' //郭圣雄本地 } else if (process.env.NODE_ENV == 'debug') { axios.defaults.baseURL = 'https://www.ceshi.com' diff --git a/src/views/projectAdmin/fourEngin/quality/leftTop.vue b/src/views/projectAdmin/fourEngin/quality/leftTop.vue index 33587831..fbbb34ba 100644 --- a/src/views/projectAdmin/fourEngin/quality/leftTop.vue +++ b/src/views/projectAdmin/fourEngin/quality/leftTop.vue @@ -11,8 +11,8 @@ }" :color="['#6EE4F0', '#E7622A']" :data="[ - { value: list.allClose, name: '已整改' }, - { value: list.allNoClose, name: '未整改' } + { value: list.allClose, name: '已闭合' }, + { value: list.allNoClose, name: '未闭合' } ]" :radius="['60%', '80%']" :legend="false" @@ -20,7 +20,7 @@
- 已整改 + 已闭合 占比
@@ -30,7 +30,7 @@
- 未整改 + 未闭合 占比
@@ -58,18 +58,18 @@
- 已整改 + 已闭合 占比
- {{ list.todayClose }} - {{ list.todayCloseRatio }}% + {{ list.weekClose }} + {{ list.weekCloseRatio }}%
- 未整改 + 未闭合 占比
- {{ list.todayNoClose }} - {{ list.todayNoCloseRatio }}% + {{ list.weekNoClose }} + {{ list.weekNoCloseRatio }}%
@@ -105,6 +105,7 @@ v-model="value" :options="listData" @change="checkSubListData" + :clearable="true" >
@@ -198,7 +199,7 @@ export default { getQualityAcceptanceApi({ projectSn: this.$store.state.projectSn }).then( (res) => { this.list = res.result - console.log('质量巡检-----', this.list) + console.log('质量巡检===========================', this.list) } ) }, diff --git a/src/views/projectFront/deepFoundationPitManage/dataConfig.vue b/src/views/projectFront/deepFoundationPitManage/dataConfig.vue index d8f114c6..0a87b7a3 100644 --- a/src/views/projectFront/deepFoundationPitManage/dataConfig.vue +++ b/src/views/projectFront/deepFoundationPitManage/dataConfig.vue @@ -3,45 +3,54 @@
- {{$t('message.deepFoundConfig.deepFoindList')}} + {{ $t('message.deepFoundConfig.deepFoindList') }}
- {{$t('message.deepFoundConfig.addDeepFound2')}} + {{ + $t('message.deepFoundConfig.addDeepFound2') + }}
-
+
-
{{item.engineeringName}}
+
{{ item.engineeringName }}
-

{{$t('message.deepFoundConfig.saveLv')}}：{{filterLeave(item.safetyLevel)}}

+

+ {{ $t('message.deepFoundConfig.saveLv') }}：{{ + filterLeave(item.safetyLevel) + }} +

- {{$t('message.deepFoundConfig.finishStatus')}}： + {{ $t('message.deepFoundConfig.finishStatus') }}： {{$t('message.deepFoundConfig.pedding')}} + :class="{ + 'status-underway': item.status == 1, + 'status-finish': item.status == 0 + }" + >{{ $t('message.deepFoundConfig.pedding') }}

- {{$t('message.deepFoundConfig.pointDistribution')}} + {{ + $t('message.deepFoundConfig.pointDistribution') + }}
- +
@@ -49,7 +58,7 @@
-

{{$t('message.deepFoundConfig.noData')}}

+

{{ $t('message.deepFoundConfig.noData') }}

@@ -57,7 +66,7 @@
- {{$t('message.deepFoundConfig.monitorInfo')}} + {{ $t('message.deepFoundConfig.monitorInfo') }}
@@ -70,9 +79,14 @@ --> - + @@ -83,27 +97,27 @@ class="detail-btn" style="margin-right: 58px" size="small" - @click="previewDetail(scope.row,1)" + @click="previewDetail(scope.row, 1)" > - {{$t('message.deepFoundConfig.pointManage')}} + {{ $t('message.deepFoundConfig.pointManage') }} - {{$t('message.deepFoundConfig.realData')}} + {{ $t('message.deepFoundConfig.realData') }} @@ -116,14 +130,18 @@ :page-sizes="$store.state.PAGESIZRS" :page-size="pagInfo.pageSize" layout="total, sizes, prev, pager, next" - :total="pagInfo.total" + :total="Number(pagInfo.total)" background >
--> - + - + - + -
- +
+ - {{$t('message.deepFoundConfig.upload')}} + {{ $t('message.deepFoundConfig.upload') }} - + - {{$t('message.deepFoundConfig.upload')}} + {{ $t('message.deepFoundConfig.upload') }}
-
+
-
- - +
+ +
@@ -337,7 +386,8 @@ :indeterminate="isIndeterminate" v-model="checkAll" @change="handleCheckAllChange" - >{{$t('message.deepFoundConfig.allCheck')}} + >{{ $t('message.deepFoundConfig.allCheck') }} {{item.monitorTypeName}} + >{{ item.monitorTypeName }}
@@ -357,9 +408,13 @@
- {{$t('message.deepFoundConfig.confirm')}} + {{ + $t('message.deepFoundConfig.confirm') + }} - {{$t('message.deepFoundConfig.cancel')}} + {{ + $t('message.deepFoundConfig.cancel') + }}
- {{$t('message.deepFoundConfig.pointNo')}} + {{ + $t('message.deepFoundConfig.pointNo') + }}
- {{$t('message.deepFoundConfig.alarmStatus')}} + {{ + $t('message.deepFoundConfig.alarmStatus') + }}
- {{$t('message.deepFoundConfig.search')}} + {{ + $t('message.deepFoundConfig.search') + }} {{$t('message.deepFoundConfig.refresh')}} + >{{ $t('message.deepFoundConfig.refresh') }} {{$t('message.deepFoundConfig.add')}} + >{{ $t('message.deepFoundConfig.add') }}
@@ -491,40 +544,55 @@ ? $t('message.deepFoundConfig.control'):""}} --> - {{scope.row.alarmState == 1 ? '正常': scope.row.alarmState == 2 - ? '超报警' :scope.row.alarmState == 3 - ? '超控制':scope.row.alarmState == 4 - ? '变化速率报警':""}} + {{ + scope.row.alarmState == 1 + ? '正常' + : scope.row.alarmState == 2 + ? '超报警' + : scope.row.alarmState == 3 + ? '超控制' + : scope.row.alarmState == 4 + ? '变化速率报警' + : '' + }} - + @@ -555,10 +623,9 @@
- {{$t('message.deepFoundConfig.pointNo')}} + {{ + $t('message.deepFoundConfig.pointNo') + }}
- {{$t('message.deepFoundConfig.alarmStatus')}} + {{ + $t('message.deepFoundConfig.alarmStatus') + }}
- {{$t('message.deepFoundConfig.gatherTime')}} + {{ + $t('message.deepFoundConfig.gatherTime') + }} - - - - - - - - - - - - - - + prop="measurePointNumber" + :label="$t('message.deepFoundConfig.pointNo')" + > + + + + + + + + + + + + + + + + + -
+
@@ -899,7 +1010,9 @@ style="width: 100%" :disabled="isPreview" v-model="item.sensorTypeId" - :placeholder="$t('message.deepFoundConfig.placeholderText2')" + :placeholder=" + $t('message.deepFoundConfig.placeholderText2') + " > @@ -922,14 +1035,16 @@ :disabled="isPreview" v-model.trim="item.alarmValue" type="number" - :placeholder="$t('message.deepFoundConfig.placeholderText')" + :placeholder=" + $t('message.deepFoundConfig.placeholderText') + " > @@ -937,13 +1052,15 @@ :disabled="isPreview" v-model.trim="item.rateAlarmValue" type="number" - :placeholder="$t('message.deepFoundConfig.placeholderText')" + :placeholder=" + $t('message.deepFoundConfig.placeholderText') + " > @@ -951,15 +1068,23 @@ :disabled="isPreview" v-model.trim="item.fiducialValue" type="number" - :placeholder="$t('message.deepFoundConfig.placeholderText')" + :placeholder=" + $t('message.deepFoundConfig.placeholderText') + " >
- - 添加 + 添加 @@ -970,12 +1095,12 @@ type="primary" icon="el-icon-circle-check" @click="addPointData" - >{{$t('message.deepFoundConfig.confirm')}} + >{{ $t('message.deepFoundConfig.confirm') }} - {{$t('message.deepFoundConfig.cancel')}} + {{ + $t('message.deepFoundConfig.cancel') + }}
@@ -995,21 +1120,21 @@
-
{{$t('message.deepFoundConfig.addLayoutImg')}}
+
{{ $t('message.deepFoundConfig.addLayoutImg') }}
  • - +
    - {{item.planeFigureName}} + {{ item.planeFigureName }} @@ -1017,7 +1142,7 @@ @@ -1029,53 +1154,77 @@
    - + - {{$t('message.deepFoundConfig.stationing')}} + {{ $t('message.deepFoundConfig.stationing') }}
    - {{$t('message.deepFoundConfig.save')}} + {{ $t('message.deepFoundConfig.save') }}
    - {{$t('message.deepFoundConfig.zoomIN')}} + {{ $t('message.deepFoundConfig.zoomIN') }}
    - {{$t('message.deepFoundConfig.zoomOut')}} + {{ $t('message.deepFoundConfig.zoomOut') }}
    - +
    • - -
      {{item.measurePointName}}
      + +
      + {{ item.measurePointName }} +

      {{item2.keyName}}：{{item.currentdata[item2.key]}}

      + > + {{ item2.keyName }}：{{ + item.currentdata[item2.key] + }} +

      - {{item.measurePointName}} + {{ item.measurePointName }}
      • @@ -1110,10 +1265,14 @@
      @@ -1143,16 +1302,22 @@ :rules="$t('message.deepFoundConfig.rules3')" > - + - + - -
      + +
      - +
      @@ -1191,15 +1366,15 @@
      - {{$t('message.deepFoundConfig.cancel')}} + {{ + $t('message.deepFoundConfig.cancel') + }} {{$t('message.deepFoundConfig.confirm')}} + >{{ $t('message.deepFoundConfig.confirm') }}
      @@ -1211,14 +1386,21 @@ :visible.sync="deleteInfo" :modal-append-to-body="false" > -

      - +

      + - {{$t('message.deepFoundConfig.hintContent')}} + {{ $t('message.deepFoundConfig.hintContent') }}

      - {{$t('message.deepFoundConfig.cancel')}} - {{$t('message.deepFoundConfig.confirm')}} + {{ + $t('message.deepFoundConfig.cancel') + }} + {{ + $t('message.deepFoundConfig.confirm') + }}
    @@ -1249,52 +1431,52 @@ import { deleteDeepExcavationPlaneFigureApi, editDeepExcavationPlaneFigureCoordinateApi, getDetailDeepExcavationApi -} from "@/assets/js/api/deepFoundationPitManage.js"; +} from '@/assets/js/api/deepFoundationPitManage.js' export default { data() { return { show: true, deleteInfo: false, isPreview: false, - isPreviewTitle:'', //标题 + isPreviewTitle: '', //标题 testPointOptions: [], - sensorRules:{ - sensorSn:[{required: true, message: "必填", trigger: "blur"}], - sensorName:[{required: true, message: "必填", trigger: "blur"}], - sensorTypeId:[{required: true, message: "必填", trigger: "blur"}], - alarmValue:[{required: true, message: "必填", trigger: "blur"}], - rateAlarmValue:[{required: true, message: "必填", trigger: "blur"}], - fiducialValue:[{required: true, message: "必填", trigger: "blur"}] + sensorRules: { + sensorSn: [{ required: true, message: '必填', trigger: 'blur' }], + sensorName: [{ required: true, message: '必填', trigger: 'blur' }], + sensorTypeId: [{ required: true, message: '必填', trigger: 'blur' }], + alarmValue: [{ required: true, message: '必填', trigger: 'blur' }], + rateAlarmValue: [{ required: true, message: '必填', trigger: 'blur' }], + fiducialValue: [{ required: true, message: '必填', trigger: 'blur' }] }, rules3: { planeFigureName: [ - { required: true, message: "请输入平面图名称", trigger: "blur" } + { required: true, message: '请输入平面图名称', trigger: 'blur' } ], pointIds: [ { - type: "array", + type: 'array', required: true, - message: "请至少选择一个测点", - trigger: "change" + message: '请至少选择一个测点', + trigger: 'change' } ], fileList: [ { - type: "array", + type: 'array', required: true, - message: "请上传示意图", - trigger: "blur" + message: '请上传示意图', + trigger: 'blur' }, { - type: "array", + type: 'array', required: true, - message: "请上传示意图", - trigger: "change" + message: '请上传示意图', + trigger: 'change' } ] }, testPointImgForm: { - planeFigureName: "", + planeFigureName: '', fileList: [], pointIds: [] }, @@ -1306,7 +1488,7 @@ export default { deepExcavationList: [], currentPointDetail: [], pointList: [], - pointStatus: "none", + pointStatus: 'none', pointTop: 0, pointLeft: 0, imgWidth: 0, @@ -1314,7 +1496,7 @@ export default { imgStartWidth: 0, imgStartHeight: 0, imgZoom: 1, - pointIndex: "", + pointIndex: '', showPointMap: false, showTestPoint: false, testPointData: [], @@ -1332,26 +1514,26 @@ export default { total: 1 }, testPointForm: { - measurePointNumber: "", // 测点编号 - measurePointName: "", // 测点名称 - measurePointAddr: "", // 测点位置 + measurePointNumber: '', // 测点编号 + measurePointName: '', // 测点名称 + measurePointAddr: '', // 测点位置 // sensorSn: '', // sensorTypeId: '', sensorList: [ { - sensorSn: "", // 传感器编号 - sensorTypeId: "", // 传感器类型 - earlyWarningValue: "", // 预警 - alarmValue: "", //报警 - controlValue: "" //控制 + sensorSn: '', // 传感器编号 + sensorTypeId: '', // 传感器类型 + earlyWarningValue: '', // 预警 + alarmValue: '', //报警 + controlValue: '' //控制 } ] // 传感器编号类型数组 }, dialogVisible: false, dialogVisible2: false, - formTitle: "", + formTitle: '', innerVisible: false, - dialogImageUrl: "", + dialogImageUrl: '', // safeLvList: [ // { // label: "一级", @@ -1372,381 +1554,387 @@ export default { // ], rules: { engineeringName: [ - { required: true, message: "请输入基坑名称", trigger: "blur" } + { required: true, message: '请输入基坑名称', trigger: 'blur' } ], startTime: [ { - type: "string", + type: 'string', required: true, - message: "请选择开工日期", - trigger: "change" + message: '请选择开工日期', + trigger: 'change' } ], endTime: [ { - type: "string", + type: 'string', required: true, - message: "请选择完工日期", - trigger: "change" + message: '请选择完工日期', + trigger: 'change' } ], foundationDitchDepth: [ - { required: true, message: "请输入基坑深度", trigger: "blur" } + { required: true, message: '请输入基坑深度', trigger: 'blur' } ], foundationDitchGirth: [ - { required: true, message: "请输入基坑周长", trigger: "blur" } + { required: true, message: '请输入基坑周长', trigger: 'blur' } ], excavationDepth: [ - { required: true, message: "请输入开挖深度", trigger: "blur" } + { required: true, message: '请输入开挖深度', trigger: 'blur' } ] }, rules2: { measurePointNumber: [ - { required: true, message: "请输入测点编号", trigger: "blur" } + { required: true, message: '请输入测点编号', trigger: 'blur' } ], measurePointName: [ - { required: true, message: "请输入测点名称", trigger: "blur" } + { required: true, message: '请输入测点名称', trigger: 'blur' } ], measurePointAddr: [ - { required: true, message: "请输入测点位置", trigger: "blur" } + { required: true, message: '请输入测点位置', trigger: 'blur' } ], sensorSn: [ - { required: true, message: "请输入采集仪编号", trigger: "blur" } + { required: true, message: '请输入采集仪编号', trigger: 'blur' } ], sensorTypeId: [ - { required: true, message: "请选择传感器类型", trigger: "change" } + { required: true, message: '请选择传感器类型', trigger: 'change' } ] }, dialogdata: { - engineeringName: "", + engineeringName: '', // projectAddress: "", - startTime: "", - endTime: "", + startTime: '', + endTime: '', safetyLevel: 1, - foundationDitchDepth: "", - foundationDitchGirth: "", - supportPattern: "", - surveyDirector: "", - surveyPersonnel: "", - excavationDepth: "", - floorPourTime: "" + foundationDitchDepth: '', + foundationDitchGirth: '', + supportPattern: '', + surveyDirector: '', + surveyPersonnel: '', + excavationDepth: '', + floorPourTime: '' }, // fileList:[], deviseDrawingList: [], surveySchemeList: [], prospectingReportList: [], - dialogTitle: "监测项管理", + dialogTitle: '监测项管理', checkAll: false, isIndeterminate: false, checkedContent: [], contentList: [], - devNum: "", - alarmStatus: "", + devNum: '', + alarmStatus: '', statusList: [ { - value: "0", - label: "正常" + value: '0', + label: '正常' }, { - value: "1", - label: "预警" + value: '1', + label: '预警' }, { - value: "2", - label: "报警" + value: '2', + label: '报警' }, { - value: "3", - label: "控制" + value: '3', + label: '控制' } ], showActiveDetail: false, acquisitionTime: [], - exportData:{ - alarmState:"", - measurePointNumber:"", - startTime:"", - endTime: "", + exportData: { + alarmState: '', + measurePointNumber: '', + startTime: '', + endTime: '' }, - startX: "", - startY: "", + startX: '', + startY: '', ratio: 1, - projectSn: "", - formType: "", // 1.新增基坑 2.编辑基坑 - editId: "", - monitorTypeId: "", - relaId: "", - deepExcavationId: "", - activeImgUrl: "", + projectSn: '', + formType: '', // 1.新增基坑 2.编辑基坑 + editId: '', + monitorTypeId: '', + relaId: '', + deepExcavationId: '', + activeImgUrl: '', showAddImg: false, isEditPoint: false, - removeData: "", - removeType: "", + removeData: '', + removeType: '', total: 0, pageNo: 1, pageSize: 10, - title: "", + title: '', dialogType: 1, // 1添加 2 编辑 - id: "" - }; + id: '' + } }, created() { - this.projectSn = this.$store.state.projectSn; - this.getDefaultMonitorTypeList(); - this.selectDeepExcavationList(); - this.selectDeepExcavationSensorTypeList(); + this.projectSn = this.$store.state.projectSn + this.getDefaultMonitorTypeList() + this.selectDeepExcavationList() + this.selectDeepExcavationSensorTypeList() }, mounted() {}, methods: { addRow() { let obj = { - sensorSn: "", - sensorName:"",//传感器名称 - sensorTypeId: "", - alarmValue:"",//累计值告警阈值 - rateAlarmValue:"",//变化速率报警值 - fiducialValue:"",//基准值 + sensorSn: '', + sensorName: '', //传感器名称 + sensorTypeId: '', + alarmValue: '', //累计值告警阈值 + rateAlarmValue: '', //变化速率报警值 + fiducialValue: '' //基准值 // earlyWarningValue: "", // 预警 // alarmValue: "", //报警 // controlValue: "" //控制 - }; + } // console.log('--------------',this.testPointForm.sensorList) - this.testPointForm.sensorList.push(obj); + this.testPointForm.sensorList.push(obj) }, - deleteRow(val,index) { - if(val.id != ''){ - this.$confirm('此操作将永久删除当前传感器以及相关联的数据, 是否继续?', '提示', { - confirmButtonText: '确定', - cancelButtonText: '取消', - type: 'warning' - }).then(() => { - this.testPointForm.sensorList.splice(index, 1); - this.$message({ - type: 'success', - message: '删除成功!' - }); - }).catch(() => { - this.$message({ - type: 'info', - message: '已取消删除' - }); - }); + deleteRow(val, index) { + if (val.id != '') { + this.$confirm( + '此操作将永久删除当前传感器以及相关联的数据, 是否继续?', + '提示', + { + confirmButtonText: '确定', + cancelButtonText: '取消', + type: 'warning' + } + ) + .then(() => { + this.testPointForm.sensorList.splice(index, 1) + this.$message({ + type: 'success', + message: '删除成功!' + }) + }) + .catch(() => { + this.$message({ + type: 'info', + message: '已取消删除' + }) + }) } }, checkMsg() { // 1、布置图 2、测点 if (this.removeType == 1) { deleteDeepExcavationPlaneFigureApi({ id: this.removeData.id }).then( - res => { + (res) => { if (res.code == 200) { // 删除成功！ this.$message.success( - this.$t("message.deepFoundConfig.removeSuccess") - ); - this.activeImgUrl = ""; - this.pointList = []; - this.selectDeepExcavationPlaneFigureList(); + this.$t('message.deepFoundConfig.removeSuccess') + ) + this.activeImgUrl = '' + this.pointList = [] + this.selectDeepExcavationPlaneFigureList() } } - ); + ) } else if (this.removeType == 2) { deleteDeepExcavationMeasurePointApi({ measurePointNumber: this.removeData.measurePointNumber - }).then(res => { + }).then((res) => { if (res.code == 200 && res.success) { this.$message.success( - this.$t("message.deepFoundConfig.removeSuccess") - ); - this.selectMeasurePointList(); + this.$t('message.deepFoundConfig.removeSuccess') + ) + this.selectMeasurePointList() } - }); + }) } - this.deleteInfo = false; + this.deleteInfo = false }, closeMsg(val) { if (val == 1) { // 已取消删除 - this.$message.info(this.$t("message.deepFoundConfig.cancelRemove")); + this.$message.info(this.$t('message.deepFoundConfig.cancelRemove')) } - this.removeType = ""; - this.removeData = ""; - this.deleteInfo = false; + this.removeType = '' + this.removeData = '' + this.deleteInfo = false }, closeActiveDetail() { - this.exportData.measurePointNumber = ""; - this.exportData.alarmState = ""; - this.showActiveDetail = false; - this.selectDeepExcavationMonitorTypeList(); + this.exportData.measurePointNumber = '' + this.exportData.alarmState = '' + this.showActiveDetail = false + this.selectDeepExcavationMonitorTypeList() }, closeDetail() { - this.selectDeepExcavationMonitorTypeList(); - this.devNum = ""; - this.alarmStatus = ""; - this.showDetail = false; + this.selectDeepExcavationMonitorTypeList() + this.devNum = '' + this.alarmStatus = '' + this.showDetail = false }, closePointMap() { - this.activeImgUrl = ""; - this.showPointMap = false; + this.activeImgUrl = '' + this.showPointMap = false }, filterLeave(val) { - console.log(val); - let text = ""; + console.log(val) + let text = '' // 一级 二级 三级 四级 五级 switch (val) { - case "1": - text = this.$t("message.deepFoundConfig.lv1"); - break; - case "2": - text = this.$t("message.deepFoundConfig.lv2"); - break; - case "3": - text = this.$t("message.deepFoundConfig.lv3"); - break; - case "4": - text = this.$t("message.deepFoundConfig.lv4"); - break; - case "5": - text = this.$t("message.deepFoundConfig.lv5"); - break; + case '1': + text = this.$t('message.deepFoundConfig.lv1') + break + case '2': + text = this.$t('message.deepFoundConfig.lv2') + break + case '3': + text = this.$t('message.deepFoundConfig.lv3') + break + case '4': + text = this.$t('message.deepFoundConfig.lv4') + break + case '5': + text = this.$t('message.deepFoundConfig.lv5') + break } - console.log(text); - return text; + console.log(text) + return text }, editPoint() { - this.isEditPoint = true; + this.isEditPoint = true // 成功 请开始移动点位！ this.$notify({ - title: this.$t("message.deepFoundConfig.success"), - message: this.$t("message.deepFoundConfig.notifyMsg"), - type: "success" - }); + title: this.$t('message.deepFoundConfig.success'), + message: this.$t('message.deepFoundConfig.notifyMsg'), + type: 'success' + }) }, savePoint() { - console.log(this.pointList); - let arr = []; - this.pointList.forEach(item => { + console.log(this.pointList) + let arr = [] + this.pointList.forEach((item) => { arr.push({ id: item.id, mapX: item.mapX, mapY: item.mapY, pointId: item.pointId, planeFigureId: item.planeFigureId - }); - }); + }) + }) // let data ={ // list: arr // } - editDeepExcavationPlaneFigureCoordinateApi(arr).then(res => { - console.log(res); + editDeepExcavationPlaneFigureCoordinateApi(arr).then((res) => { + console.log(res) if (res.code && res.success) { // 保存成功！ - this.$message.success(this.$t("message.deepFoundConfig.saveSuccess")); + this.$message.success(this.$t('message.deepFoundConfig.saveSuccess')) } - }); - this.isEditPoint = false; + }) + this.isEditPoint = false }, // 关闭添加图片弹窗 closeAddImg() { - this.showAddImg = false; + this.showAddImg = false this.testPointImgForm = { - planeFigureName: "", + planeFigureName: '', fileList: [], pointIds: [] - }; - this.$refs["testPointImgForm"].resetFields(); + } + this.$refs['testPointImgForm'].resetFields() }, // 列表查询所有测点 selectDeepExcavationAllMeasurePointList() { selectDeepExcavationAllMeasurePointListApi({ deepExcavationId: this.deepExcavationId - }).then(res => { - console.log(res); + }).then((res) => { + console.log(res) if (res.code == 200) { - this.testPointOptions = res.result; + this.testPointOptions = res.result } - }); + }) }, // 添加布置图 openAddImgDialog() { - this.title = "添加平面图"; - this.dialogType = 1; - this.showAddImg = true; - this.selectDeepExcavationAllMeasurePointList(); + 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 }]; + 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 => { + this.$refs['testPointImgForm'].validate((valid) => { if (valid) { let data = { planeFigureName: this.testPointImgForm.planeFigureName, - pointIds: this.testPointImgForm.pointIds.join(","), + pointIds: this.testPointImgForm.pointIds.join(','), imageUrl: this.testPointImgForm.fileList[0].url, projectSn: this.projectSn, deepExcavationId: this.deepExcavationId - }; - console.log(data); + } + console.log(data) if (this.dialogType == 1) { - addDeepExcavationPlaneFigureApi(data).then(res => { - console.log(res); + addDeepExcavationPlaneFigureApi(data).then((res) => { + console.log(res) if (res.code == 200) { this.$message.success( - this.$t("message.deepFoundConfig.addSuccess") - ); - this.selectDeepExcavationPlaneFigureList(); - this.showAddImg = false; + this.$t('message.deepFoundConfig.addSuccess') + ) + this.selectDeepExcavationPlaneFigureList() + this.showAddImg = false } - }); + }) } else { - (data.id = this.id), - editDeepExcavationPlaneFigureApi(data).then(res => { + ;(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) + 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); + } + this.selectDeepExcavationPlaneFigureCoordinate(val) } - }); + }) } } - }); + }) }, // 删除布置图 deleteDeepImg(val) { - this.removeType = 1; - this.removeData = val; - this.deleteInfo = true; + this.removeType = 1 + this.removeData = val + this.deleteInfo = true }, // 获取点位位置信息 selectDeepExcavationPlaneFigureCoordinate(val) { selectDeepExcavationPlaneFigureCoordinateApi({ planeFigureId: val.id, deepExcavationId: val.deepExcavationId - }).then(res => { - console.log("点点点", res); + }).then((res) => { + console.log('点点点', res) if (res.code == 200) { - res.result.forEach(item => { - item.status = "block"; - (item.transform = ""), (item.showDetail = false); - let arr = []; + res.result.forEach((item) => { + item.status = 'block' + ;(item.transform = ''), (item.showDetail = false) + let arr = [] // let obj = JSON.parse(item.dataField); // let obj = item.sensorlist // for (let key in obj) { @@ -1755,70 +1943,80 @@ export default { // keyName: obj[key] // }); // } - item.detailList = arr; - }); - this.pointList = res.result; - console.log(this.pointList); + item.detailList = arr + }) + this.pointList = res.result + console.log(this.pointList) } - }); + }) }, // 切换平面图 checkImg(val, index) { - console.log(val); - this.imgZoom = 1; - this.activeImgIndex = index; - this.activeImgUrl = val.imageUrl; - this.isEditPoint = false; - this.selectDeepExcavationPlaneFigureCoordinate(val); + console.log(val) + this.imgZoom = 1 + this.activeImgIndex = index + this.activeImgUrl = val.imageUrl + this.isEditPoint = false + this.selectDeepExcavationPlaneFigureCoordinate(val) this.$nextTick(() => { - this.getNaturalSize(); - }); + this.getNaturalSize() + }) }, selectDeepExcavationPlaneFigureList() { let data = { deepExcavationId: this.deepExcavationId, projectSn: this.projectSn - }; - selectDeepExcavationPlaneFigureListApi(data).then(res => { + } + selectDeepExcavationPlaneFigureListApi(data).then((res) => { if (res.code == 200) { - console.log("布点图的信息", res); - this.deepImgList = res.result; + console.log('布点图的信息', res) + this.deepImgList = res.result if (this.deepImgList.length > 0) { - this.checkImg(this.deepImgList[0], 0); + this.checkImg(this.deepImgList[0], 0) } } - console.log(res); - }); + console.log(res) + }) }, selectDeepExcavationCurrentData() { let data = this.exportData - data.startTime = this.acquisitionTime != "" ? this.acquisitionTime[0] : "", - data.endTime = this.acquisitionTime != "" ? this.acquisitionTime[1] : "", - data.pageNo = this.pagInfo2.pageNo, - data.pageSize = this.pagInfo2.pageSize, - data.relaId = this.relaId - selectDeepExcavationCurrentDataListApi(data).then(res => { - console.log(res); + ;(data.startTime = + this.acquisitionTime != '' ? this.acquisitionTime[0] : ''), + (data.endTime = + this.acquisitionTime != '' ? this.acquisitionTime[1] : ''), + (data.pageNo = this.pagInfo2.pageNo), + (data.pageSize = this.pagInfo2.pageSize), + (data.relaId = this.relaId) + selectDeepExcavationCurrentDataListApi(data).then((res) => { + console.log(res) if (res.code == 200) { - this.currentPointDetail = res.result.data.records; - console.log('分页信息',res) - this.pagInfo2.total = res.result.data.total; + this.currentPointDetail = res.result.data.records + console.log('分页信息', res) + this.pagInfo2.total = res.result.data.total } - }); + }) }, // 导出数据 - exportDataFn(){ - this.exportData.startTime = this.acquisitionTime != "" ? this.acquisitionTime[0] : "", - this.exportData.endTime = this.acquisitionTime != "" ? this.acquisitionTime[1] : "", - console.log('=======导出传进去的参数',this.exportData) + exportDataFn() { + ;(this.exportData.startTime = + this.acquisitionTime != '' ? this.acquisitionTime[0] : ''), + (this.exportData.endTime = + this.acquisitionTime != '' ? this.acquisitionTime[1] : ''), + console.log('=======导出传进去的参数', this.exportData) window.location.href = this.$http.defaults.baseURL + - 'xmgl/deepExcavationCurrentData/exportData?alarmState=' + this.exportData.alarmState + - '&measurePointNumber=' + this.exportData.measurePointNumber + - '&projectSn=' + this.projectSn + - '&relaId=' + this.relaId + - '&startTime=' + this.exportData.startTime + - '&endTime=' + this.exportData.endTime + 'xmgl/deepExcavationCurrentData/exportData?alarmState=' + + this.exportData.alarmState + + '&measurePointNumber=' + + this.exportData.measurePointNumber + + '&projectSn=' + + this.projectSn + + '&relaId=' + + this.relaId + + '&startTime=' + + this.exportData.startTime + + '&endTime=' + + this.exportData.endTime }, // 获取当前时间 返回YYYY-MM-DD HH:mm:ss selectNowDate() { @@ -1828,145 +2026,147 @@ export default { day = date.getDate(), hours = date.getHours(), //获取当前小时数(0-23) minutes = date.getMinutes(), //获取当前分钟数(0-59) - seconds = date.getSeconds(); - month >= 1 && month <= 9 ? (month = "0" + month) : ""; - day >= 0 && day <= 9 ? (day = "0" + day) : ""; - hours >= 0 && hours <= 9 ? (hours = "0" + hours) : ""; - minutes >= 0 && minutes <= 9 ? (minutes = "0" + minutes) : ""; - seconds >= 0 && seconds <= 9 ? (seconds = "0" + seconds) : ""; + seconds = date.getSeconds() + month >= 1 && month <= 9 ? (month = '0' + month) : '' + day >= 0 && day <= 9 ? (day = '0' + day) : '' + hours >= 0 && hours <= 9 ? (hours = '0' + hours) : '' + minutes >= 0 && minutes <= 9 ? (minutes = '0' + minutes) : '' + seconds >= 0 && seconds <= 9 ? (seconds = '0' + seconds) : '' var timer = year + - "-" + + '-' + month + - "-" + + '-' + day + - " " + + ' ' + hours + - ":" + + ':' + minutes + - ":" + - seconds; - console.log(timer); - return timer; + ':' + + seconds + console.log(timer) + return timer }, // 提交测点数据 测点新增按钮 addPointData() { if (this.isPreview) { - this.closeDialog2(); - return; + this.closeDialog2() + return } - this.$refs["testPointForm"].validate(valid => { - if(valid){ - let data = this.testPointForm; - data.relaId = this.relaId; - data.deepExcavationId = this.deepExcavationId; // 深基坑id - if(this.isPreviewTitle == '新增测点'){ - addDeepExcavationMeasurePointApi(data).then(res=>{ - if(res.code == 200){ - this.$message.success(this.$t("message.deepFoundConfig.addSuccess2")) - this.selectMeasurePointList(); - this.showTestPoint = false; + this.$refs['testPointForm'].validate((valid) => { + if (valid) { + let data = this.testPointForm + data.relaId = this.relaId + data.deepExcavationId = this.deepExcavationId // 深基坑id + if (this.isPreviewTitle == '新增测点') { + addDeepExcavationMeasurePointApi(data).then((res) => { + if (res.code == 200) { + this.$message.success( + this.$t('message.deepFoundConfig.addSuccess2') + ) + this.selectMeasurePointList() + this.showTestPoint = false } - }) - }else{ - console.log('=====编辑的参数',data) - editDeepExcavationMeasurePointApi(data).then((res)=>{ - if(res.code == 200){ - this.$message.success('编辑成功'); - this.selectMeasurePointList(); - this.showTestPoint = false; + }) + } else { + console.log('=====编辑的参数', data) + editDeepExcavationMeasurePointApi(data).then((res) => { + if (res.code == 200) { + this.$message.success('编辑成功') + this.selectMeasurePointList() + this.showTestPoint = false } }) } - } - }) - }, + } + }) + }, // 1编辑 2详情 else新增 - preViewPointData(val,type) { - console.log("查询详情", val); - if(type == 1) { - this.isPreview = false; - this.show = true; + preViewPointData(val, type) { + console.log('查询详情', val) + if (type == 1) { + this.isPreview = false + this.show = true this.isPreviewTitle = '编辑' - console.log('======',this.isPreviewTitle) - }else{ - this.isPreview = true; - this.show = false; + console.log('======', this.isPreviewTitle) + } else { + this.isPreview = true + this.show = false this.isPreviewTitle = '详情' } - this.showTestPoint = true; - let data = {}; + this.showTestPoint = true + let data = {} // this.testPointForm = val - data.measurePointNumber = val.measurePointNumber; + data.measurePointNumber = val.measurePointNumber data.relaId = val.relaId - getDetailDeepExcavationApi(data).then(res => { - console.log("--------------查询的结果", res.result); - res.result.sensorList.map(item => { - console.log("item", item); - item.earlyWarningValue = String(item.earlyWarningValue); - item.alarmValue = String(item.alarmValue); - item.controlValue = String(item.controlValue); - item.rateAlarmValue = String(item.rateAlarmValue); - item.fiducialValue = String(item.fiducialValue); - item.sensorTypeId = String(item.sensorTypeId); - return; - }); - console.log("转换类型", res.result.sensorList); - this.testPointForm = res.result; - this.testPointForm.thresholdList = res.result.sensorList; - }); + getDetailDeepExcavationApi(data).then((res) => { + console.log('--------------查询的结果', res.result) + res.result.sensorList.map((item) => { + console.log('item', item) + item.earlyWarningValue = String(item.earlyWarningValue) + item.alarmValue = String(item.alarmValue) + item.controlValue = String(item.controlValue) + item.rateAlarmValue = String(item.rateAlarmValue) + item.fiducialValue = String(item.fiducialValue) + item.sensorTypeId = String(item.sensorTypeId) + return + }) + console.log('转换类型', res.result.sensorList) + this.testPointForm = res.result + this.testPointForm.thresholdList = res.result.sensorList + }) // this.testPointData = val.thresholdList }, // 删除测点数据 deletePointData(val) { - console.log("sssss", val); + console.log('sssss', val) // deleteDeepExcavationMeasurePointApi({id: val.id}).then(res=>{ // if(res.code == 200 && res.success){ // this.$message.success('删除成功！') // this.selectMeasurePointList() // } // }) - this.removeData = val; - this.removeType = 2; - this.deleteInfo = true; + this.removeData = val + this.removeType = 2 + this.deleteInfo = true }, // 关闭新增测点弹窗 closeDialog2() { this.testPointForm = { - measurePointNumber: "", - measurePointName: "", - measurePointAddr: "", + measurePointNumber: '', + measurePointName: '', + measurePointAddr: '', sensorList: [ { - sensorSn: "", // 传感器编号 - sensorTypeId: "", // 传感器类型 - earlyWarningValue: "", // 预警 - alarmValue: "", //报警 - controlValue: "" //控制 + sensorSn: '', // 传感器编号 + sensorTypeId: '', // 传感器类型 + earlyWarningValue: '', // 预警 + alarmValue: '', //报警 + controlValue: '' //控制 } ] } - this.isPreview = false; - this.$refs["testPointForm"].resetFields(); - this.testPointForm.sensorList.forEach(item => { - item.alarmValue = ""; - item.earlyWarningValue = ""; - item.controlValue = ""; - }); - this.selectMeasurePointList(); + this.isPreview = false + this.$refs['testPointForm'].resetFields() + this.testPointForm.sensorList.forEach((item) => { + item.alarmValue = '' + item.earlyWarningValue = '' + item.controlValue = '' + }) + this.selectMeasurePointList() // this.testPointData = this.testPointData - this.showTestPoint = false; + this.showTestPoint = false }, // 查询传感器类型 selectDeepExcavationSensorTypeList() { - selectDeepExcavationSensorTypeListApi().then(res => { - console.log(res); + selectDeepExcavationSensorTypeListApi().then((res) => { + console.log(res) if (res.code == 200 && res.result) { - this.typeOptions = res.result; + this.typeOptions = res.result } - }); + }) }, // 查询基坑监测内容 selectDeepExcavationMonitorTypeList() { @@ -1976,54 +2176,54 @@ export default { pageNo: this.pagInfo.pageNo, pageSize: this.pagInfo.pageSize, projectSn: this.projectSn - }; - selectDeepExcavationMonitorTypeListApi(data).then(res => { + } + selectDeepExcavationMonitorTypeListApi(data).then((res) => { if (res.code == 200) { - console.log(res.result.records); - console.log("监测信息", res); - this.tableData = res.result.records; - this.pagInfo.total = res.result.total; + console.log(res.result.records) + console.log('监测信息', res) + this.tableData = res.result.records + this.pagInfo.total = res.result.total } - }); + }) } }, // 选中基坑 checkDeep(item, index) { - this.activeDeep = index; - this.pagInfo.pageNo = 1; - this.pagInfo.pageSize = 10; - this.selectDeepExcavationMonitorTypeList(); + this.activeDeep = index + this.pagInfo.pageNo = 1 + this.pagInfo.pageSize = 10 + this.selectDeepExcavationMonitorTypeList() }, // 查询基坑列表 selectDeepExcavationList() { - selectDeepExcavationListApi({ projectSn: this.projectSn }).then(res => { - console.log(res, "----基坑列表"); + selectDeepExcavationListApi({ projectSn: this.projectSn }).then((res) => { + console.log(res, '----基坑列表') if (res.code == 200 && res.result) { - this.deepExcavationList = res.result; - this.activeDeep = 0; - this.selectDeepExcavationMonitorTypeList(); + this.deepExcavationList = res.result + this.activeDeep = 0 + this.selectDeepExcavationMonitorTypeList() } - }); + }) }, // 获取监测内容选项列表 getDefaultMonitorTypeList() { - getDefaultMonitorTypeListApi().then(res => { + getDefaultMonitorTypeListApi().then((res) => { // console.log(res, '---监测内容') - this.contentList = res.result; - }); + this.contentList = res.result + }) }, changeImgSize(val) { if (val == 1) { - this.imgZoom = this.imgZoom + 0.5; - console.log(this.imgZoom); + this.imgZoom = this.imgZoom + 0.5 + console.log(this.imgZoom) // this.pointList.forEach(item=>{ // item.x = Math.ceil(item.x)*1.5 // item.y = Math.ceil(item.y)*1.6 // }) } else if (val == 2) { this.imgZoom = - this.imgZoom - 0.5 <= 0 ? this.imgZoom : this.imgZoom - 0.5; - console.log(this.imgZoom); + this.imgZoom - 0.5 <= 0 ? this.imgZoom : this.imgZoom - 0.5 + console.log(this.imgZoom) // if((this.imgZoom - 0.5) > 0){ // this.pointList.forEach(item=>{ // item.x = Math.ceil(item.x)/1.5 @@ -2033,66 +2233,66 @@ export default { } }, showMap(val) { - this.showPointMap = true; - this.deepExcavationId = val.id; - this.selectDeepExcavationPlaneFigureList(); + this.showPointMap = true + this.deepExcavationId = val.id + this.selectDeepExcavationPlaneFigureList() }, // 新增测点 addTestPoint() { - this.show = true; + this.show = true this.isPreviewTitle = '新增测点' - this.showTestPoint = true; + this.showTestPoint = true }, handleSelectionChange(val) { - console.log(val); + console.log(val) }, handleCheckAllChange(val) { - let arr = []; - this.contentList.forEach(item => { - arr.push(item.id); - }); - console.log(arr); - this.checkedContent = val ? arr : []; - this.isIndeterminate = false; + let arr = [] + this.contentList.forEach((item) => { + arr.push(item.id) + }) + console.log(arr) + this.checkedContent = val ? arr : [] + this.isIndeterminate = false }, handleCheckedCitiesChange(value) { - console.log(value); - let checkedCount = value.length; - this.checkAll = checkedCount === this.contentList.length; + console.log(value) + let checkedCount = value.length + this.checkAll = checkedCount === this.contentList.length this.isIndeterminate = - checkedCount > 0 && checkedCount < this.contentList.length; + checkedCount > 0 && checkedCount < this.contentList.length }, SizeChange(val) { - console.log(val); - this.pagInfo.pageSize = val; - this.selectDeepExcavationMonitorTypeList(); + console.log(val) + this.pagInfo.pageSize = val + this.selectDeepExcavationMonitorTypeList() }, CurrentChange(val) { - console.log(val); - this.pagInfo.pageNo = val; - this.selectDeepExcavationMonitorTypeList(); + console.log(val) + this.pagInfo.pageNo = val + this.selectDeepExcavationMonitorTypeList() }, changeSize(val) { - console.log(val); - this.pagInfo2.pageSize = val; - this.selectDeepExcavationCurrentData(); + console.log(val) + this.pagInfo2.pageSize = val + this.selectDeepExcavationCurrentData() }, changeCurrent(val) { - console.log(val); - this.pagInfo2.pageNo = val; - this.selectDeepExcavationCurrentData(); + console.log(val) + this.pagInfo2.pageNo = val + this.selectDeepExcavationCurrentData() }, addProject() { - this.formType = 1; - this.dialogVisible = true; + this.formType = 1 + this.dialogVisible = true }, // 编辑获取基坑详情 editProject(data) { - this.formType = 2; - this.dialogVisible = true; - this.editId = data.id; - queryByIdDeepExcavationEngineeringApi({ id: data.id }).then(res => { - console.log(res); + this.formType = 2 + this.dialogVisible = true + this.editId = data.id + queryByIdDeepExcavationEngineeringApi({ id: data.id }).then((res) => { + console.log(res) if (res.code == 200) { this.dialogdata = { engineeringName: res.result.engineeringName, @@ -2106,118 +2306,118 @@ export default { surveyPersonnel: res.result.surveyPersonnel, excavationDepth: res.result.excavationDepth, floorPourTime: res.result.floorPourTime - }; + } this.deviseDrawingList = res.result.deviseDrawing ? JSON.parse(res.result.deviseDrawing) - : []; + : [] this.surveySchemeList = res.result.surveyScheme ? JSON.parse(res.result.surveyScheme) - : []; + : [] this.prospectingReportList = res.result.prospectingReport ? JSON.parse(res.result.prospectingReport) - : []; + : [] } - }); + }) }, // 删除文件 handleRemove(file, fileList, type) { - console.log(file, fileList, type); + console.log(file, fileList, type) if (type == 1) { - this.surveySchemeList = fileList; - console.log(this.surveySchemeList); + this.surveySchemeList = fileList + console.log(this.surveySchemeList) } else if (type == 2) { - this.prospectingReportList = fileList; - console.log(this.prospectingReportList); + this.prospectingReportList = fileList + console.log(this.prospectingReportList) } else if (type == 3) { - this.deviseDrawingList = fileList; - console.log(this.deviseDrawingList); + this.deviseDrawingList = fileList + console.log(this.deviseDrawingList) } else if (type == 4) { - this.testPointImgForm.fileList = fileList; + this.testPointImgForm.fileList = fileList } // this.$confirm(`确定移除 ${ file.name }？`); }, handleBeforeUpload(file) { - console.log(file); + console.log(file) if ( - file.type != "image/png" && - file.type != "image/jpg" && - file.type != "image/jpeg" + file.type != 'image/png' && + file.type != 'image/jpg' && + file.type != 'image/jpeg' ) { // 请上传图片！ - this.$message.error(this.$t("message.deepFoundConfig.uploadError")); - return false; + this.$message.error(this.$t('message.deepFoundConfig.uploadError')) + return false } }, // 上传文件 handleSuccess(res, file, type) { // type 1、监测方案 2、地勘报告 3、基坑设计图纸 4.示意图 - console.log(res, file, type); - if (res.status == "SUCCESS") { + console.log(res, file, type) + if (res.status == 'SUCCESS') { // 上传成功！ - this.$message.success(this.$t("message.deepFoundConfig.uploadSuccess")); + this.$message.success(this.$t('message.deepFoundConfig.uploadSuccess')) if (type == 1) { this.surveySchemeList.push({ name: file.name, url: this.$store.state.FILEURL + file.response.data[0].imageUrl - }); - console.log(this.surveySchemeList); + }) + console.log(this.surveySchemeList) } else if (type == 2) { this.prospectingReportList.push({ name: file.name, url: this.$store.state.FILEURL + file.response.data[0].imageUrl - }); - console.log(this.prospectingReportList); + }) + console.log(this.prospectingReportList) } else if (type == 3) { this.deviseDrawingList.push({ name: file.name, url: this.$store.state.FILEURL + file.response.data[0].imageUrl - }); - console.log(this.deviseDrawingList); + }) + console.log(this.deviseDrawingList) } else if (type == 4) { this.testPointImgForm.fileList = [ { name: file.name, url: this.$store.state.FILEURL + file.response.data[0].imageUrl } - ]; - this.$refs["testPointImgForm"].clearValidate(); - console.log(this.testPointImgForm.fileList); + ] + this.$refs['testPointImgForm'].clearValidate() + console.log(this.testPointImgForm.fileList) } } }, // 查看大图 handlePictureCardPreview(file, fileList) { - console.log(21); - this.dialogImageUrl = file.url; - this.dialogVisible2 = true; + console.log(21) + this.dialogImageUrl = file.url + this.dialogVisible2 = true }, // 添加、编辑基坑 submitForm() { - console.log(this.dialogdata); - this.$refs["form"].validate(valid => { + console.log(this.dialogdata) + this.$refs['form'].validate((valid) => { if (valid) { if (this.checkedContent.length == 0 && this.formType == 1) { // 请选择监测内容 this.$message.error( - this.$t("message.deepFoundConfig.placeholderText2") + - this.$t("message.deepFoundConfig.monitorContent") - ); - return; + this.$t('message.deepFoundConfig.placeholderText2') + + this.$t('message.deepFoundConfig.monitorContent') + ) + return } - let data = this.dialogdata; + let data = this.dialogdata data.deviseDrawing = this.deviseDrawingList.length > 0 ? JSON.stringify(this.deviseDrawingList) - : ""; + : '' data.surveyScheme = this.surveySchemeList.length > 0 ? JSON.stringify(this.surveySchemeList) - : ""; + : '' data.prospectingReport = this.prospectingReportList.length > 0 ? JSON.stringify(this.prospectingReportList) - : ""; - data.projectSn = this.projectSn; + : '' + data.projectSn = this.projectSn // this.safeLvList.forEach(item=>{ // if(item.value == this.dialogdata.safeLv){ // data.safetyLevel = item.label @@ -2227,35 +2427,35 @@ export default { // surveySchemeList:[], // prospectingReportList: [], if (this.formType == 1) { - data.status = 1; - data.monitorTypeIds = this.checkedContent.join(","); - addDeepExcavationEngineeringApi(data).then(res => { - console.log(res); + data.status = 1 + data.monitorTypeIds = this.checkedContent.join(',') + addDeepExcavationEngineeringApi(data).then((res) => { + console.log(res) if (res.code == 200) { // 新增成功！ this.$message.success( - this.$t("message.deepFoundConfig.addSuccess2") - ); - this.closeDialog(); - this.selectDeepExcavationList(); + this.$t('message.deepFoundConfig.addSuccess2') + ) + this.closeDialog() + this.selectDeepExcavationList() } - }); + }) } else if (this.formType == 2) { - data.id = this.editId; - editDeepExcavationEngineeringApi(data).then(res => { - console.log(res); + data.id = this.editId + editDeepExcavationEngineeringApi(data).then((res) => { + console.log(res) if (res.code == 200) { // 编辑成功！ this.$message.success( - this.$t("message.deepFoundConfig.editSuccess") - ); - this.closeDialog(); - this.selectDeepExcavationList(); + this.$t('message.deepFoundConfig.editSuccess') + ) + this.closeDialog() + this.selectDeepExcavationList() } - }); + }) } } - }); + }) // this.closeDialog() }, // 删除基坑 @@ -2265,75 +2465,75 @@ export default { // 确定 // 取消 this.$confirm( - this.$t("message.deepFoundConfig.hintContent"), - this.$t("message.deepFoundConfig.hint"), + this.$t('message.deepFoundConfig.hintContent'), + this.$t('message.deepFoundConfig.hint'), { - confirmButtonText: this.$t("message.deepFoundConfig.confirm"), - cancelButtonText: this.$t("message.deepFoundConfig.cancel"), - type: "warning" + confirmButtonText: this.$t('message.deepFoundConfig.confirm'), + cancelButtonText: this.$t('message.deepFoundConfig.cancel'), + type: 'warning' } ) .then(() => { - deleteDeepExcavationEngineeringApi({ id: data.id }).then(res => { + deleteDeepExcavationEngineeringApi({ id: data.id }).then((res) => { if (res.code == 200) { - this.tableData = []; - this.selectDeepExcavationList(); + this.tableData = [] + this.selectDeepExcavationList() // '删除成功!' this.$message({ - type: "success", - message: this.$t("message.deepFoundConfig.removeSuccess") - }); + type: 'success', + message: this.$t('message.deepFoundConfig.removeSuccess') + }) } - }); + }) }) .catch(() => { // '已取消删除' this.$message({ - type: "info", - message: this.$t("message.deepFoundConfig.cancelRemove") - }); - }); + type: 'info', + message: this.$t('message.deepFoundConfig.cancelRemove') + }) + }) }, // 重置基坑提交表单 resetForm() { this.dialogdata = { - engineeringName: "", + engineeringName: '', // projectAddress: "", - startTime: "", - endTime: "", + startTime: '', + endTime: '', safetyLevel: 1, - foundationDitchDepth: "", - foundationDitchGirth: "", - supportPattern: "", - surveyDirector: "", - surveyPersonnel: "", - excavationDepth: "", - floorPourTime: "" - }; - this.editId = ""; - this.checkedContent = []; - this.deviseDrawingList = []; - this.surveySchemeList = []; - this.prospectingReportList = []; - this.checkAll = false; - this.isIndeterminate = false; + foundationDitchDepth: '', + foundationDitchGirth: '', + supportPattern: '', + surveyDirector: '', + surveyPersonnel: '', + excavationDepth: '', + floorPourTime: '' + } + this.editId = '' + this.checkedContent = [] + this.deviseDrawingList = [] + this.surveySchemeList = [] + this.prospectingReportList = [] + this.checkAll = false + this.isIndeterminate = false }, closeDialog() { - this.dialogVisible = false; - this.$refs["form"].resetFields(); - this.resetForm(); + this.dialogVisible = false + this.$refs['form'].resetFields() + this.resetForm() }, previewDetail(val, type) { - this.relaId = val.id; - this.deepExcavationId = val.deepExcavationId; - console.log(val); + this.relaId = val.id + this.deepExcavationId = val.deepExcavationId + console.log(val) if (type == 1) { - this.selectMeasurePointList(); - this.showDetail = true; - this.testPointData = []; + this.selectMeasurePointList() + this.showDetail = true + this.testPointData = [] if (val.dataField) { - console.log(JSON.parse(val.dataField)); - let obj = JSON.parse(val.dataField); + console.log(JSON.parse(val.dataField)) + let obj = JSON.parse(val.dataField) for (var key in obj) { this.testPointData.push({ targetField: key, @@ -2342,87 +2542,87 @@ export default { warningValue: 0, alarmValue: 0, controlValue: 0 - }); + }) } } } else if (type == 2) { if (val.dataField) { - console.log(JSON.parse(val.dataField)); - let obj = JSON.parse(val.dataField); - this.currentTableData = []; + console.log(JSON.parse(val.dataField)) + let obj = JSON.parse(val.dataField) + this.currentTableData = [] for (var key in obj) { this.currentTableData.push({ targetField: key, targetName: obj[key] - }); + }) } - console.log(this.currentTableData); + console.log(this.currentTableData) } // let nowTime = this.selectNowDate(); // this.acquisitionTime = [nowTime.split(' ')[0] + ' ' + '00:00:00',nowTime] - this.selectDeepExcavationCurrentData(); - this.showActiveDetail = true; + this.selectDeepExcavationCurrentData() + this.showActiveDetail = true } }, // 列表查询深基坑-测点信息 selectMeasurePointList(val) { if (val == 1) { - this.alarmStatus = ""; - this.devNum = ""; + this.alarmStatus = '' + this.devNum = '' } let data = { - alarmState: this.alarmStatus ? this.alarmStatus : "", + alarmState: this.alarmStatus ? this.alarmStatus : '', measurePointNumber: this.devNum, relaId: this.relaId, pageNo: this.pageNo, pageSize: this.pageSize - }; - console.log("参数", data); - selectMeasurePointListApi(data).then(res => { - console.log(res); + } + console.log('参数', data) + selectMeasurePointListApi(data).then((res) => { + console.log(res) if (res.code == 200) { - console.log("====查询测点管理的列表", res); - this.surveyPointDetail = res.result.records; - this.total = res.result.total; + console.log('====查询测点管理的列表', res) + this.surveyPointDetail = res.result.records + this.total = res.result.total } - }); + }) }, handleSizeChange(val) { - this.pageSize = val; - this.selectMeasurePointList(); + this.pageSize = val + this.selectMeasurePointList() }, handleCurrentChange(val) { - this.pageNo = val; - this.selectMeasurePointList(); + this.pageNo = val + this.selectMeasurePointList() }, // 获取基坑布置图图片大小 getNaturalSize(callback) { - let Domlement = this.$refs["map"]; - console.dir(Domlement); - var natureSize = {}; + let Domlement = this.$refs['map'] + console.dir(Domlement) + var natureSize = {} if (window.naturalWidth && window.naturalHeight) { - natureSize.width = Domlement.naturalWidth; - natureSize.height = Domlement.naturalHeight; + natureSize.width = Domlement.naturalWidth + natureSize.height = Domlement.naturalHeight // let heightRatio = natureSize.height / 569 // this.mapDate.width = natureSize.width*heightRatio } else { - console.log(213); - let _this = this; - var img = new Image(); - img.src = Domlement.src; - img.onload = function() { - natureSize.width = img.width; - natureSize.height = img.height; - console.log("------", natureSize); - _this.imgWidth = natureSize.width; - _this.imgHeight = natureSize.height; - _this.imgStartWidth = img.width; - _this.imgStartHeight = img.width; + console.log(213) + let _this = this + var img = new Image() + img.src = Domlement.src + img.onload = function () { + natureSize.width = img.width + natureSize.height = img.height + console.log('------', natureSize) + _this.imgWidth = natureSize.width + _this.imgHeight = natureSize.height + _this.imgStartWidth = img.width + _this.imgStartHeight = img.width console.log( - _this.$refs["mapbox"].clientWidth, - _this.$refs["mapbox"].clientHeight - ); + _this.$refs['mapbox'].clientWidth, + _this.$refs['mapbox'].clientHeight + ) // let heightRatio = 780 / natureSize.height // let widthRatio = _this.$refs['mapbox'].clientWidth / natureSize.width @@ -2437,29 +2637,29 @@ export default { // } // _this.mapDate.width = natureSize.width*heightRatio if (callback) { - return callback(natureSize); + return callback(natureSize) } - }; + } } - console.log(natureSize); + console.log(natureSize) // return natureSize; }, // 添加鼠标监听事件 move(val, e) { - console.log(val, e.pageX, e.pageY); - this.ratio = window.localStorage.getItem("zoom"); - this.startX = e.pageX; - this.startY = e.pageY; - this.pointIndex = val; + console.log(val, e.pageX, e.pageY) + this.ratio = window.localStorage.getItem('zoom') + this.startX = e.pageX + this.startY = e.pageY + this.pointIndex = val // console.dir(this.$refs['point'+val]) // this.$refs['point'+val].style.opacity = '0' - let _this = this; - console.log(this.pointList[val]); + let _this = this + console.log(this.pointList[val]) if (this.isEditPoint) { - this.pointList[val].status = "none"; + this.pointList[val].status = 'none' // this.$refs['point'+ val].style.display = 'none' - document.body.addEventListener("mousemove", this.movePoint, false); - document.body.addEventListener("mouseup", this.removeUp, false); + document.body.addEventListener('mousemove', this.movePoint, false) + document.body.addEventListener('mouseup', this.removeUp, false) } // document.body.addEventListener('mousemove',(e)=>{ @@ -2476,9 +2676,9 @@ export default { // 清除鼠标监听时间 removeUp(e) { let top = (e.pageY - this.startY) / this.imgZoom, - left = (e.pageX - this.startX) / this.imgZoom; - console.log(top, left); - this.pointStatus = "none"; + left = (e.pageX - this.startX) / this.imgZoom + console.log(top, left) + this.pointStatus = 'none' let x = Math.ceil( Number( this.pointList[this.pointIndex].mapX @@ -2494,22 +2694,22 @@ export default { : 0 ) + top / this.ratio - ); - console.log(x, y, this.imgWidth, this.imgHeight); + ) + console.log(x, y, this.imgWidth, this.imgHeight) if (y <= this.imgHeight && y >= 0) { - this.pointList[this.pointIndex].mapY = y; + this.pointList[this.pointIndex].mapY = y } if (x <= this.imgWidth && x >= 0) { - this.pointList[this.pointIndex].mapX = x; + this.pointList[this.pointIndex].mapX = x } - this.pointList[this.pointIndex].status = "block"; - console.log(this.pointList); - this.$forceUpdate(); + this.pointList[this.pointIndex].status = 'block' + console.log(this.pointList) + this.$forceUpdate() // this.pointList[this.pointIndex].transform = 'translate(-150%, -150%)' // this.$refs['point'+this.pointIndex].style.transform = 'translate(-150%, -150%)' // this.$refs['point'+ this.pointIndex].style.display = 'block' - document.body.removeEventListener("mousemove", this.movePoint, false); - document.body.removeEventListener("mouseup", this.removeUp, false); + document.body.removeEventListener('mousemove', this.movePoint, false) + document.body.removeEventListener('mouseup', this.removeUp, false) }, // 移动鼠标 movePoint(target) { @@ -2519,39 +2719,38 @@ export default { // console.dir(document.getElementById('app')) let bodyWidth = document.body.clientWidth, bodyHeight = document.body.clientHeight, - appWidth = document.getElementById("app").clientWidth * this.ratio, - appHeight = document.getElementById("app").clientHeight * this.ratio, + appWidth = document.getElementById('app').clientWidth * this.ratio, + appHeight = document.getElementById('app').clientHeight * this.ratio, a = bodyWidth - appWidth, - b = bodyHeight - appHeight; + b = bodyHeight - appHeight // console.log(document.body.clientHeight,document.body.clientWidth) // this.$refs['pointFixed'].style.top = ((target.pageY)/ratio - (b*0.5)/ratio)-15/ratio + 'px' // this.$refs['pointFixed'].style.left = ((target.pageX)/ratio - (a*0.5)/ratio)-15/ratio+ 'px' if (this.ratio != 1) { - this.$refs["pointFixed"].style.transform = "translate(0px, -75px)"; - this.pointTop = target.pageY / this.ratio - (b * 0.5) / this.ratio; - this.pointLeft = - target.pageX / this.ratio - (a * 0.5) / this.ratio - 60; + this.$refs['pointFixed'].style.transform = 'translate(0px, -75px)' + this.pointTop = target.pageY / this.ratio - (b * 0.5) / this.ratio + this.pointLeft = target.pageX / this.ratio - (a * 0.5) / this.ratio - 60 } else { - this.pointTop = target.pageY; - this.pointLeft = target.pageX - 60; + this.pointTop = target.pageY + this.pointLeft = target.pageX - 60 } - this.pointStatus = "block"; + this.pointStatus = 'block' // console.log(target) }, // 鼠标抬起 up(val, e) { - let _this = this; + let _this = this if (this.isEditPoint) { - window.removeEventListener("mousemove", function(e) { - _this.movePoint(); - }); + window.removeEventListener('mousemove', function (e) { + _this.movePoint() + }) } // this.$refs['point'+val].style.display = '1' } } -}; +}