Merge branch 'web-v2' into web-v2-pro

src/layout/components/AppMain.vue

@@ -18,7 +18,7 @@
 </template>
 
 <script>
-  import { selectTriggerInfo} from '@/api/evacuationBigData/index.js'
+  import { selectTriggerInfo } from '@/api/evacuationBigData/index.js'
   import store from '@/store'
   import mqtt from 'mqtt'
 export default {
@@ -55,7 +55,7 @@ export default {
   },
   mounted(){
     this.userType = localStorage.getItem('userType')
-    if(this.userType != 22){
+    if( this.userType != 22 && this.versionField() != 'xiBeiNongLinDaXue'){
       this.selectTriggerInfo();
       this.subscriptionMQTT();
     }

src/views/safetyCheck/laboratorySelfTest/selfInspectionTask/listPage.vue

@@ -97,11 +97,11 @@
               <div class="table-button-box">
                 <p class="table-button-null"></p>
                 <p class="table-button-p" v-hasPermi="['security:checkManage_3:query']"
-                   v-show="scope.row.manageStatus==0||scope.row.manageStatus==2" @click="goAddPage(3,scope.row.id)">详情</p>
+                   v-show="scope.row.manageStatus==0||scope.row.manageStatus==2 && scope.row.isSelfData==1" @click="goAddPage(3,scope.row.id)">详情</p>
                 <p class="table-button-p" v-hasPermiAnd="['security:checkManage_3:query','security:checkManage_3:edit']"
-                   v-show="scope.row.manageStatus==1 && scope.row.isCheck==1" @click="goAddPage(2,scope.row.id)">编辑</p>
+                   v-show="scope.row.manageStatus==1 && scope.row.isCheck==1 && scope.row.isSelfData==1" @click="goAddPage(2,scope.row.id)">编辑</p>
                 <p class="table-button-p" v-hasPermiAnd="['security:checkManage_3:query','security:checkManage_3:edit']"
-                   v-show="scope.row.manageStatus==0 && scope.row.isCheck==1" @click="goAddPage(2,scope.row.id)">开始检查</p>
+                   v-show="scope.row.manageStatus==0 && scope.row.isCheck==1 && scope.row.isSelfData==1" @click="goAddPage(2,scope.row.id)">开始检查</p>
                 <p class="table-button-p"
                    style="color:#999" v-show="scope.row.manageStatus==0 && scope.row.isCheck==0">开始检查</p>
                 <p class="table-button-p" v-show="scope.row.isEndProcess==1 && scope.row.checkResult==0" @click="lookDocumentButton(1,scope.row)">整改报告</p>

src/views/safetyCheck/schoolInspection/inspectionPlan/listPage.vue

@@ -99,11 +99,11 @@
                 <p class="table-button-p" v-hasPermi="['security:checkManage_2:query']"
                    v-show="scope.row.manageStatus==0||scope.row.manageStatus==2" @click="goAddPage(3,scope.row.id)">详情</p>
                 <p class="table-button-p" v-hasPermiAnd="['security:checkManage_2:query','security:checkManage_2:edit']"
-                   v-show="scope.row.manageStatus==1 && scope.row.isCheck==1" @click="goAddPage(2,scope.row.id)">编辑</p>
+                   v-show="scope.row.manageStatus==1 && scope.row.isCheck==1 && scope.row.isSelfData==1" @click="goAddPage(2,scope.row.id)">编辑</p>
                 <p class="table-button-p" v-hasPermiAnd="['security:checkManage_2:query','security:checkManage_2:edit']"
-                   v-show="scope.row.manageStatus==0 && scope.row.isCheck==1" @click="goAddPage(2,scope.row.id)">开始检查</p>
+                   v-show="scope.row.manageStatus==0 && scope.row.isCheck==1 && scope.row.isSelfData==1" @click="goAddPage(2,scope.row.id)">开始检查</p>
                 <p class="table-button-p" v-hasPermiAnd="['security:checkManage_2:query','security:checkManage_2:edit']"
-                   style="color:#999" v-show="scope.row.manageStatus==0 && scope.row.isCheck==0">开始检查</p>
+                   style="color:#999" v-show="scope.row.manageStatus==0 && scope.row.isCheck==0 && scope.row.isSelfData==1">开始检查</p>
                 <p class="table-button-p" v-show="scope.row.isEndProcess==1 && scope.row.checkResult==0" @click="lookDocumentButton(1,scope.row)">整改报告</p>
                 <p class="table-button-p" v-show="scope.row.isAttachment == 1" @click="lookDocumentListButton(1,scope.row)">查看附件</p>
                 <p class="table-button-null"></p>