From 5b9b8b72dc11f923ed824a355769061e63802d85 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9B=B9=E5=89=8D=E6=98=8E?= <909355014@qq.com>
Date: Mon, 18 Jul 2022 17:08:13 +0800
Subject: [PATCH] =?UTF-8?q?=E9=A6=96=E9=A1=B5=E6=A0=B7=E5=BC=8F=E8=B0=83?=
 =?UTF-8?q?=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/am/audio.vue                        |  15 +--
 src/views/am/blt.vue                          |   2 +-
 src/views/am/monitor.vue                      |   7 +-
 .../home/widgets/components/eventlist.vue     | 111 +++++++++---------
 src/views/home/widgets/components/ticket.vue  |  23 ++--
 src/views/home/widgets/index.vue              |   4 +-
 src/views/ops/menu.vue                        |   2 +-
 7 files changed, 82 insertions(+), 82 deletions(-)

diff --git a/src/views/am/audio.vue b/src/views/am/audio.vue
index fc5dca52..390e2b14 100644
--- a/src/views/am/audio.vue
+++ b/src/views/am/audio.vue
@@ -39,7 +39,7 @@
           prop="name"
           min-width="150"
         ></el-table-column>
-        <el-table-column label="音量" prop="extra" min-width="100">
+        <el-table-column label="音量" prop="extra" min-width="40">
           <template #default="scope">
             <span v-if="scope.row.extra && scope.row.extra.player">{{
               scope.row.extra.player.EnvVolume
@@ -51,7 +51,7 @@
             <span v-if="scope.row.extra">{{ scope.row.extra.ip }}</span>
           </template>
         </el-table-column>
-        <el-table-column label="在线状态" prop="extra" min-width="90">
+        <el-table-column label="在线状态" prop="extra" min-width="40">
           <template #default="scope">
             <span v-if="scope.row.extra">
               <el-tag v-if="scope.row.extra.online">在线</el-tag>
@@ -62,15 +62,10 @@
         <!--<el-table-column label="位置" prop="count_people" min-width="90"></el-table-column>-->
         <el-table-column
           label="所在区域"
-          prop="create_time"
-          min-width="180"
+          prop="my_info.area_name"
+          min-width="100"
         ></el-table-column>
-        <el-table-column
-          label="覆盖区域"
-          prop="create_time"
-          width="160"
-        ></el-table-column>
-        <el-table-column label="操作" fixed="right" align="center" width="160">
+        <el-table-column label="操作" fixed="right" align="center" width="180">
           <template #default="scope">
             <el-button-group>
               <el-button
diff --git a/src/views/am/blt.vue b/src/views/am/blt.vue
index 32b75968..4dc4c6a1 100644
--- a/src/views/am/blt.vue
+++ b/src/views/am/blt.vue
@@ -64,7 +64,7 @@
             <span v-if="scope.row.employee">{{scope.row.employee_.name}}</span>
           </template>
         </el-table-column>
-        <el-table-column label="操作" fixed="right" align="center" width="160">
+        <el-table-column label="操作" fixed="right" align="center" width="180">
           <template #default="scope">
             <el-button-group>
               <el-button
diff --git a/src/views/am/monitor.vue b/src/views/am/monitor.vue
index 44b1b84f..1c29351e 100644
--- a/src/views/am/monitor.vue
+++ b/src/views/am/monitor.vue
@@ -71,12 +71,17 @@
             <span v-else><el-tag type="success">在线</el-tag></span>
           </template>
         </el-table-column>
+        <el-table-column
+          label="所在区域"
+          prop="my_info.area_name"
+          min-width="100"
+        ></el-table-column>
         <el-table-column
           label="创建时间"
           prop="createTime"
           min-width="160"
         ></el-table-column>
-        <el-table-column label="操作" fixed="right" align="center" width="260">
+        <el-table-column label="操作" fixed="right" align="center" width="180">
           <template #default="scope">
             <el-button-group>
               <el-button
diff --git a/src/views/home/widgets/components/eventlist.vue b/src/views/home/widgets/components/eventlist.vue
index 7b31816e..4e7565c7 100644
--- a/src/views/home/widgets/components/eventlist.vue
+++ b/src/views/home/widgets/components/eventlist.vue
@@ -1,32 +1,33 @@
 <template>
-  <el-row>
-     <el-col :md="4" :sm="24" style="padding-left: 7.5px;padding-right: 7.5px">
-      <el-card shadow="hover" style="height:438px;" header="工单待办">
+  <el-row :gutter="10">
+    <el-col :md="6" :sm="24">
+      <el-card shadow="hover" style="height: 360px" header="工单待办">
         <div class="welcome" v-for="item in dutyAgg" :key="item.workflow">
-           <div style="width:33%;float:left">
-          <div style="margin: 0px 20px 12px 40px;">
-            <el-badge :value="item.count" class="item">
-              <el-button 
-                icon="el-icon-document-copy"
-                type="primary"
-                size="small"
-              ></el-button>
-              
-            </el-badge>
-          </div>
-          <div style="margin: 0px 20px 12px 40px">
-            <span>{{item.workflow__name}}</span>
+          <div style="width: 33%; float: left">
+            <div style="margin: 0px 20px 12px 40px">
+              <el-badge :value="item.count" class="item">
+                <el-button
+                  icon="el-icon-document-copy"
+                  type="primary"
+                  size="small"
+                ></el-button>
+              </el-badge>
+            </div>
+            <div style="margin: 0px 20px 12px 40px">
+              <span>{{ item.workflow__name }}</span>
+            </div>
           </div>
         </div>
-      
-       </div>
       </el-card>
     </el-col>
-    <el-col :md="10" :sm="24" style="padding-left: 7.5px;padding-right: 7.5px;
-   ">
+    <el-col :md="10" :sm="24">
       <el-card shadow="hover" header="今日事件">
-        <el-button style="float: right; padding: 3px;margin-top: -44px;" link @click="moreEvent">更多</el-button>
-        <div class="welcome">
+        <template #header>
+      <div class="card-header">
+        <span>今日事件</span>
+        <el-button @click="moreEvent" type="primary" text>更多</el-button>
+      </div>
+    </template>
           <scTable
             ref="table"
             :apiObj="apiObj"
@@ -34,8 +35,7 @@
             row-key="id"
             fit
             stripe
-              hideDo
-             
+            hideDo
           >
             <el-table-column
               label="#"
@@ -101,24 +101,16 @@
               prop="create_time"
             ></el-table-column>
 
-            <el-table-column
+            <!-- <el-table-column
               label="处理人"
               prop="handle_user_name"
-            ></el-table-column>
-
-          
+            ></el-table-column> -->
           </scTable>
-        </div>
       </el-card>
     </el-col>
-    <el-col :md="10" :sm="24" style="
-    padding-left: 7.5px;">
-      <el-card header="今日事件统计">
-        <scEcharts
-          height="360px"
-          :option="option3"
-         
-        ></scEcharts>
+    <el-col :md="8" :sm="24">
+      <el-card shadow="hover" header="今日事件统计">
+        <scEcharts height="360px" :option="option3"></scEcharts>
       </el-card>
     </el-col>
   </el-row>
@@ -136,33 +128,34 @@ export default {
   },
   data() {
     return {
-      dutyAgg:[],
+      dutyAgg: [],
       params: {
         page: 1,
         page_size: 20,
-        start_create: ""
+        start_create: "",
       },
       apiObj: null,
       postOptions: [],
-      option3:null,
-        operationnumber: null,
-      rpjnumber:null,
-      visitnumber:null
+      option3: null,
+      operationnumber: null,
+      rpjnumber: null,
+      visitnumber: null,
     };
   },
   created() {
-    var craeteTime=this.$TOOL.dateFormat(
+    var craeteTime = this.$TOOL.dateFormat(
       new Date().toLocaleDateString(),
       "yyyy-MM-dd"
     );
-    
 
     this.postOptions = [];
-    this.$API.ecm.event.cateAgg.req({ completed: false,start_create:craeteTime }).then((res) => {
-      res.details.forEach((itemI, indexI) => {
-        this.postOptions.push({ value: itemI.count, name: itemI.cate__name });
+    this.$API.ecm.event.cateAgg
+      .req({ completed: false, start_create: craeteTime })
+      .then((res) => {
+        res.details.forEach((itemI, indexI) => {
+          this.postOptions.push({ value: itemI.count, name: itemI.cate__name });
+        });
       });
-    });
     this.option3 = {
       title: {},
       tooltip: {
@@ -182,24 +175,21 @@ export default {
 
     this.params.start_create = craeteTime;
     this.apiObj = this.$API.ecm.event.list;
-     this.getdutyAgg();
+    this.getdutyAgg();
   },
 
   methods: {
-    moreEvent(){
-        this.$router.push({
-            name: "event",
-            query: {
-              
-            },
-          });
+    moreEvent() {
+      this.$router.push({
+        name: "event",
+        query: {},
+      });
     },
     //工单待办
     async getdutyAgg() {
       let res = await this.$API.wf.ticket.dutyAgg.req({ page: 0 });
       this.dutyAgg = res.details;
     },
-    
   },
 };
 </script>
@@ -258,4 +248,9 @@ export default {
   text-align: center;
   margin: 40px 0 20px 0;
 }
+.card-header {
+  display: flex;
+  justify-content: space-between;
+  align-items: center;
+}
 </style>
diff --git a/src/views/home/widgets/components/ticket.vue b/src/views/home/widgets/components/ticket.vue
index 8ba9a5d4..ff6281d2 100644
--- a/src/views/home/widgets/components/ticket.vue
+++ b/src/views/home/widgets/components/ticket.vue
@@ -1,8 +1,7 @@
 <template>
-  <el-row>
-   
-    <el-col :md="12" :sm="24" style="padding-right: 7.5px; padding-left: 7.5px">
-      <el-card header="进行项目">
+  <el-row :gutter="10">
+    <el-col :md="12" :sm="24">
+      <el-card shadow="hover" header="进行项目">
         <div style="width:33%;float:left">
           <div style="margin: 0px 20px 12px 40px;">
             <el-badge :value="operationnumber" class="item">
@@ -47,13 +46,19 @@
         </div>
       </el-card>
     </el-col>
-    <el-col :md="12" :sm="24" style="padding-left: 7.5px">
-      <el-card>
+    <el-col :md="12" :sm="24">
+      <el-card shadow="hover">
+        <template #header>
+      <div class="card-header">
+        <span>人员统计</span>
+        <el-button class="button" text>在厂</el-button>
+        <el-button class="button" text>有卡</el-button>
+      </div>
+    </template>
         <div class="screen-cockpits">
           <div class="cockpit-count">
-            <div class="divider"></div>
+            <!-- <div class="divider"></div>
             <div class="simple-title">
-              <span>人员统计</span>
               <div class="countTypeWrap">
                 <span
                   :class="{ activeCount: countIndex === '1' }"
@@ -67,7 +72,7 @@
                   >在厂</span
                 >
               </div>
-            </div>
+            </div> -->
             <div class="count-list">
               <div class="count-list-item">
                 <div class="item-img item-img2"></div>
diff --git a/src/views/home/widgets/index.vue b/src/views/home/widgets/index.vue
index 5e7d81bd..d8f1bf5a 100644
--- a/src/views/home/widgets/index.vue
+++ b/src/views/home/widgets/index.vue
@@ -13,7 +13,7 @@
 					<div v-if="nowCompsList.length<=0" class="no-widgets">
 						<el-empty image="img/no-widgets.svg" description="没有部件啦" :image-size="280"></el-empty>
 					</div>
-					<el-row :gutter="15">
+					<el-row :gutter="10">
 						<el-col v-for="(item, index) in grid.layout" v-bind:key="index" :md="item" :xs="24">
 							<draggable v-model="grid.copmsList[index]" animation="200" handle=".customize-overlay" group="people" item-key="com" dragClass="aaaaa" force-fallback fallbackOnBody class="draggable-box">
 								<template #item="{ element }">
@@ -193,7 +193,7 @@
 
 <style scoped lang="scss">
 	.widgets-home {display: flex;flex-direction: row;flex: 1;height: 100%;}
-	.widgets-content {flex: 1;overflow: auto;overflow-x:hidden;padding:15px;}
+	.widgets-content {flex: 1;overflow: auto;overflow-x:hidden;padding:8px;}
 	.widgets-aside {width: 360px;background: #fff;box-shadow: 0 0 10px rgba(0,0,0,.1);position: relative;overflow: auto;}
 	.widgets-aside-title {font-size: 14px;display: flex;align-items: center;justify-content: center;}
 	.widgets-aside-title i {margin-right: 10px;font-size: 18px;}
diff --git a/src/views/ops/menu.vue b/src/views/ops/menu.vue
index 6e1ed341..224b490f 100644
--- a/src/views/ops/menu.vue
+++ b/src/views/ops/menu.vue
@@ -223,7 +223,7 @@ export default {
     //编辑
     editMenu(row) {
       this.type = "edit";
-      this.addForm = row;
+      this.addForm = Object.assign({}, row);
       this.limitedVisible = true;
     },