Merge branch 'bjxz-dev' into chenH

src/assets/js/api/safeManage.js

@@ -54,7 +54,7 @@ export const deleteSafeInspectTaskRecordApi = data => post('xmgl/xzSecurityInspe
 
 //子任务管理
 export const getinspectTaskItemRecordApi = data => post('xmgl/inspectTaskItemRecord/list', data);
-export const getSafeinspectTaskItemRecordApi = data => post('xmgl/SafeInspectTaskItemRecord/list', data);
+export const getSafeinspectTaskItemRecordApi = data => post('xmgl/xzSecurityInspectTaskItemRecord/list', data);
 export const deleteinspectTaskItemRecordApi = data => post('xmgl/inspectTaskItemRecord/delete', data);
 export const deleteSafeinspectTaskItemRecordApi = data => post('xmgl/SafeInspectTaskItemRecord/delete', data);
 

src/pages/index/index.js

@@ -277,6 +277,27 @@ Vue.use(vuescroll, {
   },
 })
 
+//  按钮权限控制指令
+Vue.directive('permission', {
+  inserted: (el, binding)=>{
+    const { value } = binding;
+    // 判断当前用户是否拥有该按钮权限
+    if (!checkPermission(value)) {
+      el.parentNode.removeChild(el);
+    }
+  }
+});
+// 判断权限的函数
+function checkPermission(permission) {
+  var permissions = store.state.userInfo.menuAuthority.menuList;
+  permissions = permissions.filter(
+    (x) => x.menuName == permission.moduleName
+  )[0];
+  let index = permissions.actionList.findIndex(
+    (x) => x.actionCode == permission.key
+  )
+  return index != -1?true:false;
+}
 //  加载缩略图
 Vue.prototype.downloadImgMin = function(row) {
   let fileUrl = store.state.FILEURL + row.fileUrl

src/views/companyAdmin/basicSafeSetup/checkItem.vue

@@ -278,6 +278,14 @@
               label="整改时限(天)"
               align="center"
             ></el-table-column>
+            <el-table-column
+              label="扣分"
+              align="center"
+            >
+            <template slot-scope="scope">
+              <span>{{scope.row.deductScore || 0}}</span>
+            </template>
+            </el-table-column>
             <el-table-column label="操作" align="center">
               <template slot-scope="scope">
                 <el-button
@@ -462,6 +470,12 @@
               @input="handleEdit"
             ></el-input>
           </el-form-item>
+          <el-form-item label="扣分" prop="deductScore">
+            <el-input
+              placeholder="请输入"
+              v-model="dialogdata.deductScore"
+            ></el-input>
+          </el-form-item>
         </el-form>
         <div class="dialog-footer">
           <el-button

src/views/projectFront/laborManage/personAuditAg.vue

@@ -67,11 +67,7 @@
               >{{ $t("message.laborMange.refresh") }}</el-button
             >
             <el-button
-              v-if="
-                menuList.actionList.findIndex(
-                  (x) => x.actionCode == 'qrcodeAg'
-                ) != -1
-              "
+              v-permission="{key: 'qrcodeAg', moduleName: '人员登记培训'}"
               type="primary"
               @click="openCode"
               plain
@@ -704,7 +700,6 @@ export default {
         { name: "不合格", value: 0 },
         { name: "未培训", value: -1 },
       ],
-      menuList: this.$store.state.userInfo.menuAuthority.menuList,
       qrCodeDialog: false,
       tableData: [],
       page: 1,
@@ -788,9 +783,6 @@ export default {
   },
   created() {
     this.projectSn = this.$store.state.projectSn;
-    this.menuList = this.menuList.filter(
-      (x) => x.menuName == "人员登记培训"
-    )[0];
     this.getMachineList();
     this.getInfoList();
     this.getProjectList();

src/views/projectFront/quality/inspectionLedger.vue

@@ -1705,7 +1705,9 @@
                           ? "一般"
                           : detailData.urgentLevel == 2
                           ? "严重"
-                          : "紧要"
+                          : detailData.urgentLevel == 3
+                          ? "紧要"
+                          : ""
                       }}</span>
                     </div>
                   </el-col>

src/views/projectFront/safeSame/inspectionLedger.vue

@@ -1702,7 +1702,9 @@
                           ? "一般"
                           : detailData.urgentLevel == 2
                           ? "严重"
-                          : "紧要"
+                          : detailData.urgentLevel == 3
+                          ? "紧要"
+                          : ""
                       }}</span>
                     </div>
                   </el-col>