zc

src/views/safetyCheck/components/infoDialog/infoDialog.vue

@@ -336,7 +336,7 @@
         <p class="out-button" @click="outLook">返回</p>
       </div>
     </div>
-    <div class="bottom-button-box dialog-footer-box" v-if="infoDialogCheckIndex == 'add'">
+    <div class="bottom-button-box dialog-footer-box" v-if="infoDialogCheckIndex == 'add'&&imgDocumentType != 1">
       <p class="dialog-footer-button-null"></p>
       <p class="dialog-footer-button-info" @click="outDialog">取消</p>
       <p class="dialog-footer-button-primary" v-if="addFormType==1" @click="upDataButton(1)">提交</p>

src/views/safetyCheck/laboratorySelfTest/selfInspectionManagement/index.vue

@@ -104,11 +104,11 @@
                 <p class="table-button-p" v-hasPermi="['safety:checkManage_1: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="['safety:checkManage_1:query','safety:checkManage_1: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="['safety:checkManage_1:query','safety:checkManage_1: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="['safety:checkManage_1:query','safety:checkManage_1: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>

src/views/safetyCheck/schoolInspection/inspectionManagement/index.vue

@@ -102,11 +102,11 @@
                 <p class="table-button-p" v-hasPermi="['safety:checkManage: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="['safety:checkManage:query','safety:checkManage: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="['safety:checkManage:query','safety:checkManage: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="['safety:checkManage:query','safety:checkManage: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>

src/views/safetyCheck/worktable/hiddenDangerStatisticsEcharts.vue

@@ -50,15 +50,17 @@
           }
         }
       },
-      //校级
+      //院系
       departmentEcharts(){
         collegCheckHiddenCountByType({hdLevel:this.hdLevel}).then(response => {
+          console.log('院系',response)
           let myChart = this.$echarts.init(document.getElementById('hiddenDangerStatisticsEcharts-box'));
           let data = {
             name:[],
             nameText:[],
             text:[],
             num: [],
+            percent: [],
           }
           if(!response.rows[0]){
             this.$set(this,'nullType',true);
@@ -72,6 +74,7 @@
             data.nameText.push(response.rows[i].subjectName)
             data.text.push(response.rows[i].hazardCheckName)
             data.num.push(response.rows[i].sumTotal)
+            data.percent.push(response.rows[i].percent)
           }
           let option = {
             grid: {
@@ -83,7 +86,7 @@
             tooltip: {
               trigger: 'axis',
               formatter: params => {
-                return data.nameText[params[0].dataIndex] +' 隐患:'+ data.num[params[0].dataIndex]
+                return data.nameText[params[0].dataIndex] +' 隐患:'+ data.num[params[0].dataIndex]+' 占比:'+data.percent[params[0].dataIndex]
                 // return `${params.data.nameText} 隐患:${params.data.value} 占比:${params.percent}%`
               },
               backgroundColor: 'rgba(0, 0, 0, 0.6)', // 提示框背景色
@@ -189,7 +192,7 @@
           myChart.setOption(option);
         })
       },
-      //院系
+      //校级
       schoolEcharts(){
         hiddenCountByType({hdLevel:this.hdLevel}).then(response => {
           let myChart = this.$echarts.init(document.getElementById('hiddenDangerStatisticsEcharts-box'));
@@ -202,7 +205,6 @@
           }
           for(let i=0;i<response.rows.length;i++){
             // substring
-            console.log(response.rows[i].collegeName.length)
             let obj = {
               name:response.rows[i].collegeName.length>8?response.rows[i].collegeName.substring(0,8)+'..':response.rows[i].collegeName,
               nameText:response.rows[i].collegeName,

src/views/safetyCheck/worktable/toDoListBox.vue

@@ -299,7 +299,8 @@
       .for-list-box{
         height:190px;
         border-radius:20px;
-        border:1px solid rgba(0,0,0,0.1);
+        box-shadow: 0 4px 10px 0 rgba(0,0,0,0.2);
+        overflow: hidden;
         margin-top:20px;
         position: relative;
         .for-name-box{