深基坑测点分布点位图修改

public/js/config.js

@@ -18,7 +18,7 @@ var PROJECT = {
 }
 
 
-var PROJECT_TYPE = PROJECT.online_zjsj
+var PROJECT_TYPE = PROJECT.local_test
 
 var headerShow = true; // 是否显示头部
 var tabsShow = true;  // 是否显示tabs

src/assets/js/http.js

@@ -40,10 +40,10 @@ 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.216:6023/' // 邱平毅本地
+  axios.defaults.baseURL = 'http://192.168.34.216:6023/' // 邱平毅本地
   // axios.defaults.baseURL = 'http://ue6a4s.natappfree.cc'  // 邱平毅vpn本地
   // axios.defaults.baseURL = 'http://139.9.66.234:6324/' // 河南春笋
-  axios.defaults.baseURL ='http://124.71.67.160:8088/' //中建四局线上
+  // 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/' //金林湾线上
   // axios.defaults.baseURL = 'http://192.168.34.231:6023/'; //杨思瑞本地

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', //
+    UPLOADURL: window.location.protocol + '//' + window.location.host + '/upload/image', //
-    // FILEURL: window.location.protocol + '//' + window.location.host + '/image/', //测试 // tag: 本地测试接口
+    FILEURL: window.location.protocol + '//' + window.location.host + '/image/', //测试 // tag: 本地测试接口
     /* 2022-05-16 */
     // tag: 部署河南项目时，需要打开这两行代码
     // UPLOADURL: 'http://139.9.66.234:6324/upload/image',
@@ -58,8 +58,8 @@ export default new Vuex.Store({
     // 邱平毅的
     // UPLOADURL: 'http://192.168.34.216:6023/upload/image',
     // FILEURL: 'http://192.168.34.216:6023/image/',
-    UPLOADURL: 'http://124.71.67.160:8088/upload/image',
+    // UPLOADURL: 'http://124.71.67.160:8088/upload/image',
-    FILEURL: 'http://124.71.67.160:8088/image/',
+    // FILEURL: 'http://124.71.67.160:8088/image/',
 
     // UPLOADURL:'http://'+"61.190.32.219:9050"+'/upload/image',//正式
     // FILEURL:'http://'+"61.190.32.219:9050"+'/image/',//正式

src/views/projectFront/deepFoundationPitManage/dataConfig.vue

@@ -1101,8 +1101,8 @@
                       <img
                         @mousedown.prevent="move(index,$event)"
                         @mouseup="up(index,$event)"
-                        style="width: 19px; height:29px;"
+                        style="width: 70px; height:70px;"
-                        src="@/assets/images/deepFoundationPitManage/point-icon.png"
+                        src="@/assets/images/deepFoundationPitManage/ljz.png"
                       />
                     </li>
                   </ul>
@@ -1113,8 +1113,8 @@
                   :style="{'top': pointTop + 'px','left': pointLeft + 'px','display': pointStatus}"
                 >
                   <img
-                    style="width: 19px; height:29px;"
+                    style="width: 70px; height:70px;"
-                    src="@/assets/images/deepFoundationPitManage/point-icon.png"
+                    src="@/assets/images/deepFoundationPitManage/ljz.png"
                   />
                 </div>
               </vue-scroll>

src/views/projectFront/deepFoundationPitManage/monitorData.vue

@@ -131,11 +131,13 @@
                   :src="mapUrl"
                 />
                 <div class="point-list">
+                  <!-- ${item.alarmState} -->
                   <div
                     class="point-item"
                     v-for="(item, index) in pointList"
                     :key="index"
-                    :style="{'left': item.mapX*mapZoom +'px','top': item.mapY*mapZoom + 'px'}"
+                    :class="item.alarmState==1 ? 'changeColor1' : item.alarmState==2 ? 'changeColor2' : item.alarmState==3 ? 'changeColor3': item.alarmState==4 ? 'changeColor4' : ''"
+                    :style="{'left': item.mapX*mapZoom - '10' +'px','top': item.mapY*mapZoom - '15' + 'px'}"
                   >
                     <span
                       @click="checkMapItem(item)"
@@ -160,7 +162,7 @@
                             <p>变化速率：{{item2.dataRate == null ? '无' : item2.dataRate}}</p>
                             <p>当前状态：
                             {{item2.status == 1 ? '正常': item2.status == 2
-                          ? '超报警' : item2.status == 3
+                          ? '累计值报警' : item2.status == 3
                           ? '超控制': item2.status == 4
                           ? '变化速率报警':""}}</p>
                           </div>
@@ -589,6 +591,7 @@ import {
 export default {
   data() {
     return {
+      changecolors:2,
       unit:"mm",
       detailData: {
         name: "",
@@ -846,7 +849,7 @@ export default {
         deepExcavationId: this.deepExcavation,
         planeFigureId: this.mapId
       }).then(res => {
-        console.log(res.result, "点位配置信息");
+        console.log("点位配置信息",res.result);
         if (res.code == 200 && res.result) {
           res.result.forEach(item => {
             item.isShow = false;
@@ -2031,13 +2034,15 @@ export default {
             top: 0;
             left: 0;
             .point-item {
-              background-image: url("~@/assets/images/pointl.png");
+              // background-image: url("~@/assets/images/pointl.png");
+              background-size:100% ;
+              background-repeat: no-repeat;
               position: absolute;
               span {
-                width: 16px;
+                width: 70px;
-                height: 16px;
+                height: 70px;
                 display: block;
-                border-radius: 50%;
+                // border-radius: 50%;
                 cursor: pointer;
               }
               .point-info {
@@ -2074,6 +2079,18 @@ export default {
                 top: -228px;
               }
             }
+            .changeColor1{
+              background-image: url("~@/assets/images/deepFoundationPitManage/zc.png");
+            }
+            .changeColor2{
+              background-image: url("~@/assets/images/deepFoundationPitManage/ckz.png");
+            }
+            .changeColor3{
+              background-image: url("~@/assets/images/deepFoundationPitManage/ljbj.png");
+            }
+            .changeColor4{
+              background-image: url("~@/assets/images/deepFoundationPitManage/bhsl.png");
+            }
           }
         }
       }

src/views/projectFront/lifter/liveDataTable.vue

@@ -441,11 +441,18 @@ export default {
         },
         exportExcel(){
             console.log('点击this.valueTime',this.valueTime)
+            const loading = this.$loading({
+                lock: true,
+                text: 'Loading',
+                spinner: 'el-icon-loading',
+                background: 'rgba(0, 0, 0, 0.7)'
+            });
             if(this.valueTime){
                 window.location.href =
                     this.$http.defaults.baseURL +
                     "xmgl/download/exporExcelTowerAlarm?projectSn=" + this.projectSn +
                     "&devSn=" + this.devSn + "&startTime=" + this.valueTime[0] + "&endTime=" + this.valueTime[1];
+                    loading.close();
             }else {
                 window.location.href =
                     this.$http.defaults.baseURL +