Merge branch 'dev-xiaole' into shenzhen-dev

2022-10-25 14:08:13 +08:00 · 2022-10-25 14:08:13 +08:00 · bfc047da2c
commit bfc047da2c
parent 33a8ab486c 023bcd7df2
21 changed files with 84 additions and 46 deletions
--- a/dist.zip
+++ b/dist.zip
--- a/public/js/config.js
+++ b/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
--- a/src/assets/images/deepFoundationPitManage/bhsl.png
+++ b/src/assets/images/deepFoundationPitManage/bhsl.png
--- a/src/assets/images/deepFoundationPitManage/ckz.png
+++ b/src/assets/images/deepFoundationPitManage/ckz.png
--- a/src/assets/images/deepFoundationPitManage/ljbj.png
+++ b/src/assets/images/deepFoundationPitManage/ljbj.png
--- a/src/assets/images/deepFoundationPitManage/ljz.png
+++ b/src/assets/images/deepFoundationPitManage/ljz.png
--- a/src/assets/images/deepFoundationPitManage/zc.png
+++ b/src/assets/images/deepFoundationPitManage/zc.png
--- a/src/assets/js/http.js
+++ b/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/'; //杨思瑞本地
--- a/src/components/videoModule/videoModule.vue
+++ b/src/components/videoModule/videoModule.vue
@ -1,7 +1,7 @@
 <template>
  <!-- 下拉框选择视频，需传入视频列表 -->
  <div class="fullHeight videoOverview" id="videoOverview">
-    <div v-show="showPlayback" class="videoTop">
+    <div v-show="showPlaybacks" class="videoTop">
    <span
      class="videoType"
      :class="{ active: videoType == 1 }"
@ -9,7 +9,7 @@
      >{{ $t("message.videoManage.live") }}</span
        >
        <span
-          v-show="showPlayback"
+          v-show="showPlaybacks"
          class="videoType"
          :class="{ active: videoType == 2 }"
          @click="
@ -156,14 +156,14 @@
          </template>
        </el-autocomplete> -->
        <span
-          v-show="showPlayback"
+          v-show="showPlaybacks"
          class="videoType"
          :class="{ active: videoType == 1 }"
          @click="videoType = 1"
          >{{ $t("message.videoManage.live") }}</span
        >
        <span
-          v-show="showPlayback"
+          v-show="showPlaybacks"
          class="videoType"
          :class="{ active: videoType == 2 }"
          @click="
@ -323,7 +323,7 @@ export default {
      showMoreWin: true, //是否显示多窗口切换
      showCaptrue: false, //是否显示截图按钮
      showControl: false, //是否显示控球按钮
-      showPlayback: false, //是否显示视频回放按钮
+      showPlaybacks: false, //是否显示视频回放按钮
      pluginType: "", //ysy:萤石云   videojs     ckPlayer  lecheng  isc  xiongmai
      initDivNum: 9,
      ysyParams: {
@ -354,8 +354,8 @@ export default {

    this.showCaptrue = this.$props.showCaptrue;
    this.showControl = this.$props.showControl;
-    this.showPlayback = this.$props.showPlayback;
-    console.log('当前显示回放不',this.showPlayback)
+    this.showPlaybacks = this.$props.showPlayback;
+    console.log('当前显示回放不',this.showPlaybacks)
    // if(this.$props.hiddenSelectBox){
    //   this.hiddenSelectBox = this.$props.hiddenSelectBox;
    // }
@ -389,7 +389,7 @@ export default {
      this.showMoreWin = false;
      this.showCaptrue = false;
      this.showControl = false;
-      this.showPlayback = true; //回放
+      this.showPlaybacks = true; //回放
      this.bottomMod = false;
      this.initDivNum = 1;
    } else if (this.pluginType == "videojs") {
--- 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://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',
-    FILEURL: 'http://124.71.67.160:8088/image/',
+    // UPLOADURL: 'http://124.71.67.160:8088/upload/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/',//正式
--- a/src/views/projectAdmin/fourEngin/command/center.vue
+++ b/src/views/projectAdmin/fourEngin/command/center.vue
@ -41,7 +41,7 @@ export default {
        bulidStatus: { label: '项目状态:', value: '' },
        constructionStage: { label: '形象进度:', value: '' },
        households:{label: '项目造价:', value: ''},
-        val2:{label: '已完成投资:', value: ''},
+        // val2:{label: '已完成投资:', value: ''},
        projectAcreage: { label: '工程面积:', value: '', unit: '' },
        constructionUnit: { label: '建设单位:', value: ''},
        projectAddress: { label: '项目地址:', value: '' },
@ -266,7 +266,9 @@ export default {
    }
  }
  .butProcess{
-    margin-bottom: 5%;
+    margin: 0% 5% 5% 5%;
+    // margin-bottom: 5%;
+    // margin-right: 5%;
  }
 }
 </style>
--- a/src/views/projectAdmin/fourEngin/command/index.vue
+++ b/src/views/projectAdmin/fourEngin/command/index.vue
@ -106,11 +106,11 @@ export default {
    }

    .rightTwo {
-      height: 30%;
+      height: 25%;
    }

    .rightThree {
-      height: 20%;
+      height: 25%;
    }

    .rightFour {
--- a/src/views/projectAdmin/fourEngin/command/leftThree/Process.vue
+++ b/src/views/projectAdmin/fourEngin/command/leftThree/Process.vue
@ -1,6 +1,6 @@
 <!-- 步骤条 -->
 <template>
-  <div class="list progress">
+  <div class="list progress" id="scrollBox">
    <div :ops="ops" class="list-item progress-item" v-for="(item, index) in list" :key="index">
      <div :class="['progress-item-dot', { active: projectData.constructionStage-1 >= index }]"></div>
      <div class="info">
@ -34,6 +34,9 @@ export default {
  created(){
    console.log('this.list',this.list)
    this.getDataDateils()
+  },
+  mounted(){
+    
  },
  methods:{
    getDataDateils() {
@ -55,7 +58,7 @@ export default {
  align-items: center;

  width: 100%;
-  height: 100%;
+  height: 95%;

  .progress-item {
    position: relative;
--- a/src/views/projectAdmin/fourEngin/command/rightThree.vue
+++ b/src/views/projectAdmin/fourEngin/command/rightThree.vue
@ -72,6 +72,7 @@ export default {
    box-sizing: border-box;
    width: 100%;
    height: 100%;
+    padding: 8px 15px;
    overflow: auto;
  .content{
    margin-top: 10px;
--- a/src/views/projectAdmin/fourEngin/command/rightTwo.vue
+++ b/src/views/projectAdmin/fourEngin/command/rightTwo.vue
@ -37,8 +37,8 @@
            class="empty"
            style="
              position: absolute;
-              left: 50%;
-              top: 50%;
+              left: 55%;
+              top: 40%;
              transform: translate(-50%, -50%);
            "
          >
@ -79,7 +79,7 @@ export default {
      list: [],
      titObj: {
        text: 0,
-        y: "35%",
+        y: "30%",
        subTitle: "质量问题数",
        color1: "#FFC303",
        size1: "38",
--- a/src/views/projectAdmin/fourEngin/progress/index.vue
+++ b/src/views/projectAdmin/fourEngin/progress/index.vue
@ -154,6 +154,7 @@ export default {
    line-height: 38px;
    text-align: center;
    z-index: 99;
+    cursor: pointer;
  }
  .changeTab0 {
    position: absolute;
--- a/src/views/projectFront/deepFoundationPitManage/dataConfig.vue
+++ b/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;"
-                        src="@/assets/images/deepFoundationPitManage/point-icon.png"
+                        style="width: 70px; height:70px;"
+                        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;"
-                    src="@/assets/images/deepFoundationPitManage/point-icon.png"
+                    style="width: 70px; height:70px;"
+                    src="@/assets/images/deepFoundationPitManage/ljz.png"
                  />
                </div>
              </vue-scroll>
--- a/src/views/projectFront/deepFoundationPitManage/monitorData.vue
+++ b/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)"
@ -148,21 +150,31 @@
                    >
                      <div class="point-title">
                        <p>测点编号：{{item.measurePointName }}</p>
-                        <p>测点名称：{{ item.monitorTypeName}}</p>
+                        <p>测点名称：<span style="color:#77e8b0;display:inline-block;width:150px;height:25px">{{ item.monitorTypeName}}</span></p>
+                        <p>测点状态:
+                            <span style="display:inline-block;width:150px;height:30px" :class="{'alarm_status1': item.alarmState == 1,
+                            'alarm_status2': item.alarmState == 2,
+                            'alarm_status3': item.alarmState == 3,
+                            'alarm_status4': item.alarmState == 4}">
+                              {{item.alarmState == 1 ? '正常': item.alarmState == 2
+                          ? '超控制' : item.alarmState == 3
+                          ? '累计值报警': item.alarmState == 4
+                          ? '变化速率报警':""}}</span></p>
                      </div>
                      <vue-scroll style="height: 200px">
                        <div class="point-content">
                          <div v-for="(item2,index2) in item.sensorlist" :key="index2">
                            <p>传感器编号：{{item2.sensorSn}}</p>
                            <p>传感器类型：{{item2.sensorTypeName == null ? '无' : item2.sensorTypeName }}</p>
-                            <p>采集时间：{{item2.receiveTime == null ? '无' : item2.receiveTime}}</p>
-                            <p>当前值：{{item2.data == null ? '无' : item2.receiveTime}}</p>
-                            <p>变化速率：{{item2.dataRate == null ? '无' : item2.dataRate}}</p>
                            <p>当前状态：
                                {{item2.status == 1 ? '正常': item2.status == 2
-                          ? '超报警' : item2.status == 3
-                          ? '超控制': item2.status == 4
+                                  ? '超控制' : item2.status == 3
+                                 ? '累计值报警': item2.status == 4
                                 ? '变化速率报警':""}}</p>
+                            <p>当前值：{{item2.data == null ? '无' : item2.data}}</p>
+                            <p>变化速率：{{item2.dataRate == null ? '无' : item2.dataRate}}</p>
+                            <p>累计值：{{item2.dataTotal == null ? '无' : item2.dataTotal}}</p>
+                            <p>采集时间：{{item2.receiveTime == null ? '无' : item2.receiveTime}}</p> 
                          </div>
                          <!-- 检测类型 -->
                          <!-- <p>{{$t('message.deepFoundConfig.detectionType')}}：{{item.monitorTypeName}}</p>
@ -589,6 +601,7 @@ import {
 export default {
  data() {
    return {
+      changecolors:2,
      unit:"mm",
      detailData: {
        name: "",
@ -846,7 +859,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 +2044,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;
-                height: 16px;
+                width: 70px;
+                height: 70px;
                display: block;
-                border-radius: 50%;
+                // border-radius: 50%;
                cursor: pointer;
              }
              .point-info {
@ -2074,6 +2089,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");
+            }
          }
        }
      }
--- a/src/views/projectFront/lifter/liveDataTable.vue
+++ b/src/views/projectFront/lifter/liveDataTable.vue
@ -440,7 +440,7 @@ export default {
            this.selectLifterCurrentData()
        },
        exportExcel(){
-            console.log('点击this.valueTime',this.valueTime)
+            // console.log('点击this.valueTime',this.valueTime)
            if(this.valueTime){
                window.location.href =
                    this.$http.defaults.baseURL +
--- a/src/views/projectFront/lifter/reportForm.vue
+++ b/src/views/projectFront/lifter/reportForm.vue
@ -13,7 +13,9 @@
            </div>
        </div>
        <div class="right">
-            <component :is="componentName"></component>
+            <!-- <component :is="componentName"></component> -->
+            <workCycleTable v-if="activeNav == 1"></workCycleTable>
+            <liveDataTable v-else></liveDataTable>
        </div>
    </div>
 </template>
--- a/src/views/projectFront/lifter/workCycleTable.vue
+++ b/src/views/projectFront/lifter/workCycleTable.vue
@ -311,12 +311,14 @@ export default {
            this.selectLifterWorkCycle()
        },
        exportExcel(){
+            // console.log('this.valueTime',this.valueTime)
            if(this.valueTime){
                window.location.href =
                    this.$http.defaults.baseURL +
                    "xmgl/download/exporExcelTowerAlarm?projectSn=" + this.projectSn +
-                    "&devSn=" + this.devSn?this.devSn:"" + "&startTime=" + this.transformTimestamp2(this.valueTime[0]) + "&endTime=" + this.transformTimestamp2(this.valueTime[1]);
-            }else {
+                    "&devSn=" + this.devSn + "&startTime=" + this.valueTime[0] + "&endTime=" + this.valueTime[1];
+            }
+            else {
                window.location.href =
                    this.$http.defaults.baseURL +
                    "xmgl/download/exporExcelTowerAlarm?projectSn=" + this.projectSn +