From 9f2f00f98ec5b8f862f52883d1e25907d31a34eb Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9B=B9=E5=89=8D=E6=98=8E?= <909355014@qq.com>
Date: Thu, 21 Jul 2022 00:33:21 +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/config/route.js                           |   6 +-
 src/style/fix.scss                            |   4 +
 .../home/widgets/components/eventlist.vue     | 194 ++++++++++--------
 src/views/home/widgets/components/ticket.vue  | 140 +++++++------
 src/views/home/widgets/index.vue              |   2 +-
 src/views/login/components/passwordForm.vue   |   4 +-
 6 files changed, 181 insertions(+), 169 deletions(-)

diff --git a/src/config/route.js b/src/config/route.js
index 5f60b9b9..ee873e32 100644
--- a/src/config/route.js
+++ b/src/config/route.js
@@ -194,19 +194,17 @@ const routes = [
         "meta": {
           "title": "我创建的",
           "icon": "el-icon-folder-add",
-          "perms": ["ownerwork"]
         },
         "component": "wf/ownerwork"
       }
       ,
       
       {
-        "name": "duyt",
+        "name": "duty",
         "path": "/wf/dutywork",
         "meta": {
           "title": "待办工单",
           "icon": "el-icon-folder-opened",
-          "perms": ["duyt"]
         },
         "component": "wf/dutywork"
       },
@@ -216,7 +214,6 @@ const routes = [
         "meta": {
           "title": "我处理的",
           "icon": "el-icon-expand",
-          "perms": ["worked"]
         },
         "component": "wf/worked"
       },
@@ -226,7 +223,6 @@ const routes = [
         "meta": {
           "title": "抄送我的",
           "icon": "el-icon-edit-pen",
-          "perms": ["ccwork"]
         },
         "component": "wf/ccwork"
       },
diff --git a/src/style/fix.scss b/src/style/fix.scss
index 7fa75652..9ce86e94 100644
--- a/src/style/fix.scss
+++ b/src/style/fix.scss
@@ -279,6 +279,10 @@ body .tox-tinymce-aux {
 	margin-bottom: 16px;
 }
 
+.el-col .el-card {
+    margin-bottom: 8px;
+}
+
 .el-card,
 .el-message {
 	border-radius: 0px;
diff --git a/src/views/home/widgets/components/eventlist.vue b/src/views/home/widgets/components/eventlist.vue
index 4e7565c7..ae8ffd88 100644
--- a/src/views/home/widgets/components/eventlist.vue
+++ b/src/views/home/widgets/components/eventlist.vue
@@ -1,116 +1,117 @@
 <template>
-  <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-row :gutter="6">
+    <el-col :md="4" :sm="24">
+      <el-card shadow="hover">
+        <template #header>
+          <div class="card-header">
+            <span>工单待办</span>
+          </div>
+        </template>
+        <div class="card-body">
+          <div v-for="item in dutyAgg" :key="item.workflow">
               <el-badge :value="item.count" class="item">
                 <el-button
                   icon="el-icon-document-copy"
                   type="primary"
                   size="small"
+                  @click="toTicket"
                 ></el-button>
               </el-badge>
-            </div>
-            <div style="margin: 0px 20px 12px 40px">
-              <span>{{ item.workflow__name }}</span>
+              <div style="font-size:12px">{{ item.workflow__name }}</div>
             </div>
           </div>
-        </div>
       </el-card>
     </el-col>
-    <el-col :md="10" :sm="24">
-      <el-card shadow="hover" header="今日事件">
+    <el-col :md="12" :sm="24">
+      <el-card shadow="hover">
         <template #header>
-      <div class="card-header">
-        <span>今日事件</span>
-        <el-button @click="moreEvent" type="primary" text>更多</el-button>
-      </div>
-    </template>
-          <scTable
-            ref="table"
-            :apiObj="apiObj"
-            :params="params"
-            row-key="id"
-            fit
-            stripe
-            hideDo
-          >
-            <el-table-column
-              label="#"
-              type="index"
-              width="50"
-            ></el-table-column>
-            <el-table-column label="事件种类">
-              <template #default="scope">
-                <el-span
-                  v-for="item in scope.row.cates_"
-                  :key="item.id"
-                  :label="item.name"
-                  :value="item.id"
-                  >{{ item.name }}</el-span
-                >
-              </template>
-            </el-table-column>
-            <el-table-column
-              label="发生区域"
-              prop="area_.name"
-            ></el-table-column>
-            <el-table-column label="当事人" prop="employee_.name">
-              <template #default="scope">
-                <span
-                  v-if="scope.row.employee && scope.row.obj_cate == 'people'"
-                  >{{ scope.row.employee_.name }}</span
-                >
-                <span v-else>未知人员</span>
-              </template>
-            </el-table-column>
+          <div class="card-header">
+            <span>今日事件</span>
+            <el-button @click="moreEvent" type="primary" text>更多</el-button>
+          </div>
+        </template>
+        <div style="height:340px">
+        <scTable
+          ref="table"
+          :apiObj="apiObj"
+          :params="params"
+          row-key="id"
+          fit
+          stripe
+          hideDo
+        >
+          <el-table-column label="#" type="index" width="50"></el-table-column>
+          <el-table-column label="事件种类">
+            <template #default="scope">
+              <el-span
+                v-for="item in scope.row.cates_"
+                :key="item.id"
+                :label="item.name"
+                :value="item.id"
+                >{{ item.name }}</el-span
+              >
+            </template>
+          </el-table-column>
+          <el-table-column label="发生区域" prop="area_.name"></el-table-column>
+          <el-table-column label="当事人" prop="employee_.name">
+            <template #default="scope">
+              <span
+                v-if="scope.row.employee && scope.row.obj_cate == 'people'"
+                >{{ scope.row.employee_.name }}</span
+              >
+              <span v-else>未知人员</span>
+            </template>
+          </el-table-column>
 
-            <el-table-column label="人员类型" prop="employee_.type">
-              <template #default="scope">
+          <el-table-column label="人员类型" prop="employee_.type">
+            <template #default="scope">
+              <span v-if="scope.row.employee && scope.row.obj_cate == 'people'">
                 <span
-                  v-if="scope.row.employee && scope.row.obj_cate == 'people'"
+                  v-if="
+                    scope.row.employee_.type != '' &&
+                    scope.row.employee_.type == 'employee'
+                  "
+                  >企业员工</span
                 >
-                  <span
-                    v-if="
-                      scope.row.employee_.type != '' &&
-                      scope.row.employee_.type == 'employee'
-                    "
-                    >企业员工</span
-                  >
-                  <span
-                    v-if="
-                      scope.row.employee_.type != '' &&
-                      scope.row.employee_.type == 'remployee'
-                    "
-                    >相关方</span
-                  >
-                  <span
-                    v-if="
-                      scope.row.employee_.type != '' &&
-                      scope.row.employee_.type == 'visitor'
-                    "
-                    >访客</span
-                  >
-                </span>
-              </template>
-            </el-table-column>
-            <el-table-column
-              label="发生时间"
-              prop="create_time"
-            ></el-table-column>
+                <span
+                  v-if="
+                    scope.row.employee_.type != '' &&
+                    scope.row.employee_.type == 'remployee'
+                  "
+                  >相关方</span
+                >
+                <span
+                  v-if="
+                    scope.row.employee_.type != '' &&
+                    scope.row.employee_.type == 'visitor'
+                  "
+                  >访客</span
+                >
+              </span>
+            </template>
+          </el-table-column>
+          <el-table-column
+            label="发生时间"
+            prop="create_time"
+          ></el-table-column>
 
-            <!-- <el-table-column
+          <!-- <el-table-column
               label="处理人"
               prop="handle_user_name"
             ></el-table-column> -->
-          </scTable>
+        </scTable>
+        </div>
+
       </el-card>
     </el-col>
     <el-col :md="8" :sm="24">
-      <el-card shadow="hover" header="今日事件统计">
-        <scEcharts height="360px" :option="option3"></scEcharts>
+      <el-card shadow="hover">
+        <template #header>
+          <div class="card-header">
+            <span>今日事件统计</span>
+          </div>
+        </template>
+        <scEcharts height="340px" :option="option3"></scEcharts>
       </el-card>
     </el-col>
   </el-row>
@@ -185,6 +186,12 @@ export default {
         query: {},
       });
     },
+    toTicket() {
+      this.$router.push({
+        name: "duty",
+        query: {},
+      });
+    },
     //工单待办
     async getdutyAgg() {
       let res = await this.$API.wf.ticket.dutyAgg.req({ page: 0 });
@@ -252,5 +259,12 @@ export default {
   display: flex;
   justify-content: space-between;
   align-items: center;
+  height:24px;
+}
+.card-body {
+  display: flex;
+  flex-wrap: wrap;
+  justify-content: space-around;
+  height:340px;
 }
 </style>
diff --git a/src/views/home/widgets/components/ticket.vue b/src/views/home/widgets/components/ticket.vue
index ff6281d2..b7ce9d1f 100644
--- a/src/views/home/widgets/components/ticket.vue
+++ b/src/views/home/widgets/components/ticket.vue
@@ -1,78 +1,61 @@
 <template>
-  <el-row :gutter="10">
+  <el-row :gutter="6">
     <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">
-              <el-button
-                icon="el-icon-document-copy"
-                type="primary"
-                size="small"
-              ></el-button>
-            </el-badge>
+      <el-card shadow="hover">
+        <template #header>
+          <div class="card-header">
+            <span>进行项目</span>
           </div>
-          <div style="margin: 0px 20px 12px 40px">
-            <span>作业</span>
+        </template>
+        <div class="card-body">
+            <div>
+              <el-badge :value="operationnumber" class="item">
+                <el-button
+                  icon="el-icon-document-copy"
+                  type="primary"
+                  size="small"
+                ></el-button>
+              </el-badge>
+              <div style="font-size:16px">危险作业</div>
+            </div>
+            <div>
+              <el-badge :value="rpjnumber" class="item">
+                <el-button
+                  icon="el-icon-document-copy"
+                  type="warning"
+                  size="small"
+                ></el-button>
+              </el-badge>
+              <div style="font-size:16px">相关方项目</div>
+            </div>
+            <div>
+              <el-badge :value="visitnumber" class="item">
+                <el-button
+                  icon="el-icon-document-copy"
+                  type="success"
+                  size="small"
+                ></el-button>
+              </el-badge>
+              <div style="font-size:16px">来访项目</div>
+            </div>
           </div>
-        </div>
-        <div style="width:33%;float:left">
-          <div style="margin: 0px 20px 12px 40px;">
-            <el-badge :value="rpjnumber" class="item">
-              <el-button
-                icon="el-icon-document-copy"
-               type="warning"
-                size="small"
-              ></el-button>
-            </el-badge>
-          </div>
-          <div style="margin: 0px 20px 12px 40px">
-            <span>相关方项目</span>
-          </div>
-        </div>
-        <div style="width:33%;float:left">
-          <div style="margin: 0px 20px 12px 40px;">
-            <el-badge :value="visitnumber" class="item">
-              <el-button
-                icon="el-icon-document-copy"
-                type="success"
-                size="small"
-              ></el-button>
-            </el-badge>
-          </div>
-          <div style="margin: 0px 20px 12px 40px">
-            <span>访客项目</span>
-          </div>
-        </div>
       </el-card>
     </el-col>
     <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="card-header">
+            <span>人员统计</span>
+            <el-switch
+              v-model="ep_count_type"
+              active-text="在厂"
+              inactive-text="有卡"
+              @change="countTypeChange"
+            />
+          </div>
+        </template>
         <div class="screen-cockpits">
           <div class="cockpit-count">
-            <!-- <div class="divider"></div>
-            <div class="simple-title">
-              <div class="countTypeWrap">
-                <span
-                  :class="{ activeCount: countIndex === '1' }"
-                  @click="countINdexChange('1')"
-                  >有卡</span
-                >
-                <el-divider direction="vertical"></el-divider>
-                <span
-                  :class="{ activeCount: countIndex === '2' }"
-                  @click="countINdexChange('2')"
-                  >在厂</span
-                >
-              </div>
-            </div> -->
             <div class="count-list">
               <div class="count-list-item">
                 <div class="item-img item-img2"></div>
@@ -118,6 +101,7 @@ export default {
     return {
       dutyAgg: [],
       //数据统计
+      ep_count_type: true,
       userCount: {
         total: 0,
         count_employee: 0, //内部员工
@@ -125,8 +109,8 @@ export default {
         count_visitor: 0, //相关方
       },
       operationnumber: null,
-      rpjnumber:null,
-      visitnumber:null
+      rpjnumber: null,
+      visitnumber: null,
     };
   },
   created() {
@@ -175,7 +159,7 @@ export default {
           this.operationnumber = res.count;
         });
     },
-     //相关方入场项目
+    //相关方入场项目
     getRpj() {
       this.$API.rpm.rpj.list
         .req({ page: 1, page_size: 1, state: 40 })
@@ -183,7 +167,7 @@ export default {
           this.rpjnumber = res.count;
         });
     },
-     //访客
+    //访客
     getVisit() {
       this.$API.vm.visit.list
         .req({ page: 1, page_size: 1, state: 40 })
@@ -276,12 +260,14 @@ export default {
   margin: 40px 0 20px 0;
 }
 .screen-cockpits {
-  margin-top: -15px;
+  // margin-top: -15px;
   .cockpit-count {
     .count-list {
       display: flex;
-      flex-wrap: wrap;
-    margin-left: 30px;
+      // flex-wrap: wrap;
+      justify-content: space-around;
+      align-items: center;
+      height: 80px;
       .count-list-item {
         width: 33.3333%;
         height: 50%;
@@ -486,4 +472,16 @@ export default {
     }
   }
 }
+.card-header {
+  display: flex;
+  justify-content: space-between;
+  align-items: center;
+  height:24px;
+}
+.card-body {
+  display: flex;
+  justify-content: space-around;
+  align-items: center;
+  height:80px;
+}
 </style>
diff --git a/src/views/home/widgets/index.vue b/src/views/home/widgets/index.vue
index d8f1bf5a..ad8ed038 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="10">
+					<el-row :gutter="6">
 						<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 }">
diff --git a/src/views/login/components/passwordForm.vue b/src/views/login/components/passwordForm.vue
index 2e2dd9ce..a0682957 100644
--- a/src/views/login/components/passwordForm.vue
+++ b/src/views/login/components/passwordForm.vue
@@ -13,12 +13,12 @@
         clearable
         :placeholder="$t('login.userPlaceholder')"
       >
-        <template #append>
+        <!-- <template #append>
           <el-select v-model="userType" style="width: 130px">
             <el-option :label="$t('login.admin')" value="admin"></el-option>
             <el-option :label="$t('login.user')" value="user"></el-option>
           </el-select>
-        </template>
+        </template> -->
       </el-input>
     </el-form-item>
     <el-form-item prop="password">