fix: BUG修改

src/assets/js/api/safeManage.js

@@ -46,6 +46,12 @@ export const addinspectTaskRecordApi = data => post('xmgl/inspectTaskRecord/add'
 export const editinspectTaskRecordApi = data => post('xmgl/inspectTaskRecord/edit', data);
 export const deleteinspectTaskRecordApi = data => post('xmgl/inspectTaskRecord/delete', data);
 
+//任务管理--安全
+export const getSafeInspectTaskRecordListApi = data => post('xmgl/xzSecurityInspectTaskRecord/list', data);
+export const addSafeInspectTaskRecordApi = data => post('xmgl/xzSecurityInspectTaskRecord/add', data);
+export const editSafeInspectTaskRecordApi = data => post('xmgl/xzSecurityInspectTaskRecord/edit', data);
+export const deleteSafeInspectTaskRecordApi = data => post('xmgl/xzSecurityInspectTaskRecord/delete', data);
+
 //子任务管理
 export const getinspectTaskItemRecordApi = data => post('xmgl/inspectTaskItemRecord/list', data);
 export const deleteinspectTaskItemRecordApi = data => post('xmgl/inspectTaskItemRecord/delete', data);

src/router/index.js

@@ -2367,6 +2367,13 @@ const routes2 = [
         component: (resolve) =>
           require(["@/views/companyAdmin/basicSetup/checkItem.vue"], resolve),
       },
+      //安全标准
+      {
+        path: "/project/basicSafeSetup/checkItem",
+        name: "安全管理质量标准",
+        component: (resolve) =>
+          require(["@/views/companyAdmin/basicSafeSetup/checkItem.vue"], resolve),
+      },
       //临边防护
       {
         path: "/project/edgeProtection/edgequtManagement",

src/views/companyAdmin/basicSafeSetup/index.vue

@@ -0,0 +1,85 @@
+<template>
+  <div class="fullHeight pages">
+    <!-- <div class="menuBox">
+      <el-menu
+        :default-active="$route.path"
+        class="el-menu-demo"
+        mode="horizontal"
+        @select="handleSelect"
+        active-text-color="#5181F6"
+        router
+      >
+        <el-menu-item :index="item.url" v-for="(item,index) in menuList" :key="index">{{item.name}}</el-menu-item>
+      </el-menu>
+    </div> -->
+    <div class="pageContainer">
+      <div class="pageDataContainer">
+        <router-view></router-view>
+      </div>
+    </div>
+  </div>
+</template>
+<script>
+export default {
+  data() {
+    return {
+    //   LOGO_white:LOGO_white,
+      currentUrl:'',
+      menuList:[
+        { name: '检查项设置', url: "/companyAdmin/basicSetup/checkItem" },
+        { name: '专项检查模板', url: "/companyAdmin/basicSetup/specialCheck" },
+        { name: '计划模板设置', url: "/companyAdmin/basicSetup/planTemplate" },
+        ]
+    };
+  },
+  mounted(){
+    console.log('mounted',this.$route.path)
+    
+  },
+  methods: {
+    handleSelect(url) {
+      // this.$store.commit('setCurrentUrl',url)
+      // this.$store.dispatch('currentUrl',url)
+    },
+  },
+};
+</script>
+<style lang="less" scoped>
+.el-menu.el-menu--horizontal {
+  box-sizing: border-box;
+  padding: 0 20px 4px;
+  border-bottom: none;
+}
+.el-menu--horizontal > .el-menu-item {
+  font-family: PingFangSC-Medium;
+  font-size: 14px;
+  letter-spacing: 0;
+  height: 44px;
+  line-height: 44px;
+  padding: 0;
+  margin-right: 70px;
+}
+.el-menu--horizontal > .el-menu-item.is-active {
+  border-bottom: 3px solid #409eff;
+}
+.menuBox{
+  position: relative;
+}
+
+.flex {
+  display: flex;
+  align-items: center;
+  justify-content: space-between;
+}
+.pageContainer{
+    width: 100%;
+    height: calc(100% - 50px);
+    padding: 0;
+    .pageDataContainer{
+        background: #fff;
+        padding: 0;
+        height: 100%;
+        width: 100%;
+    }
+}
+</style>

src/views/companyAdmin/basicSafeSetup/planTemplate.vue

@@ -0,0 +1,47 @@
+<template>
+    <vue-scroll  class="planTemplate">
+        <img v-if="dialogVisible" src="@/assets/images/firmNotice/jhmb.png" @click="btn(1)" class="left_img"/>
+        <img v-else src="@/assets/images/firmNotice/jhmb_details.png" @click="btn(2)" class="right_img"/>
+    </vue-scroll>
+</template>
+<script>
+export default {
+    data(){
+        return{
+            dialogVisible:true,
+            dialogImageUrl:'',
+        }
+    },
+    methods:{
+        btn(type){
+            if(type==1){
+                this.dialogVisible=false
+            }else if(type==2){
+                this.dialogVisible=true
+            }
+        }
+    }
+}
+</script>
+<style lang="less" scoped>
+.planTemplate{
+    width: 100%;
+    height: 100%;
+    box-sizing: border-box;
+    background: #fff;
+    margin-top: 12px;
+    .left_img{
+        width: 100%;
+        height: auto;
+        cursor: pointer;
+    }
+    .right_img{
+        width: 100%;
+        height: auto;
+        cursor: pointer;
+    }
+   /deep/ .el-dialog__body{
+        padding: 0 !important;
+    }
+}
+</style>

src/views/companyAdmin/basicSafeSetup/specialCheck.vue

@@ -0,0 +1,62 @@
+<template>
+    <vue-scroll  class="specialCheck">
+        <div class="flex">
+        <img src="@/assets/images/firmNotice/jxxj_l.png" @click="btn(1)" class="left_img"/>
+        <img src="@/assets/images/firmNotice/jxxj_r.png" @click="btn(2)" class="right_img"/>
+        </div>
+        <el-dialog :modal-append-to-body="false" :visible.sync="dialogVisible" width="350px">
+             <img width="100%" height="auto" :src="dialogImageUrl" @click="btn(3)" alt="">
+        </el-dialog>
+
+    </vue-scroll>
+</template>
+<script>
+export default {
+    data(){
+        return{
+            dialogVisible:false,
+            dialogImageUrl:'',
+        }
+    },
+    methods:{
+        btn(type){
+            if(type==1){
+                this.dialogVisible = true;
+                this.dialogImageUrl = require('@/assets/images/firmNotice/jxxj_edit.png')
+            }else if(type==2){
+                this.dialogVisible = true;
+                this.dialogImageUrl = require('@/assets/images/firmNotice/jxxj_save.png')
+            }else{
+                this.dialogVisible = false;
+            }
+        }
+    }
+}
+</script>
+<style lang="less" scoped>
+.flex{
+   display: flex;
+}
+.specialCheck{
+    width: 100%;
+    height: 100%;
+ 
+    box-sizing: border-box;
+    background: #fff;
+    margin-top: 12px;
+    .left_img{
+        width: auto;
+        height: 100%;
+        cursor: pointer;
+        margin-right: 12px;
+    }
+    .right_img{
+        width: 100%;
+        height: auto;
+        cursor: pointer;
+    }
+   /deep/ .el-dialog__body{
+        padding: 0 !important;
+    }
+}
+</style>

src/views/projectFront/quality/inspectionLedger.vue

@@ -1008,7 +1008,7 @@
                   </el-option>
                 </el-select>
               </el-form-item> -->
-              <el-form-item label="巡检楼层" prop="floor">
+              <!-- <el-form-item label="巡检楼层" prop="floor">
                 <el-input
                   style="width: 400px"
                   :disabled="type == 'detail'"
@@ -3180,9 +3180,9 @@ export default {
       this.fileList2 = []
       this.fileList3 = []
       this.fileList4 = []
-      $nextTick(()=>{
+      this.$nextTick(()=>{
-        this.$refs.addForm1.resetFields() //清除所有验证
+        this.$refs.addForm1.clearValidate() //清除所有验证
-        this.$refs.addForm2.resetFields() //清除所有验证
+        this.$refs.addForm2.clearValidate() //清除所有验证
       })
       
       this.hideUpload = false

src/views/projectFront/quality/recordsModule/inspectionRecord.vue

@@ -644,7 +644,7 @@
                   </div>
                 </el-col>
               </el-row>
-              <el-row :gutter="20">
+              <!-- <el-row :gutter="20">
                 <el-col :span="12">
                   <div class="grid-content">
                     <span class="label">分部工程：</span>
@@ -661,17 +661,17 @@
                     </span>
                   </div>
                 </el-col>
-              </el-row>
+              </el-row> -->
 
               <el-row :gutter="20">
-                <el-col :span="12">
+                <!-- <el-col :span="12">
                   <div class="grid-content">
                     <span class="label">巡检楼层：</span>
                     <span class="value">
                       {{ detailData.floor }}
                     </span>
                   </div>
-                </el-col>
+                </el-col> -->
                 <el-col :span="12">
                   <div class="grid-content">
                     <span class="label" style="line-height: 25px"
@@ -686,16 +686,6 @@
                     </span>
                   </div>
                 </el-col>
-              </el-row>
-              <!-- <el-row :gutter="20">
-                <el-col :span="24">
-                  <div class="grid-content">
-                    <span class="label">模型定位：</span>
-                    <span class="value"> 已关联 </span>
-                  </div>
-                </el-col>
-              </el-row> -->
-              <el-row :gutter="20">
                 <el-col :span="12">
                   <div class="grid-content">
                     <span class="label">现场照片：</span>
@@ -715,6 +705,34 @@
                   </div>
                 </el-col>
               </el-row>
+              <!-- <el-row :gutter="20">
+                <el-col :span="24">
+                  <div class="grid-content">
+                    <span class="label">模型定位：</span>
+                    <span class="value"> 已关联 </span>
+                  </div>
+                </el-col>
+              </el-row> -->
+              <!-- <el-row :gutter="20">
+                <el-col :span="12">
+                  <div class="grid-content">
+                    <span class="label">现场照片：</span>
+                    <span class="value"  style="cursor: pointer;">
+                      <el-image
+                        v-for="(item, index) in parseImage2(
+                          detailData.imageUrl
+                        )"
+                        :key="index"
+                        style="width: 100px; height: 100px; margin-right: 10px"
+                        :src="item"
+                        :preview-src-list="parseImage2(item.fileUrl)"
+                        @click="openImg(item)"
+                      >
+                      </el-image>
+                    </span>
+                  </div>
+                </el-col>
+              </el-row> -->
               <div class="headerLeft" v-if="rectifyRecordList.length > 0">
                 整改&复核记录
               </div>

src/views/projectFront/safeSame/inspectionLedger.vue

@@ -1008,7 +1008,7 @@
                   </el-option>
                 </el-select>
               </el-form-item> -->
-              <el-form-item label="巡检楼层" prop="floor">
+              <!-- <el-form-item label="巡检楼层" prop="floor">
                 <el-input
                   style="width: 400px"
                   :disabled="type == 'detail'"
@@ -3180,9 +3180,9 @@ export default {
       this.fileList2 = []
       this.fileList3 = []
       this.fileList4 = []
-      $nextTick(()=>{
+      this.$nextTick(()=>{
-        this.$refs.addForm1.resetFields() //清除所有验证
+        this.$refs.addForm1.clearValidate() //清除所有验证
-        this.$refs.addForm2.resetFields() //清除所有验证
+        this.$refs.addForm2.clearValidate() //清除所有验证
       })
       
       this.hideUpload = false

src/views/projectFront/safeSame/recordsModule/inspectionRecord.vue

@@ -644,7 +644,7 @@
                   </div>
                 </el-col>
               </el-row>
-              <el-row :gutter="20">
+              <!-- <el-row :gutter="20">
                 <el-col :span="12">
                   <div class="grid-content">
                     <span class="label">分部工程：</span>
@@ -661,17 +661,17 @@
                     </span>
                   </div>
                 </el-col>
-              </el-row>
+              </el-row> -->
 
               <el-row :gutter="20">
-                <el-col :span="12">
+                <!-- <el-col :span="12">
                   <div class="grid-content">
                     <span class="label">巡检楼层：</span>
                     <span class="value">
                       {{ detailData.floor }}
                     </span>
                   </div>
-                </el-col>
+                </el-col> -->
                 <el-col :span="12">
                   <div class="grid-content">
                     <span class="label" style="line-height: 25px"
@@ -686,16 +686,6 @@
                     </span>
                   </div>
                 </el-col>
-              </el-row>
-              <!-- <el-row :gutter="20">
-                <el-col :span="24">
-                  <div class="grid-content">
-                    <span class="label">模型定位：</span>
-                    <span class="value"> 已关联 </span>
-                  </div>
-                </el-col>
-              </el-row> -->
-              <el-row :gutter="20">
                 <el-col :span="12">
                   <div class="grid-content">
                     <span class="label">现场照片：</span>
@@ -715,6 +705,34 @@
                   </div>
                 </el-col>
               </el-row>
+              <!-- <el-row :gutter="20">
+                <el-col :span="24">
+                  <div class="grid-content">
+                    <span class="label">模型定位：</span>
+                    <span class="value"> 已关联 </span>
+                  </div>
+                </el-col>
+              </el-row> -->
+              <!-- <el-row :gutter="20">
+                <el-col :span="12">
+                  <div class="grid-content">
+                    <span class="label">现场照片：</span>
+                    <span class="value"  style="cursor: pointer;">
+                      <el-image
+                        v-for="(item, index) in parseImage2(
+                          detailData.imageUrl
+                        )"
+                        :key="index"
+                        style="width: 100px; height: 100px; margin-right: 10px"
+                        :src="item"
+                        :preview-src-list="parseImage2(item.fileUrl)"
+                        @click="openImg(item)"
+                      >
+                      </el-image>
+                    </span>
+                  </div>
+                </el-col>
+              </el-row> -->
               <div class="headerLeft" v-if="rectifyRecordList.length > 0">
                 整改&复核记录
               </div>