首页样式调整

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"
       },

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;

src/views/home/widgets/components/eventlist.vue

@@ -1,33 +1,36 @@
 <template>
-  <el-row :gutter="10">
+  <el-row :gutter="6">
-    <el-col :md="6" :sm="24">
+    <el-col :md="4" :sm="24">
-      <el-card shadow="hover" style="height: 360px" header="工单待办">
+      <el-card shadow="hover">
-        <div class="welcome" v-for="item in dutyAgg" :key="item.workflow">
+        <template #header>
-          <div style="width: 33%; float: left">
+          <div class="card-header">
-            <div style="margin: 0px 20px 12px 40px">
+            <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="font-size:12px">{{ item.workflow__name }}</div>
-            <div style="margin: 0px 20px 12px 40px">
-              <span>{{ item.workflow__name }}</span>
-            </div>
             </div>
           </div>
       </el-card>
     </el-col>
-    <el-col :md="10" :sm="24">
+    <el-col :md="12" :sm="24">
-      <el-card shadow="hover" header="今日事件">
+      <el-card shadow="hover">
         <template #header>
           <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"
@@ -37,11 +40,7 @@
           stripe
           hideDo
         >
-            <el-table-column
+          <el-table-column label="#" type="index" width="50"></el-table-column>
-              label="#"
-              type="index"
-              width="50"
-            ></el-table-column>
           <el-table-column label="事件种类">
             <template #default="scope">
               <el-span
@@ -53,10 +52,7 @@
               >
             </template>
           </el-table-column>
-            <el-table-column
+          <el-table-column label="发生区域" prop="area_.name"></el-table-column>
-              label="发生区域"
-              prop="area_.name"
-            ></el-table-column>
           <el-table-column label="当事人" prop="employee_.name">
             <template #default="scope">
               <span
@@ -69,9 +65,7 @@
 
           <el-table-column label="人员类型" prop="employee_.type">
             <template #default="scope">
-                <span
+              <span v-if="scope.row.employee && scope.row.obj_cate == 'people'">
-                  v-if="scope.row.employee && scope.row.obj_cate == 'people'"
-                >
                 <span
                   v-if="
                     scope.row.employee_.type != '' &&
@@ -106,11 +100,18 @@
               prop="handle_user_name"
             ></el-table-column> -->
         </scTable>
+        </div>
+
       </el-card>
     </el-col>
     <el-col :md="8" :sm="24">
-      <el-card shadow="hover" header="今日事件统计">
+      <el-card shadow="hover">
-        <scEcharts height="360px" :option="option3"></scEcharts>
+        <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>

src/views/home/widgets/components/ticket.vue

@@ -1,9 +1,14 @@
 <template>
-  <el-row :gutter="10">
+  <el-row :gutter="6">
     <el-col :md="12" :sm="24">
-      <el-card shadow="hover" header="进行项目">
+      <el-card shadow="hover">
-        <div style="width:33%;float:left">
+        <template #header>
-          <div style="margin: 0px 20px 12px 40px;">
+          <div class="card-header">
+            <span>进行项目</span>
+          </div>
+        </template>
+        <div class="card-body">
+            <div>
               <el-badge :value="operationnumber" class="item">
                 <el-button
                   icon="el-icon-document-copy"
@@ -11,13 +16,9 @@
                   size="small"
                 ></el-button>
               </el-badge>
+              <div style="font-size:16px">危险作业</div>
             </div>
-          <div style="margin: 0px 20px 12px 40px">
+            <div>
-            <span>作业</span>
-          </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"
@@ -25,13 +26,9 @@
                   size="small"
                 ></el-button>
               </el-badge>
+              <div style="font-size:16px">相关方项目</div>
             </div>
-          <div style="margin: 0px 20px 12px 40px">
+            <div>
-            <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"
@@ -39,9 +36,7 @@
                   size="small"
                 ></el-button>
               </el-badge>
-          </div>
+              <div style="font-size:16px">来访项目</div>
-          <div style="margin: 0px 20px 12px 40px">
-            <span>访客项目</span>
             </div>
           </div>
       </el-card>
@@ -51,28 +46,16 @@
         <template #header>
           <div class="card-header">
             <span>人员统计</span>
-        <el-button class="button" text>在厂</el-button>
+            <el-switch
-        <el-button class="button" text>有卡</el-button>
+              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,
+      rpjnumber: null,
-      visitnumber:null
+      visitnumber: null,
     };
   },
   created() {
@@ -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;
+      // flex-wrap: wrap;
-    margin-left: 30px;
+      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>

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 }">

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">