From de57967ef4e34c8b51122aa9bc16f16863945282 Mon Sep 17 00:00:00 2001
From: yangzongjia <yangzongjia>
Date: Sat, 10 Jun 2023 14:32:31 +0800
Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E6=96=B0=E4=BB=93=E5=BA=93=E8=A1=A8?=
 =?UTF-8?q?=E7=BB=93=E6=9E=84=EF=BC=8C=E6=96=B0=E5=A2=9E=E4=BB=93=E5=BA=93?=
 =?UTF-8?q?=E6=9F=A5=E8=AF=A2=E7=9A=84=E7=AD=9B=E9=80=89=E6=9D=A1=E4=BB=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/monitor/videos/index.vue            | 32 +++++++++++++++----
 .../shebeitaizhang/shebeitaizhangList.vue     |  4 +--
 2 files changed, 28 insertions(+), 8 deletions(-)

diff --git a/src/views/monitor/videos/index.vue b/src/views/monitor/videos/index.vue
index be2dac2..5217d3e 100644
--- a/src/views/monitor/videos/index.vue
+++ b/src/views/monitor/videos/index.vue
@@ -5,11 +5,10 @@
       <div class="main-content">
 
         <div class="shipinlisttop">
-          <el-form ref="listQueryform" :inline="true" :model="listQuery" label-width="110px" class="tab-header">
+          <el-form ref="" :inline="true" label-width="110px" class="tab-header">
             <el-form-item label="选择仓库">
-              <el-select v-model="listQuery.params.cangku" filterable clearable placeholder="请选择仓库">
-                <el-option v-for="item in cangku_list" :key="item.dictKey" :label="item.dictValue"
-                  :value="item.dictKey" />
+              <el-select v-model="ckId" filterable clearable placeholder="请选择仓库" @change="ckChange">
+                <el-option v-for="item in ckList" :key="item.id" :label="item.name" :value="item.id" />
               </el-select>
             </el-form-item>
             <!-- <el-form-item label="选择楼栋">
@@ -217,7 +216,7 @@
 import Pagination from '@/components/pagination'
 import pageye from '@/components/pagination/pageye'
 import ButtonBar from '@/components/ButtonBar'
-import { getOtherList, sysArm, sysDisArm } from '@/api/device/device'
+import { getOtherList, sysArm, sysDisArm, getWareHouseList } from '@/api/device/device'
 import { getVedioPcRecById, getVedioPcLiveById } from '@/api/deviceImage/deviceImage'
 // import baojingchaxunAdd from './baojingchaxunAdd'
 // import baojingchaxunInfo from './baojingchaxunInfo'
@@ -298,7 +297,8 @@ export default {
       dialogImageJKRec: false,
       // 视频开始
       videoSrc: '../../../image/cangkushipin.mp4',
-
+      ckList: [],
+      ckId: '',
       playStatus: '',
       muteStatus: '',
       spUrl: '',
@@ -375,6 +375,20 @@ export default {
     this.init()
   },
   methods: {
+    ckChange(item) {
+      getOtherList({ type: 1, ckId: item }).then((res) => {
+        if (res.code == 200) {
+          this.zc_list = res.data
+        }
+      })
+
+      getOtherList({ type: 2, ckId: item }).then((res) => {
+        if (res.code == 200) {
+          this.dzwl_list = res.data
+        }
+        console.log(this.dzwl_list)
+      })
+    },
     bodyCloseMenus() {
       console.log(111111)
       this.active = -1
@@ -587,6 +601,12 @@ export default {
       }
     },
     init() {
+      getWareHouseList().then(res => {
+        console.log(res)
+        if (res.code == 200) {
+          this.ckList = res.data
+        }
+      })
       getOtherList({ type: 1 }).then((res) => {
         if (res.code == 200) {
           this.zc_list = res.data
diff --git a/src/views/shebeitaizhang/shebeitaizhangList.vue b/src/views/shebeitaizhang/shebeitaizhangList.vue
index fc3a751..05c6717 100644
--- a/src/views/shebeitaizhang/shebeitaizhangList.vue
+++ b/src/views/shebeitaizhang/shebeitaizhangList.vue
@@ -151,7 +151,7 @@ import PieChartrenyuan from '@/views/echarts/components/PieChartrenyuanb'
 // 1.1完好率饼图
 const wanhao_Chart = {
   unit: '次',
-  color: ['#30e9ff', '#d9d9d9', '#fdc004'],
+  color: ['#30e9ff', '#d9d9d9'],
   Data: {
     seriesData: [
       { value: 75, name: '完好' },
@@ -185,7 +185,7 @@ const weixiu_Chart = {
 // 1.3损害率饼图
 const sunhai_Chart = {
   unit: '次',
-  color: ['#d2cece', '#ff0202', '#fdc004'],
+  color: ['#ff0202', '#d2cece'],
   Data: {
     seriesData: [
       { value: 10, name: '损害' },