深基坑(实时数据)：修改数据表格

src/assets/js/http.js

@@ -41,7 +41,7 @@ if (process.env.NODE_ENV == 'development') {
   // 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.216:6023/' // 邱平毅本地
   // axios.defaults.baseURL ='http://124.71.67.160:8088/' //中建四局线上
   // axios.defaults.baseURL = 'http://192.168.34.125:6023/' //杨意本地 http/1.1
   // axios.defaults.baseURL ='http://47.97.202.104:6023/' //金林湾线上
@@ -50,7 +50,7 @@ if (process.env.NODE_ENV == 'development') {
   // axios.defaults.baseURL = 'http://47.97.202.104:6023/';
   // axios.defaults.baseURL = 'http://139.9.66.234:8/';
   // axios.defaults.baseURL = 'http://120.196.217.6:7000/'; // 鹤洲
-  axios.defaults.baseURL = 'http://182.90.224.237:7000/'; // 广西
+  // axios.defaults.baseURL = 'http://182.90.224.237:7000/'; // 广西
   // axios.defaults.baseURL = 'http://120.196.217.6:7000/'  //鹤洲
 
   // axios.defaults.baseURL = 'http://117.156.17.59:9090/'; //

src/views/home/login_v1.vue

@@ -326,13 +326,16 @@ export default {
         window._paq.push(["trackEvent", "点击", "登录", "使用账号登录"]);
       }
     },
-    // form:{
+    form:{
-    //   immediate: true,
+      immediate: true,
-    //   deep: true,
+      deep: true,
-    //   handler(newVal,oldVal){
+      handler(newVal,oldVal){
-
+        if(newVal != oldVal){
-    //   }
+          console.log("newVal",newVal)
-    // }
+          console.log("oldVal",oldVal)
+        }
+      }
+    }
   },
   created() {
     this.company = COMPANY;

src/views/projectFront/deepFoundationPitManage/dataConfig.vue

@@ -624,13 +624,39 @@
             >导出</el-button>
           </div>
           <el-table :data="currentPointDetail" class="tables" height="560">
-            <!-- 测点编号 -->
             <el-table-column
+                      prop="measurePointNumber"
+                      :label="$t('message.deepFoundConfig.pointNo')"
+                    ></el-table-column>
+                    <el-table-column prop="sensorSn" label="传感器编号"></el-table-column>
+                    <el-table-column prop="fiducialValue" label="初始值" align="center" width="80"></el-table-column>
+                     <!-- 采集时间 -->
+                     <el-table-column
+                      width="220"
+                      align="center"
+                      prop="receiveTime"
+                      :label="$t('message.deepFoundConfig.gatherTime')"
+                    ></el-table-column>
+                    <el-table-column prop="lastTimeData" label="上次值"></el-table-column>
+                    <el-table-column prop="data" label="本次值">
+                      <template slot-scope="scope">{{scope.row.data + scope.row.unit}}</template>
+                    </el-table-column>
+                    <el-table-column prop="dataThis" label="本次变化量">
+                      <template slot-scope="scope">{{scope.row.dataThis + scope.row.unit}}</template>
+                    </el-table-column>
+                    <el-table-column prop="dataTotal" label="累计值">
+                      <template slot-scope="scope">{{scope.row.dataTotal + scope.row.unit}}</template>
+                    </el-table-column>
+                    <el-table-column prop="alarmValue" label="累计预警值" align="center"></el-table-column>
+                    <el-table-column prop="dataRate" label="变化速率" align="center"></el-table-column>
+                    <el-table-column prop="rateAlarmValue" label="变化速率预警值" align="center" width="120"></el-table-column>
+            <!-- 测点编号 -->
+            <!-- <el-table-column
               prop="measurePointNumber"
               :label="$t('message.deepFoundConfig.pointNo')"
-            ></el-table-column>
+            ></el-table-column> -->
             <!-- 测点名称 -->
-            <el-table-column prop="measurePointName" label="测点名称"></el-table-column>
+            <!-- <el-table-column prop="measurePointName" label="测点名称"></el-table-column>
             <el-table-column prop="sensorSn" label="传感器编号"></el-table-column>
             <el-table-column prop="sensorTypeName" label="传感器类型"></el-table-column>
             <el-table-column prop="data" label="值">
@@ -641,7 +667,7 @@
               :key="index"
               :prop="item.targetField"
               :label="item.targetName"
-            ></el-table-column>
+            ></el-table-column> -->
             <!-- 采集时间 -->
             <!-- <el-table-column prop="receiveTime" :label="$t('message.deepFoundConfig.gatherTime')"></el-table-column> -->
             <!-- 报警状态 -->

src/views/projectFront/deepFoundationPitManage/monitorData.vue

@@ -468,11 +468,30 @@
                       :label="$t('message.deepFoundConfig.pointNo')"
                     ></el-table-column>
                     <el-table-column prop="sensorSn" label="传感器编号"></el-table-column>
-                    <el-table-column prop="sensorTypeName" label="传感器类型"></el-table-column>
+                    <el-table-column prop="fiducialValue" label="初始值" align="center" width="100"></el-table-column>
-                    <el-table-column prop="data" label="值">
+                     <!-- 采集时间 -->
+                     <el-table-column
+                      width="220"
+                      align="center"
+                      prop="receiveTime"
+                      :label="$t('message.deepFoundConfig.gatherTime')"
+                    ></el-table-column>
+                    <el-table-column prop="lastTimeData" label="上次值"></el-table-column>
+                    <el-table-column prop="data" label="本次值">
+                      <template slot-scope="scope">{{scope.row.data + scope.row.unit}}</template>
+                    </el-table-column>
+                    <el-table-column prop="dataThis" label="本次变化量">
+                      <template slot-scope="scope">{{scope.row.dataThis + scope.row.unit}}</template>
+                    </el-table-column>
+                    <el-table-column prop="dataTotal" label="累计值">
+                      <template slot-scope="scope">{{scope.row.dataTotal + scope.row.unit}}</template>
+                    </el-table-column>
+                    <el-table-column prop="alarmValue" label="累计预警值" align="center"></el-table-column>
+                    <el-table-column prop="dataRate" label="变化速率" align="center"></el-table-column>
+                    <el-table-column prop="rateAlarmValue" label="变化速率预警值" align="center"></el-table-column>
+                    <!-- <el-table-column prop="data" label="值">
                       <template slot-scope="scope">{{scope.row.data + scope.row.unit}}</template>
                     </el-table-column>
-                    <!-- 测点名称 -->
                     <el-table-column
                       prop="measurePointName"
                       :label="$t('message.deepFoundConfig.pointName')"
@@ -482,12 +501,7 @@
                       :key="index"
                       :prop="item.key"
                       :label="item.keyName"
-                    ></el-table-column>
+                    ></el-table-column> -->
-                    <!-- 采集时间 -->
-                    <el-table-column
-                      prop="receiveTime"
-                      :label="$t('message.deepFoundConfig.gatherTime')"
-                    ></el-table-column>
                     <!-- 报警状态 -->
                     <el-table-column :label="$t('message.deepFoundConfig.alarmStatus')">
                       <template slot-scope="scope">
@@ -703,7 +717,7 @@ export default {
         pageSize:this.pageSize1,
       }).then(res => {
         this.echartData7.unit = res.result.unit;
-        console.log("默认第一次进来的时候单位", this.echartData7.unit)
+        console.log("默认第一次进来的时候单位", res.result)
         if (res.code == 200 && res.result) {
           this.total1 = res.result.data.total
           this.tableData2 = res.result.data.records;
@@ -1584,8 +1598,8 @@ export default {
           },
           yAxis: {
             type: "value",
-            name:'单位/mm',
+            // name:'单位/mm',
-            // name:`${'单位/'} ${this.echartData7.unit }`,
+            name:`${'单位/'} ${this.echartData7.unit }`,
             boundaryGap: [0, '100%'],
             splitLine: {
               lineStyle: {
@@ -1816,8 +1830,8 @@ export default {
         pageNo:this.pageNo1,
         pageSize:this.pageSize1,
       }).then(res => {
-        // this.echartData7.unit = res.result.unit
+        this.echartData7.unit = res.result.unit
-        console.log('第二个选择时的单位',this.echartData7.unit)
+        console.log('第二个选择时的单位',res.result)
         if (res.code == 200 && res.result) {
           this.total1 = res.result.data.total
           this.tableData2 = res.result.data.records;