修改场景判断

1 year ago · 6c1f0f5c76
parent 4f7facac64
commit 6c1f0f5c76
5 changed files with 97 additions and 73 deletions
--- a/ruoyi-ui/src/components/BoardTopNav/index.vue
+++ b/ruoyi-ui/src/components/BoardTopNav/index.vue
@ -72,7 +72,12 @@ export default {
  async mounted() {
    if (this.$route.name === 'SmartScene' || this.$route.name === 'GPS' || this.$route.name === 'index' || this.$store.getters.sceneId) {
    } else {
-      await this.$router.replace({path: "/board/index"});
+      if (this.$store.state.user.permissions.includes('business:monitor:index') || this.$store.state.user.permissions.includes('*:*:*')) {
+        await this.$router.replace({path: "/board/index"});
+      } else {
+        await this.$router.replace({path: "/board/smartScene"});
+        this.$router.push({path: '/board/smartScene'})
+      }
    }
    await this.setSelectSecnes()
    if (this.$route.name === 'SmartScene' || this.$route.name === 'GPS') {
--- a/ruoyi-ui/src/views/board/equipment/index.vue
+++ b/ruoyi-ui/src/views/board/equipment/index.vue
@ -70,7 +70,7 @@
          <div style="position: absolute;left: 24%;top: 0px;width: 55%;height: 100%;">
            <div
              v-for="val in Object.keys(i.deviceDataMap).slice(0,6).filter(e=> !(i.deviceDataMap[e].toString().includes('http')))"
-              class="infoItem">
+              class="infoItem" :style="'height:'+(Object.keys(i.deviceDataMap).length<4 ? '100%':'50%')">
              <div class="span">{{ val }}:</div>
              <div class="spanBg"></div>
              <div class="num">{{ i.deviceDataMap[val] }}</div>
@ -163,8 +163,10 @@ export default {
      });
    },
    async getTree() {
-      const {data} = await treeList(this.$store.getters.sceneId)
-      this.treeData = data
+      if(this.$store.getters.sceneId){
+        const {data} = await treeList(this.$store.getters.sceneId)
+        this.treeData = data
+      }
    },
    treeClick(e) {
      if (!e.children?.length > 0) {
@ -421,7 +423,7 @@ export default {
        display: inline-block;
        position: relative;
        width: 6vw;
-        height: 100%;
+        height: 50%;

        .spanBg {
          //background-image: url("~@/assets/board/equipment/icon.png");
--- a/ruoyi-ui/src/views/board/equipmentMonitoring/index.vue
+++ b/ruoyi-ui/src/views/board/equipmentMonitoring/index.vue
@ -2,13 +2,13 @@
  <div class="container">
    <div class="centerImg"></div>
    <div class="leftMenu">
-      <div v-for="(i,k) in deviceList" class="item" @click="getRightData(i)" :key="k">
+      <div v-for="(i,k) in deviceList" :key="k" class="item" @click="getRightData(i)">
        <span>{{ i.deviceModeName }}</span>
      </div>
    </div>
    <div ref="right" class="right">
      <div ref="search" class="search" style="min-height: 60px">
-        <el-form :inline="true" :model="form" class="demo-form-inline" v-show="tableShow">
+        <el-form v-show="tableShow" :inline="true" :model="form" class="demo-form-inline">
          <el-form-item label="传感器编号">
            <el-input v-model="form.data1" placeholder="传感器编号"></el-input>
          </el-form-item>
@ -18,10 +18,10 @@
          <el-form-item label="采集时间">
            <el-date-picker
              v-model="form.data3"
-              type="datetimerange"
+              end-placeholder="结束日期"
              range-separator="至"
              start-placeholder="开始日期"
-              end-placeholder="结束日期">
+              type="datetimerange">
            </el-date-picker>
          </el-form-item>
          <el-form-item>
@ -32,55 +32,64 @@
      </div>
      <div :style="{height:maxHeight+'px'}" class="table">
        <el-table
-          v-loading="loading"
          v-if='tableShow'
+          v-loading="loading"
          :cell-style="setStyle"
          :data="tableData"
          :header-cell-style="{ textAlign: 'center',backgroundColor:'#0a457d' }"
          :max-height="maxHeight">
          style="width: 100%">
          <el-table-column v-for="i in deviceDataColumns" :label="i.columnName" :prop="i.columnKey">
+            <template slot-scope="scope">
+              <img v-if="tableData[scope.$index][i.columnKey].toString().includes('http')"
+                   :src="tableData[scope.$index][i.columnKey]" alt="" height="100px"
+                   width="100px">
+              <span v-else> {{ tableData[scope.$index][i.columnKey].toString() }}</span>
+            </template>
          </el-table-column>
-<!--          <el-table-column-->
-<!--            label="rssi"-->
-<!--            prop="rssi">-->
-<!--          </el-table-column>-->
-<!--          <el-table-column-->
-<!--            label="value1"-->
-<!--            prop="value1">-->
-<!--          </el-table-column>-->
-<!--          <el-table-column-->
-<!--            label="编号"-->
-<!--            prop="devicecode">-->
-<!--          </el-table-column>-->
-<!--          <el-table-column-->
-<!--            label="alias"-->
-<!--            prop="alias">-->
-<!--          </el-table-column>-->
-<!--          <el-table-column-->
-<!--            label="设备名称"-->
-<!--            prop="devicename">-->
-<!--          </el-table-column>-->
-<!--          <el-table-column-->
-<!--            label="ts"-->
-<!--            prop="ts">-->
-<!--          </el-table-column>-->
-<!--          <el-table-column-->
-<!--            label="voltage"-->
-<!--            prop="voltage">-->
-<!--          </el-table-column>-->
-          <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
+          <!--          <el-table-column-->
+          <!--            label="rssi"-->
+          <!--            prop="rssi">-->
+          <!--          </el-table-column>-->
+          <!--          <el-table-column-->
+          <!--            label="value1"-->
+          <!--            prop="value1">-->
+          <!--          </el-table-column>-->
+          <!--          <el-table-column-->
+          <!--            label="编号"-->
+          <!--            prop="devicecode">-->
+          <!--          </el-table-column>-->
+          <!--          <el-table-column-->
+          <!--            label="alias"-->
+          <!--            prop="alias">-->
+          <!--          </el-table-column>-->
+          <!--          <el-table-column-->
+          <!--            label="设备名称"-->
+          <!--            prop="devicename">-->
+          <!--          </el-table-column>-->
+          <!--          <el-table-column-->
+          <!--            label="ts"-->
+          <!--            prop="ts">-->
+          <!--          </el-table-column>-->
+          <!--          <el-table-column-->
+          <!--            label="voltage"-->
+          <!--            prop="voltage">-->
+          <!--          </el-table-column>-->
+          <el-table-column align="center" class-name="small-padding fixed-width" label="操作">
            <template slot-scope="scope">
              <el-button
                type="primary"
                @click="toHistory(scope.row.deviceid,scope.row.devicemodeid)"
-              >查看历史</el-button>
+              >查看历史
+              </el-button>
            </template>
          </el-table-column>
        </el-table>
      </div>
      <div ref="pagination" style="margin-top: 12px;height: 36px;">
-        <el-pagination :current-page="offset" :total="total" background layout="prev, pager, next" style="display: inline-block;float:right;" :pageSize="limit" @current-change="currentChange">
+        <el-pagination :current-page="offset" :pageSize="limit" :total="total" background
+                       layout="prev, pager, next" style="display: inline-block;float:right;"
+                       @current-change="currentChange">
        </el-pagination>
      </div>
    </div>
@ -94,27 +103,26 @@ import {
 } from '@/api/board/equipmentMonitoring'

 export default {
-  components: {
-  },
+  components: {},
  data() {
    return {
-      loading:false,
+      loading: false,
      tableShow: false,
      form: {
        data1: '',
        data2: '',
        data3: null
      },
-      deviceModeId:'',
+      deviceModeId: '',
      maxHeight: 0,
      tableData: [],
-      deviceList:[],
+      deviceList: [],
      sceneId: 0,
-      offset:1,
-      limit:10,
-      total:0,
-      deviceDataColumns:[],
-      tableDataRow:[]
+      offset: 1,
+      limit: 10,
+      total: 0,
+      deviceDataColumns: [],
+      tableDataRow: []
    }
  },
  async mounted() {
@ -122,30 +130,33 @@ export default {
    await this.getData()
  },
  methods: {
-    query(){
-      this.getRightData({deviceModeId:this.deviceModeId})
+    log(e) {
+      console.log(e)
    },
-    reset(){
+    query() {
+      this.getRightData({deviceModeId: this.deviceModeId})
+    },
+    reset() {
      this.form = {
        data1: '',
        data2: '',
        data3: null
      }
-      this.getRightData({deviceModeId:this.deviceModeId})
+      this.getRightData({deviceModeId: this.deviceModeId})
    },
-    async currentChange(e){
-      this.tableData =this.tableDataRow.slice(this.limit*(e-1),this.limit*e)
+    async currentChange(e) {
+      this.tableData = this.tableDataRow.slice(this.limit * (e - 1), this.limit * e)
    },
-    async getRightData(e){
+    async getRightData(e) {
      this.deviceModeId = e.deviceModeId
      this.loading = true
      await this.setSelectLatestDataByDeviceMode({
        "sceneId": this.$store.getters.sceneId,
        "deviceModeId": e.deviceModeId,
-        deviceCode:this.form.data1,
-        deviceName:this.form.data2,
-        startTime:this.form?.data3?.length>1? new Date(this.form.data3[0]).getTime():'',
-        endTime:this.form?.data3?.length>1? new Date(this.form.data3[1]).getTime():'',
+        deviceCode: this.form.data1,
+        deviceName: this.form.data2,
+        startTime: this.form?.data3?.length > 1 ? new Date(this.form.data3[0]).getTime() : '',
+        endTime: this.form?.data3?.length > 1 ? new Date(this.form.data3[1]).getTime() : '',
        // "offset": this.offset-1,
        // "limit": 10
      })
@ -163,24 +174,24 @@ export default {
        return {textAlign: 'center', backgroundColor: '#063468', color: '#05aaba'}
      }
    },
-    async setSelectLatestDataByDeviceMode(e){
+    async setSelectLatestDataByDeviceMode(e) {
      const {data} = await selectLatestDataByDeviceMode(e)
      this.deviceDataColumns = data.deviceDataColumns
-      this.tableDataRow =data.latestData || []
-      this.tableData =( data.latestData || []).slice(0,this.limit)
-      this.total=data.latestData.length || 0
+      this.tableDataRow = data.latestData || []
+      this.tableData = (data.latestData || []).slice(0, this.limit)
+      this.total = data.latestData.length || 0
      this.offset = 1
    },
-    async setDeviceModesBySceneId(){
-      const {data} = await getDeviceModesBySceneId( {
+    async setDeviceModesBySceneId() {
+      const {data} = await getDeviceModesBySceneId({
        "sceneId": this.$store.getters.sceneId,
      })
      this.deviceList = data
    },
-    toHistory(e,i){
+    toHistory(e, i) {
      console.log(e)
      console.log(i)
-      this.$router.push({path: "/board/senso",query:{id:e,deviceModeId:i}});
+      this.$router.push({path: "/board/senso", query: {id: e, deviceModeId: i}});
    }
  }
 };
@ -253,7 +264,8 @@ export default {
      color: #25bffc;
      border-color: #25bffc;
    }
-    /deep/.el-range-input{
+
+    /deep/ .el-range-input {
      background-color: #0000;
    }
  }
--- a/ruoyi-ui/src/views/board/senso/index.vue
+++ b/ruoyi-ui/src/views/board/senso/index.vue
@ -179,6 +179,9 @@ export default {
    async setDeviceInfo() {
      const {data} = await getDeviceInfo(this.deviceId)
      this.topData = data || {}
+      if(this.topData.gpsFlag !== '1'){
+        this.date = null
+      }
    },
    async setHistoryData() {
      this.isMap = false
@ -191,7 +194,7 @@ export default {
        "offset": this.currentPage - 1,
        "limit": 10,
        startTime: this.date,
-        endTime: this.date + (1000 * 60 * 60 * 24)
+        endTime: this.date ? this.date + (1000 * 60 * 60 * 24) : null
      })
      let dataList = data.historyData?.dataList || []
      if (dataList.filter(e => (Object.keys(e).includes('longitude') || Object.keys(e).includes('longitude'))).length > 0) {
--- a/ruoyi-ui/src/views/board/smartScene/index.vue
+++ b/ruoyi-ui/src/views/board/smartScene/index.vue
@ -136,7 +136,9 @@ export default {
    }
  },
  async mounted() {
-    // await this.getData(this.$store.getters.sceneId)
+    if(this.$store.getters.sceneId !== null){
+      await this.getData(this.$store.getters.sceneId)
+    }
  },
  methods: {
    toMonitor(e){