upup

src/views/dashboard/index.vue

@@ -296,12 +296,107 @@
         </el-col>
         <el-col :span="12">
           <div ref="lxTable" class="table-tree">
-             <div style="padding: 15px;background-color: #fff;" class="form-sub-title">
-               <el-link type="primary" style="font-size:18px" href="#/lawsfile/article">综合数据</el-link>
-               <p class="no-redirect"></p>
-             </div>
-             <div class="overall">
-               <div>
+            <div style="display:flex;justify-content: space-between;;padding: 15px;padding-left: 20px;background-color: #fff;" class="form-sub-title">
+              <el-link type="primary" style="font-size:18px" href="#/lawsfile/article">综合数据</el-link>
+              <div>
+                <span style="background-color: #95ca7a;display: inline-block;width:50px;height: 20px;
+    vertical-align: bottom;border-radius: 5px;margin:0 5px"></span>已完成
+                <span style="background-color: #dddddd;display: inline-block;width:50px;height: 20px;
+    vertical-align: bottom;border-radius: 5px;margin:0 5px"></span>未完成
+              </div>
+            </div>
+            <div class="overall">
+              <el-descriptions class="margin-top" :labelStyle="{'color':'#2c2d2f'}"
+                :contentStyle="{'font-size':'24px','color':'#333333','padding-left':'25px'}"
+                contentClassName="contentClass" labelClassName="labelClass" :colon='false' title="" :column="4"
+                direction="vertical">
+                <el-descriptions-item span="2">
+                  <template slot='label'>
+                    <div style='display: flex;'>
+                      <p style="margin-right: 20%;">
+                        <img :src="icon1" alt="">
+                        年度计划任务
+                      </p>
+                      <p>
+                        <img :src="icon2" alt="">
+                        已完成任务
+                      </p>
+                    </div>
+                  </template>
+                  <div style="display: flex;">
+                    <p style="margin-right: 46%;">0<span>项</span></p>
+                    <p>0<span>项</span></p>
+                  </div>
+                </el-descriptions-item>
+                <el-descriptions-item span="2">
+                  <template slot='label'>
+                    <img :src="icon3" alt="">
+                    进度
+                  </template>
+                  <div style="margin-left:-23px">
+                    <el-progress :stroke-width="26" :percentage="0" color="#95ca7a"></el-progress>
+
+                  </div>
+                </el-descriptions-item>
+
+                <el-descriptions-item span="2">
+                  <template slot='label'>
+                    <img :src="icon4" alt="">
+                    安全检查 <span>（月/年）</span>
+                  </template>
+                  <div>
+                    10 / 100<span>次</span>
+                  </div>
+                </el-descriptions-item>
+                <el-descriptions-item span="2">
+                  <template slot='label'>
+                    <img :src="icon5" alt="">
+                    安全培训<span>（月/年）</span>
+                  </template>
+                  <div>
+                    0 / 0<span>次</span>
+                  </div>
+                </el-descriptions-item>
+
+                <el-descriptions-item span="2">
+                  <template slot='label'>
+                    <img :src="icon6" alt="">
+                    应急演练<span>（年）</span>
+                  </template>
+                  <div>
+                    5<span>次</span>
+                  </div>
+                </el-descriptions-item>
+                <el-descriptions-item span="2">
+                  <template slot='label'>
+                    <img :src="icon7" alt="">
+                    专项任务开展<span></span>
+                  </template>
+                  <div>
+                    5<span>项</span>
+                  </div>
+                </el-descriptions-item>
+
+                <el-descriptions-item span="2">
+                  <template slot='label'>
+                    <img :src="icon8" alt="">
+                    安全隐患数量
+                  </template>
+                  <div>
+                    6<span>处</span>
+                  </div>
+                </el-descriptions-item>
+                <el-descriptions-item span="2">
+                  <template slot='label'>
+                    <img :src="icon9" alt="">
+                    安全事件
+                  </template>
+                  <div>
+                    2<span>起</span>
+                  </div>
+                </el-descriptions-item>
+              </el-descriptions>
+              <!-- <div>
                  <p><span>年度计划任务：</span>0</p>
                  <p><span>已完成任务：</span>0</p>
                  <p><span>进度：</span>0</p>
@@ -317,10 +412,10 @@
                <div>
                  <p><span>安全隐患数量：</span>0</p>
                  <p><span>安全事件：</span>0</p>
-               </div>
-             </div>
-           </div>
-         <!-- <div ref="lxTable" class="table-tree">
+               </div> -->
+            </div>
+          </div>
+          <!-- <div ref="lxTable" class="table-tree">
             <div style="padding: 15px;background-color: #fff;" class="form-sub-title">
               <el-link type="primary" style="font-size:18px" href="#/lawsfile/article">任务进展</el-link>
               <p class="no-redirect"></p>
@@ -331,28 +426,32 @@
         <el-col :span="12">
           <div ref="lxTable" class="table-tree">
             <div style="padding: 15px;background-color: #fff;" class="form-sub-title">
-              <div>
+              <div style="display: flex;justify-content: space-between;">
                 <el-link type="primary" style="font-size:18px" href="#/lawsfile/article">检查整改</el-link>
-                <p class="no-redirect"></p>
+                <!-- <p class="no-redirect"></p> -->
+                <Select placeholder="数据类型" v-model="select.question_type" style="width:130px;margin-left:5px">
+                  <Option v-for="item in typeList" :value="item.id" :key="item.value">{{ item.value }}</Option>
+                </Select>
               </div>
               <div>
-                <Select placeholder="问题类型" v-model="select.question_type" style="width:130px;margin-left:5px">
-                        <Option v-for="item in questionList" :value="item.id" :key="item.value">{{ item.value }}</Option>
-                    </Select>
+
+                <!-- <Select placeholder="问题类型" v-model="select.question_type" style="width:130px;margin-left:5px">
+                  <Option v-for="item in questionList" :value="item.id" :key="item.value">{{ item.value }}</Option>
+                </Select>
                 <Select placeholder="检查类型" v-model="select.check_type" style="width:130px;margin-left:5px">
-                        <Option v-for="item in checkList" :value="item.id" :key="item.value">{{ item.value }}</Option>
-                    </Select>
+                  <Option v-for="item in checkList" :value="item.id" :key="item.value">{{ item.value }}</Option>
+                </Select>
                 <Select placeholder="责任科室" v-model="select.department_id" style="width:130px;margin-left:5px">
-                        <Option v-for="item in departmentList" :value="item.id" :key="item.value">{{ item.name }}</Option>
-                    </Select>
-                <DatePicker  placeholder="月份" placement="bottom"
-                  style="width: 130px;margin-left:5px" type="month" @on-change="changeMonth"></DatePicker>
-                <DatePicker  placeholder="年份" placement="bottom"
-                  style="width: 130px;margin-left:5px" type="year" @on-change="changeYear"></DatePicker>
+                  <Option v-for="item in departmentList" :value="item.id" :key="item.value">{{ item.name }}</Option>
+                </Select>
+                <DatePicker placeholder="月份" placement="bottom" style="width: 130px;margin-left:5px" type="month"
+                  @on-change="changeMonth"></DatePicker>
+                <DatePicker placeholder="年份" placement="bottom" style="width: 130px;margin-left:5px" type="year"
+                  @on-change="changeYear"></DatePicker> -->
 
               </div>
             </div>
-            <myecharts :height="'317px'" :data="inspection_data"></myecharts>
+            <myecharts :height="'345px'" :data="inspection_data"></myecharts>
           </div>
         </el-col>
       </el-row>
@@ -456,16 +555,32 @@
     },
     data() {
       return {
-        select:{
-          question_type:'',
-          year:'2023',
-          department_id:'',
-          month:'',
-          check_type:''
+        icon1: require('@/assets/index/icon1.png'),
+        icon2: require('@/assets/index/icon2.png'),
+        icon3: require('@/assets/index/icon3.png'),
+        icon4: require('@/assets/index/icon4.png'),
+        icon5: require('@/assets/index/icon5.png'),
+        icon6: require('@/assets/index/icon6.png'),
+        icon7: require('@/assets/index/icon7.png'),
+        icon8: require('@/assets/index/icon8.png'),
+        icon9: require('@/assets/index/icon9.png'),
+        typeList:[{id:1,value:'责任科室'},
+                  {id:1,value:'问题类型'},
+                  {id:1,value:'检查类型'},
+                  {id:1,value:'月份'},
+                  {id:1,value:'年份'}
+
+        ],
+        select: {
+          question_type: '',
+          year: '2023',
+          department_id: '',
+          month: '',
+          check_type: ''
         },
-        questionList:[],
-        departmentList:[],
-        checkList:[{
+        questionList: [],
+        departmentList: [],
+        checkList: [{
           id: 1,
           value: '专项检查'
         }, {
@@ -653,7 +768,7 @@
                           }
                           preview-src-list = {
                             arr
-                          }>
+                          } >
                           </el-image>)
                         })
                     } </div>)
@@ -676,7 +791,7 @@
                         {
                           whiteSpace: 'normal'
                         }
-                      }> {
+                      } > {
                         row.fix_files.map(item => {
                             arr.push(item.url)
                             return ( <el-image style = {
@@ -691,7 +806,7 @@
                               }
                               preview-src-list = {
                                 arr
-                              }>
+                              } >
                               </el-image>)
                             })
                         } </div>)
@@ -770,8 +885,8 @@
 
               },
               methods: {
-                changeYear(e){},
-                changeMonth(e){},
+                changeYear(e) {},
+                changeMonth(e) {},
                 async getQuestion() {
                   const res = await getparameteritem('askList')
                   this.questionList = res.detail
@@ -779,7 +894,7 @@
                 loadDeptOptions() {
                   listdept().
                   then((res) => {
-                    this.departmentList =  res
+                    this.departmentList = res
                   }).catch(error => {
                     console.log(error)
                     reject(error)
@@ -978,26 +1093,47 @@
 </script>
 
 <style lang="scss" scoped>
+  .labelClass {
+    img {
+      vertical-align: sub;
+      margin-right: 5px;
+    }
 
-.progress-card {
-  display: flex;
+    >span {
+      color: #5b5d61;
+      font-weight: normal;
+    }
+  }
 
-  &-item {
-    text-align: center;
-    flex: 1;
+  .contentClass {
 
-    &__label {
-      font-size: 14px;
+    span {
+      color: #9c9ea4;
+      font-size: 16px;
+      margin-left:5px;
     }
+  }
+
+  .progress-card {
+    display: flex;
+
+    &-item {
+      text-align: center;
+      flex: 1;
 
-    &__num {
-      font-size: 20px;
-      font-weight: 600;
+      &__label {
+        font-size: 14px;
+      }
 
-      padding: 6px 0;
+      &__num {
+        font-size: 20px;
+        font-weight: 600;
+
+        padding: 6px 0;
+      }
     }
   }
-}
+
   ::v-deep .elrows {
     .el-col {
       padding: 10px !important
@@ -1028,20 +1164,24 @@
   .dialogConcent {
     overflow-y: auto;
   }
-  .overall{
+
+  .overall {
     background-color: #fff;
-    height:350px;
-        padding: 15px;
-        padding-top: 0;
-        font-size: 18px;
-    >div{
-        display: flex;
-        justify-content: space-between;
-        >p{
-          max-width: 50%;
-          width:50%;
-          margin-bottom: 60px;
-        }
+    height: 350px;
+    padding: 15px;
+    padding-left: 20px;
+    padding-top: 0;
+    font-size: 18px;
+
+    >div {
+      display: flex;
+      justify-content: space-between;
+
+      >p {
+        max-width: 50%;
+        width: 50%;
+        margin-bottom: 60px;
+      }
     }
   }
 </style>

src/views/task/list/components/showPatrol.vue

@@ -92,7 +92,7 @@
             <el-descriptions class="margin-top" :column="3" border>
               <el-descriptions-item>
                 <template slot="label">
-                  确认结果
+                  规计科确认结果
                 </template>
                 <div>
                   <span v-if='showform.status==6'>
@@ -262,7 +262,7 @@
             <el-descriptions class="margin-top" :column="3" border>
               <el-descriptions-item>
                 <template slot="label">
-                  整改审核结果
+                  规计科审核结果
                 </template>
                 <div>
                   <span v-if='showform.status==5'>
@@ -811,10 +811,10 @@
           value: '已撤回'
         }, {
           id: 0,
-          value: '待审核'
+          value: '待确认'
         }, {
           id: 1,
-          value: '待领导意见'
+          value: '待领导确认'
         }, {
           id: 2,
           value: '已分发,待接收'
@@ -829,7 +829,7 @@
           value: '已整改'
         }, {
           id: 6,
-          value: '不通过'
+          value: '退回'
         }, {
           id: 7,
           value: '整改不通过,重新整改'
@@ -838,7 +838,7 @@
           value: '部门退回'
         }, {
           id: 9,
-          value: '待领导意见整改'
+          value: '待领导审核'
         }],
         id: '',
         uploadOther: {