Merge branch 'master' of http://101.42.248.108:3000/wangyu/post-check-web

src/views/examineCompetition/assessment/index.vue

@@ -175,7 +175,7 @@ export default {
         serviceType: 'assessment_rating_other_1'
       },
       userId: '',
-      isDisplay: true
+      isDisplay: false
     }
   },
 
@@ -304,11 +304,11 @@ export default {
     look(row) {
       if (this.queryParams.type === 1) {
         this.$router.push(
-          `/examineCompetition/ruleManagement/assessmentEditOrLook?id=${row.id}&type=1`
+          `/examineCompetition/assessmentEditOrLook?id=${row.id}&type=1`
         )
       } else {
         this.$router.push(
-          `/examineCompetition/ruleManagement/produceScore?id=${row.id}&type=1`
+          `/examineCompetition/produceScore?id=${row.id}&type=1`
         )
       }
     },
@@ -316,11 +316,11 @@ export default {
     edit(row) {
       if (this.queryParams.type === 1) {
         this.$router.push(
-          `/examineCompetition/ruleManagement/assessmentEditOrLook?id=${row.id}&type=2`
+          `/examineCompetition/assessmentEditOrLook?id=${row.id}&type=2`
         )
       } else {
         this.$router.push(
-          `/examineCompetition/ruleManagement/produceScore?id=${row.id}&type=2`
+          `/examineCompetition/produceScore?id=${row.id}&type=2`
         )
       }
     },

src/views/examineCompetition/assessment/produce.vue

@@ -188,7 +188,7 @@ export default {
         serviceType: 'assessment_rating_other_2'
       },
       userId: '',
-      isDisplay: true
+      isDisplay: false
     }
   },
 
@@ -315,11 +315,11 @@ export default {
     look(row) {
       if (this.queryParams.type === 1) {
         this.$router.push(
-          `/examineCompetition/ruleManagement/assessmentEditOrLook?id=${row.id}&type=1`
+          `/examineCompetition/assessmentEditOrLook?id=${row.id}&type=1`
         )
       } else {
         this.$router.push(
-          `/examineCompetition/ruleManagement/produceScore?id=${row.id}&type=1`
+          `/examineCompetition/produceScore?id=${row.id}&type=1`
         )
       }
     },
@@ -327,11 +327,11 @@ export default {
     edit(row) {
       if (this.queryParams.type === 1) {
         this.$router.push(
-          `/examineCompetition/ruleManagement/assessmentEditOrLook?id=${row.id}&type=2`
+          `/examineCompetition/assessmentEditOrLook?id=${row.id}&type=2`
         )
       } else {
         this.$router.push(
-          `/examineCompetition/ruleManagement/produceScore?id=${row.id}&type=2`
+          `/examineCompetition/produceScore?id=${row.id}&type=2`
         )
       }
     },

src/views/home/centerBottom.vue

@@ -46,7 +46,7 @@
         <!--<el-table-column label="问题整改率" align="center" prop="problemRectificationRate">-->
         <el-table-column label="整改率" align="center" prop="problemRectificationRate">
            <template #default="{ row }">
-              {{ row.problemRectificationRate? (Math.floor(row.problemRectificationRate) * 100) + '%': ''}}
+              {{ row.problemRectificationRate? (row.problemRectificationRate) * 100 + '%': ''}}
           </template>
         </el-table-column>
       </el-table>
@@ -73,7 +73,7 @@
         </el-table-column>
         <el-table-column label="问题整改率" align="center" prop="problemRectificationRate" show-overflow-tooltip>
            <template #default="{ row }">
-              {{ row.problemRectificationRate? Math.floor(row.problemRectificationRate) * 100 + '%': ''}}
+              {{ row.problemRectificationRate? row.problemRectificationRate * 100 + '%': ''}}
           </template>
         </el-table-column>
     </el-table>

src/views/home/rightBottom.vue

@@ -137,9 +137,9 @@ export default {
           return [
             item.rating,
             item.deptName,
-            Math.floor(item.postScore),
-            Math.floor(item.deptScore),
-            Math.floor(item.score)
+            item.postScore * 1,
+            item.deptScore * 1,
+            item.score * 1
           ]
         })
         this.config = Object.assign({}, this.config)
@@ -155,9 +155,9 @@ export default {
           return [
             item.rating,
             item.deptName,
-            Math.floor(item.postScore),
-            Math.floor(item.deptScore),
-            Math.floor(item.score)
+            item.postScore * 1,
+            item.deptScore * 1,
+            item.score * 1
           ]
         })
         this.config = Object.assign({}, this.config)

src/views/jobinspectionHistory/jobinspectionProblem/index.vue

@@ -176,6 +176,22 @@
           }}</span>
         </template>
       </el-table-column>
+
+      <el-table-column
+        label="整改责任人"
+        align="center"
+        show-overflow-tooltip
+        width="150"
+      >
+        <template slot-scope="scope">
+          <span>{{
+              scope.row.rectificationResponsibleName
+                ? scope.row.rectificationResponsibleName
+                : '--'
+            }}</span>
+        </template>
+      </el-table-column>
+
       <el-table-column
         label="问题原因"
         align="center"
@@ -189,7 +205,7 @@
         </template>
       </el-table-column>
       <el-table-column
-        label="是否立即立改问题"
+        label="是否立行立改问题"
         align="center"
         show-overflow-tooltip
       >
@@ -198,7 +214,7 @@
         </template>
       </el-table-column>
       <el-table-column
-        label="整改措施"
+        label="整改措施/建议"
         align="center"
         show-overflow-tooltip
         width="200"
@@ -211,20 +227,9 @@
           }}</span>
         </template>
       </el-table-column>
-      <el-table-column
-        label="整改责任人"
-        align="center"
-        show-overflow-tooltip
-        width="150"
-      >
-        <template slot-scope="scope">
-          <span>{{
-            scope.row.rectificationResponsibleName
-              ? scope.row.rectificationResponsibleName
-              : '--'
-          }}</span>
-        </template>
-      </el-table-column>
+
+
+
       <el-table-column
         label="整改期限"
         align="center"
@@ -240,7 +245,7 @@
       <el-table-column label="整改情况" align="center" show-overflow-tooltip>
         <template slot-scope="scope">
           <span>{{
-            scope.row.isRectificationCompleted == 1 ? '已完成' : '未完成'
+            scope.row.isRectificationCompleted == 1 ? '是' : '否'
           }}</span>
         </template>
       </el-table-column>
@@ -258,15 +263,8 @@
           }}</span>
         </template>
       </el-table-column>
-      <el-table-column label="整改记录" align="center" width="200" show-overflow-tooltip>
-        <template slot-scope="scope">
-          <span>{{
-            scope.row.postCheckedProblemRecord
-              ? scope.row.postCheckedProblemRecord
-              : '--'
-          }}</span>
-        </template>
-      </el-table-column>
+
+
       <el-table-column label="部门审核人" align="center" width="120" show-overflow-tooltip>
         <template slot-scope="scope">
           <span>{{
@@ -285,6 +283,7 @@
           }}</span>
         </template>
       </el-table-column>
+
       <el-table-column label="专业部门审核人" align="center" width="120" show-overflow-tooltip>
         <template slot-scope="scope">
           <span>{{
@@ -303,11 +302,12 @@
           }}</span>
         </template>
       </el-table-column>
+
       <el-table-column label="复查人" align="center" width="120" show-overflow-tooltip>
         <template slot-scope="scope">
           <span>{{
-            scope.row.reviewDepartmentReviewerUserName
-              ? scope.row.reviewDepartmentReviewerUserName
+            scope.row.reviewDepartmentReviewerName
+              ? scope.row.reviewDepartmentReviewerName
               : '--'
           }}</span>
         </template>
@@ -338,6 +338,17 @@
           }}</span>
         </template>
       </el-table-column>
+
+      <el-table-column label="整改记录" align="center" width="200" show-overflow-tooltip>
+        <template slot-scope="scope">
+          <span>{{
+              scope.row.postCheckedProblemRecord
+                ? scope.row.postCheckedProblemRecord
+                : '--'
+            }}</span>
+        </template>
+      </el-table-column>
+
       <el-table-column
         label="操作"
         align="center"

src/views/postInspectionPlanning/planManagement/jobPlanLook.vue

@@ -2,7 +2,7 @@
   <div class="app-container">
     <calendar ref="postPlan" :eventsTime="eventsTime" @initList="getList" />
     <el-form :model="queryParams" ref="queryForm" size="small" :inline="true">
-      <el-form-item label="->受检部门：">
+      <el-form-item label="受检部门：">
         <el-cascader
           v-model="queryParams.checkedDeptId"
           :options="deptTreeList"

src/views/postResponsibility/inventoryRelease/index.vue

@@ -105,7 +105,7 @@
           }}</span>
         </template>
       </el-table-column>
-      <el-table-column label="是否通过" align="center" show-overflow-tooltip>
+      <el-table-column label="状态" align="center" show-overflow-tooltip>
         <template slot-scope="scope">
           <span>{{ initStatus(scope.row.status) }}</span>
         </template>
@@ -200,6 +200,8 @@ export default {
     },
     initStatus(val) {
       switch (val) {
+        case 0:
+          return '待提交'
         case 1:
           return '待审核'
         case 2:

src/views/postResponsibility/inventoryReview/index.vue

@@ -173,6 +173,7 @@ export default {
   data() {
     return {
       queryParams: {
+        statusList: [1,2,3,4], //待审核、审核中、审核通过、驳回
         postName: '',
         pageNum: 1,
         pageSize: 10
@@ -342,4 +343,4 @@ export default {
 </script>
 
 <style lang="scss" scoped>
-</style>
+</style>

src/views/postResponsibility/postResponsibilityOrganization/addDialog.vue

@@ -73,13 +73,32 @@
                   placeholder="请选择岗位级别："
                   style="width: 200px"
                 >
-                  <el-option label="M1" value="M1"></el-option>
-                  <el-option label="M2" value="M2"></el-option>
-                  <el-option label="M3" value="M3"></el-option>
-                  <el-option label="M4" value="M4"></el-option>
-                  <el-option label="M5" value="M5"></el-option>
-                  <el-option label="M6" value="M6"></el-option>
                   <el-option label="M7" value="M7"></el-option>
+                  <el-option label="M8" value="M8"></el-option>
+                  <el-option label="M9" value="M9"></el-option>
+                  <el-option label="M10" value="M10"></el-option>
+                  <el-option label="T5" value="T5"></el-option>
+                  <el-option label="T6" value="T6"></el-option>
+                  <el-option label="T7" value="T7"></el-option>
+                  <el-option label="T8" value="T8"></el-option>
+                  <el-option label="B1" value="B1"></el-option>
+                  <el-option label="B2" value="B2"></el-option>
+                  <el-option label="B3" value="B3"></el-option>
+                  <el-option label="B4" value="B4"></el-option>
+                  <el-option label="B5" value="B5"></el-option>
+                  <el-option label="B6" value="B6"></el-option>
+                  <el-option label="B7" value="B7"></el-option>
+                  <el-option label="B8" value="B8"></el-option>
+                  <el-option label="B9" value="B9"></el-option>
+                  <el-option label="B10" value="B10"></el-option>
+                  <el-option label="W5" value="W5"></el-option>
+                  <el-option label="W6" value="W6"></el-option>
+                  <el-option label="W7" value="W7"></el-option>
+                  <el-option label="W8" value="W8"></el-option>
+                  <el-option label="W9" value="W9"></el-option>
+                  <el-option label="W10" value="W10"></el-option>
+                  <el-option label="W11" value="W11"></el-option>
+                  <el-option label="W12" value="W12"></el-option>
                 </el-select>
               </el-form-item>
               <el-form-item label="是否涉密" prop="isConfidential">
@@ -551,7 +570,7 @@ export default {
         positionLevel: '',
         positionArr: [],
         children:[],
-        isConfidential: "是",
+        isConfidential: "否",
         subordinateCount: null,
         positionCode: '',
         directSuperior: '',
@@ -923,4 +942,4 @@ export default {
     align-items: center;
   }
 }
-</style>
+</style>

src/views/postResponsibility/postResponsibilityOrganization/index.vue

@@ -62,7 +62,7 @@
         <el-button type="primary" @click="doAdd(`新建`, 0)">新建</el-button>
       </el-col>
       <el-col :span="1.5">
-        <el-button @click="importWen = true">批量导入</el-button>
+        <el-button type="primary" @click="importWen = true">批量导入</el-button>
       </el-col>
     </el-row>
 
@@ -143,7 +143,7 @@
           }}</span>
         </template>
       </el-table-column>
-      <el-table-column label="是否通过" align="center" show-overflow-tooltip>
+      <el-table-column label="状态" align="center" show-overflow-tooltip>
         <template slot-scope="scope">
           <span>{{ initStatus(scope.row.status) }}</span>
         </template>
@@ -193,11 +193,12 @@
     <el-dialog
       v-dialogDrag
       v-loading="loading"
+      v-if="importWen"
       title="批量导入"
       :visible.sync="importWen"
       width="40%"
       :close-on-click-modal="false"
-      @closed="cancelCredent"
+      :before-close="cancelCredent"
     >
       <el-row>
         <el-col :span="24">
@@ -355,6 +356,8 @@ export default {
     },
     initStatus(val) {
       switch (val) {
+        case 0:
+          return '待提交'
         case 1:
           return '待审核'
         case 2:
@@ -397,16 +400,11 @@ export default {
     // 导入证件文件取消按钮
     cancelCredent() {
       this.importWen = false
+      this.uploadList = []
       this.fileList = []
       // 清除上传的文件数据
       this.$refs.upload.clearFiles()
     },
-    // 导入证件文件取消按钮
-    cancelCredent() {
-      this.importWen = false
-      // 清除上传的文件数据
-      this.$refs.upload.clearFiles()
-    },
     async confirmCredent() {
       if (this.uploadList.length === 0) return this.$message.error('文件必传')
       // 调用上传文件接口
@@ -418,7 +416,7 @@ export default {
         this.getList()
         this.fileList = []
         this.uploadList = []
-      
+
     },
     // 文件上传前
     async uploadHttpRequest1(response, file, fileList) {
@@ -516,4 +514,4 @@ export default {
 </script>
 
 <style lang="scss" scoped>
-</style>
+</style>

src/views/statisticAnalysis/AtopForm.vue

@@ -87,7 +87,7 @@
       <el-table-column label="整改率" align="center" show-overflow-tooltip>
         <template slot-scope="scope">
           <span>{{
-            scope.row.rate ? formatNumber(scope.row.rate) : '0%'
+            scope.row.rate ? formatNumber(scope.row.rate) * 100 + '%' : '0%'
           }}</span>
         </template>
       </el-table-column>

src/views/statisticAnalysis/problemStatistics/leftZhu.vue

@@ -66,7 +66,8 @@ export default {
     initTopLeftChartEcharts() {
       const option = {
         title: {
-          text: '岗检问题级别占比',
+          // text: '岗检问题级别占比',
+          text: '岗检问题属性整改占比',
           left: 'center'
         },
         //格式化提示
@@ -113,4 +114,4 @@ export default {
     }
   }
 }
-</script>
+</script>

src/views/statisticAnalysis/topRigthChart.vue

@@ -136,4 +136,4 @@ export default {
 </script>
 
 <style lang="scss" scoped>
-</style>
+</style>

src/views/system/dept/index.vue

@@ -24,7 +24,7 @@
         <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
       </el-form-item>
     </el-form>
-
+    <!--
     <el-row :gutter="10" class="mb8">
       <el-col :span="1.5">
         <el-button
@@ -47,6 +47,7 @@
       </el-col>
       <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
     </el-row>
+    -->
 
     <el-table
       v-if="refreshTable"
@@ -86,6 +87,7 @@
             @click="handleUpdate(scope.row)"
             v-hasPermi="['system:dept:edit']"
           >修改</el-button>
+          <!--
           <el-button
             size="mini"
             type="text"
@@ -101,6 +103,7 @@
             @click="handleDelete(scope.row)"
             v-hasPermi="['system:dept:remove']"
           >删除</el-button>
+          -->
         </template>
       </el-table-column>
     </el-table>
@@ -166,12 +169,15 @@
               <el-input-number v-model="form.orderNum" controls-position="right" :min="0" />
             </el-form-item>
           </el-col>
+          <!--
           <el-col :span="12">
             <el-form-item label="负责人" prop="leader">
               <el-input v-model="form.leader" placeholder="请输入负责人" maxlength="20" />
             </el-form-item>
           </el-col>
+          -->
         </el-row>
+        <!--
         <el-row>
           <el-col :span="12">
             <el-form-item label="联系电话" prop="phone">
@@ -185,6 +191,7 @@
           </el-col>
         </el-row>
         <el-row>
+        -->
           <!--<el-col :span="12">
             <el-form-item label="部门状态">
               <el-radio-group v-model="form.status">

src/views/system/post/index.vue

@@ -170,7 +170,7 @@
       :visible.sync="importWen"
       width="40%"
       :close-on-click-modal="false"
-      @closed="cancelCredent"
+      :before-close="cancelCredent"
     >
       <el-row>
         <el-col :span="24">