后勤资产接口对接

src/components/VideoComponent/index.vue

@@ -137,7 +137,7 @@ export default {
         }
       });
     },
-    
+
     //开始播放
     // videoPlay(options) {
     //   const that = this;
@@ -186,6 +186,62 @@ export default {
       });
     },
 
+    // 云台控制
+    videoControl(options) {
+      const that = this;
+      if(!options || !options.code) {
+        console.log("==设备编码不全，无法播放==");
+        return;
+      }
+      if(!that.nrUvpVideoObj) {
+        console.log("==创建播放器==");
+        that.nrUvpVideoObj = new UVPVideoObj({
+          id: that.clientId,
+          winNum: options.winNum,
+          ip: that.cameraConfig.ip,
+          port: that.cameraConfig.port,
+          token: that.cameraConfig.token,
+          ak: that.cameraConfig.ak,
+          callback: onEventNotify
+        });
+      }
+      console.log("==开始操作==>参数集: ",JSON.stringify(options));
+      that.nrUvpVideoObj.uvpVideoControl({
+        // winNum: options.winNum,
+        devCode: options.code,
+        cmd:options.control,
+        lspeed:5,
+        rspeed:5,
+      });
+    },
+
+    // 视频截图
+    capture(options){
+      const that = this;
+      if(!options || !options.code) {
+        console.log("==设备编码不全，无法播放==");
+        return;
+      }
+      if(!that.nrUvpVideoObj) {
+        console.log("==创建播放器==");
+        that.nrUvpVideoObj = new UVPVideoObj({
+          id: that.clientId,
+          winNum: options.winNum,
+          ip: that.cameraConfig.ip,
+          port: that.cameraConfig.port,
+          token: that.cameraConfig.token,
+          ak: that.cameraConfig.ak,
+          callback: onEventNotify
+        });
+      }
+      console.log("==开始截图==>参数集: ",JSON.stringify(options));
+      that.nrUvpVideoObj.uvpCapture({
+        winNum: options.winNum,
+        fileName:"",
+        fileType:1
+      });
+
+    },
     //播放结束
     videoStop(winNum) {
       const that = this;
@@ -193,14 +249,14 @@ export default {
     },
     // 生成UUID
      generateUUID() {
-    var d = new Date().getTime(); 
-    var d2 = (performance && performance.now && (performance.now()*1000)) || 0; 
+    var d = new Date().getTime();
+    var d2 = (performance && performance.now && (performance.now()*1000)) || 0;
     return 'xxxxxxxxxxxx4xxxy'.replace(/[xy]/g, function(c) {
-        var r = Math.random() * 16; 
-        if(d > 0) { 
+        var r = Math.random() * 16;
+        if(d > 0) {
             r = (d + r)%16 | 0;
             d = Math.floor(d/16);
-        } else { 
+        } else {
             r = (d2 + r)%16 | 0;
             d2 = Math.floor(d2/16);
         }
@@ -211,7 +267,7 @@ export default {
     getCurrentTimestamp() {
     return new Date().getTime();
    }
- 
+
   },
 };
 </script>

src/views/pad/main.vue

@@ -4,41 +4,46 @@
       <div class="main-wrapper">
         <div class="header-area">
           <div class="left">
-            <div
+            <div class="modelTime" >
+              <div>{{timeString}}</div>
+              <div>{{timeDay}}</div>
+            </div>
+            <!-- <div
               :class="['model', 0 == curIndex ? 'cur' : '']"
               @click="chooseTab(0, 'main')"
             >
               首页
-            </div>
+            </div> -->
             <div
-              :class="['model', 1 == curIndex ? 'cur' : '']"
-              @click="chooseTab(1, 'service')"
+              :class="['model', 0 == curIndex ? 'cur' : '']"
+              @click="chooseTab(0, 'service')"
             >
               服务保障中心
             </div>
             <div
-              :class="['model', 2 == curIndex ? 'cur' : '']"
-              @click="chooseTab(2, 'logistics')"
+              :class="['model', 1 == curIndex ? 'cur' : '']"
+              @click="chooseTab(1, 'logistics')"
             >
               后勤资源监控
             </div>
           </div>
+          <div class="mid" @dblclick="fullScreen"></div>
           <div class="right">
             <div
-              :class="['model', 3 == curIndex ? 'cur' : '']"
-              @click="chooseTab(3, 'building')"
+              :class="['model', 2 == curIndex ? 'cur' : '']"
+              @click="chooseTab(2, 'building')"
             >
               楼宇运行监控
             </div>
             <div
-              :class="['model', 4 == curIndex ? 'cur' : '']"
-              @click="chooseTab(4, 'engineering')"
+              :class="['model', 3 == curIndex ? 'cur' : '']"
+              @click="chooseTab(3, 'engineering')"
             >
               工程现场监控
             </div>
             <div
-              :class="['model', 5 == curIndex ? 'cur' : '']"
-              @click="chooseTab(5, 'official')"
+              :class="['model', 4 == curIndex ? 'cur' : '']"
+              @click="chooseTab(4, 'official')"
             >
               公务用车监控
             </div>
@@ -97,13 +102,10 @@ export default {
   data() {
     return {
       curIndex: 0,
-      showTab: "main",
+      showTab: "service",
+      currentTime: new Date(),
       tabs: [
         {
-          name: "首页",
-          tab: "main",
-        },
-        {
           name: "服务保障中心",
           tab: "service",
         },
@@ -126,11 +128,37 @@ export default {
       ],
     };
   },
-
+  computed: {
+    timeString() {
+      const year = this.currentTime.getFullYear();
+      const month = String(this.currentTime.getMonth() + 1).padStart(2, '0');
+      const day = String(this.currentTime.getDate()).padStart(2, '0');
+      return `${year}-${month}-${day}`;
+    },
+    timeDay(){
+      const weekdays = ['星期日', '星期一', '星期二', '星期三', '星期四', '星期五', '星期六'];
+      const weekday = weekdays[this.currentTime.getDay()];
+      const hours = String(this.currentTime.getHours()).padStart(2, '0');
+      const minutes = String(this.currentTime.getMinutes()).padStart(2, '0');
+      const seconds = String(this.currentTime.getSeconds()).padStart(2, '0');
+
+      return `${weekday} ${hours}:${minutes}:${seconds}`;
+    }
+  },
+  mounted() {
+    this.updateTime();
+    setInterval(this.updateTime, 1000);
+  },
   created() {
     document.documentElement.requestFullscreen();
   },
   methods: {
+    fullScreen(){
+      document.documentElement.requestFullscreen();
+    },
+    updateTime() {
+      this.currentTime = new Date();
+    },
     //切换菜单
     chooseTab(index) {
       this.curIndex = index;
@@ -204,6 +232,20 @@ export default {
           color: #ffffff;
           cursor: pointer;
         }
+        .modelTime {
+          margin-right: 15px;
+          width: 130px;
+          height: 45px;
+          text-align: center;
+          font-family: "PingFangSc";
+          font-size: 12px;
+          padding-top: 5px;
+          font-weight: bold;
+          background: url("../../assets/images/main/menu_bg.png") no-repeat;
+          background-size: 100% 100%;
+          color: #ffffff;
+          cursor: pointer;
+        }
         .model:last-child {
           margin-right: 0;
         }

src/views/pad/service/basicOperation.vue

@@ -21,13 +21,13 @@
           <div class="rate-item">
             <el-progress
               type="circle"
-              :width="70"
+              :width="80"
               :stroke-width="5"
-              :percentage="onlineRate.value"
-              color="#00F7FF"
+              :percentage=onlineRate
+              color="#00FFFF"
               style="color:rgba(0, 247, 255, 0.18);"
             ></el-progress>
-            <div class="name">{{ onlineRate.name }}</div>
+            <div class="name">人数在线率</div>
           </div>
         </div>
       </div>
@@ -59,7 +59,7 @@ export default {
   data() {
     return {
       dataList: [],
-      onlineRate: {},
+      onlineRate: '',
     };
   },
   created() {
@@ -84,17 +84,13 @@ export default {
           )
           this.dataList.push(
             {
-              name: res.data.onlineNum.name,
-              data: res.data.onlineNum.value,
-            }
-          )
-          this.dataList.push(
-            {
               name: res.data.orderNum.name,
               data: res.data.orderNum.value,
             }
           )
-          this.onlineRate = res.data.onlineRate
+          // console.log(dataList);
+         this.onlineRate =res.data.onlineRate;
+          //alert(this.onlineRate);
         }
       });
     },
@@ -208,6 +204,11 @@ export default {
     font-size: 16px !important;
   }
 
+  .el-progress-circle__track {
+    color: #FFFFFF;
+    opacity: 0.1;
+    }
+
   ::-webkit-scrollbar {
     width: 3px;
     height: 3px;

src/views/pad/service/canteenDialog.vue

@@ -13,6 +13,17 @@
             <div class="content-title">
               <span class="title">食堂概览</span>
             </div>
+            <!-- <div class="choose-area">
+                <el-select v-model="canteen" @visible-change="selectOP" @change="getCanteenScoreData" placeholder="请选择">
+                  <el-option
+                    v-for="item in canteens"
+                    :key="item"
+                    :label="item"
+                    :value="item"
+                  >
+                  </el-option>
+                </el-select>
+              </div> -->
             <div class="data-list">
               <div v-for="(item, index) in dataList" :key="index" :class="'data-item ' + (index===0 || index===4 ? 'wid80' : 'wid130')">
                 <div class="data-fir">
@@ -43,7 +54,6 @@
           <div class="dialog-item wid100">
             <div class="content-title">
               <span class="title">食堂服务满意度
-               
               </span>
             </div>
             <div class="content">
@@ -66,7 +76,7 @@
                 y-color="#FFF"
                 l-color="#FFF"
                 width="515px"
-                height="200px"
+                height="180px"
               />
             </div>
           </div>
@@ -167,13 +177,13 @@
             </div>
             <div class="content">
               <div class="food-cont">
-                <div class="food-list" @click="foodsClick(1)">
+                <!-- <div class="food-list" @click="foodsClick(1)">
                   <div class="value">
                     <div>{{dailyMenu.value}}</div>
                     <div class="unit">道</div>
                   </div>
                   <div class="name">{{dailyMenu.name}}</div>
-                </div>
+                </div> -->
 
                 <div class="food-list" @click="foodsClick(0)">
                   <div class="value">
@@ -296,9 +306,9 @@
         </div>
 
         <div class="dialog-list">
-          <div class="dialog-item">
+          <!-- <div class="dialog-item">
             <div class="content-title">
-              <div class="title">食堂能耗信息（本月）</div>
+              <div class="title">能耗信息（本月）</div>
             </div>
             <div class="content">
               <div
@@ -317,8 +327,8 @@
                 </div>
               </div>
             </div>
-          </div>
-          <div class="dialog-item">
+          </div> -->
+          <div class="dialog-item wid100">
             <div class="content-title">
               <span class="title">热销菜品排行</span>
             </div>
@@ -326,6 +336,7 @@
               <bar-chart
                 :chart-data="foodsRankBarData"
                 :x-axis="foodsRankBarAxis"
+
                 position="left"
                 :yAxis="{
                   name: '受欢迎度(百分制)',
@@ -334,7 +345,7 @@
                     padding: [0,0,0,20]
                   },
                   axisLabel: {
-                    color: '#FFF',
+                    color: 'white',
                   },
                   splitLine: {
                     show: false,
@@ -351,7 +362,7 @@
                 :legend="foodsRankBarLegend"
                 y-color="#FFF"
                 l-color="#FFF"
-                width="100%"
+                width="515px"
                 height="200px"
               />
             </div>
@@ -369,7 +380,7 @@
                   <div class="data-item">
                     <div class="data-fir">
                       <img src="@/assets/images/service_new/img_1.png" class="icon" />
-                      <div class="name">参评数量</div>
+                      <div class="name">参评绿智食堂</div>
                     </div>
                     <div class="data-snd">
                       <div class="num">{{participate.value}}</div>
@@ -379,7 +390,7 @@
                   <div class="data-item">
                     <div class="data-fir">
                       <img src="@/assets/images/service_new/img_1.png" class="icon" />
-                      <div class="name">完成数量</div>
+                      <div class="name">已完成单位</div>
                     </div>
                     <div class="data-snd">
                       <div class="num">{{completed.value}}</div>
@@ -455,6 +466,17 @@
             <div class="content-title">
               <span class="title">电子餐券</span>
             </div>
+            <!-- <div class="choose-area">
+                <el-select v-model="canteen" @visible-change="selectOP" @change="getCanteenScoreData" placeholder="请选择">
+                  <el-option
+                    v-for="item in canteens"
+                    :key="item"
+                    :label="item"
+                    :value="item"
+                  >
+                  </el-option>
+                </el-select>
+              </div> -->
             <div class="content">
 <!--              <div class="choose-area">-->
 <!--                <el-select v-model="canteen" @visible-change="selectOP" placeholder="请选择">-->
@@ -472,14 +494,14 @@
                 :chart-data="electronicVouchersBarData"
                 :x-axis="electronicVouchersBarAxis"
                 :yAxis="{
-                  name: '张',
+                  name: '',
                   nameTextStyle: {
                     color: '#fff',
                     padding: [0,20,0,0],
                     fontSize:14
                   },
                   axisLabel: {
-                    color: '#FFF',
+                    color: 'white',
                   },
                   splitLine: {
                     show: false,
@@ -516,13 +538,10 @@ import {
   getCanteenData,
   getCanteenScoreData,
   getCanteenDegreeData,
-  getCanteenTotalRank,
   getQualificationData,
   getFoodData,
   getOtherData,
   getSafetyData,
-  getPowerData,
-  getFoodRankData,
   geParticipateData,
   getDiningPieData,
   getSmartCanteenPieData,
@@ -583,13 +602,13 @@ export default {
       canteenScoreBarYaxis: {
         type: "value",
         boundaryGap: [0, 0.01],
-        name:"%",
+        name:"",
         nameTextStyle: {
           color: "#fff",
           fontSize: 14,
         },
         axisLabel: {
-          color: "white", // 设置横坐标轴字体颜色为红色
+          color: "white", // 设置纵坐标轴字体颜色为红色
         },
         splitLine: {
           show: false,
@@ -615,7 +634,7 @@ export default {
       canteenDegreeBarYaxis: {
         type: "value",
         boundaryGap: [0, 0.01],
-        name:"%",
+        name:"",
         nameTextStyle: {
           color: "#fff",
           fontSize: 14,
@@ -637,10 +656,12 @@ export default {
       //各单位统计排行
       canteenTotalRankBarData: [],
       canteenTotalRankBarAxis: {},
+
+
       canteenTotalRankBarYaxis: {
         type: "value",
         boundaryGap: [0, 0.01],
-        name:"人",
+        name:"",
         nameTextStyle: {
           color: "#fff",
           fontSize: 14,
@@ -749,9 +770,6 @@ export default {
     //各食堂满意度排名
     this.getCanteenDegreeData();
 
-    //各单位统计排行
-    this.getCanteenTotalRank();
-
     //菜品信息
     this.getFoodData();
 
@@ -761,12 +779,6 @@ export default {
     //食堂安全管理
     this.getSafetyData();
 
-    //能耗信息（本月）
-    this.getPowerData();
-
-    //热销菜品排行
-    this.getFoodRankData();
-
     //绿智食堂参评情况
     this.geParticipateData();
 
@@ -931,7 +943,7 @@ export default {
             type: "category",
             data: ["其他人员", "服务人员", "厨师人数", "管理人员"],
             axisLabel: {
-              color: "white", // 设置横坐标轴字体颜色为红色
+              color: "white", // 设置纵坐标轴字体颜色为红色
             },
             axisTick: {
               show: false,
@@ -1193,7 +1205,7 @@ export default {
             axisLabel: {
               interval: 0,
               color: "white", // 设置横坐标轴字体颜色为红色
-              rotate: 65,
+              rotate: -20,
             },
             axisTick: {
               show: false,
@@ -1208,52 +1220,6 @@ export default {
       });
     },
 
-    //各单位统计排行
-    getCanteenTotalRank() {
-      getCanteenTotalRank(this.$props.appOrg).then((res) => {
-        if (Number(res.code) === 200) {
-          this.canteenTotalRankBarData = [
-            {
-              name: res.data.chefs.name,
-              type: "bar",
-              itemStyle: {
-                color: res.data.chefs.color,
-                //barBorderRadius: [5, 5, 0, 0], // 统一设置四个角的圆角大小
-              },
-              barWidth: 10,
-              data: res.data.chefs.dataList,
-            },
-            {
-              name: res.data.service.name,
-              type: "bar",
-              itemStyle: {
-                color: res.data.service.color,
-                //barBorderRadius: [5, 5, 0, 0], // 统一设置四个角的圆角大小
-              },
-              barWidth: 10,
-              data: res.data.service.dataList,
-            },
-          ];
-          this.canteenTotalRankBarAxis = {
-            type: "category",
-            data: res.data.xList,
-            axisLabel: {
-              interval: 0,
-              color: "white", // 设置横坐标轴字体颜色为红色
-              rotate: 65,
-            },
-            axisTick: {
-              show: false,
-            },
-            axisLine: {
-              lineStyle: {
-                color: "#465A64",
-              },
-            },
-          };
-        }
-      });
-    },
 
     //获取资质证件
     getQualificationData() {
@@ -1299,79 +1265,6 @@ export default {
       });
     },
 
-    //能耗信息（本月）
-    getPowerData() {
-      getPowerData(this.$props.appOrg).then((res) => {
-        if (Number(res.code) === 200) {
-          let list3 = [
-            "waterConsumptionNum",
-            "quantityHeatNum",
-            "gasVolumeNum",
-          ];
-          for (let index = 0; index < list3.length; index++) {
-            let name = "";
-            if(index == 0){
-              name = '用水量';
-            }else if(index == 1){
-              name = '用热量';
-            }else if(index == 2){
-              name = '用气量';
-            }
-            this.energyData.push({
-              name: name,
-              data: res.data[list3[index]].value,
-            });
-          }
-        }
-      });
-    },
-
-    //热销菜品排行
-    getFoodRankData() {
-      getFoodRankData(this.$props.appOrg).then((res) => {
-        if (Number(res.code) === 200) {
-          this.foodsRankBarData = [
-            {
-              name: "",
-              type: "bar",
-              itemStyle: {
-                color: res.data.yData.color,
-              },
-              barWidth: 30,
-              data: res.data.yData.yList,
-            },
-          ];
-
-          this.foodsRankBarGrid = {
-            top: 30,
-            bottom: 0,
-            left: "3%",
-            right: "2%",
-            containLabel: true,
-          };
-
-          this.foodsRankBarAxis = {
-            type: "category",
-            data: res.data.xList,
-            axisLabel: {
-              color: "white", // 设置横坐标轴字体颜色为红色
-              rotate: 50,
-              interval: 0,
-            },
-            axisTick: {
-              show: false,
-            },
-            axisLine: {
-              lineStyle: {
-                color: "#0A7C80",
-              },
-            },
-            splitArea: false,
-          };
-        }
-      });
-    },
-
     //绿智食堂参评情况
     geParticipateData() {
       geParticipateData(this.$props.appOrg).then((res) => {
@@ -1477,9 +1370,9 @@ export default {
 .dialog-canteen-area {
   overflow: hidden;
   width: 1125px;
-  height:1000px;
+  height:920px;
   background: url("../../../assets/images/main/components_max_bg.png") no-repeat;
-  background-size: 100% 100%;
+  background-size: cover;
   padding: 19px 15px 11px 15px;
 
   .dialog-title {
@@ -1509,11 +1402,11 @@ export default {
 
   .dialog-cont {
     width:100%;
-    height: 920px;
+    height: 850px;
     padding: 15px;
     overflow-y: scroll;
     background: url("../../../assets/images/main/components_max_cont.png") no-repeat;
-    background-size: 100% 100%;
+    background-size: cover;
 
     .dialog-left{
       width: 520px;
@@ -1548,7 +1441,6 @@ export default {
       .content-title {
         width: 100%;
         background: url("../../../assets/images/main/title_pro_long.png") no-repeat;
-        display: flex;
       }
     }
   }
@@ -1696,7 +1588,7 @@ export default {
     width:100%;
     padding:0 15px;
     display: flex;
-    justify-content: space-between;
+    justify-content: center;
     align-items: center;
 
     .food-list{
@@ -1780,14 +1672,6 @@ export default {
     }
   }
 
-  .tips{
-    width: 12px;
-    height: 12px;
-    /* margin: 0 0 -4px 10px; */
-    position: relative;
-    top: -7px;
-    left: 1px;
-  }
   .rate-area {
     display: flex;
     flex-direction: row;
@@ -2193,6 +2077,15 @@ export default {
     }
   }
 
+  .tips{
+    width: 12px;
+    height: 12px;
+    /* margin: 0 0 -4px 10px; */
+    position: relative;
+    top: -7px;
+    left: 1px;
+  }
+
   .case-area {
     background: url("../../../assets/images/main/data_bg6.png") no-repeat;
     background-size: 100% 100%;

src/views/pad/service/employeeHealth.vue

@@ -9,17 +9,17 @@
         <div class="health-cont">
           <div class="health-left">
             <div class="left-list">
-              <img src="@/assets/images/service_new/person.png">
+              <img src="@/assets/images/service_new/person2.png">
               <div class="left-info">
-                <div class="num">{{actualParticipateNum.value}}<span class="unit">人</span></div>
-                <div class="name">{{actualParticipateNum.name}}</div>
+                <div class="num">{{participateNum.value}}<span class="unit">人</span></div>
+                <div class="name">{{participateNum.name}}</div>
               </div>
             </div>
             <div class="left-list">
-              <img src="@/assets/images/service_new/person2.png">
+              <img src="@/assets/images/service_new/person.png">
               <div class="left-info">
-                <div class="num">{{participateNum.value}}<span class="unit">人</span></div>
-                <div class="name">{{participateNum.name}}</div>
+                <div class="num">{{actualParticipateNum.value}}<span class="unit">人</span></div>
+                <div class="name">{{actualParticipateNum.name}}</div>
               </div>
             </div>
           </div>
@@ -32,7 +32,7 @@
               color="#00F7FF"
               style="color:rgba(0, 247, 255, 0.18);"
             ></el-progress>
-            <div class="name">参检占比</div>
+            <div class="name">检查人数占比</div>
           </div>
         </div>
       </div>
@@ -147,8 +147,8 @@ export default {
 
         img{
           display: block;
-          width:80px;
-          height:80px;
+          width:60px;
+          height:60px;
         }
         .left-info{
           padding-left:12px;
@@ -181,8 +181,8 @@ export default {
       align-items: center;
 
       .name{
-        width:75px;
-        font-size: 18px;
+       //width:75px;
+        font-size: 14px;
         color:#FFFFFF;
         font-family: 'fashionZh';
         padding-top:10px;

src/views/pad/service/employeeHealthDialog.vue

@@ -15,37 +15,38 @@
             </div>
             <div class="data-chart">
               <div class="health-cont">
-                <div class="health-left">
-                  <div class="left-list">
-                    <img src="@/assets/images/service_new/person.png">
-                    <div class="left-info">
-                      <div class="num">{{actualParticipateNum.value}}<span class="unit">人</span></div>
-                      <div class="name">{{actualParticipateNum.name}}</div>
-                    </div>
-                  </div>
-                  <div class="left-list">
-                    <img src="@/assets/images/service_new/person2.png">
-                    <div class="left-info">
-                      <div class="num">{{participateNum.value}}<span class="unit">人</span></div>
-                      <div class="name">{{participateNum.name}}</div>
-                    </div>
-                  </div>
-                </div>
-                <div class="health-right">
-                  <el-progress
-                    type="circle"
-                    :width="112"
-                    :stroke-width="8"
-                    :percentage="participateProportionRate.value"
-                    color="#00F7FF"
-                    style="color:rgba(0, 247, 255, 0.18);"
-                  ></el-progress>
-                  <div class="name">参检占比</div>
-                </div>
+          <div class="health-left">
+            <div class="left-list">
+              <img src="@/assets/images/service_new/person2.png">
+              <div class="left-info">
+                <div class="num">{{participateNum.value}}<span class="unit">人</span></div>
+                <div class="name">{{participateNum.name}}</div>
               </div>
             </div>
+            <div class="left-list">
+              <img src="@/assets/images/service_new/person.png">
+              <div class="left-info">
+                <div class="num">{{actualParticipateNum.value}}<span class="unit">人</span></div>
+                <div class="name">{{actualParticipateNum.name}}</div>
+              </div>
+            </div>
+          </div>
+          <div class="health-right">
+            <el-progress
+              type="circle"
+              :width="112"
+              :stroke-width="8"
+              :percentage="participateProportionRate.value"
+              color="#00FFFF"
+              style="color:rgba(0, 247, 255, 0.18);"
+            ></el-progress>
+            <div class="name">检查人数占比</div>
           </div>
         </div>
+            </div>
+          </div>
+
+        </div>
 
         <div class="dialog-list">
           <div class="dialog-item wid100">
@@ -67,6 +68,9 @@
         </div>
 
       </div>
+
+
+
     </div>
   </div>
 </template>
@@ -104,15 +108,15 @@ export default {
       illnessBarData: [],
       illnessBarAxis: {},
       illnessBarYAxis:{
-        name: "人",
+        name: "",
         nameTextStyle: {
           color: "#fff",
           fontSize:14,
           padding:[0,10,0,0]
         },
         axisLabel: {
-          color: "#FFF",
-          formatter: "{value}人",
+          color: "white",
+          formatter: "{value}",
         },
         splitLine: {
           show: false,
@@ -175,18 +179,24 @@ export default {
               data: [{
                   value: res.data.yData.yList[0],
                   itemStyle: {
-                    color: '#43DCDB'
+                    color: res.data.yData.cList[0],
                   }
                 },{
                   value: res.data.yData.yList[1],
                   itemStyle: {
-                    color: '#00FF9D'
+                    color: res.data.yData.cList[1],
+                  }
+                },
+                {
+                  value: res.data.yData.yList[2],
+                  itemStyle: {
+                    color: res.data.yData.cList[2],
                   }
-                },res.data.yData.yList[2]],
+                }],
               type: "bar",
               barWidth: 40,
               itemStyle: {
-                color: res.data.yData.color,
+                color: res.data.yData.cList,
               },
             },
           ];
@@ -218,10 +228,10 @@ export default {
 <style lang="scss">
 .employee-health-dialog-area {
   position: relative;
-  top: 330px;
+  top: 309px;
   overflow: hidden;
   width: 580px;
-  height:650px;
+  height:610px;
   background: url("../../../assets/images/main/main_bg.png") no-repeat;
   background-size: cover;
   padding: 19px 15px 11px 15px;
@@ -259,21 +269,21 @@ export default {
 
   .dialog-cont {
     width:100%;
-    height: 620px;
+    height: 543px;
     padding: 15px;
     overflow-y: scroll;
     background: url("../../../assets/images/main/components_high_bg.png") no-repeat;
-    background-size: 100% 95%;
+    background-size: cover;
 
 
-    .dialog-left{
-      width: 520px;
-      float: left;
-    }
-    .dialog-right{
-      width: 520px;
-      float: right;
-    }
+    // .dialog-left{
+    //   width: 520px;
+    //   float: left;
+    // }
+    // .dialog-right{
+    //   width: 520px;
+    //   float: right;
+    // }
   }
 
   .dialog-list{
@@ -300,6 +310,7 @@ export default {
         width:100%;
         background: url("../../../assets/images/main/title_pro_long.png") no-repeat;
       }
+
     }
   }
 
@@ -341,8 +352,8 @@ export default {
 
         img{
           display: block;
-          width:80px;
-          height:80px;
+          width:60px;
+          height:60px;
         }
         .left-info{
           padding-left:12px;
@@ -350,7 +361,7 @@ export default {
           .num{
             font-size: 25px;
             color:#00FFFF;
-            font-family: 'electronicFont';
+            font-family: "electronicFont";
             display: flex;
             flex-direction: row;
             align-items: baseline;
@@ -375,8 +386,8 @@ export default {
       align-items: center;
 
       .name{
-        width:75px;
-        font-size: 18px;
+        //width:75px;
+        font-size: 14px;
         color:#FFFFFF;
         font-family: 'fashionZh';
         padding-top:10px;
@@ -384,6 +395,11 @@ export default {
       }
     }
   }
+  .el-progress-circle__track {
+    color: #FFFFFF;
+    opacity: 0.1;
+    }
+
 
   ::v-deep .el-progress__text {
     color: #ffffff !important;

src/views/pad/service/employeeProfileDialog.vue

@@ -87,6 +87,25 @@
         </div>
 
         <div class="dialog-list">
+          <div class="dialog-item wid100">
+            <div class="content-title">
+              <span class="title">员工性别分布情况</span>
+            </div>
+            <div class="data-chart">
+              <bar-chart
+                :chart-data="sexBarData"
+                :x-axis="sexBarAxis"
+                :y-axis="sexBarYAxis"
+                y-color="#FFF"
+                l-color="#FFF"
+                width="515px"
+                height="180px"
+              />
+            </div>
+          </div>
+        </div>
+
+        <!-- <div class="dialog-list">
           <div class="dialog-item">
             <div class="content-title">
               <span class="title">员工年龄分布情况</span>
@@ -119,7 +138,7 @@
               />
             </div>
           </div>
-        </div>
+        </div> -->
 
         <div class="dialog-list">
           <div class="dialog-item wid100">
@@ -168,7 +187,6 @@ import {
   getEnterBuildData,
   getEmployeePieData,
   getPastWeekFlowData,
-  getAgePieData,
   getSexChartData, getEmployeeOtherData,
 } from "@/api/screen/service";
 
@@ -233,8 +251,7 @@ export default {
         splitArea:false
       },
 
-      //员工年龄分布情况
-      sexPieData: [],
+
 
       //员工性别分布情况
       sexBarData: [],
@@ -282,8 +299,6 @@ export default {
     this.getEnterBuildData();
     //一周人流量
     this.getPastWeekFlowData();
-    //员工年龄分布情况
-    this.getAgePieData();
     //员工性别分布情况
     this.getSexChartData();
     //其他数据信息
@@ -376,8 +391,7 @@ export default {
               },
               barWidth: 20,
               data: res.data.visitor.dataList.reverse(),
-            }
-            
+            },
           ];
 
           this.pedestrianFlowBarAxis = {
@@ -404,14 +418,6 @@ export default {
       });
     },
 
-    //员工年龄分布情况
-    getAgePieData() {
-      getAgePieData(this.$props.appOrg).then((res) => {
-        if (Number(res.code) === 200) {
-          this.sexPieData = res.data;
-        }
-      });
-    },
 
     //员工性别分布情况
     getSexChartData() {
@@ -443,7 +449,7 @@ export default {
                   color: "#FFD296",
                   //barBorderRadius: [10, 10, 0, 0], // 统一设置四个角的圆角大小
                 },
-                barWidth: 30,
+                barWidth: 80,
                 data: [{
                   value: res.data.yData.yList[0],
                   itemStyle: {
@@ -487,9 +493,9 @@ export default {
 .employee-profile-dialog-area {
   overflow: hidden;
   width: 580px;
-  height:1000px;
-  // background: url("../../../assets/images/main/main_bg.png") no-repeat;
-  // background-size: cover;
+  height:920px;
+  background: url("../../../assets/images/main/main_bg.png") no-repeat;
+  background-size: cover;
   padding: 19px 15px 11px 15px;
 
   .dialog-title {
@@ -519,11 +525,11 @@ export default {
 
   .dialog-cont {
     width:100%;
-    height: 920px;
+    height: 850px;
     padding: 15px;
     overflow-y: scroll;
     background: url("../../../assets/images/main/components_long_bg.png") no-repeat;
-    background-size: 100% 100%;
+    background-size: cover;
 
     .dialog-left{
       width: 520px;
@@ -602,7 +608,7 @@ export default {
       margin-right: 37px;
       .data{
         width: auto;
-        font-size: 20px;
+        font-size: 25px;
         color:#00FFFF;
         font-family: 'electronicFont';
       }

src/views/pad/service/property.vue

@@ -29,25 +29,32 @@
             <div class="name">{{ suggestedNum.name }}</div>
           </div>
           <div class="data-item">
+                  <div class="data">
+                    <div>{{repairOrdersNum.value}}</div>
+                    <div class="unit">个</div>
+                  </div>
+                  <div class="name">{{ repairOrdersNum.name }}</div>
+                </div>
+          <div class="data-item">
             <div class="data">
               <div>{{questionnairesNum.value}}</div>
               <div class="unit">个</div>
             </div>
             <div class="name">{{ questionnairesNum.name }}</div>
           </div>
-          <div class="data-item">
+          <!-- <div class="data-item">
             <div class="data">
               <div>{{carlicense.value}}</div>
               <div class="unit">个</div>
             </div>
             <div class="name">{{ carlicense.name }}</div>
-          </div>
-          
+          </div> -->
+
         </div>
       </div>
 
       <div class="content-title mar">
-        <span class="title">近一个月报修数量占比</span>
+        <span class="title">近一个月报修分类占比</span>
       </div>
     </div>
   </div>
@@ -76,7 +83,7 @@ export default {
       faultWarrantyNum: {},
       dispatchedNum: {},
       suggestedNum: {},
-      carlicense: {},
+      carlicense:{},
       repairOrdersNum: {},
       questionnairesNum: {},
     };
@@ -98,8 +105,9 @@ export default {
           this.dispatchedNum = res.data.dispatchedNum
           this.suggestedNum = res.data.suggestedNum
           this.repairOrdersNum = res.data.repairOrdersNum
-          this.questionnairesNum = res.data.questionnairesNum
           this.carlicense = res.data.carlicense
+
+          this.questionnairesNum = res.data.questionnairesNum
         }
       });
     },

src/views/pad/service/shareStation.vue

@@ -36,8 +36,11 @@
                   <div>{{parseFloat(participateProportionRate.value).toFixed(0)}}</div>
                   <div class="unit">%</div>
                 </div>
+                 <div class="revo">
+                      <div class="name">完成</div>
+                      <div class="name">达标率</div>
+                     </div>
               </div>
-              <div class="name">完成达标率</div>
             </div>
           </div>
         </div>
@@ -47,13 +50,42 @@
           <div class="title">服务内容</div>
         </div>
         <div class="content">
-          <pie-chart
-            :chart-data="pieData"
-            :legend="pieLegend"
-            :title="pieTitle"
-            width="220px"
-            height="180px"
-          />
+          <div class="data-content">
+                <div class="data-left">
+                  <div class="data-item">
+                    <div class="data-fir">
+                      <img src="@/assets/images/service_new/img_1.png" class="icon" />
+                      <div class="name">{{serviceContent[0].name}}</div>
+                    </div>
+                    <div class="data-snd">
+                      <div class="num">{{serviceContent[0].value}}</div>
+                      <div class="unit">个</div>
+                    </div>
+                  </div>
+                  <div class="data-item">
+                    <div class="data-fir">
+                      <img src="@/assets/images/service_new/img_1.png" class="icon" />
+                      <div class="name">{{serviceContent[1].name}}</div>
+                    </div>
+                    <div class="data-snd">
+                      <div class="num">{{serviceContent[0].value}}</div>
+                      <div class="unit">个</div>
+                    </div>
+                  </div>
+                </div>
+                <div class="data-right">
+                    <pie-chart
+                    position="left"
+                  :chart-data="fwData"
+                  :legend="fwLegend"
+                  :center="['40%','45%']"
+                  width="120px"
+                  height="160px"
+                />
+
+
+                </div>
+              </div>
         </div>
       </div>
     </div>
@@ -62,7 +94,7 @@
 
 <script>
 
-import {getOverviewData, getToolsChartsList} from "@/api/screen/service";
+import {getOverviewData,getSelfTestAndConsultation} from "@/api/screen/service";
 import PieChart from "@/components/Echarts/PieChart.vue";
 
 
@@ -98,17 +130,31 @@ export default {
       },
       pieTitle: {},
       constructionQuantityNum: {},
+        // 服务内容
+      serviceContent :{},
       completedNum: {},
       participateProportionRate: {
         value:0
       },
+      fwData: [],
+      fwLegend: {
+        top: 115,
+        orient: "vertical",
+        left: 10,
+        itemWidth: 10, // 设置图例标记的宽度
+        itemHeight: 10, // 设置图例标记的高度
+        textStyle: {
+          color: "#FFF",
+        },
+
+      },
     };
   },
   created() {
     //建设完成率
     this.getOverviewData();
-    //工具箱二具数量
-    this.getToolsChartsList();
+    // 服务内容
+    this.getSelfTestAndConsultation()
   },
   destroyed() {},
   beforeDestroy() {},
@@ -124,14 +170,23 @@ export default {
         }
       });
     },
-    //工具箱二具数量
-    getToolsChartsList() {
-      getToolsChartsList(this.$props.appOrg).then((res) => {
+        // 服务内容
+        getSelfTestAndConsultation(){
+      getSelfTestAndConsultation(this.$props.appOrg).then((res) => {
         if (Number(res.code) === 200) {
-          this.pieData = res.data;
+          this.serviceContent = res.data;
+          this.fwData = res.data;
         }
       });
     },
+    // //工具箱二具数量
+    // getToolsChartsList() {
+    //   getToolsChartsList(this.$props.appOrg).then((res) => {
+    //     if (Number(res.code) === 200) {
+    //       this.pieData = res.data;
+    //     }
+    //   });
+    // },
   },
 };
 </script>
@@ -175,7 +230,7 @@ export default {
     .data-content{
       display: flex;
       justify-content: space-between;
-      padding-top:10px;
+      // padding-top:10px;
 
       .mar{
         margin-bottom: 15px;
@@ -223,26 +278,28 @@ export default {
         }
       }
       .data-right{
-        padding-top:3px;
         display: flex;
         flex-direction: column;
         align-items: center;
-
+        margin-top: -50px;
         .name{
-          font-size:14px;
+          font-size:13px;
           color:#fff;
-          padding-top:5px;
         }
-
         .circle{
           width: 100px;
           height:100px;
           background: url("../../../assets/images/service_new/circle_2.png") no-repeat;
           background-size: 100% 100%;
           display: flex;
-          justify-content: center;
-          align-items: flex-start;
-
+          justify-content: space-around;
+        align-items:center;
+        flex-direction: column;
+          .revo{
+          display: flex;
+          flex-direction: column;
+          align-items: center;
+        }
           .value{
             display: flex;
             align-items: center;
@@ -264,7 +321,18 @@ export default {
       }
     }
   }
-
+  .data-content{
+      display: flex;
+       justify-content:space-around;
+      align-items: center;
+      overflow: visible;
+      padding:10px 0px 0px 0px;
+      margin-left: 10px;
+      .imgPos{
+        padding-left: 15px;
+        padding-right: 15px;
+      }
+ }
   ::-webkit-scrollbar {
     width: 3px;
     height: 3px;

src/views/pad/service/shareStationDialog.vue

@@ -43,8 +43,13 @@
                       <div>{{parseFloat(participateProportionRate.value).toFixed(0)}}</div>
                       <div class="unit">%</div>
                     </div>
+                     <div class="revo">
+                      <div class="name">完成</div>
+                      <div class="name">达标率</div>
+                     </div>
+
                   </div>
-                  <div class="name">完成达标率</div>
+
                 </div>
               </div>
             </div>
@@ -54,17 +59,44 @@
             <div class="content-title">
               <span class="title">服务内容</span>
             </div>
-            <div class="data-chart">
-              <pie-chart
-                :chart-data="pieData"
-                :legend="pieLegend"
-                :title="pieTitle"
-                :center='["35%", "40%"]'
-                position="left"
-                width="220px"
-                height="180px"
-              />
-            </div>
+            <div class="content">
+              <div class="data-content">
+                <div class="data-left">
+                  <div class="data-item">
+                    <div class="data-fir">
+                      <img src="@/assets/images/service_new/img_1.png" class="icon" />
+                      <div class="name">{{serviceContent[0].name}}</div>
+                    </div>
+                    <div class="data-snd">
+                      <div class="num">{{serviceContent[0].value}}</div>
+                      <div class="unit">个</div>
+                    </div>
+                  </div>
+                  <div class="data-item">
+                    <div class="data-fir">
+                      <img src="@/assets/images/service_new/img_1.png" class="icon" />
+                      <div class="name">{{serviceContent[1].name}}</div>
+                    </div>
+                    <div class="data-snd">
+                      <div class="num">{{serviceContent[1].value}}</div>
+                      <div class="unit">个</div>
+                    </div>
+                  </div>
+                </div>
+                <div class="data-right">
+                    <pie-chart
+                    position="left"
+                  :chart-data="fwData"
+                  :legend="fwLegend"
+                  :center="['40%','45%']"
+                  width="120px"
+                  height="160px"
+                />
+
+
+                </div>
+              </div>
+        </div>
           </div>
         </div>
 
@@ -76,7 +108,7 @@
             <div class="data-chart">
               <div class="table-cont">
                 <div class="table-top">
-                  <div class="fir">驿站名称</div>
+                  <div class="fir">单位名称</div>
                   <div class="snd">驿站地址</div>
                   <div class="thd">服务次数</div>
                 </div>
@@ -101,7 +133,7 @@
 import PieChart from "@/components/Echarts/PieChart";
 import BarChart from "@/components/Echarts/BarChart.vue";
 
-import { getOverviewData, getToolsChartsList,getPropertyList } from "@/api/screen/service";
+import { getOverviewData,getSelfTestAndConsultation,getPropertyList } from "@/api/screen/service";
 
 export default {
   name: "ShareStationDialog",
@@ -119,6 +151,8 @@ export default {
     return {
       //建设完成达标率
       constructionQuantityNum: {},
+      // 服务内容
+      serviceContent :{},
       completedNum: {},
       participateProportionRate: {
         value:0
@@ -140,13 +174,26 @@ export default {
 
       //单位列表
       unitDataList: [],
+        //服务内容
+      fwData: [],
+      fwLegend: {
+        top: 115,
+        orient: "vertical",
+        left: 10,
+        itemWidth: 10, // 设置图例标记的宽度
+        itemHeight: 10, // 设置图例标记的高度
+        textStyle: {
+          color: "#FFF",
+        },
+
+      },
     };
   },
   created() {
     //建设完成率
     this.getOverviewData();
-    //工具箱数量
-    this.getToolsChartsList();
+    // 服务内容
+    this.getSelfTestAndConsultation()
     //单位列表
     this.getPropertyList();
   },
@@ -165,15 +212,23 @@ export default {
       });
     },
 
-    //工具箱二具数量
-    getToolsChartsList() {
-      getToolsChartsList(this.$props.appOrg).then((res) => {
+    // //工具箱二具数量
+    // getToolsChartsList() {
+    //   getToolsChartsList(this.$props.appOrg).then((res) => {
+    //     if (Number(res.code) === 200) {
+    //       this.pieData = res.data;
+    //     }
+    //   });
+    // },
+    // 服务内容
+    getSelfTestAndConsultation(){
+      getSelfTestAndConsultation(this.$props.appOrg).then((res) => {
         if (Number(res.code) === 200) {
-          this.pieData = res.data;
+          this.serviceContent = res.data;
+          this.fwData = res.data;
         }
       });
     },
-
     //单位数量
     getPropertyList() {
       getPropertyList(this.$props.appOrg).then((res) => {
@@ -201,9 +256,9 @@ export default {
 .share-station-dialog-area {
   overflow: hidden;
   width: 580px;
-  height:1000px;
+  height:920px;
   background: url("../../../assets/images/main/main_bg.png") no-repeat;
-  background-size: 100% 100%;
+  background-size: cover;
   padding: 19px 15px 11px 15px;
 
   .dialog-title {
@@ -233,11 +288,11 @@ export default {
 
   .dialog-cont {
     width:100%;
-    height: 920px;
+    height: 850px;
     padding: 15px;
     overflow-y: scroll;
     background: url("../../../assets/images/main/components_long_bg.png") no-repeat;
-    background-size: 100% 100%;
+    background-size: cover;
 
     .dialog-left{
       width: 520px;
@@ -294,14 +349,14 @@ export default {
   }
 
   .data-chart {
-    margin-top: 15px !important;
+    margin-top: 20px !important;
     margin-bottom: 5px !important;
   }
 
   .data-content{
     display: flex;
     justify-content: space-between;
-    padding-top:10px;
+    // padding-top:10px;
 
     .mar{
       margin-bottom: 15px;
@@ -349,15 +404,15 @@ export default {
       }
     }
     .data-right{
-      padding-top:3px;
+      // padding-top:3px;
       display: flex;
       flex-direction: column;
       align-items: center;
-
+      margin-top: -50px;
       .name{
-        font-size:14px;
+        font-size:13px;
         color:#fff;
-        padding-top:5px;
+        // padding-top:5px;
       }
 
       .circle{
@@ -366,9 +421,14 @@ export default {
         background: url("../../../assets/images/service_new/circle_2.png") no-repeat;
         background-size: 100% 100%;
         display: flex;
-        justify-content: center;
-        align-items: flex-start;
-
+        justify-content: space-around;
+        align-items:center;
+        flex-direction: column;
+        .revo{
+          display: flex;
+          flex-direction: column;
+          align-items: center;
+        }
         .value{
           display: flex;
           align-items: center;
@@ -402,7 +462,7 @@ export default {
       display: flex;
       justify-content: space-between;
       align-items: center;
-      font-size:12px;
+      font-size:14px;
       color:#00FFFF;
     }
     .table-bot{
@@ -411,13 +471,14 @@ export default {
       .table-list{
         width:100%;
         height:30px;
-        padding:5px 25px 0 10px;
+        padding:5px 25px 10px 10px;
         display: flex;
         justify-content: space-between;
         align-items: center;
-        font-size:12px;
+        font-size:15px;
         color:#FFFFFF;
         font-weight: 500;
+        border: 1px dotted #14302F;
       }
     }
 
@@ -433,11 +494,25 @@ export default {
       width:12%;
       text-align: left;
     }
-    .color{
-      color:#FF8C00;
-    }
+    // .color{
+    //   color:#FF8C00;
+    // }
   }
-
+  .content {
+    margin-top: 20px;
+  }
+  .data-content{
+      display: flex;
+       justify-content:space-around;
+      align-items: center;
+      overflow: visible;
+      padding:10px 0px 0px 0px;
+      margin-left: 10px;
+      .imgPos{
+        padding-left: 15px;
+        padding-right: 15px;
+      }
+ }
   ::-webkit-scrollbar {
     display: none;
     width: 3px;

src/views/screen/engineering/monitorLive.vue

@@ -11,6 +11,32 @@
         <video-component @videoLoad="playVideo"></video-component>
       </div>
     </div>
+    <div @click="upWord"  class="c1" style="right: 20px;top: 70px;" >
+      <img src="../../../assets/zhang/cameraScreen/leave.png" width="20px">
+    </div>
+    <div @click="shot"  class="c1" style="right: 20px;top: 120px;">
+      <img src="../../../assets/zhang/cameraScreen/cut.png" width="20px">
+    </div>
+    <div @click="amplify" class="c1" style="right: 20px;top: 170px;">
+      <img src="../../../assets/zhang/cameraScreen/bigger.png" width="20px">
+    </div>
+    <div @click="reduce" class="c1" style="right: 20px;top: 220px;">
+      <img src="../../../assets/zhang/cameraScreen/smaller.png" width="20px">
+    </div>
+    <div class="c2" style="right: 20px;top: 390px;">
+      <div @click="left" style="position: absolute;left: 0;">
+        <img src="../../../assets/zhang/cameraScreen/left.png" width="60px">
+      </div>
+      <div @click="right" style="position: absolute;right: 0;">
+        <img src="../../../assets/zhang/cameraScreen/right.png" width="60px">
+      </div>
+      <div @click="top" style="position: absolute;top: 0;">
+        <img src="../../../assets/zhang/cameraScreen/up.png" width="80px">
+      </div>
+      <div @click="bottom" style="position: absolute;bottom: 0;">
+        <img src="../../../assets/zhang/cameraScreen/down.png" width="80px">
+      </div>
+    </div>
   </div>
 </template>
 
@@ -81,6 +107,115 @@ export default {
       this.played = true;
     },
 
+    left(obj) {
+      console.log(obj, '================================')
+      this.videoObj = obj;
+      this.code = this.monitorInfo.code;
+      if(!this.code) return;
+      console.log("视频播放编号", this.code);
+      this.videoObj.videoControl({
+        winNum: this.winNum,
+        code: this.monitorInfo.code,
+        control:0x0504,
+      });
+      this.played = true;
+    },
+    right(obj) {
+      console.log(obj, '================================')
+      this.videoObj = obj;
+      this.code = this.monitorInfo.code;
+      if(!this.code) return;
+      console.log("视频播放编号", this.code);
+      this.videoObj.videoControl({
+        winNum: this.winNum,
+        code: this.monitorInfo.code,
+        control:0x0502,
+      });
+      this.played = true;
+    },
+    top(obj) {
+      console.log(obj, '================================')
+      this.videoObj = obj;
+      this.code = this.monitorInfo.code;
+      if(!this.code) return;
+      console.log("视频播放编号", this.code);
+      this.videoObj.videoControl({
+        winNum: this.winNum,
+        code: this.monitorInfo.code,
+        control:0x0402,
+      });
+      this.played = true;
+    },
+    bottom(obj) {
+      console.log(obj, '================================')
+      this.videoObj = obj;
+      this.code = this.monitorInfo.code;
+      if(!this.code) return;
+      console.log("视频播放编号", this.code);
+      this.videoObj.videoControl({
+        winNum: this.winNum,
+        code: this.monitorInfo.code,
+        control:0x0404,
+      });
+      this.played = true;
+    },
+
+
+    upWord(obj) {
+      console.log(obj, '================================')
+      this.videoObj = obj;
+      this.code = this.monitorInfo.code;
+      if(!this.code) return;
+      console.log("视频播放编号", this.code);
+      this.videoObj.videoControl({
+        winNum: this.winNum,
+        code: this.monitorInfo.code,
+        control:0x0401,
+      });
+      this.played = true;
+    },
+
+    //视频截图
+    shot(obj) {
+      console.log(obj, '================================')
+      this.videoObj = obj;
+      this.code = this.monitorInfo.code;
+      if(!this.code) return;
+      console.log("视频播放编号", this.code);
+      this.videoObj.capture({
+        winNum: this.winNum,
+      });
+      this.played = true;
+    },
+
+    amplify(obj) {
+      console.log(obj, '================================')
+      this.videoObj = obj;
+      this.code = this.monitorInfo.code;
+      if(!this.code) return;
+      console.log("视频播放编号", this.code);
+      this.videoObj.videoControl({
+        winNum: this.winNum,
+        code: this.monitorInfo.code,
+        control:0x0304,
+      });
+      this.played = true;
+    },
+
+    reduce(obj) {
+      console.log(obj, '================================')
+      this.videoObj = obj;
+      this.code = this.monitorInfo.code;
+      if(!this.code) return;
+      console.log("视频播放编号", this.code);
+      this.videoObj.videoControl({
+        winNum: this.winNum,
+        code: this.monitorInfo.code,
+        control:0x0302,
+      });
+      this.played = true;
+    },
+
   },
 };
 </script>
@@ -231,6 +366,28 @@ export default {
   .title-area{
     padding-left: 40px !important;
   }
+  .c1{
+  width: 50px;
+  height: 30px;
+  background-color: rgba(88,139,196,0.37);box-shadow: 0 0 15px rgb(47,113,124);
+  display: flex;
+  position:absolute;
+  justify-content: center;
+  align-items: center;
+}
+.c1:hover{
+  cursor: pointer;
+}
+  .c2{
+  width: 150px;
+  height: 150px;
+  border-radius: 50%;
+  background-color: rgba(88,139,196,0.37);box-shadow: 0 0 15px rgb(47,113,124);
+  display: flex;
+  position:absolute;
+  justify-content: center;
+  align-items: center;
+}
 
   ::-webkit-scrollbar {
     width: 3px;

src/views/screen/logistics/houseArea.vue

@@ -38,8 +38,7 @@
             :chart-data="buildingAreaBarData"
             :x-axis="buildingAreaBarAxis"
             :yAxis="buildingAreaBarYaxis"
-            :legend="buildingAreaBarLegend"
-            :grid="barGrid"
+
             y-color="#FFF"
             l-color="#FFF"
             width="520px"
@@ -52,7 +51,7 @@
         <div class="content">
           <div class="data-list">
             <div class="data-item">
-             
+
               <img
                 src="@/assets/images/logistics_guarantee/estate.png"
                 class="img"
@@ -78,14 +77,14 @@
                     <div class="num">43<span class="unit">个</span></div>
                   </div>
                  </div>
-   
+
 
               </div>
             </div>
           </div>
         </div>
       </div>
-   
+
     </div>
   </div>
 </template>
@@ -125,12 +124,12 @@ export default {
       //   { value: 24.15, name: "车辆资源" },
       // ],
       pieData: [
-        { value: 151.56, name: "办公用房", itemStyle: {color:'#2F82FE'} },
-        { value: 3.53, name: "周转用房", itemStyle: {color:'#00FFFF'} },
-        { value: 86.21, name: "生产管理", itemStyle: {color:'#7565EF'} },
-        { value: 20.02, name: "教育培训用房", itemStyle: {color:'#1C61C7'} },
-        { value: 0.62, name: "交流干部住房", itemStyle: {color:'#4E2FFE'} },
-        { value: 2.92, name: "单身公寓/单身宿舍" , itemStyle: {color:'#00AEFF'} },
+        { value: 151.56, name: "办公用房", itemStyle: {color:'#FEB948'} },
+        { value: 3.53, name: "周转用房", itemStyle: {color:'#2F82FE'} },
+        { value: 86.21, name: "生产管理", itemStyle: {color:'#01F6EC'} },
+        { value: 20.02, name: "教育培训用房", itemStyle: {color:'#7465EF'} },
+        { value: 0.62, name: "交流干部住房", itemStyle: {color:'#242CC4'} },
+        { value: 2.92, name: "单身公寓/单身宿舍" , itemStyle: {color:'#2FFEA0'} },
       ],
       pieLegend: {
         top: 55,
@@ -145,16 +144,39 @@ export default {
       pieCenter: ["30%", "50%"],
       buildingAreaBarData: [
         {
-          name: "",
-          type: "bar",
-          itemStyle: {
-            color: "#D67C15",
-            //barBorderRadius: [0, 0, 0, 0], // 统一设置四个角的圆角大小
-          },
-          barWidth: 10,
-          data: [110, 30, 100],
-        },
-        
+              name: "",
+              type: "bar",
+              stack: "a",
+              itemStyle: {
+                color: "#00f0ff",
+                //barBorderRadius: [10, 10, 0, 0], // 统一设置四个角的圆角大小
+              },
+              barWidth: 10,
+              data: [110,0, 0 ],
+            },
+            {
+              name: "",
+              type: "bar",
+              stack: "a",
+              itemStyle: {
+                color: "#D67C15",
+                //barBorderRadius: [10, 10, 0, 0], // 统一设置四个角的圆角大小
+              },
+              barWidth: 10,
+              data: [0,80,0],
+            },
+            {
+              name: "",
+              type: "bar",
+              stack: "a",
+              itemStyle: {
+                color: "#D67C15",
+                //barBorderRadius: [10, 10, 0, 0], // 统一设置四个角的圆角大小
+              },
+              barWidth: 10,
+              data: [0,0,90],
+            },
+
       ],
       buildingAreaBarYaxis: {
         type: "category",
@@ -166,9 +188,12 @@ export default {
           show: false,
         },
         axisTick: {
-          show: false,
-        },
-        splitArea: false,
+              show: false,
+            },
+            splitArea: false,
+            axisLine: {
+              show: false,
+            },
       },
       buildingAreaBarAxis: {
         type: "value",
@@ -315,7 +340,7 @@ export default {
   .total-cont {
     height: 110px;
     margin: 15px 50px 0 50px;
- 
+
     display: flex;
     align-items: center;
     justify-content: space-between;
@@ -331,7 +356,7 @@ export default {
         font-weight: bold;
         font-family: "electronicFont";
       }
-      .unit { 
+      .unit {
         font-size: 12px;
         color: #00ffff;
         font-weight: 500;
@@ -354,7 +379,7 @@ export default {
         font-weight: bold;
         font-family: "electronicFont";
       }
-      .unit { 
+      .unit {
         font-size: 12px;
         color: #00ffff;
         font-weight: 500;

src/views/screen/logistics/logisticsAssets.vue

@@ -246,14 +246,7 @@ export default {
       default: "0000",
     },
   },
-  watch:{
-    appOrg(newValue,oldValue){
-      this.show = false;
-      setTimeout(()=>{
-        this.show = true;
-      },0)
-    },
-  },
+
   data() {
     return {
       curIndex: 0,
@@ -360,7 +353,7 @@ export default {
       const day = String(this.currentTime.getDate());
       return `${year}年${month}月${day}日`;
     },
-   
+
   },
   created() {
     //楼宇各类资产占比
@@ -395,7 +388,7 @@ export default {
               }
             };
           });
- 
+
       this.lyTitle= {
         text: `{title|资产数量}\n{subtitle|${res.data.buildingAssetNum}}`,
         left: "22%",//对齐方式居中
@@ -418,7 +411,7 @@ export default {
               }
             }
       }
-          
+
         }
       });
     },
@@ -432,7 +425,7 @@ export default {
         }
       });
     },
-     
+
     //资产新增数量
     scrap() {
       scrap(this.$props.appOrg).then((res) => {
@@ -442,7 +435,7 @@ export default {
       });
     },
 
-      
+
     //资产报废数量
     dump() {
       dump(this.$props.appOrg).then((res) => {

src/views/screen/logistics/main.vue

@@ -1,9 +1,13 @@
 <template>
   <div class="main-data data-logistics">
-    <div class="main-area" v-if="active === 0">
+    <div class="main-area">
       <div class="left">
         <div class="left-cont" v-if="leftShow">
-          <div class="left-top bg">
+          <div class="left-top bg"
+           @click="showAssets"
+          @mouseover="showAssets"
+
+          >
             <div class="cont-title-area">
               <img
                 class="cont-title-bg"
@@ -13,22 +17,11 @@
               <div class="cont-title">后勤资产</div>
             </div>
             <div class="components-item bg3">
-              <logistics-assets :key="appOrg" @onClick="showAssets"></logistics-assets>
+              <logistics-assets :appOrg="appOrg" :key="appOrg"></logistics-assets>
+
             </div>
           </div>
-          <!-- <div class="left-bottom bg">
-            <div class="cont-title-area">
-              <img
-                class="cont-title-bg"
-                src="@/assets/images/main/cont_title_bg.png"
-                alt=""
-              />
-              <div class="cont-title">房产土地</div>
-            </div>
-            <div class="components-item">
-              <official-car :key="appOrg"></official-car>
-            </div>
-          </div> -->
+
         </div>
       </div>
       <div class="middle">
@@ -36,7 +29,7 @@
         <asset
           v-if="showMap"
           ref="asset"
-          height="900px"
+          height="920px"
           @mapClick="onMapClick"
         ></asset>
         <img src="@/assets/zhang/logistics/logistics.png" width="50" style="position: absolute;top: 125px;left: 20px;cursor: pointer">
@@ -147,529 +140,70 @@
               <div class="cont-title">房产土地</div>
             </div>
             <div class="components-item bg3">
-              <house-area :key="appOrg"></house-area>
-            </div>
-          </div>
-        </div>
-      </div>
-    </div>
-    <!-- 后勤资产 -->
-    <div class="main-area" v-else-if="active === 1">
-      <div class="left">
-        <div class="left-cont" v-if="leftShow">
-          <div
-            class="left-top bg2"
-            @click="showDialog(1)"
-            @mouseover="showDialog(1)"
-          >
-            <div class="cont-title-area">
-              <img
-                class="cont-title-bg"
-                src="@/assets/images/main/cont_title_bg.png"
-                alt=""
-              />
-              <div class="cont-title">后勤资产存量情况</div>
-            </div>
-            <div class="components-item bg3">
-              <assets-stock :key="appOrg"></assets-stock>
-            </div>
-          </div>
-          <div
-            class="left-bottom bg2"
-            @click="showDialog(2)"
-            @mouseover="showDialog(2)"
-          >
-            <div class="cont-title-area">
-              <img
-                class="cont-title-bg"
-                style="width: 404px"
-                src="@/assets/images/main/cont_title_max_bg.png"
-                alt=""
-              />
-              <div class="cont-title">后勤资产累计变化情况</div>
-            </div>
-            <div class="components-item bg3">
-              <assets-change :key="appOrg"></assets-change>
-            </div>
-          </div>
-        </div>
-      </div>
-      <div class="middle">
-        <province
-          v-if="showMap"
-          ref="province"
-          height="850px"
-          @mapClick="onMapClick"
-        ></province>
-        <img
-          v-if="showLocal"
-          class="build"
-          src="@/assets/images/build.png"
-          alt=""
-        />
-        <!-- 返回按钮 -->
-        <div class="bottom-left flex-row align-items-center">
-            <div class="left-item">
-              <el-cascader
-              v-model="curCompany"
-              :options="company"
-              @change="handleCompanyChange"
-              placeholder="单位"
-              :show-all-levels="false"
-            >
-              <template slot-scope="{ node, data }">
-                <div style="display: flex; align-items: center">
-                  <img
-                    v-if="data.label == '山西省公司(本部)'"
-                    src="../../../assets/images/main/tiaozhuanlouyu.png"
-                    style="width: 15px; margin-right: 10px"
-                  />
-                  <span
-                    v-else-if="data.value == '1A001' || data.value == '1A002' || data.value == '1A004' || data.value == '1A005'"
-                    style="
-                      display: inline-block;
-                      width: 10px;
-                      height: 10px;
-                      border-radius: 50%;
-                      margin-right: 10px;
-                      background: rgb(255, 180, 74);
-                    "
-                  ></span>
-                  <span
-                    v-else-if="data.value.length == 5 && data.value != '10001'"
-                    style="
-                      display: inline-block;
-                      width: 10px;
-                      height: 10px;
-                      border-radius: 50%;
-                      margin-right: 10px;
-                      background: rgb(74, 194, 29);
-                    "
-                  ></span>
-                  <span
-                    v-else-if="data.value.length == 7"
-                    style="
-                      display: inline-block;
-                      width: 10px;
-                      height: 10px;
-                      border-radius: 50%;
-                      margin-right: 10px;
-                      background: rgb(99, 235, 255);
-                    "
-                  ></span>
-                  <span>{{ data.label }}</span>
-                </div>
-                <!-- <div
-                    v-if="data.level == 2"
-                    style="width: 1.5vh;height: 1.5vh;background-color: red;border-radius: 60%;margin-top:10px;margin-left:10px;float:right"
-                  ></div> -->
-              </template>
-            </el-cascader>
-          </div>
-          <div class="office" disabled>办公区</div>
-        </div>
-        <main-data></main-data>
-      </div>
-      <div class="right">
-        <div class="right-cont" v-if="rightShow">
-          <div
-            class="right-top bg2"
-            @click="showDialog(3)"
-            @mouseover="showDialog(3)"
-          >
-            <div class="cont-title-area">
-              <img
-                class="cont-title-bg"
-                src="@/assets/images/main/cont_title_bg.png"
-                alt=""
-              />
-              <div class="cont-title">资产分类统计</div>
-            </div>
-            <div class="components-item bg3">
-              <assets-cate :key="appOrg"></assets-cate>
-            </div>
-          </div>
-          <div
-            class="right-bottom bg2"
-            @click="showDialog(4)"
-            @mouseover="showDialog(4)"
-          >
-            <div class="cont-title-area">
-              <img
-                class="cont-title-bg"
-                src="@/assets/images/main/cont_title_bg.png"
-                alt=""
-              />
-              <div class="cont-title">赋码贴签情况</div>
-            </div>
-            <div class="components-item bg3">
-              <code-bill></code-bill>
-            </div>
-          </div>
-        </div>
-      </div>
-    </div>
-
-    <!-- 工程项目  -->
-    <div class="main-area" v-else-if="active === 3">
-      <div class="left">
-        <div class="left-cont" v-if="leftShow">
-          <div class="left-top bg">
-            <div class="cont-title-area">
-              <img
-                class="cont-title-bg"
-                src="@/assets/images/main/cont_title_bg.png"
-                alt=""
-              />
-              <div class="cont-title">年度投资情况</div>
-            </div>
-            <div class="components-item">
-              <engineering-invest :key="appOrg"></engineering-invest>
-            </div>
-          </div>
-          <div
-            class="left-bottom bg2"
-            @click="showDialog(2)"
-            @mouseover="showDialog(2)"
-          >
-            <div class="cont-title-area">
-              <img
-                class="cont-title-bg"
-                src="@/assets/images/main/cont_title_bg.png"
-                alt=""
-              />
-              <div class="cont-title">项目建设进度</div>
-            </div>
-            <div class="components-item bg3">
-              <project-schedule :key="appOrg"></project-schedule>
-            </div>
-          </div>
-        </div>
-      </div>
-      <div class="middle">
-        <province
-          v-if="showMap"
-          ref="province"
-          height="850px"
-          @mapClick="onMapClick"
-        ></province>
-        <img
-          v-if="showLocal"
-          class="build"
-          src="@/assets/images/build.png"
-          alt=""
-        />
-        <!-- 返回按钮 -->
-        <div class="bottom-left flex-row align-items-center">
-            <div class="left-item">
-              <el-cascader
-              v-model="curCompany"
-              :options="company"
-              @change="handleCompanyChange"
-              placeholder="单位"
-              :show-all-levels="false"
-            >
-              <template slot-scope="{ node, data }">
-                <div style="display: flex; align-items: center">
-                  <img
-                    v-if="data.label == '山西省公司(本部)'"
-                    src="../../../assets/images/main/tiaozhuanlouyu.png"
-                    style="width: 15px; margin-right: 10px"
-                  />
-                  <span
-                    v-else-if="data.value == '1A001' || data.value == '1A002' || data.value == '1A004' || data.value == '1A005'"
-                    style="
-                      display: inline-block;
-                      width: 10px;
-                      height: 10px;
-                      border-radius: 50%;
-                      margin-right: 10px;
-                      background: rgb(255, 180, 74);
-                    "
-                  ></span>
-                  <span
-                    v-else-if="data.value.length == 5 && data.value != '10001'"
-                    style="
-                      display: inline-block;
-                      width: 10px;
-                      height: 10px;
-                      border-radius: 50%;
-                      margin-right: 10px;
-                      background: rgb(74, 194, 29);
-                    "
-                  ></span>
-                  <span
-                    v-else-if="data.value.length == 7"
-                    style="
-                      display: inline-block;
-                      width: 10px;
-                      height: 10px;
-                      border-radius: 50%;
-                      margin-right: 10px;
-                      background: rgb(99, 235, 255);
-                    "
-                  ></span>
-                  <span>{{ data.label }}</span>
-                </div>
-                <!-- <div
-                    v-if="data.level == 2"
-                    style="width: 1.5vh;height: 1.5vh;background-color: red;border-radius: 60%;margin-top:10px;margin-left:10px;float:right"
-                  ></div> -->
-              </template>
-            </el-cascader>
-          </div>
-          <div class="office" disabled>办公区</div>
-        </div>
-        <main-data></main-data>
-      </div>
-      <div class="right">
-        <div class="right-cont">
-          <div class="right-top bg">
-            <div class="cont-title-area">
-              <img
-                class="cont-title-bg"
-                src="@/assets/images/main/cont_title_bg.png"
-                alt=""
-              />
-              <div class="cont-title">项目分类统计</div>
-            </div>
-            <div class="components-item">
-              <project-category :key="appOrg"></project-category>
-            </div>
-          </div>
-          <div class="right-bottom bg">
-            <div class="cont-title-area">
-              <img
-                class="cont-title-bg"
-                src="@/assets/images/main/cont_title_bg.png"
-                alt=""
-              />
-              <div class="cont-title">项目建设情况</div>
-            </div>
-            <div class="components-item">
-              <project-construct :key="appOrg"></project-construct>
-            </div>
-          </div>
-        </div>
-      </div>
-    </div>
-
-    <div class="main-area" v-else-if="active === 2">
-      <div class="left">
-        <div class="left-cont">
-          <div class="left-top bg">
-            <div class="cont-title-area">
-              <img
-                class="cont-title-bg"
-                src="@/assets/images/main/cont_title_bg.png"
-                alt=""
-              />
-              <div class="cont-title">房产资源存量变化</div>
-            </div>
-            <div class="components-item">
-              <house-resource :key="appOrg"></house-resource>
-            </div>
-          </div>
-          <div class="left-bottom bg">
-            <div class="cont-title-area">
-              <img
-                class="cont-title-bg"
-                src="@/assets/images/main/cont_title_bg.png"
-                alt=""
-              />
-              <div class="cont-title">房产分类统计</div>
-            </div>
-            <div class="components-item">
-              <house-cate :key="appOrg"></house-cate>
-            </div>
-          </div>
-        </div>
-      </div>
-      <div class="middle">
-        <province
-          v-if="showMap"
-          ref="province"
-          height="850px"
-          @mapClick="onMapClick"
-        ></province>
-        <img
-          v-if="showLocal"
-          class="build"
-          src="@/assets/images/build.png"
-          alt=""
-        />
-        <!-- 返回按钮 -->
-        <div class="bottom-left flex-row align-items-center">
-            <div class="left-item">
-              <el-cascader
-              v-model="curCompany"
-              :options="company"
-              @change="handleCompanyChange"
-              placeholder="单位"
-              :show-all-levels="false"
-            >
-              <template slot-scope="{ node, data }">
-                <div style="display: flex; align-items: center">
-                  <img
-                    v-if="data.label == '山西省公司(本部)'"
-                    src="../../../assets/images/main/tiaozhuanlouyu.png"
-                    style="width: 15px; margin-right: 10px"
-                  />
-                  <span
-                    v-else-if="data.value == '1A001' || data.value == '1A002' || data.value == '1A004' || data.value == '1A005'"
-                    style="
-                      display: inline-block;
-                      width: 10px;
-                      height: 10px;
-                      border-radius: 50%;
-                      margin-right: 10px;
-                      background: rgb(255, 180, 74);
-                    "
-                  ></span>
-                  <span
-                    v-else-if="data.value.length == 5 && data.value != '10001'"
-                    style="
-                      display: inline-block;
-                      width: 10px;
-                      height: 10px;
-                      border-radius: 50%;
-                      margin-right: 10px;
-                      background: rgb(74, 194, 29);
-                    "
-                  ></span>
-                  <span
-                    v-else-if="data.value.length == 7"
-                    style="
-                      display: inline-block;
-                      width: 10px;
-                      height: 10px;
-                      border-radius: 50%;
-                      margin-right: 10px;
-                      background: rgb(99, 235, 255);
-                    "
-                  ></span>
-                  <span>{{ data.label }}</span>
-                </div>
-                <!-- <div
-                    v-if="data.level == 2"
-                    style="width: 1.5vh;height: 1.5vh;background-color: red;border-radius: 60%;margin-top:10px;margin-left:10px;float:right"
-                  ></div> -->
-              </template>
-            </el-cascader>
-          </div>
-          <div class="office" disabled>办公区</div>
-        </div>
-        <main-data></main-data>
-      </div>
-      <div class="right">
-        <div class="right-cont">
-          <div class="right-top bg">
-            <div class="cont-title-area">
-              <img
-                class="cont-title-bg"
-                src="@/assets/images/main/cont_title_bg.png"
-                alt=""
-              />
-              <div class="cont-title">房产土地使用情况</div>
-            </div>
-            <div class="components-item">
-              <area-resource-cate :key="appOrg"></area-resource-cate>
-            </div>
-          </div>
-          <div class="right-bottom bg">
-            <div class="cont-title-area">
-              <img
-                class="cont-title-bg"
-                src="@/assets/images/main/cont_title_bg.png"
-                alt=""
-              />
-              <div class="cont-title">建筑面积情况</div>
-            </div>
-            <div class="components-item">
-              <building-area :key="appOrg"></building-area>
+              <house-area :appOrg="appOrg"></house-area>
             </div>
           </div>
         </div>
       </div>
     </div>
 
-    <!-- 公务用车 -->
-    <div class="main-area" v-else-if="active === 4">
-      <div class="left">
-        <div class="left-cont" v-if="leftShow">
-          <div class="left-top bg">
-            <car-resource></car-resource>
-          </div>
-          <div class="left-bottom bg">
-            <car-stock></car-stock>
-          </div>
-        </div>
-      </div>
-      <div class="middle">
-        <province ref="province" @mapClick="onMapClick"></province>
-        <main-data></main-data>
-      </div>
-      <div class="right">
-        <div class="right-cont" v-if="rightShow">
-          <div class="right-top bg">
-            <car-category></car-category>
-          </div>
-          <div class="right-bottom bg">
-            <car-terminal></car-terminal>
-          </div>
-        </div>
-      </div>
-    </div>
 
-    <menu-bar
+    <!-- <menu-bar
       :active="active"
       @showModal="changeActive"
       @onBack="onBack"
       @showTabs="showTabs"
       :curDeep="curDeep"
-    ></menu-bar>
+    ></menu-bar> -->
 
     <!--弹出层-->
     <div
       :class="dialogType < 3 ? 'dialog' : 'dialog-r'"
       v-if="dialogShow"
       @click="closeDialog"
+       :appOrg="appOrg"
     >
-      <assets-stock-dialog
+      <!-- <assets-stock-dialog
         v-if="dialogType === 1 && active === 1"
         @closeDialog="closeDialog"
+         :appOrg="appOrg"
       ></assets-stock-dialog>
 
       <assets-change-dialog
         v-if="dialogType === 2 && active === 1"
         @closeDialog="closeDialog"
+         :appOrg="appOrg"
       ></assets-change-dialog>
 
       <assets-cate-dialog
         v-if="dialogType === 3 && active === 1"
         @closeDialog="closeDialog"
+         :appOrg="appOrg"
       ></assets-cate-dialog>
 
       <code-bill-dialog
         v-if="dialogType === 4 && active === 1"
         @closeDialog="closeDialog"
+         :appOrg="appOrg"
       ></code-bill-dialog>
 
       <project-schedule-dialog
         v-if="dialogType === 2 && active === 3"
         @closeDialog="closeDialog"
-      ></project-schedule-dialog>
+         :appOrg="appOrg"
+      ></project-schedule-dialog> -->
 
       <code-bill-dialog
         v-if="dialogType === 1 && active === 0"
         @closeDialog="closeDialog"
+          :appOrg="appOrg"
       ></code-bill-dialog>
     </div>
   </div>
 </template>
 
 <script>
-import LogisticsAssets from "./logisticsAssets.vue";
+import LogisticsAssets from "@/views/screen/logistics/logisticsAssets.vue";
 import HouseArea from "./houseArea.vue";
 import ProjectItem from "./projectItem.vue";
 import OfficialCar from "./officialCar.vue";

src/views/screen/main.vue

@@ -127,18 +127,9 @@ export default {
       const year = this.currentTime.getFullYear();
       const month = String(this.currentTime.getMonth() + 1).padStart(2, '0');
       const day = String(this.currentTime.getDate()).padStart(2, '0');
-      const weekdays = ['星期日', '星期一', '星期二', '星期三', '星期四', '星期五', '星期六'];
-      const weekday = weekdays[this.currentTime.getDay()];
-      const hours = String(this.currentTime.getHours()).padStart(2, '0');
-      const minutes = String(this.currentTime.getMinutes()).padStart(2, '0');
-      const seconds = String(this.currentTime.getSeconds()).padStart(2, '0');
-
       return `${year}-${month}-${day}`;
     },
     timeDay(){
-      const year = this.currentTime.getFullYear();
-      const month = String(this.currentTime.getMonth() + 1).padStart(2, '0');
-      const day = String(this.currentTime.getDate()).padStart(2, '0');
       const weekdays = ['星期日', '星期一', '星期二', '星期三', '星期四', '星期五', '星期六'];
       const weekday = weekdays[this.currentTime.getDay()];
       const hours = String(this.currentTime.getHours()).padStart(2, '0');
@@ -154,7 +145,7 @@ export default {
   },
   created() {
     document.documentElement.requestFullscreen();
-   
+
   },
   methods: {
     fullScreen(){

src/views/screen/service/main.vue

@@ -63,7 +63,7 @@
         v-if="showMap"
         ref="province"
         @mapClick="onMapClick"
-        height="950px"
+        height="920px"
       ></province>
       <img
         v-if="showLocal"
@@ -383,6 +383,7 @@ export default {
         this.showMap = true;
         this.showLocal = false;
         this.curCompany = e.curCompany;
+
       }
       //判断是否点击了子单位
       if (e.curCompany && e.curCompany.length > 0) {