大屏environmentalScreen修改

src/views/environmentalScreen/index.vue

@@ -186,14 +186,22 @@
         <div class="env-item container-wrap">
           <span class="right-top-line" />
           <span class="left-bottom-line" />
-          <h3><i class="iconfont icon-zhenglishi" />阅览室</h3>
-          <LineChart :class-name="className[0]" :chart-data="lineChartData.readRoomData" />
+          <h3><i class="iconfont icon-zhenglishi" />档案借阅</h3>
+          <div class="chart-wrapper">
+            <lend-across :lend-data="lendData" />
+          </div>
         </div>
         <div class="env-item container-wrap">
           <span class="right-top-line" />
           <span class="left-bottom-line" />
           <h3><i class="iconfont icon-zhenglishi" />整理室</h3>
-          <LineChart :class-name="className[1]" :chart-data="lineChartData.collateRoomData" />
+          <div v-if="typeData.length !== 0" class="chart-wrapper">
+            <type-pie :type-data="typeData" />
+          </div>
+          <div v-else class="empty-main">
+            <svg-icon icon-class="empty" class-name="empty-img" />
+            <p>暂无数据</p>
+          </div>
         </div>
         <!-- 报警记录 -->
         <warehouse-warning :height="'calc(100% - 38px)'" />
@@ -206,7 +214,8 @@
 
 <script>
 import { getCurrentTime } from '@/utils/index'
-import LineChart from './module/lineChart'
+import typePie from '@/views/components/echarts/typePie.vue'
+import lendAcross from '@/views/components/echarts/lendAcross.vue'
 import Video from '@/views/storeManage/warehouse3D/module/video'
 import data1 from './data1.json'
 import WarehouseWarning from '@/views/components/WarehouseWarning'
@@ -226,8 +235,9 @@ export default {
   components: {
     WarehouseWarning,
     SecurityDoor,
-    LineChart,
-    Video
+    Video,
+    lendAcross,
+    typePie
   },
   data() {
     return {
@@ -235,6 +245,8 @@ export default {
       timer: null,
       tableData: [],
       lineChartData: lineChartData,
+      lendData: [],
+      typeData: [],
       className: ['readRoomContainer', 'collateRoomContainer']
     }
   },

src/views/storeManage/warehouse3DConfig/index.vue

@@ -116,9 +116,10 @@ export default {
       tableData: [],
       selections: [],
       dialogVisible: false,
-      cameraTypeId: '',
+      cameraTypeId: '', // 摄像头
       airEquipmentTypeId: '', // 空气质量检测设备
       temperaSensorTypeId: '', // 温湿度感应器
+      waterSensorTypeId: '', // 漏水传感器
       form: { deviceInfo: {}, divPosition: '' },
       // 设备绑定
       devVal: '',
@@ -129,6 +130,9 @@ export default {
       rules: {
         deviceInfo: [
           { required: true, validator: checkDeviceInfo, trigger: 'change' }
+        ],
+        isDisplay: [
+          { required: true, message: '请选择是否显示', trigger: 'change' }
         ]
       },
       isMultiple: false,
@@ -137,7 +141,7 @@ export default {
   },
   watch: {
     'form.divPosition'(newVal, oldVal) {
-      if (newVal && newVal.includes('OAO')) {
+      if (newVal && (newVal.includes('OAO') || newVal.includes('LS'))) {
         this.isMultiple = true
       } else {
         this.isMultiple = false
@@ -168,6 +172,7 @@ export default {
       this.cameraTypeId = data.find((x) => { return x.name === '摄像头' }).id
       this.airEquipmentTypeId = data.find((x) => { return x.name === '空气质量检测设备' }).id
       this.temperaSensorTypeId = data.find((x) => { return x.name === '温湿度感应器' }).id
+      this.waterSensorTypeId = data.find((x) => { return x.name === '漏水传感器' }).id
     })
   },
   methods: {
@@ -194,6 +199,8 @@ export default {
           deviceTypeId = this.cameraTypeId
         } else if (this.form.divPosition.includes('TOP')) {
           deviceTypeId = this.airEquipmentTypeId
+        } else if (this.form.divPosition.includes('LS')) {
+          deviceTypeId = this.waterSensorTypeId
         } else {
           deviceTypeId = this.temperaSensorTypeId
         }