2021-12-27

src/views/Alarm/AlarmSet.vue

@@ -1,7 +1,7 @@
 <!--
  * @Author: your name
  * @Date: 2021-11-29 15:06:41
- * @LastEditTime: 2021-12-17 16:08:35
+ * @LastEditTime: 2021-12-27 09:12:11
  * @LastEditors: Please set LastEditors
  * @Description: 报警阈值设置
  * @FilePath: \hyyfClient\src\views\Alarm\AlarmSet.vue
@@ -30,7 +30,13 @@
         <alarm-form ref="alarmFormRef"></alarm-form>
         <alarm-table ref="alarmTableRef"></alarm-table>
         <div class="submit-btn">
-          <el-button type="primary" @click="handleSubmit">提交</el-button>
+          <el-button
+            v-if="hasPerm('alarmSet:edit')"
+            type="primary"
+            @click="handleSubmit"
+          >
+            提交
+          </el-button>
         </div>
       </div>
     </div>

src/views/BioSafety/CarAdmin.vue

@@ -1,7 +1,7 @@
 <!--
  * @Author: your name
  * @Date: 2021-09-13 17:52:31
- * @LastEditTime: 2021-12-21 13:50:07
+ * @LastEditTime: 2021-12-27 09:06:13
  * @LastEditors: Please set LastEditors
  * @Description: 生物安全 - 车辆管理
  * @FilePath: \hyyfClient\src\views\BioSafety\CarAdmin.vue
@@ -35,37 +35,52 @@
     >
       <template #right>
         <template v-if="btnSelected === 1">
-          <el-button size="mini" @click="add" type="primary"
-            >新增车辆</el-button
+          <el-button
+            v-if="hasPerm('car:add')"
+            size="mini"
+            @click="add"
+            type="primary"
           >
-          <el-button size="mini" @click="btnSelected = 5" type="success"
-            >查看白名单</el-button
+            新增车辆
+          </el-button>
+          <el-button
+            v-if="hasPerm('car:white')"
+            size="mini"
+            @click="btnSelected = 5"
+            type="success"
           >
-          <el-button size="mini" @click="btnSelected = 6" type="warning"
-            >查看黑名单</el-button
+            查看白名单
+          </el-button>
+          <el-button
+            v-if="hasPerm('car:black')"
+            size="mini"
+            @click="btnSelected = 6"
+            type="warning"
           >
+            查看黑名单
+          </el-button>
         </template>
         <template v-if="btnSelected === 5">
-          <el-button size="mini" type="success" @click="addWhite(1)"
-            >添加白名单</el-button
-          >
-          <el-button size="mini" @click="btnSelected = 1" type="primary"
-            >查看车辆档案</el-button
-          >
-          <el-button size="mini" @click="btnSelected = 6" type="warning"
-            >查看黑名单</el-button
-          >
+          <el-button size="mini" type="success" @click="addWhite(1)">
+            添加白名单
+          </el-button>
+          <el-button size="mini" @click="btnSelected = 1" type="primary">
+            查看车辆档案
+          </el-button>
+          <el-button size="mini" @click="btnSelected = 6" type="warning">
+            查看黑名单
+          </el-button>
         </template>
         <template v-if="btnSelected === 6">
-          <el-button size="mini" type="success" @click="addWhite(2)"
-            >添加黑名单</el-button
-          >
-          <el-button size="mini" @click="btnSelected = 1" type="primary"
-            >查看车辆档案</el-button
-          >
-          <el-button size="mini" @click="btnSelected = 5" type="success"
-            >查看白名单</el-button
-          >
+          <el-button size="mini" type="success" @click="addWhite(2)">
+            添加黑名单
+          </el-button>
+          <el-button size="mini" @click="btnSelected = 1" type="primary">
+            查看车辆档案
+          </el-button>
+          <el-button size="mini" @click="btnSelected = 5" type="success">
+            查看白名单
+          </el-button>
         </template>
       </template>
       <!-- <template v-slot:right>
@@ -85,22 +100,37 @@
       </template> -->
       <!--  白名单操作    -->
       <template #whiteHandle="scope">
-        <el-button size="mini" type="primary" @click="del(scope.row, 1)"
-          >移出白名单</el-button
+        <el-button
+          v-if="hasPerm('car:white-del')"
+          size="mini"
+          type="primary"
+          @click="del(scope.row, 1)"
         >
+          移出白名单
+        </el-button>
       </template>
       <template #blackHandle="scope">
-        <el-button size="mini" type="primary" @click="del(scope.row, 2)"
-          >移出黑名单</el-button
+        <el-button
+          v-if="hasPerm('car:black-del')"
+          size="mini"
+          type="primary"
+          @click="del(scope.row, 2)"
         >
+          移出黑名单
+        </el-button>
       </template>
       <!--  车辆档案操作    -->
       <template #handle="scope">
         <!--        <el-button size="mini" type="success" @click="onJoin(scope.row, 1)">加入白名单</el-button>-->
         <!--        <el-button size="mini" type="warning" @click="onJoin(scope.row, 2)">加入黑名单</el-button>-->
-        <el-button size="mini" type="danger" @click="onJoin(scope.row, 3)"
-          >删除</el-button
+        <el-button
+          v-if="hasPerm('car:del')"
+          size="mini"
+          type="danger"
+          @click="onJoin(scope.row, 3)"
         >
+          删除
+        </el-button>
       </template>
       <template v-slot:carNum="slotProps">
         {{ slotProps.row.carNum ? slotProps.row.carNum : "未识别" }}

src/views/BioSafety/PersonAdmin.vue

@@ -1,7 +1,7 @@
 <!--
  * @Author: your name
  * @Date: 2021-09-16 11:27:35
- * @LastEditTime: 2021-12-25 19:32:36
+ * @LastEditTime: 2021-12-27 08:54:07
  * @LastEditors: Please set LastEditors
  * @Description: In User Settings Edit
  * @FilePath: \hyyfClient\src\views\BioSafety\PersonAdmin.vue
@@ -51,10 +51,16 @@
       <template v-slot:right>
         <template v-if="btnSelected === 1">
           <div>
-            <el-button size="mini" @click="handleAddOrEdit">新增人员</el-button>
-            <el-button size="mini" type="danger" @click="handleDelete"
-              >批量删除</el-button
+            <el-button
+              size="mini"
+              @click="handleAddOrEdit"
+              v-if="hasPerm('personAdmin:add')"
             >
+              新增人员
+            </el-button>
+            <el-button size="mini" type="danger" @click="handleDelete">
+              批量删除
+            </el-button>
           </div>
         </template>
         <!-- <template v-else-if="btnSelected === 2">
@@ -100,17 +106,18 @@
         <span>{{ personStatus[slotProps.row.status] }}</span>
       </template>
       <template #handler="slotProps">
-<!--        <el-button-->
-<!--          size="mini"-->
-<!--          type="primary"-->
-<!--          @click="handleAddOrEdit(slotProps.row)"-->
-<!--        >-->
-<!--          编 辑-->
-<!--        </el-button>-->
+        <!--        <el-button-->
+        <!--          size="mini"-->
+        <!--          type="primary"-->
+        <!--          @click="handleAddOrEdit(slotProps.row)"-->
+        <!--        >-->
+        <!--          编 辑-->
+        <!--        </el-button>-->
         <el-button
           size="mini"
           type="danger"
           @click="handleDelete(slotProps.row)"
+          v-if="hasPerm('personAdmin:del')"
         >
           删 除
         </el-button>

src/views/DeviceMana/Device.vue

@@ -1,7 +1,7 @@
 <!--
  * @Author: your name
  * @Date: 2021-12-07 14:27:28
- * @LastEditTime: 2021-12-25 17:24:39
+ * @LastEditTime: 2021-12-27 09:15:07
  * @LastEditors: Please set LastEditors
  * @Description: 设备管理页面
  * @FilePath: \hyyfClient\src\views\DeviceMana\Device.vue
@@ -26,10 +26,14 @@
     >
       <!-- 右上角新增按钮 -->
       <template #right>
-        <el-button size="mini" @click="handleAdd">
+        <el-button v-if="hasPerm('device:add')" size="mini" @click="handleAdd">
           新增设备
         </el-button>
-        <el-button size="mini" @click="handleDelete(true)">
+        <el-button
+          v-if="hasPerm('device:del')"
+          size="mini"
+          @click="handleDelete(true)"
+        >
           批量删除
         </el-button>
       </template>
@@ -45,10 +49,18 @@
       </template>
 
       <template #handler="slotProps">
-        <el-button type="text" @click="handleEdit(slotProps.row)">
+        <el-button
+          v-if="hasPerm('device:edit')"
+          type="text"
+          @click="handleEdit(slotProps.row)"
+        >
           编辑
         </el-button>
-        <el-button type="text" @click="handleDelete(false, slotProps.row)">
+        <el-button
+          v-if="hasPerm('device:del')"
+          type="text"
+          @click="handleDelete(false, slotProps.row)"
+        >
           删除
         </el-button>
       </template>

src/views/Env/chart/ChartStarkBar.vue

@@ -1,5 +1,5 @@
 <template>
-  <div :id="'chart-stark-bar-'+ id" style="width: 100%; height: 100%"></div>
+  <div :id="'chart-stark-bar-' + id" style="width: 100%; height: 100%"></div>
 </template>
 
 <script>
@@ -8,152 +8,162 @@ export default {
   props: {
     id: {
       type: String,
-      default: () => '0'
+      default: () => "0",
     },
     starkList: {
       type: Array,
-      default: () => []
-    }
+      default: () => [],
+    },
   },
   watch: {
     starkList: {
       handler(newVal) {
-        if(newVal) {
+        if (newVal) {
           this.myChart.clear();
-          this.init()
+          this.init();
         }
       },
-      deep: true
-    }
+      deep: true,
+    },
   },
   data() {
     return {
-      myChart: null
-    }
+      myChart: null,
+    };
   },
   methods: {
     init() {
       var time = [];
       var data1 = [];
       var data2 = [];
-      var data3 = []
-      this.starkList.forEach(item => {
+      var data3 = [];
+      this.starkList.forEach((item) => {
         time.push(item.screateTime);
-        data1.push(item.onevalue)
-        data2.push(item.twovalue)
-        data3.push(item.threevalue)
-      })
+        data1.push(item.onevalue);
+        data2.push(item.twovalue);
+        data3.push(item.threevalue);
+      });
+      let start = time.length - 8;
+      let end = time.length - 1;
       var option = {
         legend: {
-          data: ['1号楼', '2号楼', '3号楼']
+          data: ["1号楼", "2号楼", "3号楼"],
         },
-        color: ['#73C0DE', '#9A60B4', '#5470C6', '#91CB74'],
+        color: ["#73C0DE", "#9A60B4", "#5470C6", "#91CB74"],
         tooltip: {
-          trigger: 'axis',
+          trigger: "axis",
         },
+        dataZoom: [
+          {
+            type: "inside",
+            startValue: start,
+            endValue: end,
+            show: false,
+          },
+        ],
         xAxis: [
           {
-            type: 'category',
+            type: "category",
             data: time,
             axisPointer: {
-              type: 'shadow'
+              type: "shadow",
             },
             axisLine: {
               show: false,
               lineStyle: {
-                color: '#6e7079',
-              }
+                color: "#6e7079",
+              },
             },
-            axisTick:{
-              show:false
+            axisTick: {
+              show: false,
             },
-          }
+          },
         ],
         yAxis: [
           {
-            type: 'value',
-            name: '用料统计情况',
+            type: "value",
+            name: "用料统计情况",
             axisLabel: {
-              formatter: '{value} 吨'
+              formatter: "{value} 吨",
             },
             axisLine: {
               show: false,
               lineStyle: {
-                color: '#6e7079',
-              }
+                color: "#6e7079",
+              },
             },
-            axisTick:{
-              show:false
+            axisTick: {
+              show: false,
             },
-          }
+          },
         ],
         series: [
           {
-            name: '1号楼',
+            name: "1号楼",
             data: data1,
-            type: 'bar',
-            itemStyle : {
+            type: "bar",
+            itemStyle: {
               color: this.color,
               borderColor: this.color,
               normal: {
-                label : {
+                label: {
                   show: true,
-                  position: 'top',
+                  position: "top",
                   textStyle: {
-                    fontSize: 14
-                  }
-                }
-              }
+                    fontSize: 14,
+                  },
+                },
+              },
             },
           },
           {
-            name: '2号楼',
+            name: "2号楼",
             data: data2,
-            type: 'bar',
-            itemStyle : {
+            type: "bar",
+            itemStyle: {
               color: this.color,
               borderColor: this.color,
               normal: {
-                label : {
+                label: {
                   show: true,
-                  position: 'top',
+                  position: "top",
                   textStyle: {
-                    fontSize: 14
-                  }
-                }
-              }
+                    fontSize: 14,
+                  },
+                },
+              },
             },
           },
           {
-            name: '3号楼',
+            name: "3号楼",
             data: data3,
-            type: 'bar',
-            itemStyle : {
+            type: "bar",
+            itemStyle: {
               color: this.color,
               borderColor: this.color,
               normal: {
-                label : {
+                label: {
                   show: true,
-                  position: 'top',
+                  position: "top",
                   textStyle: {
-                    fontSize: 14
-                  }
-                }
-              }
+                    fontSize: 14,
+                  },
+                },
+              },
             },
-          }
-        ]
+          },
+        ],
       };
-      this.myChart.setOption(option)
-    }
+      this.myChart.setOption(option);
+    },
   },
   mounted() {
-    this.myChart = this.$echarts.init(document.getElementById('chart-stark-bar-' + this.id));
-    this.init()
-  }
-}
+    this.myChart = this.$echarts.init(
+      document.getElementById("chart-stark-bar-" + this.id)
+    );
+    this.init();
+  },
+};
 </script>
 
-<style scoped>
-
-</style>
+<style scoped></style>