Merge remote-tracking branch 'origin/V0.0.5' into V0.0.5

src/components/userSelector/index.vue

@@ -87,7 +87,7 @@
               />
               <el-table-column
                 label="所属机构"
-                header-align="center"
+                align="center"
                 key="orgName"
                 prop="orgName"
                 :show-overflow-tooltip="true"

src/views/core/accessPlan/index.vue

@@ -736,14 +736,52 @@ export default {
             let msg = "";
             if (request.planStatus == 1) {
               if(request.isComplete==true){
-                msg =  "因不存在已完成任务，本次修改内容将立即生效，是否确认提交?";
+              if (request.planCycle==0) {
+                this.$modal
+         .confirm("因存在已完成任务，无周期任务如需修改，请删除后重新下发”。")
+         .then(() => {
+             
+                this.open = false;
+                this.getList();
+
+              })
+              }else{
+                msg =  "因不存在已完成任务，本次修改内容将立即生效";
+                this.$modal
+              .confirm(msg)
+              .then(function () {
+                return updatePlan(request);
+              })
+              .then(() => {
+                this.$modal.msgSuccess("编辑成功");
+                this.open = false;
+                this.getList();
+
+              })
+              .catch(() => {
+              });
+              }
+              
               }else{
-                msg = "因存在已完成任务，本次修改内容将下周期生效，是否确认提交?";
+                msg = "因存在已完成任务，本次修改内容将下周期生效";
+                this.$modal
+              .confirm(msg)
+              .then(function () {
+                return updatePlan(request);
+              })
+              .then(() => {
+                this.$modal.msgSuccess("编辑成功");
+                this.open = false;
+                this.getList();
+
+              })
+              .catch(() => {
+              });
               }
+              
             }else{
               msg = "是否确认修改?";
-            }
-            this.$modal
+              this.$modal
               .confirm(msg)
               .then(function () {
                 return updatePlan(request);
@@ -756,13 +794,9 @@ export default {
               })
               .catch(() => {
               });
+            }
 
 
-            // updatePlan(this.form).then((response) => {
-            //   this.$modal.msgSuccess("修改成功");
-            //   this.open = false;
-            //   this.getList();
-            // });
           } else {
             addPlan(this.form).then((response) => {
               this.$modal.msgSuccess("新增成功");
@@ -913,6 +947,10 @@ export default {
         if (row.planCycle==0) {
            this.$modal
          .confirm("存在已完成任务，无周期任务不允许撤回，如需删除下发任务请点击“删除”。")
+         .then(() => {
+          this.getList();
+       
+        })
         }else{
           this.$modal
         .confirm("因存在已完成任务，撤回后下周期起将不再生成任务")

src/views/core/drill/drillDictionary/index.vue

@@ -120,16 +120,14 @@
             />
             <el-table-column
               label="机构名称"
-              align="left"
-              header-align="center"
+              align="center"
               width="250"
               prop="orgName"
             />
 
             <el-table-column
               label="演练项目"
-              align="left"
-              header-align="center"
+              align="center"
               width="180"
               prop="drillType"
             >
@@ -143,7 +141,7 @@
             <!--            <el-table-column
                           label="演练类型"
                           align="left"
-                          header-align="center"
+                          align="center"
                           width="180"
                           prop="drillType"
                         >
@@ -154,7 +152,7 @@
                             />
                           </template>
                         </el-table-column>-->
-            <el-table-column label="演练场景" scoped-slot="drillProjects" header-align="center" align="left" width="180"
+            <el-table-column label="演练场景" scoped-slot="drillProjects" align="center" width="180"
                              prop="drillProjects">
               <template slot-scope="scope">
                 <div class="ellipsis" :title="scope.row.drillProjects">{{ scope.row.drillProjects }}</div>
@@ -171,7 +169,6 @@
             <el-table-column
               label="操作"
               align="center"
-              header-align="center"
               width="150"
               class-name="small-padding fixed-width"
             >

src/views/core/drill/plan/index.vue

@@ -140,22 +140,19 @@
             <el-table-column label="序号" align="center" width="60" prop="no"/>
             <el-table-column
               label="任务名称"
-              align="left"
-              header-align="center"
+              align="center"
               prop="planName"
               :show-overflow-tooltip="true"
             />
             <el-table-column
               label="创建机构"
-              align="left"
-              header-align="center"
+              align="center"
               width="220"
               prop="createOrgName"
             />
             <el-table-column
               label="行社名称"
-              align="left"
-              header-align="center"
+              align="center"
               width="220"
               prop="belongOrgName"
             />
@@ -208,8 +205,7 @@
             <!-- <el-table-column label="修改人" align="center" width="100" prop="updateBy"/> -->
             <el-table-column
               label="操作"
-              align="left"
-              header-align="center"
+              align="center"
               fixed="right"
               width="200"
               class-name="small-padding fixed-width"

src/views/core/drill/task/index.vue

@@ -138,15 +138,13 @@
             />
             <el-table-column
               label="任务名称"
-              align="left"
-              header-align="center"
+              align="center"
               prop="title"
             />
             <el-table-column
               label="演练机构"
               width="200"
-              align="left"
-              header-align="center"
+              align="center"
               prop="orgName"
             />
             <!--          <el-table-column label="演练角色" align="center">
@@ -163,8 +161,7 @@
             <el-table-column
               label="演练项目"
               width="200"
-              align="left"
-              header-align="center"
+              align="center"
               prop="type"
             >
               <template slot-scope="scope">
@@ -178,7 +175,6 @@
               label="任务进度"
               width="100"
               align="center"
-              header-align="center"
               prop="status"
             >
               <template slot-scope="scope">
@@ -222,8 +218,7 @@
 
             <el-table-column
               label="操作"
-              align="left"
-              header-align="center"
+              align="center"
               class-name="small-padding fixed-width"
               width="380"
             >

src/views/core/edu/plan/index.vue

@@ -171,20 +171,17 @@
             <el-table-column label="序号" align="center" prop="no" width="60"/>
             <el-table-column
               label="任务名称"
-              align="left"
-              header-align="center"
+              align="center"
               prop="planName"
             />
             <el-table-column
               label="创建机构"
-              align="left"
-              header-align="center"
+              align="center"
               prop="createOrgName"
             />
             <el-table-column
               label="行社名称"
-              align="left"
-              header-align="center"
+              align="center"
               prop="belongOrgName"
             />
             <!-- <el-table-column label="所属机构" align="left" width="180" prop="belongOrgName"/> -->
@@ -252,8 +249,7 @@
             <el-table-column
               label="操作"
               width="200"
-              align="left"
-              header-align="center"
+              align="center"
               fixed="right"
               class-name="small-padding fixed-width"
             >

src/views/core/edu/task/index.vue

@@ -156,15 +156,13 @@
             <el-table-column label="序号" align="center" width="70" prop="no" />
             <el-table-column
               label="任务名称"
-              align="left"
-              header-align="center"
+              align="center"
               prop="title"
             />
             <el-table-column
               label="受训机构"
               width="315"
-              align="left"
-              header-align="center"
+              align="center"
               prop="orgName"
             />
             <el-table-column
@@ -226,7 +224,7 @@
             <el-table-column
               label="操作"
               fixed="right"
-              header-align="center"
+              align="center"
               class-name="small-padding fixed-width"
               width="350"
             >

src/views/core/materials/index.vue

@@ -127,15 +127,13 @@
             />
             <el-table-column
               label="创建机构"
-              align="left"
-              header-align="center"
+              align="center"
               prop="orgName"
               width="200px"
             />
             <el-table-column
               label="资料名称"
-              align="left"
-              header-align="center"
+              align="center"
               prop="title"
               :show-overflow-tooltip="true"
             />
@@ -155,7 +153,6 @@
             <el-table-column
               label="资料状态"
               align="center"
-              header-align="center"
               prop="isOpen"
               width="100px"
             >
@@ -175,7 +172,7 @@
             <el-table-column
               label="操作"
               width="250px"
-              header-align="center"
+              align="center"
               class-name="small-padding fixed-width"
             >
               <template slot-scope="scope">

src/views/core/message/index.vue

@@ -193,8 +193,7 @@
             </el-table-column>
             <el-table-column
               label="操作"
-              align="left"
-              header-align="center"
+              align="center"
               width="280"
               fixed="right"
               class-name="small-padding fixed-width"

src/views/core/outIn/approve/index.vue

@@ -58,14 +58,14 @@
         <el-table-column align="center" label="介绍信编号" prop="letterNo" width="120">
         </el-table-column>
         <!-- <el-table-column label="序号"  align="center"  type="index" width="70" /> -->
-        <el-table-column align="center" header-align="center" label="介绍信类型" prop="type" width="150">
+        <el-table-column align="center" label="介绍信类型" prop="type" width="150">
           <template slot-scope="scope">
             <dict-tag :options="dict.type.out_in_type" :value="scope.row.type"/>
           </template>
         </el-table-column>
-        <el-table-column align="left"  :show-overflow-tooltip="true" header-align="center" label="来访事由" prop="reasons"/>
+        <el-table-column  :show-overflow-tooltip="true" align="center" label="来访事由" prop="reasons"/>
 
-        <!-- <el-table-column label="介绍信" header-align="center" align="left" prop="letterNo" width="250">
+        <!-- <el-table-column label="介绍信" align="center" align="left" prop="letterNo" width="250">
           <template slot-scope="scope">
           <template v-if="scope.row.letterFile">
             <K-file-upload ref="upload" :isShowUploadBtn="false"
@@ -79,16 +79,16 @@
             <span>{{ scope.row.startTime }}</span>
           </template>
         </el-table-column>
-        <el-table-column align="center" header-align="center" label="有效天数" prop="effectiveDays" width="120"/>
-        <!-- <el-table-column label="审批时间" width="150" header-align="center" align="left"  prop="approveTime" /> -->
+        <el-table-column  align="center" label="有效天数" prop="effectiveDays" width="120"/>
+        <!-- <el-table-column label="审批时间" width="150" align="center" align="left"  prop="approveTime" /> -->
 
-        <el-table-column align="center" label="审批状态" prop="approveStatus" width="100">
+        <el-table-column label="审批状态" prop="approveStatus" width="100">
           <template slot-scope="scope">
             <dict-tag :options="dict.type.out_in_approve_status" :value="scope.row.approveStatus"/>
           </template>
         </el-table-column>
-        <!-- <el-table-column label="备注" header-align="center" align="left" width="150" prop="description" /> -->
-        <el-table-column align="left" class-name="small-padding fixed-width" header-align="center" label="操作"
+        <!-- <el-table-column label="备注" align="center" align="left" width="150" prop="description" /> -->
+        <el-table-column class-name="small-padding fixed-width" align="center" label="操作"
                          width="180">
           <template slot-scope="scope">
             <el-button

src/views/core/outIn/letter/dialog.letter.detail.vue

@@ -124,13 +124,13 @@
           </el-col>
         </el-row>
         <el-table border :data="formData.approveInfos" max-height="500" style="margin-bottom: 10px;">
-          <el-table-column label="机构名称" header-align="center" align="left" prop="orgName" />
+          <el-table-column label="机构名称" align="center" prop="orgName" />
           <el-table-column label="审批状态" align="center" prop="approveStatus" >
             <template slot-scope="scope">
               <dict-tag :options="dict.type.out_in_approve_status" :value="scope.row.approveStatus"/>
             </template>
           </el-table-column>
-          <el-table-column label="审批说明" header-align="center" align="center" prop="approveRemark">
+          <el-table-column label="审批说明" align="center"  prop="approveRemark">
           </el-table-column>
         </el-table>
       </div>

src/views/core/outIn/letter/index.vue

@@ -56,11 +56,11 @@
       <el-table-column label="介绍信编号" align="center" prop="letterNo" width="170">
       </el-table-column>
 
-      <el-table-column label="接待机构"  :show-overflow-tooltip="true" header-align="center" align="left"  prop="receptionOrgNames" />
+      <el-table-column label="接待机构"  :show-overflow-tooltip="true" align="center"  prop="receptionOrgNames" />
 
-      <el-table-column label="来访事由"  :show-overflow-tooltip="true" header-align="center" align="left" prop="reasons" />
-      <el-table-column label="开具日期" header-align="center" align="center" prop="startTime"  width="150"/>
-      <el-table-column label="有效天数" header-align="center" align="center" prop="effectiveDays" width="100"/>
+      <el-table-column label="来访事由"  :show-overflow-tooltip="true" align="center" prop="reasons" />
+      <el-table-column label="开具日期" align="center" prop="startTime"  width="150"/>
+      <el-table-column label="有效天数" align="center"  prop="effectiveDays" width="100"/>
       <!-- <el-table-column label="介绍信有效期" align="center" width="250">
         <template slot-scope="scope">
           <span>{{ scope.row.startTime}}~{{scope.row.endTime}}</span>
@@ -72,8 +72,8 @@
             </template>
       </el-table-column>
 
-      <!-- <el-table-column label="备注" header-align="center" align="left" width="200" prop="description" /> -->
-      <el-table-column label="操作" header-align="center" align="left" width="280" class-name="small-padding fixed-width">
+      <!-- <el-table-column label="备注" align="center" align="left" width="200" prop="description" /> -->
+      <el-table-column label="操作" align="center" width="280" class-name="small-padding fixed-width">
         <template slot-scope="scope">
           <el-button
             size="mini"

src/views/core/outIn/outInLog/index.vue

@@ -133,7 +133,6 @@
 
             <el-table-column
               label="介绍信类型"
-              header-align="center"
               align="center"
               prop="type"
               width="110"
@@ -147,14 +146,12 @@
             </el-table-column>
             <el-table-column
               label="来访事由"
-              header-align="center"
-              align="left"
+              align="center"
               :show-overflow-tooltip="true"
               prop="reasons"
             />
             <el-table-column
               label="接待机构"
-              header-align="center"
               align="center"
               prop="orgName"
               width="180"
@@ -162,8 +159,7 @@
             </el-table-column>
             <el-table-column
               label="出入时间"
-              header-align="center"
-              align="left"
+              align="center"
               width="360"
             >
               <template slot-scope="scope">
@@ -198,7 +194,6 @@
 
             <el-table-column
               label="操作"
-              header-align="center"
               align="center"
               width="210"
               fixed="right"

src/views/index.vue

@@ -20,7 +20,8 @@
             <el-col :xs="24" :sm="24" :md="12"  :lg="12" v-for="(v,i) in dataList" :key="i">
               <div class="card-panel">
                 <div class="card-panel-icon-wrapper icon-people">
-                  <svg-icon icon-class="example" class-name="card-panel-icon" />
+<!--                  <svg-icon icon-class="example" class-name="card-panel-icon" />-->
+                  <img class="card-item-icon" :src="require(`../assets/icons/home/${v.taskTypeText}.png`)" alt="">
                   <div class="card-icon-text">
                     {{v.taskTypeText}}
                   </div>
@@ -29,7 +30,10 @@
                   <div class="card-panel-text">
                     {{v.statusText}}
                   </div>
-                  <count-to :start-val="0" :end-val="v.nums" :duration="3000" class="card-panel-num" />
+                  <span v-if="!v.nums" style="font-size: 20px;">0</span>
+                  <span v-else @click="clickNum(v)" >
+                     <count-to :start-val="0" :end-val="v.nums" :duration="3000" class="card-panel-num" />
+                  </span>
                 </div>
               </div>
             </el-col>
@@ -120,6 +124,9 @@ export default {
   },
   methods: {
     imageUrl,
+    clickNum(item){
+      console.log(item,'666')
+    },
     showMsg(v){
       this.show = true;
       this.selectMsg = v;
@@ -163,11 +170,17 @@ export default {
     border-radius: 4px;
     box-shadow: none;
   }
+  .el-tabs--border-card{
+    border: none;
+  }
   .chart-wrapper{
     .el-card__body{
       padding: 0;
     }
   }
+  .card-panel-num{
+    color:#1ea8e9;
+  }
 }
 </style>
 <style lang="scss" scoped>
@@ -184,6 +197,7 @@ export default {
   margin: 0 0 10px 0;
   padding-left: 4px;
   color:#fff;
+  line-height: 26px;
   font-weight: bold;
   letter-spacing: 2px;
   background: linear-gradient(to right, #71bfe3, #fff);
@@ -194,9 +208,17 @@ export default {
   }
 }
 .tab-panel{
-  height: 455px;
+  height: 457px;
   overflow: auto;
 }
+//css 透明的属性=
+.card-item-icon{
+  width: 50px;
+  height: 50px;
+  &:hover{
+    opacity:.8;
+  }
+}
 .msg-item{
   font-size: 15px;
   padding: 0 10px;
@@ -241,7 +263,7 @@ export default {
     }
   }
   &:hover{
-    background-color: #1ea8e9;
+    background-color: #6eb9ec;
     color:#fff;
     transition: all .38s ease-out;
   }
@@ -252,7 +274,6 @@ export default {
     display: flex;
     flex:1;
     justify-content: space-between;
-    cursor: pointer;
     font-size: 12px;
     color: #666;
     background: #fff;
@@ -303,6 +324,7 @@ export default {
 
       .card-panel-num {
         font-size: 20px;
+        cursor: pointer;
       }
     }
   }

src/views/question/list/index.vue

@@ -123,7 +123,6 @@
             border
           >
             <el-table-column
-              header-align="center"
               type="index"
               label="序号"
               align="center"
@@ -139,19 +138,19 @@
               </template>
             </el-table-column>
             <el-table-column
-              header-align="center"
+              align="center"
               label="机构名称"
               prop="orgName"
               v-if="columns[1].visible"
             />
             <el-table-column
-              header-align="center"
+              align="center"
               label="隐患来源"
               prop="srcTaskName"
               v-if="columns[2].visible"
             />
             <el-table-column
-              header-align="center"
+              align="center"
               label="标准依据"
               prop="checkContent"
               v-if="columns[3].visible"
@@ -161,24 +160,22 @@
               </template>
             </el-table-column>
             <el-table-column
-              header-align="center"
+              align="center"
               label="隐患描述"
               prop="questionDesc"
               :show-overflow-tooltip="true"
               v-if="columns[4].visible"
             />
             <el-table-column
-              header-align="center"
-              label="提出人"
               align="center"
+              label="提出人"
               prop="submitorName"
               width="100px"
               v-if="columns[5].visible"
             />
             <el-table-column
-              header-align="center"
-              label="发现时间"
               align="center"
+              label="发现时间"
               prop="submitTime"
               width="170px"
               v-if="columns[6].visible"
@@ -190,10 +187,9 @@
               </template>
             </el-table-column>
             <el-table-column
-              header-align="center"
+              align="center"
               label="隐患状态"
               width="100px"
-              align="center"
               prop="confirmStatus"
               v-if="columns[7].visible"
             >
@@ -209,7 +205,7 @@
               </template>
             </el-table-column>
             <el-table-column
-              header-align="center"
+              align="center"
               label="操作"
               width="180"
               class-name="small-padding fixed-width"

src/views/question/reform/index.vue

@@ -107,7 +107,6 @@
             border
           >
             <el-table-column
-              header-align="center"
               align="center"
               type="index"
               label="序号"
@@ -123,13 +122,13 @@
               </template>
             </el-table-column>
             <el-table-column
-              header-align="center"
+              align="center"
               label="机构名称"
               prop="orgName"
               v-if="columns[1].visible"
             />
             <el-table-column
-              header-align="center"
+              align="center"
               label="标准依据"
               prop="checkContent"
               v-if="columns[2].visible"
@@ -139,7 +138,7 @@
               </template>
             </el-table-column>
             <el-table-column
-              header-align="center"
+              align="center"
               label="隐患描述"
               prop="questionDesc"
               :show-overflow-tooltip="true"
@@ -147,7 +146,6 @@
             />
 
             <el-table-column
-              header-align="center"
               align="center"
               label="整改期限"
               prop="submitTime"
@@ -161,7 +159,6 @@
               </template>
             </el-table-column>
             <el-table-column
-              header-align="center"
               align="center"
               label="整改状态"
               prop="reformStatus"
@@ -180,7 +177,7 @@
               </template>
             </el-table-column>
             <el-table-column
-              header-align="center"
+              align="center"
               label="操作"
               width="150"
               class-name="small-padding fixed-width"

src/views/resumption/protection/dialog.history.vue

@@ -58,13 +58,11 @@
               type="index"
               label="序号"
               width="60"
-              header-align="center"
               align="center"
             ></el-table-column>
             <el-table-column
               prop="statusText"
               label="报警控制器状态"
-              header-align="center"
               align="center"
               ><template slot-scope="r">
                 {{ getLabel(statusDict, r.row.status) }}
@@ -73,12 +71,10 @@
             <el-table-column
               prop="updateTime"
               label="布撤防登记时间"
-              header-align="center"
               align="center"
             >
             </el-table-column>
             <el-table-column
-              header-align="center"
               align="center"
               prop="statusUpdatorName"
               label="登记人"

src/views/resumption/protection/index.vue

@@ -118,7 +118,6 @@
             height="594"
           >
             <el-table-column
-              header-align="center"
               align="center"
               type="index"
               label="序号"
@@ -134,20 +133,19 @@
               </template>
             </el-table-column>
             <el-table-column
-              header-align="center"
+              align="center"
               prop="orgName"
               label="所属机构"
               v-if="columns[1].visible"
             ></el-table-column>
             <el-table-column
-              header-align="center"
+              align="center"
               prop="name"
               label="报警控制器名称"
               v-if="columns[2].visible"
             >
             </el-table-column>
             <el-table-column
-              header-align="center"
               align="center"
               prop="status"
               label="报警控制器状态"
@@ -160,7 +158,6 @@
               </template>
             </el-table-column>
             <el-table-column
-              header-align="center"
               align="center"
               prop="statusUpdatorName"
               label="登记人"
@@ -168,14 +165,13 @@
             >
             </el-table-column>
             <el-table-column
-              header-align="center"
               align="center"
               prop="statusUpdateTime"
               label="最近登记时间"
               v-if="columns[5].visible"
             >
             </el-table-column>
-            <el-table-column header-align="center" label="操作">
+            <el-table-column align="center" label="操作">
               <template slot-scope="r">
                 <!-- <el-button
                 size="mini"

src/views/resumption/rule/index.vue

@@ -104,11 +104,10 @@
             height="646"
           >
             <el-table-column
-              header-align="center"
+              align="center"
               type="index"
               label="序号"
               width="60"
-              align="center"
               v-if="columns[0].visible"
             >
               <template slot-scope="scope">
@@ -120,13 +119,13 @@
               </template>
             </el-table-column>
             <el-table-column
-              header-align="center"
+              align="center"
               prop="name"
               label="履职手册名称"
               v-if="columns[1].visible"
             ></el-table-column>
             <el-table-column
-              header-align="center"
+              align="center"
               prop="orgType"
               label="履职机构类型"
               v-if="columns[2].visible"
@@ -136,16 +135,15 @@
               </template>
             </el-table-column>
             <el-table-column
-              header-align="center"
+              align="center"
               prop="orgName"
               label="发布机构"
               v-if="columns[3].visible"
             ></el-table-column>
             <el-table-column
-              header-align="center"
+              align="center"
               prop="status"
               label="状态"
-              align="center"
               v-if="columns[4].visible"
             >
               <template slot-scope="r">
@@ -153,13 +151,13 @@
               </template>
             </el-table-column>
             <el-table-column
-              header-align="center"
+              align="center"
               prop="remark"
               label="备注"
               v-if="columns[5].visible"
             ></el-table-column>
             <el-table-column
-              header-align="center"
+              align="center"
               label="操作"
               class="small-padding fixed-width"
               width="300"

src/views/resumption/ruleManager/dialog.editItem.vue

@@ -37,13 +37,12 @@
             >
           </div>
           <el-table :data="formData.pointDtoList" border style="width: 100%">
-            <el-table-column prop="name" label="履职内容" header-align="center">
+            <el-table-column prop="name" label="履职内容" align="center">
               <template slot-scope="scope">
                 <div style="white-space: pre-wrap">{{ scope.row.name }}</div>
               </template>
             </el-table-column>
             <el-table-column
-              header-align="center"
               align="center"
               prop="areaName"
               label="履职区域"
@@ -52,11 +51,10 @@
             <el-table-column
               prop="checkName"
               label="履职点位"
-              header-align="center"
               align="center"
             >
             </el-table-column>
-            <el-table-column label="操作" width="140" header-align="center">
+            <el-table-column label="操作" width="140" align="center">
               <template slot-scope="scope">
                 <el-button
                   type="text"

src/views/resumption/ruleManager/dialog.select.point.vue

@@ -45,13 +45,13 @@
         <!-- 表格 -->
         <template slot="columns">
           <el-table-column
-            header-align="center"
+            align="center"
             prop="itemName"
             label="履职项"
             min-width="40%"
           ></el-table-column>
           <el-table-column
-            header-align="center"
+            align="center"
             label="履职内容"
             prop="pointName"
             min-width="40%"
@@ -61,19 +61,18 @@
             </template>
           </el-table-column>
           <el-table-column
-            header-align="center"
             align="center"
             prop="areaName"
             label="履职区域"
             min-width="20%"
           ></el-table-column>
           <el-table-column
-            header-align="center"
+            align="center"
             prop="checkName"
             label="履职点位"
             min-width="20%"
           ></el-table-column>
-          <!--         <el-table-column  header-align="center"   prop="nfcName"
+          <!--         <el-table-column  align="center"   prop="nfcName"
                            label="采集点"
                            width="120"></el-table-column>-->
         </template>

src/views/resumption/ruleManager/index.vue

@@ -118,7 +118,7 @@
                 >
                   <el-table-column type="index"></el-table-column>
                   <el-table-column
-                    header-align="center"
+                    align="center"
                     prop="name"
                     label="履职内容"
                     v-if="columns[3].visible"
@@ -130,7 +130,7 @@
                     </template>
                   </el-table-column>
                   <el-table-column
-                    header-align="center"
+                    align="center"
                     prop="areaName"
                     label="履职区域"
                     v-if="columns[4].visible"
@@ -139,7 +139,7 @@
                   <el-table-column
                     prop="checkName"
                     label="履职点位"
-                    header-align="center"
+                    align="center"
                   >
                   </el-table-column>
                   <!-- <el-table-column prop="dataTypeName" label="数据类型">
@@ -150,7 +150,6 @@
               </template>
             </el-table-column>
             <el-table-column
-              header-align="center"
               align="center"
               type="index"
               label="序号"
@@ -168,7 +167,7 @@
               </template>
             </el-table-column>
             <el-table-column
-              header-align="center"
+              align="center"
               prop="name"
               label="履职项"
               v-if="columns[1].visible"
@@ -177,7 +176,6 @@
             <!-- <el-table-column prop="itemDesc" label="标准及要求">
           </el-table-column> -->
             <el-table-column
-              header-align="center"
               align="center"
               prop="pointNums"
               label="履职内容数量"
@@ -185,7 +183,7 @@
             >
             </el-table-column>
             <el-table-column
-              header-align="center"
+              align="center"
               label="操作"
               width="150"
               v-if="rule && rule.orgId == orgId && rule.status == 0"

src/views/resumption/taskManager/index.vue

@@ -139,7 +139,6 @@
             :data="pageData"
           >
             <el-table-column
-              header-align="center"
               align="center"
               fixed
               width="60px"
@@ -155,7 +154,7 @@
               </template>
             </el-table-column>
             <el-table-column
-              header-align="center"
+              align="center"
               prop="name"
               label="任务名称"
               min-width="120"
@@ -163,7 +162,7 @@
             >
             </el-table-column>
             <el-table-column
-              header-align="center"
+              align="center"
               prop="orgName"
               label="履职机构"
               min-width="120"
@@ -171,7 +170,7 @@
             >
             </el-table-column>
             <el-table-column
-              header-align="center"
+              align="center"
               prop="roleName"
               label="履职人员"
               width="150"
@@ -179,7 +178,6 @@
             >
             </el-table-column>
             <el-table-column
-              header-align="center"
               align="center"
               prop="status"
               label="任务进度"
@@ -191,7 +189,7 @@
               </template>
             </el-table-column>
             <el-table-column
-              header-align="center"
+              align="center"
               prop="planStartTime"
               label="任务时间"
               width="270px"
@@ -204,7 +202,6 @@
               </template>
             </el-table-column>
             <el-table-column
-              header-align="center"
               align="center"
               prop="abnormalDataNums"
               label="隐患问题数"
@@ -219,7 +216,7 @@
             </el-table-column>
 
             <el-table-column
-              header-align="center"
+              align="center"
               label="操作"
               fixed="right"
               min-width="120px"

src/views/safetyBook/hsggbsdj/index.vue

@@ -103,15 +103,13 @@
       >
         <el-table-column align="center" label="序号" type="index" width="60"/>
         <el-table-column
-          align="left"
-          header-align="center"
+          align="center"
           label="行社名称"
           prop="orgName"
           width="300"
         />
         <el-table-column
-          align="left"
-          header-align="center"
+          align="center"
           label="会议主题"
           prop="title"
           width="300"

src/views/safetycheck/plan/index.vue

@@ -340,7 +340,7 @@
               label="操作"
               width="200"
               fixed="right"
-              header-align="center"
+              align="center"
             >
               <template slot-scope="r">
                 <el-button

src/views/safetycheck/rule/index.vue

@@ -104,7 +104,6 @@
             height="646"
           >
             <el-table-column
-              header-align="center"
               align="center"
               type="index"
               label="序号"
@@ -120,13 +119,12 @@
               </template>
             </el-table-column>
             <el-table-column
-              header-align="center"
+              align="center"
               prop="name"
               label="检查手册名称"
               v-if="columns[1].visible"
             ></el-table-column>
             <el-table-column
-              header-align="center"
               align="center"
               prop="orgType"
               label="受检机构类型"
@@ -137,13 +135,12 @@
               </template>
             </el-table-column>
             <el-table-column
-              header-align="center"
+              align="center"
               prop="orgName"
               label="发布机构"
               v-if="columns[3].visible"
             ></el-table-column>
             <el-table-column
-              header-align="center"
               align="center"
               prop="status"
               label="状态"
@@ -154,12 +151,12 @@
               </template>
             </el-table-column>
             <el-table-column
-              header-align="center"
+              align="center"
               prop="remark"
               label="备注"
               v-if="columns[5].visible"
             ></el-table-column>
-            <el-table-column header-align="center" label="操作" width="300">
+            <el-table-column align="center" label="操作" width="300">
               <template slot-scope="r">
                 <div>
                   <el-button

src/views/safetycheck/ruleManager/dialog.editItem.vue

@@ -34,7 +34,7 @@
             >
           </div>
           <el-table :data="formData.pointDtoList" border style="width: 100%">
-            <el-table-column header-align="center" prop="name" label="检查内容">
+            <el-table-column align="center" prop="name" label="检查内容">
               <template slot-scope="scope">
                 <div style="white-space: pre-wrap">
                   {{ scope.row.name }}
@@ -42,13 +42,12 @@
               </template>
             </el-table-column>
             <el-table-column
-              header-align="center"
               align="center"
               prop="areaName"
               label="检查区域"
             >
             </el-table-column>
-            <el-table-column header-align="center" label="操作" width="140">
+            <el-table-column align="center" label="操作" width="140">
               <template slot-scope="scope">
                 <el-button
                   type="text"

src/views/safetycheck/ruleManager/dialog.select.point.vue

@@ -47,13 +47,13 @@
         <!-- 表格 -->
         <template slot="columns">
           <el-table-column
-            header-align="center"
+            align="center"
             prop="itemName"
             label="检查项"
             min-width="40%"
           ></el-table-column>
           <el-table-column
-            header-align="center"
+            align="center"
             label="检查内容"
             prop="pointName"
             min-width="40%"
@@ -63,13 +63,12 @@
             </template>
           </el-table-column>
           <el-table-column
-            header-align="center"
             align="center"
             prop="areaName"
             label="检查区域"
             min-width="20%"
           ></el-table-column>
-          <!--         <el-table-column  header-align="center"   prop="nfcName"
+          <!--         <el-table-column  align="center"   prop="nfcName"
                            label="采集点"
                            width="120"></el-table-column>-->
         </template>

src/views/safetycheck/ruleManager/index.vue

@@ -109,7 +109,7 @@
             :cell-style="tableCellStyle"
             :header-cell-style="tableHeaderCellStyle"
           >
-            <el-table-column header-align="center" type="expand">
+            <el-table-column align="center" type="expand">
               <template slot-scope="props">
                 <el-table
                   :data="props.row.pointDtoList"
@@ -119,7 +119,7 @@
                 >
                   <el-table-column type="index" />
                   <el-table-column
-                    header-align="center"
+                    align="center"
                     prop="name"
                     label="检查内容"
                     v-if="columns[3].visible"
@@ -131,7 +131,6 @@
                     </template>
                   </el-table-column>
                   <el-table-column
-                    header-align="center"
                     align="center"
                     prop="areaName"
                     label="检查区域"
@@ -142,7 +141,6 @@
               </template>
             </el-table-column>
             <el-table-column
-              header-align="center"
               align="center"
               type="index"
               label="序号"
@@ -160,14 +158,13 @@
               </template>
             </el-table-column>
             <el-table-column
-              header-align="center"
+              align="center"
               prop="name"
               label="检查项"
               v-if="columns[1].visible"
             >
             </el-table-column>
             <el-table-column
-              header-align="center"
               align="center"
               prop="pointNums"
               label="检查内容数量"
@@ -175,7 +172,7 @@
             >
             </el-table-column>
             <el-table-column
-              header-align="center"
+              align="center"
               label="操作"
               width="140"
               v-if="rule && rule.orgId == orgId && rule.status == 0"

src/views/safetycheck/task/components/detail.vue

@@ -62,7 +62,7 @@
               <el-table :data="scope.row.pointList" size="small">
                 <el-table-column type="index" />
                 <el-table-column
-                  header-align="center"
+                  align="center"
                   prop="pointName"
                   label="检查内容"
                 >
@@ -90,7 +90,7 @@
                   </template>
                 </el-table-column>
                 <el-table-column
-                  header-align="center"
+                  align="center"
                   prop="imgData"
                   label="异常图片"
                 >

src/views/safetycheck/task/index.vue

@@ -212,7 +212,7 @@
             >
             </el-table-column>
             <el-table-column
-              header-align="center"
+              align="center"
               prop="title"
               label="任务名称"
               width="250px"
@@ -221,7 +221,7 @@
             >
             </el-table-column>
             <el-table-column
-              header-align="center"
+              align="center"
               prop="checkOrgName"
               label="检查主体"
               width="180px"
@@ -265,7 +265,7 @@
             <el-table-column
               prop="orgName"
               label="受检机构"
-              header-align="center"
+              align="center"
               width="180px"
               v-if="columns[5].visible"
             >
@@ -274,7 +274,7 @@
             <el-table-column
               prop="planStartTime"
               label="任务时间"
-              header-align="center"
+              align="center"
               width="300px"
               v-if="columns[6].visible"
               ><template slot-scope="r">
@@ -335,7 +335,7 @@
             <el-table-column
               label="操作"
               fixed="right"
-              header-align="center"
+              align="center"
               min-width="120px"
             >
               <template slot-scope="r">    

src/views/system/menu/index.vue

@@ -114,8 +114,7 @@
     >
       <el-table-column
         :show-overflow-tooltip="true"
-        align="left"
-        header-align="center"
+        align="center"
         label="菜单名称"
         prop="menuName"
         width="180"

src/views/system/user/index.vue

@@ -206,9 +206,8 @@
               />
 
               <el-table-column
-                label="所属机构"
-                align="left"
-                header-align="center"
+                label="所属机构"                
+                align="center"
                 key="orgName"
                 prop="orgName"
                 width="200"
@@ -217,8 +216,7 @@
               />
               <el-table-column
                 label="用户角色"
-                align="left"
-                header-align="center"
+                align="center"
                 prop="roles"
                 width="300"
                 v-if="columns[2].visible"
@@ -289,8 +287,7 @@
               </el-table-column>
               <el-table-column
                 label="操作"
-                align="left"
-                header-align="center"
+                align="center"
                 width="350"
                 fixed="right"
                 class-name="small-padding fixed-width"

src/views/system/workTimeSet/workTime.vue

@@ -172,8 +172,7 @@
             </el-table-column>
             <el-table-column
               label="操作"
-              header-align="center"
-              align="left"
+              align="center"
               width="160"
             >
               <template slot-scope="r">

src/views/system/workTimeSet/workTimeWeek.vue

@@ -87,7 +87,7 @@
             <el-table-column prop="workDay" align="center" label="工作日" width="240"></el-table-column>
             <el-table-column prop="modifiedName" align="center" label="更新人" width="160"></el-table-column>
             <el-table-column prop="updateTime" align="center" label="更新时间" width="180"></el-table-column>
-            <el-table-column label="操作" header-align="center" align="left" width="140" >
+            <el-table-column label="操作" align="center"  width="140" >
               <template slot-scope="r">
                   <el-button size="mini" type="text" v-if="r.row.timeCheck===0||r.row.timeCheck===3" @click="onEdit(r.row)">编辑</el-button>
   <!--                <el-button type="text" v-if="r.row.timeCheck===0" @click="onDelete(r.row.id)">删除</el-button>-->