Revert "修改地图"

This reverts commit ea612ad905. # Conflicts: # ruoyi-ui/src/assets/board/senso/bg2.jpg
5 months ago · 0b9239a98f
parent 651831313e
commit 0b9239a98f
6 changed files with 91 additions and 147 deletions
--- a/ruoyi-ui/src/assets/board/senso/bg2.jpg
+++ b/ruoyi-ui/src/assets/board/senso/bg2.jpg
--- a/ruoyi-ui/src/components/BoardTopNav/index.vue
+++ b/ruoyi-ui/src/components/BoardTopNav/index.vue
@ -124,10 +124,8 @@ export default {
      await this.$store.dispatch('app/setSceneId', this.sceneId)
    },
    toLink(e, nowMenu) {
-      if (this.$store.getters.sceneId) {
-        this.nowMenu = nowMenu
-        this.$router.replace({path: "/board/" + e});
-      }
+      this.nowMenu = nowMenu
+      this.$router.replace({path: "/board/" + e});
    },
    async dropdownLink(e,) {
      this.nowMenu = '2'
--- a/ruoyi-ui/src/views/board/equipment/index.vue
+++ b/ruoyi-ui/src/views/board/equipment/index.vue
@ -1,5 +1,5 @@
 <template>
-  <div class="container" :style="'background-image: url('+((controlList&& controlList.length === 0) ? bgImg1 : bgImg)+')'">
+  <div class="container">
    <div class="title1">监控设备</div>
    <div class="centerImg"></div>
    <div class="title">监控单元</div>
@ -15,7 +15,7 @@
      </span>
      </el-tree>
    </div>
-    <div v-if="show" :class="((controlList&& controlList.length === 0) ? 'equipmentInfo1' : 'equipmentInfo')">
+    <div v-if="show" class="equipmentInfo">
      <p>
        <span>名称：</span>
        <span style="color: #d9dee3">{{ MonitorInfo.monitorUnitName }}</span>
@ -35,7 +35,7 @@
    </div>
    <div v-if="show"
         :style="'background-image: url('+(MonitorInfo.monitorPic ? MonitorInfo.monitorPic :defaultImg)+');'"
-         :class="((controlList&& controlList.length === 0) ? 'img1' : 'img')"></div>
+         class="img"></div>
    <div class="terminal">
      <!--el-form :model="form" class="demo-form-inline">
        <el-form-item label="传感器名称：">
@ -120,8 +120,6 @@ import {
 import defaultImg from '@/assets/board/equipment/icon.png'
 import defaultImg1 from '@/assets/board/equipment/icon2.png'
 import defaultImg2 from '@/assets/board/equipment/defaultImg.png'
-import bgImg from '@/assets/board/equipment/bg.jpg'
-import bgImg1 from '@/assets/board/equipment/bg2.jpg'


 let getDeviceInterval = null
@ -132,8 +130,6 @@ export default {
      defaultImg,
      defaultImg1,
      defaultImg2,
-      bgImg,
-      bgImg1,
      show: false,
      monitorUnitId: '',
      data1: true,
@ -161,6 +157,8 @@ export default {
      await this.getTree()
    },
    switchChange(functionIdentifier, deviceId, deviceCode, modeFunctionId) {
+      console.log(this.controlList)
+      console.log(this.controlList)
      this.$confirm('确定执行么？', '提示', {
        confirmButtonText: '确定',
        cancelButtonText: '取消',
@ -245,6 +243,7 @@ export default {
 }

 .container {
+  background-image: url("~@/assets/board/equipment/bg.jpg");
  background-repeat: no-repeat;
  background-size: 100% 100%;
  width: 100%;
@ -306,22 +305,6 @@ export default {
  }
 }

-.equipmentInfo1 {
-  position: absolute;
-  top: 52.6%;
-  left: 17.2%;
-  width: 28.4%;
-  height: 44%;
-  color: #1684c2;
-  padding: 2vh 0 0 1vw;
-
-  p {
-    margin: 0;
-    line-height: 10vh;
-    font-size: 0.9vw;
-  }
-}
-
 .img {
  background-repeat: no-repeat;
  background-size: 100% 100%;
@ -331,15 +314,6 @@ export default {
  width: 12%;
  height: 20.4%;
 }
-.img1{
-  background-repeat: no-repeat;
-  background-size: 100% 100%;
-  position: absolute;
-  top: 11.5%;
-  left: 16.9%;
-  width: 28.8%;
-  height: 40.4%;
-}

 .terminal {
  position: absolute;
--- a/ruoyi-ui/src/views/board/index/index.vue
+++ b/ruoyi-ui/src/views/board/index/index.vue
@ -438,6 +438,7 @@ export default {
      this.$refs.chart3.setData(option3)
    },
    dispose(e) {
+      console.log(e)
      this.$confirm('该问题已处理？', '提示', {
        confirmButtonText: '确定',
        cancelButtonText: '取消',
--- a/ruoyi-ui/src/views/board/senso/index.vue
+++ b/ruoyi-ui/src/views/board/senso/index.vue
@ -41,8 +41,7 @@
                      <span style="color: #fff;"> 起止时间：</span>
                      <div style="display: inline-block;margin-right: 12px;">
                        <el-date-picker v-model="date" end-placeholder="结束日期" format="yyyy-MM-dd hh:ss:mm"
-                                        range-separator="至" start-placeholder="开始日期" type="datetimerange"
-                                        value-format="timestamp">
+                          range-separator="至" start-placeholder="开始日期" type="datetimerange" value-format="timestamp">
                        </el-date-picker>
                        <!--                        - -->
                        <!--                        <el-date-picker-->
@ -60,14 +59,14 @@
                  </el-col>
                </el-row>
                <el-table v-if="show" :cell-style="setStyle" :data="tableData"
-                          :header-cell-style="{ textAlign: 'center', backgroundColor: '#0a457d' }"
-                          style="width: 100%;margin-top: 12px;">
+                  :header-cell-style="{ textAlign: 'center', backgroundColor: '#0a457d' }"
+                  style="width: 100%;margin-top: 12px;">
                  <el-table-column v-for="i in deviceDataColumns" :key="i.columnName" :label="i.columnName"
-                                   :prop="i.columnKey">
+                    :prop="i.columnKey">
                    <template slot-scope="scope">
                      <el-image v-if="scope.row[i.columnKey].toString().includes('http')"
-                                :preview-src-list="[scope.row[i.columnKey]]" :src="scope.row[i.columnKey]"
-                                style="width: 100px; height: 100px">
+                        :preview-src-list="[scope.row[i.columnKey]]" :src="scope.row[i.columnKey]"
+                        style="width: 100px; height: 100px">
                      </el-image>
                      <span v-else>{{ scope.row[i.columnKey] }}</span>

@ -75,7 +74,7 @@
                  </el-table-column>
                </el-table>
                <el-pagination v-show="!isMap" :currentPage="currentPage" :pageSize="10" :total="total" background
-                               layout="prev, pager, next" @current-change="currentChange">
+                  layout="prev, pager, next" @current-change="currentChange">
                </el-pagination>
              </div>
            </div>
@ -105,28 +104,26 @@
      </div>

      <div style="text-align: center;margin: 8px 0;">
-        <el-button v-if="isMap" disabled type="primary"
-                   @click="continueMap">已加载： {{ (mapOffset + 1) * 100 }} 总计： {{ mapTotal }}
-        </el-button>
-        <el-button v-if="isMap" :disabled="mapTotal < (mapOffset + 1) * 100" type="primary"
-                   @click="continueMap">继续加载
-        </el-button>
+        <el-button type="primary" v-if="isMap" @click="continueMap"
+          disabled>已加载： {{(mapOffset + 1) * 100}} 总计： {{mapTotal}}</el-button>
+        <el-button type="primary" v-if="isMap" @click="continueMap"
+          :disabled="mapTotal < (mapOffset + 1) * 100">继续加载</el-button>
      </div>
      <el-table v-show="isMap" :data="mapData" :max-height="40 * vh" highlight-current-row style="width: 100%"
-                @current-change="mapTableChange">
+        @current-change="mapTableChange">
        <el-table-column type="index" width="50">
        </el-table-column>
        <el-table-column label="日期" property="date" width="120">
          <template slot-scope="scope">
            {{
-              parseTime(scope.row.ts, '{y}-{m}-{d}')
-            }}
+          parseTime(scope.row.ts, '{y}-{m}-{d}')
+        }}
          </template>
        </el-table-column>
        <el-table-column label="时间" property="time" width="120">
          <template slot-scope="scope">
            {{
-              parseTime(scope.row.ts, '{h}:{i}:{s}')
+            parseTime(scope.row.ts, '{h}:{i}:{s}')
            }}
          </template>
        </el-table-column>
@ -216,8 +213,8 @@ export default {
      console.log(polyline1);
      polyline1 = new AMap.Polyline({
        path: e,
-        strokeColor: '#000',
-        strokeWeight: 10,
+        strokeColor:'#000',
+        strokeWeight:10,
        borderWeight: 2, // 线条宽度，默认为 1
      });
      map.add(polyline1);
@ -251,7 +248,7 @@ export default {
          endMarkerhs = e.target.hS
          let hs1 = startMarkerhs
          let hs2 = endMarkerhs
-          if (startMarkerhs > endMarkerhs) {
+          if(startMarkerhs>endMarkerhs){
            hs1 = endMarkerhs
            hs2 = startMarkerhs
          }
@ -323,13 +320,13 @@ export default {
    },
    setStyle(e) {
      if (e.rowIndex % 2 === 0) {
-        return {textAlign: 'center', backgroundColor: '#08406f', color: '#05aaba'}
+        return { textAlign: 'center', backgroundColor: '#08406f', color: '#05aaba' }
      } else {
-        return {textAlign: 'center', backgroundColor: '#063468', color: '#05aaba'}
+        return { textAlign: 'center', backgroundColor: '#063468', color: '#05aaba' }
      }
    },
    async setDeviceInfo() {
-      const {data} = await getDeviceInfo(this.deviceId)
+      const { data } = await getDeviceInfo(this.deviceId)
      this.topData = data || {}
      if (this.topData.gpsFlag !== '1') {
        this.date = null
@ -342,7 +339,7 @@ export default {
        this.show = false
        this.mapOffset = 0
      }
-      const {data} = await getHistoryData({
+      const { data } = await getHistoryData({
        "sceneId": this.$store.getters.sceneId,
        "deviceId": this.deviceId,
        deviceModeId: this.deviceModeId,
@ -351,13 +348,11 @@ export default {
        startTime: this.date?.[0],
        endTime: this.date?.[1],
      })
-      console.log(data)
-      let deviceDataColumns = data.deviceDataColumns
      let dataList = data.historyData?.dataList || []
-      if (deviceDataColumns.filter(e => e.columnKey === 'longitude' || e.columnKey === '"latitude"').length >0) {
-        this.isMap = true
+      if (dataList.filter(e => (Object.keys(e).includes('longitude') || Object.keys(e).includes('longitude'))).length > 0) {
        this.mapTotal = data.historyData.count
-        let mapData = dataList.filter(e => (Object.keys(e).includes('longitude') || Object.keys(e).includes('"latitude"'))).map(e => {
+        this.isMap = true
+        let mapData = dataList.filter(e => (Object.keys(e).includes('longitude') || Object.keys(e).includes('longitude'))).map(e => {
          let [lng, lat] = wgs84togcj02(e.longitude, e.latitude)
          return {
            ...e,
@ -385,7 +380,7 @@ export default {
      }
    },
    async setLinkDevices() {
-      const {data} = await getLinkDevices(this.deviceId)
+      const { data } = await getLinkDevices(this.deviceId)
      this.bottomData = data
    },
    mapTableChange(e) {
@ -448,46 +443,47 @@ export default {
    background-color: #FFF0 !important;
  }

-  /deep/ .el-table th.el-table__cell.is-leaf, {
-    border-color: #0000;
-  }
+  /deep/ .el-table th.el-table__cell.is-leaf,
+  {
+  border-color: #0000;
+}

-  /deep/ .el-table::before,
-  .el-table--group::after,
-  .el-table--border::after {
-    background-color: #0000;
-  }
+/deep/ .el-table::before,
+.el-table--group::after,
+.el-table--border::after {
+  background-color: #0000;
+}

-  /deep/ .el-table .el-table__header-wrapper th,
-  .el-table .el-table__fixed-header-wrapper th {
-    background-color: #0000;
-  }
+/deep/ .el-table .el-table__header-wrapper th,
+.el-table .el-table__fixed-header-wrapper th {
+  background-color: #0000;
+}

-  /deep/ .el-collapse-item__header {
-    background-color: #0000;
-    border-color: #0000;
-    height: auto;
-  }
+/deep/ .el-collapse-item__header {
+  background-color: #0000;
+  border-color: #0000;
+  height: auto;
+}

-  /deep/ .el-collapse {
-    border-color: #0000;
-  }
+/deep/ .el-collapse {
+  border-color: #0000;
+}

-  /deep/ .el-table td.el-table__cell {
-    border-color: #0000;
-  }
+/deep/ .el-table td.el-table__cell {
+  border-color: #0000;
+}

-  /deep/ .el-table .el-table__header-wrapper th {
-    color: #05ecf3;
-  }
+/deep/ .el-table .el-table__header-wrapper th {
+  color: #05ecf3;
+}

-  /deep/ .el-table .current-row {
-    color: #000;
-  }
+/deep/ .el-table .current-row {
+  color: #000;
+}

-  /deep/ .el-table .el-table__row:hover {
-    color: #000;
-  }
+/deep/ .el-table .el-table__row:hover {
+  color: #000;
+}
 }


--- a/ruoyi-ui/src/views/board/smartScene/index.vue
+++ b/ruoyi-ui/src/views/board/smartScene/index.vue
@ -15,22 +15,22 @@

    <div class="table1">
      <div style="background-color: #094170">
-        <div class="scrollTable" style="font-weight: bold;width: 10%">
+        <div class="scrollTable" style="font-weight: bold;width: 8%">
          告警编号
        </div>
-        <div class="scrollTable" style="font-weight: bold;width: 15%">
+        <div class="scrollTable" style="font-weight: bold;width: 8%">
          告警类型
        </div>
        <div class="scrollTable" style="font-weight: bold;width: 15%">
          告警级别
        </div>
-        <div class="scrollTable" style="font-weight: bold;width: 30%">
+        <div class="scrollTable" style="font-weight: bold;width: 21%">
          告警单元
        </div>
        <div class="scrollTable" style="font-weight: bold;width: 20%">
          告警时间
        </div>
-        <div class="scrollTable" style="font-weight: bold;width: 10%">
+        <div class="scrollTable" style="font-weight: bold;width: 8%">
          处理情况
        </div>
      </div>
@ -38,24 +38,23 @@
                           style="height: calc(100% - 33px);overflow: hidden;">
        <div v-for="(item, index) in table1Data" :key="index">
          <div :style='"background-color:" + ((index % 2 === 0) ? "#053460" : "#032d57")'>
-            <div class="scrollTable" style="width: 10%">
-              {{ item.alarmInfoId }}
+            <div class="scrollTable" style="width: 8%">
+              {{ item.data1 }}
            </div>
-            <div class="scrollTable" style="width: 15%">
-              {{ item.alarmTypeName }}
+            <div class="scrollTable" style="width: 8%">
+              {{ item.data2 }}
            </div>
            <div class="scrollTable" style="width: 15%">
-              {{ item.alarmLevelName }}
+              {{ item.data3 }}
            </div>
-            <div class="scrollTable" style="width: 30%">
-              {{ item.monitorUnitName }}
+            <div class="scrollTable" style="width: 21%">
+              {{ item.data4 }}
            </div>
            <div class="scrollTable" style="width: 20%">
-              {{ item.alarmTime }}
+              {{ item.data5 }}
            </div>
-            <div class="scrollTable" style="width: 10%">
-              <el-button v-if="item.handleStatus === '0'" size="mini" type="primary" @click="dispose(item)">处理</el-button>
-                            <span v-else style="color: #67C23A;">已处理</span>
+            <div class="scrollTable" style="width: 8%">
+              <span style="color: #67C23A;">已处理</span>
            </div>
          </div>
        </div>
@ -91,9 +90,6 @@ import {
  getAlarmCountGroupAlarmType,
  getAlarmInfos
 } from '@/api/board/smartScene'
-import {
-  handleAlarmInfo
-} from '@/api/board/index'

 export default {
  components: {
@ -179,36 +175,15 @@ export default {
    },
    async setAlarmInfos(e) {
      const {rows: data} = await getAlarmInfos({"sceneId":e})
-      this.table1Data = data
-    },
-    dispose(e) {
-      this.$confirm('该问题已处理？', '提示', {
-        confirmButtonText: '确定',
-        cancelButtonText: '取消',
-        type: 'warning'
-      }).then(() => {
-        handleAlarmInfo({
-          alarmInfoId:e.alarmInfoId
-        }).then(e=>{
-          if(e.code === 200){
-            this.$message({
-              type: 'success',
-              message: '已处理!'
-            });
-            this.setTable3()
-          }else{
-            this.$message({
-              type: 'info',
-              message: '网络错误'
-            });
-          }
-        })
-      }).catch(() => {
-        this.$message({
-          type: 'info',
-          message: '已取消'
-        });
-      });
+      this.table1Data = data.map((e,i)=>{
+        return {
+          data1: e.alarmInfoId,
+          data2: e.alarmTypeName,
+          data3: e.alarmLevelName,
+          data4: e.monitorUnitName,
+          data5: e.alarmTime,
+        }
+      })
    }
  }
 };