dedsudiyu 2 年之前
父节点
当前提交
85b5c5fa8a
共有 100 个文件被更改,包括 186 次插入133 次删除
  1. 2 1
      src/views/comprehensive/laboratoryManagement/classified/index.vue
  2. 2 1
      src/views/comprehensive/laboratoryManagement/classifiedGrading/classtype.vue
  3. 2 1
      src/views/comprehensive/laboratoryManagement/classifiedGrading/subjectClass.vue
  4. 2 1
      src/views/comprehensive/laboratoryManagement/inspection/index.vue
  5. 2 1
      src/views/comprehensive/laboratoryManagement/layout/index.vue
  6. 2 1
      src/views/comprehensive/laboratoryManagement/onepc/index.vue
  7. 4 2
      src/views/comprehensive/laboratoryManagement/record/index.vue
  8. 2 1
      src/views/comprehensive/laboratoryManagement/record/myRecord.vue
  9. 2 1
      src/views/comprehensive/laboratoryManagement/securityconfigure/index.vue
  10. 4 2
      src/views/comprehensive/laboratoryManagement/subject/deviceListOne.vue
  11. 2 1
      src/views/comprehensive/message/addContent/subjectList.vue
  12. 2 1
      src/views/comprehensive/message/addContent/userList.vue
  13. 2 1
      src/views/comprehensive/message/labNotify/index.vue
  14. 2 1
      src/views/comprehensive/message/labNotifyplan/index.vue
  15. 2 1
      src/views/comprehensive/personnel/major/index.vue
  16. 2 1
      src/views/comprehensive/personnel/post/index.vue
  17. 2 1
      src/views/comprehensive/personnel/post/selectUser.vue
  18. 1 1
      src/views/comprehensive/personnel/student/addPage.vue
  19. 6 4
      src/views/comprehensive/personnel/teacher/addPage.vue
  20. 4 4
      src/views/comprehensive/personnel/teacher/indexOne.vue
  21. 1 1
      src/views/comprehensive/system/config/index.vue
  22. 3 3
      src/views/comprehensive/system/dept/index.vue
  23. 1 1
      src/views/comprehensive/system/dict/data.vue
  24. 1 1
      src/views/comprehensive/system/dict/index.vue
  25. 1 1
      src/views/comprehensive/system/menu/index.vue
  26. 1 1
      src/views/comprehensive/system/notice/index.vue
  27. 1 1
      src/views/comprehensive/system/operlog/index.vue
  28. 1 1
      src/views/comprehensive/system/publicConfig/indexOne.vue
  29. 2 2
      src/views/comprehensive/system/role/index.vue
  30. 1 1
      src/views/comprehensive/system/role/selectUser.vue
  31. 2 1
      src/views/comprehensive/system/syntheticMusic/index.vue
  32. 2 2
      src/views/comprehensive/system/user/index.vue
  33. 1 1
      src/views/creditViolation/credit/blacklist/index.vue
  34. 2 2
      src/views/creditViolation/credit/negativeListRecords/index.vue
  35. 7 4
      src/views/creditViolation/violation/violation/index.vue
  36. 1 0
      src/views/emergencyManagement/electronicInformationBoard/index.vue
  37. 2 1
      src/views/emergencyManagement/evacuation/light/index.vue
  38. 2 1
      src/views/emergencyManagement/evacuation/sparseHardware/index.vue
  39. 2 1
      src/views/emergencyManagement/plan/addPlan.vue
  40. 2 1
      src/views/emergencyManagement/plan/associationPage.vue
  41. 2 2
      src/views/emergencyManagement/plan/index.vue
  42. 2 1
      src/views/emergencyManagement/plan/newAddPlan.vue
  43. 2 1
      src/views/emergencyManagement/plan/newAssociatedPage.vue
  44. 2 1
      src/views/emergencyManagement/smartLoT/abnormal/index.vue
  45. 2 1
      src/views/emergencyManagement/smartLoT/control/index.vue
  46. 2 1
      src/views/emergencyManagement/smartLoT/hardware/voiceIntercom.vue
  47. 2 1
      src/views/emergencyManagement/smartLoT/sensor/index.vue
  48. 1 1
      src/views/gasManage3_0/manage/RFIDManage/RFIDManage.vue
  49. 2 1
      src/views/gasManage3_0/manage/infoRecord/detailsPage.vue
  50. 1 1
      src/views/gasManage3_0/manage/qualificationApply/qualificationApplyAdd.vue
  51. 1 1
      src/views/gasManage3_0/manage/recognizerManage/recognizerManage.vue
  52. 1 1
      src/views/gasManage3_0/student/qualificationApply/qualificationApplyAdd.vue
  53. 2 1
      src/views/gasManage_syd/manage/RFIDManage/RFIDManage.vue
  54. 2 1
      src/views/gasManage_syd/manage/gasManage/gasManage.vue
  55. 2 1
      src/views/gasManage_syd/manage/gasUseManage/gasUseManage.vue
  56. 2 1
      src/views/gasManage_syd/student/gasUseManage/gasUseManage.vue
  57. 1 1
      src/views/hazardManagement/hazard/addLaboratory.vue
  58. 2 1
      src/views/hazardManagement/hazard/index.vue
  59. 1 1
      src/views/hierarchicalControl/hierarchicalControl/gradeManage/index.vue
  60. 1 1
      src/views/hierarchicalControl/hierarchicalControl/gradeManage/subjectList.vue
  61. 1 1
      src/views/hierarchicalControl/hierarchicalControl/gradeManage/userList.vue
  62. 1 1
      src/views/hierarchicalControl/hierarchicalControl/gradeManageRecord/index.vue
  63. 1 1
      src/views/medicUniversity-3_1/chemicalManagement/InventoryManagement/OutboundRecord/index.vue
  64. 1 1
      src/views/medicUniversity-3_1/chemicalManagement/InventoryManagement/warehousingRecord/index.vue
  65. 1 1
      src/views/medicUniversity-3_1/chemicalManagement/alarmRecord/detailsPage.vue
  66. 1 1
      src/views/medicUniversity-3_1/chemicalManagement/chemicalLibrary/CabinetManagement/operationRecord.vue
  67. 2 2
      src/views/medicUniversity-3_1/chemicalManagement/chemicalLibrary/CabinetManagement/smartLock.vue
  68. 1 1
      src/views/medicUniversity-3_1/chemicalManagement/chemicalLibrary/ChemicalInfo/index.vue
  69. 1 1
      src/views/medicUniversity-3_1/chemicalManagement/chemicalLibrary/ChemicalInfo/listPage.vue
  70. 2 2
      src/views/medicUniversity-3_1/chemicalManagement/chemicalLibrary/msds/index.vue
  71. 1 1
      src/views/medicUniversity-3_1/chemicalManagement/chemicalProcurement/approvalProcess/index.vue
  72. 2 2
      src/views/medicUniversity-3_1/chemicalManagement/chemicalProcurement/purchaseRequisition/approvalPage.vue
  73. 4 2
      src/views/medicUniversity-3_1/chemicalManagement/deviceManagement/IntelligentTerminal/index.vue
  74. 1 1
      src/views/medicUniversity-3_1/chemicalManagement/deviceManagement/SmartAccessControl/index.vue
  75. 2 2
      src/views/medicUniversity-3_1/chemicalManagement/deviceManagement/rfidIdentifier/index.vue
  76. 3 3
      src/views/medicUniversity-3_1/chemicalManagement/deviceManagement/smartAlarm/index.vue
  77. 3 3
      src/views/medicUniversity-3_1/chemicalManagement/deviceManagement/smartLocker/index.vue
  78. 1 1
      src/views/medicUniversity-3_1/chemicalManagement/deviceManagement/smartLocker/operationRecord.vue
  79. 1 1
      src/views/medicUniversity-3_1/chemicalManagement/usageRecord/infoPage.vue
  80. 1 1
      src/views/medicUniversity-3_1/indexHome.vue
  81. 2 2
      src/views/mine/index.vue
  82. 3 3
      src/views/mine/indexOne.vue
  83. 1 1
      src/views/mine/userAvatar.vue
  84. 1 1
      src/views/oneKeyOutfire/outfireDevice/outfireDevice.vue
  85. 1 0
      src/views/safetyCheck/checkConfiguration/configDialog.vue
  86. 4 2
      src/views/safetyCheck/checkItemLibrary/index.vue
  87. 0 1
      src/views/safetyCheck/components/addPage/addPage.vue
  88. 1 0
      src/views/safetyCheck/components/infoDialog/infoDialog.vue
  89. 2 1
      src/views/safetyCheck/laboratorySelfTest/selfInspectionTask/addDialog.vue
  90. 1 0
      src/views/safetyCheck/safetyHazard/batchAudit.vue
  91. 1 0
      src/views/safetyCheck/schoolInspection/inspectionGroup/addDialog.vue
  92. 1 1
      src/views/safetyCheck/schoolInspection/inspectionGroup/index.vue
  93. 8 7
      src/views/safetyCheck/schoolInspection/inspectionPlan/addDialog.vue
  94. 1 0
      src/views/safetyCheck/snapshotManagement/index.vue
  95. 1 2
      src/views/safetyCheck/startInspection/index.vue
  96. 1 1
      src/views/safetyEducationExam/safeLearning/el_category/index.vue
  97. 1 1
      src/views/safetyEducationExam/safeLearning/el_course/edit.vue
  98. 1 1
      src/views/safetyEducationExam/safeLearning/el_course/index.vue
  99. 6 4
      src/views/safetyEducationExam/safeLearning/el_resources/index.vue
  100. 0 0
      src/views/safetyEducationExam/safeLearning/hazard_book/index.vue

+ 2 - 1
src/views/comprehensive/laboratoryManagement/classified/index.vue

@@ -67,7 +67,8 @@
     />
 
     <!-- 添加或修改安全分级对话框 -->
-    <el-dialog :title="title" :visible.sync="open" width="500px" append-to-body>
+    <el-dialog :title="title" :visible.sync="open" width="500px" append-to-body
+               :close-on-click-modal="false">
       <el-form ref="form" :model="form" :rules="rules" label-width="80px">
         <el-form-item label="分级名称" prop="classifiedName">
           <el-input v-model="form.classifiedName" maxlength="4" placeholder="请输入内容" />

+ 2 - 1
src/views/comprehensive/laboratoryManagement/classifiedGrading/classtype.vue

@@ -57,7 +57,8 @@
     />
 
     <!-- 添加或修改安全分级类型对话框 -->
-    <el-dialog :title="title" :visible.sync="open" width="500px" append-to-body>
+    <el-dialog :title="title" :visible.sync="open" width="500px" append-to-body
+               :close-on-click-modal="false">
       <el-form ref="form" :model="form" :rules="rules" label-width="110px">
         <el-form-item label="安全类别名称" prop="typeName">
           <el-input v-model="form.typeName" maxlength="10" placeholder="请输入安全类别名称" />

+ 2 - 1
src/views/comprehensive/laboratoryManagement/classifiedGrading/subjectClass.vue

@@ -53,7 +53,8 @@
           @pagination="getList"
         />
         <!-- 添加或修改安全分级类型对话框 -->
-        <el-dialog :title="title" :visible.sync="open" width="500px" append-to-body>
+        <el-dialog :title="title" :visible.sync="open" width="500px" append-to-body
+                   :close-on-click-modal="false">
           <el-form ref="form" :model="form" :rules="rules" label-width="110px">
             <el-form-item label="实验室类型" prop="moldName">
               <el-input v-model="form.moldName" maxlength="10" placeholder="请输入实验室类型名称" />

+ 2 - 1
src/views/comprehensive/laboratoryManagement/inspection/index.vue

@@ -137,7 +137,8 @@
     />
 
     <!-- 添加或修改拍照检查附件对话框 -->
-    <el-dialog :title="title" :visible.sync="open" width="500px" append-to-body>
+    <el-dialog :title="title" :visible.sync="open" width="500px" append-to-body
+               :close-on-click-modal="false">
       <el-form ref="form" :model="form" :rules="rules" label-width="80px">
         <el-form-item label="进出记录表id" prop="accessId">
           <el-input v-model="form.accessId" placeholder="请输入进出记录表id" />

+ 2 - 1
src/views/comprehensive/laboratoryManagement/layout/index.vue

@@ -172,7 +172,8 @@
     />
 
     <!-- 添加或修改实验室布局对话框 -->
-    <el-dialog :title="title" :visible.sync="open" width="500px" append-to-body>
+    <el-dialog :title="title" :visible.sync="open" width="500px" append-to-body
+               :close-on-click-modal="false">
       <el-form ref="form" :model="form" :rules="rules" label-width="80px">
         <el-form-item label="实验室id" prop="subjectId">
           <el-input v-model="form.subjectId" placeholder="请输入实验室id" />

+ 2 - 1
src/views/comprehensive/laboratoryManagement/onepc/index.vue

@@ -137,7 +137,8 @@
     />
 
     <!-- 添加或修改一体机设备勾选对话框 -->
-    <el-dialog :title="title" :visible.sync="open" width="500px" append-to-body>
+    <el-dialog :title="title" :visible.sync="open" width="500px" append-to-body
+               :close-on-click-modal="false">
       <el-form ref="form" :model="form" :rules="rules" label-width="80px">
         <el-form-item label="进出记录表id" prop="accessId">
           <el-input v-model="form.accessId" placeholder="请输入进出记录表id" />

+ 4 - 2
src/views/comprehensive/laboratoryManagement/record/index.vue

@@ -118,7 +118,8 @@
         @pagination="getList"
       />
       <!-- 添加或修改实验室进出记录对话框 -->
-      <el-dialog :title="title" :visible.sync="open" width="500px" append-to-body>
+      <el-dialog :title="title" :visible.sync="open" width="500px" append-to-body
+                 :close-on-click-modal="false">
         <el-form ref="form" :model="form" :rules="rules" label-width="80px">
           <el-form-item label="姓名" prop="nickName" >
             <el-input v-model="form.nickName" placeholder="无" disabled/>
@@ -161,7 +162,8 @@
     </div>
     <my-record v-if="pageType == 2"></my-record>
 
-    <el-dialog class="record-el-dialog-max-box" :title="infoList[infoIndex].imgName" :visible.sync="infoShadeType" v-if="infoShadeType" width="1070px" height="700" append-to-body>
+    <el-dialog class="record-el-dialog-max-box" :title="infoList[infoIndex].imgName" :visible.sync="infoShadeType" v-if="infoShadeType" width="1070px" height="700" append-to-body
+               :close-on-click-modal="false">
       <div class="record-el-dialog-min-box scrollbar-box">
         <img style="width:1026px;" :src="infoList[infoIndex].imgUrl">
       </div>

+ 2 - 1
src/views/comprehensive/laboratoryManagement/record/myRecord.vue

@@ -92,7 +92,8 @@
     </div>
 
     <!-- 添加或修改实验室进出记录对话框 -->
-    <el-dialog :title="title" :visible.sync="open" width="500px" append-to-body>
+    <el-dialog :title="title" :visible.sync="open" width="500px" append-to-body
+               :close-on-click-modal="false">
       <el-form ref="form" :model="form" :rules="rules" label-width="80px">
         <el-form-item label="出进人员id" prop="joinUserId">
           <el-input v-model="form.joinUserId" placeholder="请输入出进人员id" />

+ 2 - 1
src/views/comprehensive/laboratoryManagement/securityconfigure/index.vue

@@ -101,7 +101,8 @@
     />
 
     <!-- 添加或修改实验室和安全准入配置中间关联对话框 -->
-    <el-dialog :title="title" :visible.sync="open" width="500px" append-to-body>
+    <el-dialog :title="title" :visible.sync="open" width="500px" append-to-body
+               :close-on-click-modal="false">
       <el-form ref="form" :model="form" :rules="rules" label-width="80px">
         <el-form-item label="实验室id" prop="subjectId">
           <el-input v-model="form.subjectId" placeholder="请输入实验室id" />

+ 4 - 2
src/views/comprehensive/laboratoryManagement/subject/deviceListOne.vue

@@ -121,7 +121,8 @@
         <!--</div>-->
         <!--<p class="add-for-p-two" @click="addData(4)"><i class="el-icon-plus"></i>添加摄像头</p>-->
       <!--</div>-->
-      <el-dialog :title="title" :visible.sync="addType" v-if="addType" width="500px" append-to-body>
+      <el-dialog :title="title" :visible.sync="addType" v-if="addType" width="500px" append-to-body
+                 :close-on-click-modal="false">
         <el-form ref="form" :model="form" :rules="rules" label-width="110px">
           <div v-if="upType == 1 || upType == 5">
             <el-form-item label="传感器类型" prop="type">
@@ -215,7 +216,8 @@
           <el-button type="primary" @click="submitForm">确 定</el-button>
         </div>
       </el-dialog>
-      <el-dialog :title="titleOne" :visible.sync="addTypeOne" v-if="addTypeOne" width="800px" append-to-body>
+      <el-dialog :title="titleOne" :visible.sync="addTypeOne" v-if="addTypeOne" width="800px" append-to-body
+                 :close-on-click-modal="false">
         <div style="height:500px;overflow: hidden;display: flex;flex-direction: column">
           <el-table  border :data="tableList" @select-all="handleSelectionChange" @select="handleSelectionChange" ref="multipleTable" :row-key="getRowKeys">
             <el-table-column type="selection" width="50" align="center" :reserve-selection="true"/>

+ 2 - 1
src/views/comprehensive/message/addContent/subjectList.vue

@@ -1,7 +1,8 @@
 <!--分级管控/实验室列表-->
 <template>
   <div class="subjectList" v-if="subjectOpen">
-    <el-dialog title="选择实验室" :visible.sync="subjectOpen" width="1500px" append-to-body>
+    <el-dialog title="选择实验室" :visible.sync="subjectOpen" width="1500px" append-to-body
+               :close-on-click-modal="false">
       <div class="gradeManage-subjectList" style="height:626px;display: flex;flex-direction: column">
         <el-form :model="queryParams" ref="queryForm" :inline="true" v-show="showSearch">
           <el-form-item label="实验室" prop="name" label-width="80px">

+ 2 - 1
src/views/comprehensive/message/addContent/userList.vue

@@ -1,7 +1,8 @@
 <!--分级管控/人员列表-->
 <template>
   <div class="userList" v-if="userOpen">
-    <el-dialog title="选择用户" :visible.sync="userOpen" width="1500px" append-to-body>
+    <el-dialog title="选择用户" :visible.sync="userOpen" width="1500px" append-to-body
+               :close-on-click-modal="false">
       <div class="gradeManage-userList" style="height:626px;display: flex;flex-direction: column">
         <el-form :model="queryParams" ref="queryForm" :inline="true" v-show="showSearch">
           <el-form-item label="姓名" prop="nickName" label-width="80px">

+ 2 - 1
src/views/comprehensive/message/labNotify/index.vue

@@ -82,7 +82,8 @@
     <add-page v-if="pageType == 2"></add-page>
     <info-page v-if="pageType == 3" :infoData="infoData"></info-page>
     <!-- 添加或修改大屏通知计划对话框 -->
-    <el-dialog :title="title" :visible.sync="open" width="500px" append-to-body>
+    <el-dialog :title="title" :visible.sync="open" width="500px" append-to-body
+               :close-on-click-modal="false">
       <el-form ref="form" :model="form" :rules="rules" label-width="80px">
         <el-form-item label="标题" prop="title">
           <el-input v-model="form.title" maxLength="12" placeholder="请输入通知标题" style="width:330px;" :disabled="lookType"/>

+ 2 - 1
src/views/comprehensive/message/labNotifyplan/index.vue

@@ -73,7 +73,8 @@
     <add-page v-if="pageType == 2"></add-page>
     <info-page v-if="pageType == 3" :infoData="infoData"></info-page>
     <!-- 添加或修改大屏通知计划对话框 -->
-    <el-dialog :title="title" :visible.sync="open" width="500px" append-to-body>
+    <el-dialog :title="title" :visible.sync="open" width="500px" append-to-body
+               :close-on-click-modal="false">
       <el-form ref="form" :model="form" :rules="rules" label-width="80px">
         <el-form-item label="标题" prop="title">
           <el-input v-model="form.title" maxLength="12" placeholder="请输入通知标题" style="width:330px;" :disabled="lookType"/>

+ 2 - 1
src/views/comprehensive/personnel/major/index.vue

@@ -59,7 +59,8 @@
     />
 
     <!-- 添加或修改major对话框 -->
-    <el-dialog :title="title" :visible.sync="open" width="500px" append-to-body>
+    <el-dialog :title="title" :visible.sync="open" width="500px" append-to-body
+               :close-on-click-modal="false">
       <el-form ref="form" :model="form" :rules="rules" label-width="80px">
         <el-form-item label="专业名称" prop="majorName">
           <el-input v-model="form.majorName" type="textarea" placeholder="请输入专业名称" />

+ 2 - 1
src/views/comprehensive/personnel/post/index.vue

@@ -99,7 +99,8 @@
       />
     </div>
     <!-- 添加或修改职位对话框 -->
-    <el-dialog :title="title" :visible.sync="open" width="500px" append-to-body>
+    <el-dialog :title="title" :visible.sync="open" width="500px" append-to-body
+               :close-on-click-modal="false">
       <el-form ref="form" :model="form" :rules="rules" label-width="80px">
         <el-form-item label="职位名称" prop="postName">
           <el-input v-model="form.postName" placeholder="请输入职位名称" maxlength="10" />

+ 2 - 1
src/views/comprehensive/personnel/post/selectUser.vue

@@ -1,6 +1,7 @@
 <template>
   <!-- 授权用户 -->
-  <el-dialog title="选择用户" :visible.sync="visible" width="1540px" top="5vh" append-to-body class="role-select-user">
+  <el-dialog title="选择用户" :visible.sync="visible" width="1540px" top="5vh" append-to-body class="role-select-user"
+             :close-on-click-modal="false">
     <el-form :model="queryParams" ref="queryForm" :inline="true">
       <el-form-item label="姓名" prop="nickName">
         <el-input

+ 1 - 1
src/views/comprehensive/personnel/student/addPage.vue

@@ -240,7 +240,7 @@
       <addPageSubPagePublic v-else></addPageSubPagePublic>
       <!--<p class="inquire-button-one" @click="upDataClick">提交</p>-->
     </div>
-    <el-dialog title="添加班级" :visible.sync="gradeOpen" width="600px" append-to-body class="teacher-revise-dialog-box">
+    <el-dialog title="添加班级" :visible.sync="gradeOpen" width="600px" append-to-body class="teacher-revise-dialog-box" :close-on-click-modal="false">
       <el-form :model="gradeForm" ref="gradeForm" :inline="true" :rules="rules" class="addCheckPage-min">
         <el-form-item label="班级名称" prop="gradeName" label-width="110px" >
           <el-input v-model="gradeForm.gradeName" clearable maxlength="20" style="width:420px;" placeholder="请输入班级名称"/>

+ 6 - 4
src/views/comprehensive/personnel/teacher/addPage.vue

@@ -178,7 +178,7 @@
             ></el-switch>
             <p v-if="editType" style="line-height:40px;color:#999;width:180px;padding-left:40px;">{{form.nature==0?'在职':'离职'}}</p>
           </el-form-item>
-          <el-form-item label="安全检查人员:" prop="isCheck">
+          <el-form-item label="安全检查人员:" prop="isCheck" v-if="versionField() != 'xiBeiNongLinDaXue'">
             <el-switch
               v-if="!editType"
               @click.native="isCheckCaptcha"
@@ -314,7 +314,8 @@
       </div>
 
       <user-list-one ref="userOpen"></user-list-one>
-      <el-dialog :title="permissionCheckData.menuName+'模块'" :visible.sync="permissionOpen" width="900px" append-to-body class="managePermissionTemplates-permission-dialog-box">
+      <el-dialog :title="permissionCheckData.menuName+'模块'" :visible.sync="permissionOpen" width="900px"
+                 :close-on-click-modal="false" append-to-body class="managePermissionTemplates-permission-dialog-box">
         <p class="title-p">{{permissionCheckData.menuName}}权限详细配置</p>
         <div class="managePermissionTemplates-permission-dialog-form-box">
           <div class="title-box">
@@ -340,7 +341,8 @@
           <p class="inquire-button-one" @click="surePermissionOpen">确定</p>
         </div>
       </el-dialog>
-      <el-dialog title="选择指定部门(可多选)" @close="deptCancel" :visible.sync="deptOpen" v-if="deptOpen" width="500px" append-to-body class="managePermissionTemplates-dept-dialog-box">
+      <el-dialog title="选择指定部门(可多选)" @close="deptCancel" :visible.sync="deptOpen" :close-on-click-modal="false"
+                 v-if="deptOpen" width="500px" append-to-body class="managePermissionTemplates-dept-dialog-box">
         <el-form :model="deptForm" ref="deptForm" :inline="true" :rules="rules" class="addCheckPage-min">
           <el-form-item label="指定部门" prop="deptIds" label-width="90px" class="el-form-item-bottom">
             <el-cascader
@@ -358,7 +360,7 @@
         </div>
       </el-dialog>
       <!--另存-->
-      <el-dialog title="另存为权限模板" :visible.sync="saveOpen" width="600px" append-to-body class="teacher-revise-dialog-box">
+      <el-dialog title="另存为权限模板" :visible.sync="saveOpen" width="600px" :close-on-click-modal="false" append-to-body class="teacher-revise-dialog-box">
         <el-form :model="saveForm" ref="saveForm" :inline="true" :rules="rules" class="addCheckPage-min">
           <el-form-item label="模板名称" prop="name" label-width="110px" >
             <el-input v-model="saveForm.name" clearable maxlength="12" style="width:420px;" placeholder="请输入模板名称"/>

+ 4 - 4
src/views/comprehensive/personnel/teacher/indexOne.vue

@@ -255,7 +255,7 @@
     </div>
     <add-page v-if="pageType == 2" :editType="editType" :propsData="propsData" :titleName="titleName"></add-page>
     <!--重置密码-->
-    <el-dialog title="重置密码" :visible.sync="reviseOpen" width="600px" append-to-body class="teacher-revise-dialog-box">
+    <el-dialog title="重置密码" :visible.sync="reviseOpen" width="600px" append-to-body class="teacher-revise-dialog-box" :close-on-click-modal="false">
       <p class="teacher-text-p">确定要重置该账号的密码吗?</p>
       <p class="teacher-text-p">确定操作后,该账号密码将重置为系统初始密码。</p>
       <div slot="footer" class="teacher-revise-dialog-button-box">
@@ -264,7 +264,7 @@
       </div>
     </el-dialog>
     <!--导入窗口-->
-    <el-dialog title="导入数据" :visible.sync="importOpen" @close="importOpenOff" width="600px" append-to-body class="teacher-import-dialog-box">
+    <el-dialog title="导入数据" :visible.sync="importOpen" @close="importOpenOff" width="600px" append-to-body class="teacher-import-dialog-box" :close-on-click-modal="false">
       <el-upload
         class="teacher-import-dialog-upLoad-box"
         :drag="true"
@@ -298,7 +298,7 @@
       <div class="teacher-import-dialog-position-box" v-if="loading"></div>
     </el-dialog>
     <!--编辑--组织架构-->
-    <el-dialog title="修改部门" :visible.sync="treeOpen" width="600px" append-to-body class="teacher-tree-dialog-box">
+    <el-dialog title="修改部门" :visible.sync="treeOpen" width="600px" append-to-body class="teacher-tree-dialog-box" :close-on-click-modal="false">
       <el-form :model="treeForm" class="teacher-tree-dialog-form-box" ref="treeForm" :rules="rules" v-show="showSearch">
         <el-form-item label="上级部门" prop="parentId" label-width="90px" v-if="treeForm.parentId != 0">
           <treeselect v-model="treeForm.parentId" :options="deptOptions" :show-count="true" @select="deptSelect" placeholder="请选择上级部门" />
@@ -319,7 +319,7 @@
       </div>
     </el-dialog>
     <!--新增--组织架构-->
-    <el-dialog title="新增部门" :visible.sync="treeAddOpen" width="600px" append-to-body class="teacher-tree-dialog-box">
+    <el-dialog title="新增部门" :visible.sync="treeAddOpen" width="600px" append-to-body class="teacher-tree-dialog-box" :close-on-click-modal="false">
       <el-form :model="treeAddForm" class="teacher-tree-dialog-form-box" ref="treeAddForm" :rules="rules" v-show="showSearch">
         <el-form-item label="上级部门" prop="id" label-width="90px">
           <treeselect v-model="treeAddForm.id" :options="deptOptions" :show-count="true" @select="deptAddSelect" placeholder="请选择上级部门" />

+ 1 - 1
src/views/comprehensive/system/config/index.vue

@@ -138,7 +138,7 @@
     />
 
     <!-- 添加或修改参数配置对话框 -->
-    <el-dialog :title="title" :visible.sync="open" width="500px" append-to-body>
+    <el-dialog :title="title" :visible.sync="open" width="500px" append-to-body :close-on-click-modal="false">
       <el-form ref="form" :model="form" :rules="rules" label-width="80px">
         <el-form-item label="参数名称" prop="configName">
           <el-input v-model="form.configName" placeholder="请输入参数名称" />

+ 3 - 3
src/views/comprehensive/system/dept/index.vue

@@ -51,7 +51,7 @@
         </template>
       </el-table-column>
     </el-table>
-    <el-dialog class="up-img-box" title="电子签章" :visible.sync="upFaceOpen" width="600px" append-to-body>
+    <el-dialog class="up-img-box" title="电子签章" :visible.sync="upFaceOpen" width="600px" append-to-body :close-on-click-modal="false">
       <el-form ref="form" :model="upFaceForm" :rules="rules">
         <el-form-item label="是否适用下级" prop="isLower" style="margin-top:30px;" label-width="140px">
           <el-select v-model="upFaceForm.isLower" placeholder="请选择是否适用下级" style="width:300px;">
@@ -83,7 +83,7 @@
       </div>
     </el-dialog>
     <!-- 添加或修改部门对话框 -->
-    <el-dialog :title="title" :visible.sync="open" width="600px" append-to-body>
+    <el-dialog :title="title" :visible.sync="open" width="600px" append-to-body :close-on-click-modal="false">
       <el-form ref="form" :model="form" :rules="rules" label-width="80px">
         <el-row>
           <el-col :span="12">
@@ -103,7 +103,7 @@
         <el-button type="primary" @click="submitForm">确 定</el-button>
       </div>
     </el-dialog>
-    <el-dialog title="电子签章" :visible.sync="signType" width="600px" append-to-body>
+    <el-dialog title="电子签章" :visible.sync="signType" width="600px" append-to-body :close-on-click-modal="false">
       <img :src="signUrl" style="width:300px;height:300px;display: block;margin:0 auto;">
       <div slot="footer" class="dialog-footer">
         <el-button type="primary" @click="lookSign(1)" style="width:100px; margin:0 auto;display: block;">确 定</el-button>

+ 1 - 1
src/views/comprehensive/system/dict/data.vue

@@ -116,7 +116,7 @@
     />
 
     <!-- 添加或修改参数配置对话框 -->
-    <el-dialog :title="title" :visible.sync="open" width="500px" append-to-body>
+    <el-dialog :title="title" :visible.sync="open" width="500px" append-to-body :close-on-click-modal="false">
       <el-form ref="form" :model="form" :rules="rules" label-width="80px">
         <!--<el-form-item label="字典类型">-->
           <!--<el-input v-model="form.dictType" :disabled="true" />-->

+ 1 - 1
src/views/comprehensive/system/dict/index.vue

@@ -107,7 +107,7 @@
     />
 
     <!-- 添加或修改参数配置对话框 -->
-    <el-dialog :title="title" :visible.sync="open" width="500px" append-to-body>
+    <el-dialog :title="title" :visible.sync="open" width="500px" append-to-body :close-on-click-modal="false">
       <el-form ref="form" :model="form" :rules="rules" label-width="80px">
         <el-form-item label="字典名称" prop="dictName">
           <el-input v-model="form.dictName" placeholder="请输入字典名称" />

+ 1 - 1
src/views/comprehensive/system/menu/index.vue

@@ -101,7 +101,7 @@
     </el-table>
 
     <!-- 添加或修改菜单对话框 -->
-    <el-dialog :title="title" :visible.sync="open" width="680px" append-to-body>
+    <el-dialog :title="title" :visible.sync="open" width="680px" append-to-body :close-on-click-modal="false">
       <el-form ref="form" :model="form" :rules="rules" label-width="100px">
         <el-row>
           <el-col :span="24">

+ 1 - 1
src/views/comprehensive/system/notice/index.vue

@@ -121,7 +121,7 @@
     />
 
     <!-- 添加或修改公告对话框 -->
-    <el-dialog :title="title" :visible.sync="open" width="780px" append-to-body>
+    <el-dialog :title="title" :visible.sync="open" width="780px" append-to-body :close-on-click-modal="false">
       <el-form ref="form" :model="form" :rules="rules" label-width="80px">
         <el-row>
           <el-col :span="12">

+ 1 - 1
src/views/comprehensive/system/operlog/index.vue

@@ -69,7 +69,7 @@
     />
 
     <!-- 操作日志详细 -->
-    <el-dialog title="操作日志详细" :visible.sync="open" width="700px" append-to-body>
+    <el-dialog title="操作日志详细" :visible.sync="open" width="700px" append-to-body :close-on-click-modal="false">
       <el-form ref="form" :model="form" label-width="100px" size="mini">
         <el-row>
           <el-col :span="12">

+ 1 - 1
src/views/comprehensive/system/publicConfig/indexOne.vue

@@ -193,7 +193,7 @@
     </el-form>
     <p class="inquire-button-one" style="margin:60px auto 60px;display: block" @click="submitForm">保存</p>
     <!--查看图片-->
-    <el-dialog title="查看" :visible.sync="imgOpen" width="1200px" append-to-body>
+    <el-dialog title="查看" :visible.sync="imgOpen" width="1200px" append-to-body :close-on-click-modal="false">
       <div class="scrollbar-box" style="width:1160px;margin:0 auto;max-height:700px;overflow-y: scroll">
         <img :src="imgUrl" style="display:block;max-width:1160px;margin:0 auto">
       </div>

+ 2 - 2
src/views/comprehensive/system/role/index.vue

@@ -94,7 +94,7 @@
     />
 
     <!-- 添加或修改角色配置对话框 -->
-    <el-dialog :title="title" :visible.sync="open" width="500px" append-to-body class="role-el-dialog">
+    <el-dialog :title="title" :visible.sync="open" width="500px" append-to-body class="role-el-dialog" :close-on-click-modal="false">
       <el-form ref="form" :model="form" :rules="rules" label-width="100px">
         <el-form-item label="角色名称" prop="roleName">
           <el-input v-model="form.roleName" placeholder="请输入角色名称" />
@@ -146,7 +146,7 @@
     </el-dialog>
 
     <!-- 分配角色数据权限对话框 -->
-    <el-dialog :title="title" :visible.sync="openDataScope" width="500px" append-to-body>
+    <el-dialog :title="title" :visible.sync="openDataScope" width="500px" append-to-body :close-on-click-modal="false">
       <el-form :model="form" label-width="80px">
         <el-form-item label="角色名称">
           <el-input v-model="form.roleName" :disabled="true" />

+ 1 - 1
src/views/comprehensive/system/role/selectUser.vue

@@ -1,6 +1,6 @@
 <template>
   <!-- 授权用户 -->
-  <el-dialog title="选择用户" :visible.sync="visible" width="1540px" top="5vh" append-to-body class="role-select-user">
+  <el-dialog title="选择用户" :visible.sync="visible" width="1540px" top="5vh" append-to-body class="role-select-user" :close-on-click-modal="false">
     <el-form :model="queryParams" ref="queryForm" :inline="true">
       <el-form-item label="姓名" prop="nickName">
         <el-input

+ 2 - 1
src/views/comprehensive/system/syntheticMusic/index.vue

@@ -44,7 +44,8 @@
     />
 
     <!-- 添加或修改音乐合成对话框 -->
-    <el-dialog :title="title" :visible.sync="open" width="500px" append-to-body>
+    <el-dialog :title="title" :visible.sync="open" width="500px" append-to-body
+               :close-on-click-modal="false">
       <el-form ref="form" :model="form" :rules="rules" label-width="110px">
         <el-form-item label="场景类型" prop="sceneType">
           <el-select v-model="form.sceneType" placeholder="请选择场景类型" clearable style="width:350px;">

+ 2 - 2
src/views/comprehensive/system/user/index.vue

@@ -165,7 +165,7 @@
     </el-row>
 
     <!-- 添加或修改参数配置对话框 -->
-    <el-dialog :title="title" :visible.sync="open" width="600px" append-to-body>
+    <el-dialog :title="title" :visible.sync="open" width="600px" append-to-body :close-on-click-modal="false">
       <el-form ref="form" :model="form" :rules="rules" label-width="80px">
         <el-row>
           <el-col :span="12">
@@ -271,7 +271,7 @@
     </el-dialog>
 
     <!-- 用户导入对话框 -->
-    <el-dialog :title="upload.title" :visible.sync="upload.open" width="400px" append-to-body>
+    <el-dialog :title="upload.title" :visible.sync="upload.open" width="400px" append-to-body :close-on-click-modal="false">
       <el-upload
         ref="upload"
         :limit="1"

+ 1 - 1
src/views/creditViolation/credit/blacklist/index.vue

@@ -63,7 +63,7 @@
     </div>
     <black-list-info v-if="pageType == 2" :propsData="propsData"></black-list-info>
     <!-- 移除黑名单 -->
-    <el-dialog :title="title" :visible.sync="open" width="500px" append-to-body>
+    <el-dialog :title="title" :visible.sync="open" width="500px" append-to-body :close-on-click-modal="false">
       <el-form ref="form" :model="form" :rules="rules" label-width="90px">
         <el-form-item label="姓名:">
           <el-input v-model="form.userName" :disabled="true" placeholder="请输入姓名" />

+ 2 - 2
src/views/creditViolation/credit/negativeListRecords/index.vue

@@ -68,7 +68,7 @@
     </div>
     <page-info :propsData="propsData" v-if="pageType == 2"></page-info>
     <!-- 移除负面清单 -->
-    <el-dialog :title="title" :visible.sync="checklistOpen" width="500px" append-to-body>
+    <el-dialog :title="title" :visible.sync="checklistOpen" width="500px" append-to-body :close-on-click-modal="false">
       <el-form ref="form" :model="form" :rules="rules" label-width="90px">
         <el-form-item label="姓名:">
           <el-input v-model="form.userName" :disabled="true" placeholder="请输入姓名" />
@@ -99,7 +99,7 @@
       </div>
     </el-dialog>
     <!-- 加入黑名单 -->
-    <el-dialog :title="title" :visible.sync="blacklistOpen" width="720px" append-to-body>
+    <el-dialog :title="title" :visible.sync="blacklistOpen" width="720px" append-to-body :close-on-click-modal="false">
       <el-form ref="form" :model="form" :rules="rules" label-width="120px">
         <el-form-item label="姓名:" style="width:600px;">
           <el-input v-model="form.userName" :disabled="true" placeholder="请输入姓名"/>

+ 7 - 4
src/views/creditViolation/violation/violation/index.vue

@@ -111,7 +111,7 @@
       />
     </div>
     <!-- 新增违规 -->
-    <el-dialog :title="title" :visible.sync="open" width="720px" append-to-body>
+    <el-dialog :title="title" :visible.sync="open" width="720px" append-to-body :close-on-click-modal="false">
       <el-form ref="form" :model="form" :rules="addRules" label-width="120px">
         <el-form-item label="姓名:" prop="userId">
           <el-select
@@ -264,7 +264,8 @@
       </div>
     </el-dialog>
     <!-- 移除黑名单 -->
-    <el-dialog :title="title" :visible.sync="form1Open" width="500px" append-to-body>
+    <el-dialog :title="title" :visible.sync="form1Open" width="500px" append-to-body
+               :close-on-click-modal="false">
       <el-form ref="form1" :model="form1" :rules="rules1" label-width="90px">
         <el-form-item label="姓名:">
           <el-input v-model="form1.userName" :disabled="true" placeholder="请输入姓名" />
@@ -295,7 +296,8 @@
       </div>
     </el-dialog>
     <!-- 加入黑名单 -->
-    <el-dialog :title="title" :visible.sync="form2Open" width="720px" append-to-body>
+    <el-dialog :title="title" :visible.sync="form2Open" width="720px" append-to-body
+               :close-on-click-modal="false">
       <el-form ref="form2" :model="form2" :rules="rules2" label-width="120px">
         <el-form-item label="姓名:" style="width:600px;">
           <el-input v-model="form2.userName" :disabled="true" placeholder="请输入姓名"/>
@@ -333,7 +335,8 @@
       </div>
     </el-dialog>
     <!-- 移除负面清单 -->
-    <el-dialog :title="title" :visible.sync="form3Open" width="500px" append-to-body>
+    <el-dialog :title="title" :visible.sync="form3Open" width="500px" append-to-body
+               :close-on-click-modal="false">
       <el-form ref="form3" :model="form3" :rules="rules3" label-width="90px">
         <el-form-item label="姓名:">
           <el-input v-model="form3.userName" :disabled="true" placeholder="请输入姓名" />

+ 1 - 0
src/views/emergencyManagement/electronicInformationBoard/index.vue

@@ -69,6 +69,7 @@
                 @pagination="getList"
     />
     <el-dialog :title="dialogTitle" :visible.sync="addDialogType" v-if="addDialogType"
+               :close-on-click-modal="false"
                width="520px" append-to-body id="onDutyConfiguration-dialog-box">
       <el-form ref="form" :model="addForm" :rules="rules" label-width="100px">
         <el-form-item label="设备编号:" prop="cardNum">

+ 2 - 1
src/views/emergencyManagement/evacuation/light/index.vue

@@ -74,7 +74,8 @@
       @pagination="getList"
     />
     <!-- 添加或修改逃生指引灯对话框 -->
-    <el-dialog :title="title" :visible.sync="open" width="500px" append-to-body>
+    <el-dialog :title="title" :visible.sync="open" width="500px" append-to-body
+               :close-on-click-modal="false">
       <el-form ref="form" :model="form" :rules="rules" label-width="120px">
         <el-form-item label="实验室名称" prop="subjectId">
           <el-input v-model="form.subName" placeholder="请输入实验室名称" :disabled="true" />

+ 2 - 1
src/views/emergencyManagement/evacuation/sparseHardware/index.vue

@@ -85,7 +85,8 @@
     </div>
     <add-page v-if="pageType == 2" :propsData="propsData"></add-page>
     <!-- 添加或修改疏散硬件对话框 -->
-    <el-dialog :title="title" :visible.sync="open" width="500px" append-to-body>
+    <el-dialog :title="title" :visible.sync="open" width="500px" append-to-body
+               :close-on-click-modal="false">
       <el-form ref="form" :model="form" :rules="rules" label-width="80px">
         <el-form-item label="设备编码" prop="hardwareNum">
           <el-input v-model="form.hardwareNum" placeholder="请输入设备编码" />

+ 2 - 1
src/views/emergencyManagement/plan/addPlan.vue

@@ -125,7 +125,8 @@
       </div>
     </el-form>
     <!--关联实验室弹框-->
-    <el-dialog title='关联实验室' @close="handleClose" :visible.sync="dialogVisible" width="80%">
+    <el-dialog title='关联实验室' @close="handleClose" :visible.sync="dialogVisible" width="80%"
+               :close-on-click-modal="false">
       <el-form :model="dialogForm" ref="dialogForm" :inline="true" label-width="140px">
         <el-form-item label="实验室名称" prop="name" >
           <el-input

+ 2 - 1
src/views/emergencyManagement/plan/associationPage.vue

@@ -91,7 +91,8 @@
         @pagination="getListPlan"
       />
       <!--关联实验室-->
-      <el-dialog title='关联实验室'  @close="handleLabClose" v-if="dialogVisible" :visible.sync="dialogVisible" width="80%">
+      <el-dialog title='关联实验室'  @close="handleLabClose" v-if="dialogVisible" :visible.sync="dialogVisible" width="80%"
+                 :close-on-click-modal="false">
         <el-form :model="dialogForm" ref="queryForm" :inline="true">
           <el-form-item label="实验室名称" prop="name">
             <el-input

+ 2 - 2
src/views/emergencyManagement/plan/index.vue

@@ -76,13 +76,13 @@
     <!--关联实验室-->
     <association-page v-if="pageType == 4" :associationData="associationData"></association-page>
     <!--  关联记录  -->
-    <el-dialog title='关联记录' @close="handleClose"  :visible.sync="dialogVisible2" width="80%">
+    <el-dialog title='关联记录' @close="handleClose"  :close-on-click-modal="false" :visible.sync="dialogVisible2" width="80%">
       <div class="scrollbar-box" style="padding:0;margin:0 auto;height:700px;overflow-y: scroll;display: flex;flex-direction: column;flex:1;">
         <relevance-record-page v-if="pageType == 3" :pageData3="pageData3" style="display: flex;flex-direction: column;flex:1;"></relevance-record-page>
       </div>
     </el-dialog>
     <!--新增预案-->
-    <el-dialog title="定制预案" v-if="addFormOpen" :visible.sync="addFormOpen" width="500px" append-to-body>
+    <el-dialog title="定制预案" v-if="addFormOpen" :close-on-click-modal="false" :visible.sync="addFormOpen" width="500px" append-to-body>
       <el-form ref="addForm" :model="addForm" :rules="rules" label-width="80px">
         <el-form-item label="预案名称" prop="name">
           <el-input v-model="addForm.name" placeholder="请输入预案名称" maxLength="15"/>

+ 2 - 1
src/views/emergencyManagement/plan/newAddPlan.vue

@@ -77,7 +77,8 @@
         <p class="plan-for-max-button-null"></p>
       </div>
     </div>
-    <el-dialog :title='dialogTitle' v-if="dialogOpen" :visible.sync="dialogOpen" width="800px" @close='closeDialog'>
+    <el-dialog :title='dialogTitle' v-if="dialogOpen" :visible.sync="dialogOpen" width="800px" @close='closeDialog'
+               :close-on-click-modal="false">
       <div class="scrollbar-box" style="height:600px;">
         <el-form :model="dialogForm" ref="dialogForm" :rules="rules" label-width="100px">
           <el-form-item label="预案等级:" prop="riskPlanLevel">

+ 2 - 1
src/views/emergencyManagement/plan/newAssociatedPage.vue

@@ -101,7 +101,8 @@
                   :limit.sync="queryParams.pageSize"
                   @pagination="getList"
       />
-      <el-dialog title='关联实验室' v-if="dialogAssociatedOpen" :visible.sync="dialogAssociatedOpen" width="1200px">
+      <el-dialog title='关联实验室' v-if="dialogAssociatedOpen" :visible.sync="dialogAssociatedOpen" width="1200px"
+                 :close-on-click-modal="false">
         <div style="height: 600px;overflow: hidden;display: flex;flex-direction: column;flex:1;">
           <el-form :model="param" ref="queryForm" :inline="true" label-width="80px">
             <el-form-item label="关键字" prop="searchValue">

+ 2 - 1
src/views/emergencyManagement/smartLoT/abnormal/index.vue

@@ -134,7 +134,8 @@
       </div>
     </div>
     <!-- 添加或修改异常设备对话框 -->
-    <el-dialog title="异常设备记录" :visible.sync="open" width="1000px" append-to-body>
+    <el-dialog title="异常设备记录" :visible.sync="open" width="1000px" append-to-body
+               :close-on-click-modal="false">
       <div class="abnormal-dialog">
         <p>出现异常次数: <span>{{this.abnormalCount}}</span></p>
         <p>最近异常时间: <span>{{this.lastAbnormalTime}}</span></p>

+ 2 - 1
src/views/emergencyManagement/smartLoT/control/index.vue

@@ -132,7 +132,8 @@
     />
 
     <!-- 添加或修改控制记录对话框 -->
-    <el-dialog :title="title" :visible.sync="open" width="500px" append-to-body>
+    <el-dialog :title="title" :visible.sync="open" width="500px" append-to-body
+               :close-on-click-modal="false">
       <el-form ref="form" :model="form" :rules="rules" label-width="80px">
         <el-form-item label="触发方式" prop="triggerModes">
           <el-input v-model="form.triggerModes" placeholder="请输入触发方式" />

+ 2 - 1
src/views/emergencyManagement/smartLoT/hardware/voiceIntercom.vue

@@ -67,7 +67,8 @@
     />
 
     <!-- 添加或修改硬件对话框 -->
-    <el-dialog :title="title" :visible.sync="open" width="500px" append-to-body class="hardware-dialog">
+    <el-dialog :title="title" :visible.sync="open" width="500px" append-to-body class="hardware-dialog"
+               :close-on-click-modal="false">
       <el-form ref="form" :model="form" :rules="rules" label-width="80px">
         <el-form-item label="设备名称" prop="name">
           <el-input v-model="form.name" placeholder="请输入设备名称" />

+ 2 - 1
src/views/emergencyManagement/smartLoT/sensor/index.vue

@@ -74,7 +74,8 @@
     />
 
     <!-- 添加或修改传感器对话框 -->
-    <el-dialog :title="title" :visible.sync="open" width="520px" append-to-body class="sensor-dialog-box">
+    <el-dialog :title="title" :visible.sync="open" width="520px" append-to-body class="sensor-dialog-box"
+               :close-on-click-modal="false">
       <el-form ref="form" :model="form" :rules="rules" label-width="120px">
         <el-form-item label="传感器名称" prop="name">
           <el-input v-model="form.name" placeholder="请输入传感器名称" maxlength="20" />

+ 1 - 1
src/views/gasManage3_0/manage/RFIDManage/RFIDManage.vue

@@ -76,7 +76,7 @@
       />
     </div>
     <!-- -->
-    <el-dialog title="RFID标签录入" :visible.sync="dialogVisible " @close="handleClose" width="500px" append-to-body>
+    <el-dialog title="RFID标签录入" :visible.sync="dialogVisible " @close="handleClose" width="500px" append-to-body :close-on-click-modal="false">
       <div style="text-align: center">
         <el-form ref="form" :model="form" label-width="80px">
           <p class="entering_t">请将RFID标签放置在RIFD读写器上进行识别</p>

+ 2 - 1
src/views/gasManage3_0/manage/infoRecord/detailsPage.vue

@@ -81,7 +81,8 @@
       </div>
     </div>
     <!--查看图片-->
-    <el-dialog title="抓拍照片" :visible.sync="imgOpen" width="1200px" append-to-body>
+    <el-dialog title="抓拍照片" :visible.sync="imgOpen" width="1200px" append-to-body
+               :close-on-click-modal="false">
       <div class="scrollbar-box" style="width:1160px;margin:0 auto;max-height:700px;overflow-y: scroll">
         <img :src="imgUrl" style="display:block;max-width:1156px;margin:0 auto;">
       </div>

+ 1 - 1
src/views/gasManage3_0/manage/qualificationApply/qualificationApplyAdd.vue

@@ -131,7 +131,7 @@
         </div>
       </div>
     </div>
-    <el-dialog :title="'已选气瓶 '+totalNum" border :visible.sync="dialogVisible">
+    <el-dialog :title="'已选气瓶 '+totalNum" border :visible.sync="dialogVisible" :close-on-click-modal="false">
       <el-table border v-loading="loading" :data="form.listDetailVo" height="500">
         <el-table-column label="气体名称" align="left" prop="airName"/>
         <el-table-column label="气体级别/规格" align="left" prop="configName"></el-table-column>

+ 1 - 1
src/views/gasManage3_0/manage/recognizerManage/recognizerManage.vue

@@ -74,7 +74,7 @@
       @pagination="getList"
     />
     <!-- 添加或修改传感器对话框 -->
-    <el-dialog :title="title" :visible.sync="open" width="600px" append-to-body class="recognizer recognizer-manage add-hardware-dialog-box">
+    <el-dialog :title="title" :visible.sync="open" width="600px" append-to-body class="recognizer recognizer-manage add-hardware-dialog-box" :close-on-click-modal="false">
       <el-form ref="form" :model="form" :rules="rules" :inline="true" label-width="130px">
         <el-form-item label="设备名称" prop="deviceName">
           <el-input v-model="form.deviceName" maxlength="30" placeholder="请输入识别器编号" style="width: 400px"/>

+ 1 - 1
src/views/gasManage3_0/student/qualificationApply/qualificationApplyAdd.vue

@@ -132,7 +132,7 @@
         </div>
       </div>
     </div>
-    <el-dialog  :visible.sync="dialogVisible">
+    <el-dialog  :visible.sync="dialogVisible" :close-on-click-modal="false">
       <el-table v-loading="loading" :data="form.listDetailVo" height="500">
         <el-table-column label="气体名称" align="left" prop="airName"/>
         <el-table-column label="气体级别/规格" align="left" prop="configName"></el-table-column>

+ 2 - 1
src/views/gasManage_syd/manage/RFIDManage/RFIDManage.vue

@@ -77,7 +77,8 @@
       />
     </div>
     <!-- -->
-    <el-dialog title="RFID标签录入" :visible.sync="dialogVisible " @close="handleClose" width="500px" append-to-body>
+    <el-dialog title="RFID标签录入" :visible.sync="dialogVisible " @close="handleClose" width="500px" append-to-body
+               :close-on-click-modal="false">
       <div style="text-align: center">
         <el-form ref="form" :model="form" label-width="80px">
           <p class="entering_t">请将RFID标签放置在RIFD读写器上进行识别</p>

+ 2 - 1
src/views/gasManage_syd/manage/gasManage/gasManage.vue

@@ -89,7 +89,8 @@
      <!--详情页面-->
     <detail-page v-if="pageType==3" :pageData2="pageData2"></detail-page>
     <!--    弹窗-->
-    <el-dialog :title=dialogTitle :visible.sync="dialogVisible" width="500px" append-to-body>
+    <el-dialog :title=dialogTitle :visible.sync="dialogVisible" width="500px" append-to-body
+               :close-on-click-modal="false">
       <el-form ref="form" :model="form" label-width="80px">
         <div style="margin-bottom: 20px">{{dialogContent}}</div>
         <el-input oninput="value=value.replace(/[^1-9]{0,1}(\d*(?:\.\d{0,1})?).*$/g, '$1')"  v-model="form.pressure" placeholder="请输入气表实际压力,精确到小数点后一位" />

+ 2 - 1
src/views/gasManage_syd/manage/gasUseManage/gasUseManage.vue

@@ -47,7 +47,8 @@
       />
     </div>
     <!--    弹窗-->
-    <el-dialog :title=dialogTitle :visible.sync="dialogVisible" width="500px" append-to-body>
+    <el-dialog :title=dialogTitle :visible.sync="dialogVisible" width="500px" append-to-body
+               :close-on-click-modal="false">
       <el-form ref="form" :model="form" :rules="rules" label-width="80px">
         <div style="margin-bottom: 20px">{{dialogContent}}</div>
         <el-input v-show="activeName==1"  v-model="form.beforeUse" placeholder="请输入气表实际压力,精确到小数点后一位" />

+ 2 - 1
src/views/gasManage_syd/student/gasUseManage/gasUseManage.vue

@@ -46,7 +46,8 @@
       />
     </div>
     <!--    弹窗-->
-    <el-dialog :title=dialogTitle :visible.sync="dialogVisible" width="500px" append-to-body>
+    <el-dialog :title=dialogTitle :visible.sync="dialogVisible" width="500px" append-to-body
+               :close-on-click-modal="false">
       <el-form ref="form" :model="form" :rules="rules" label-width="80px">
         <div style="margin-bottom: 20px;color: #333;">{{dialogContent}}</div>
         <el-input v-show="activeName==1" v-model="form.beforeUse" oninput="value=value.replace(/[^1-9]{0,1}(\d*(?:\.\d{0,1})?).*$/g, '$1')" placeholder="请输入气表实际压力,精确到小数点后一位" />

+ 1 - 1
src/views/hazardManagement/hazard/addLaboratory.vue

@@ -35,7 +35,7 @@
         <el-button class="color_ff back_one" @click="previewButton">确定</el-button>
       </div>
     </el-form>
-    <el-dialog title="预览" class="richTextDialog" v-if="richTextDialogType" :visible.sync="richTextDialogType" append-to-body>
+    <el-dialog title="预览" class="richTextDialog" v-if="richTextDialogType" :close-on-click-modal="false" :visible.sync="richTextDialogType" append-to-body>
       <div class="button-max-box">
         <el-select v-model="previewKey" placeholder="请选择" style="margin-bottom:20px;">
           <el-option

+ 2 - 1
src/views/hazardManagement/hazard/index.vue

@@ -98,7 +98,8 @@
     </div>
     <add-laboratory v-if="pageType==2" :hazardId="hazardId"></add-laboratory>
     <!-- 二维码展示 -->
-    <el-dialog title="二维码" class="qr-codeUrl-dialog" :visible.sync="dialogQrCodeType" width="300px" append-to-body>
+    <el-dialog title="二维码" class="qr-codeUrl-dialog" :visible.sync="dialogQrCodeType" width="300px" append-to-body
+               :close-on-click-modal="false">
       <vue-qr style="display: block;height:200px;width:200px;cursor:pointer;margin:0 auto;" :text="dialogQrCodeUrl" :size="200"></vue-qr>
     </el-dialog>
   </div>

+ 1 - 1
src/views/hierarchicalControl/hierarchicalControl/gradeManage/index.vue

@@ -53,7 +53,7 @@
     <!-- 新增编辑 -->
     <add-page v-if="pageType == 2" :propsType="propsType" :propsId="propsId"></add-page>
     <!-- 添加或修改分级管控管理对话框 -->
-    <el-dialog :title="title" :visible.sync="open" width="500px" append-to-body>
+    <el-dialog :title="title" :visible.sync="open" width="500px" append-to-body :close-on-click-modal="false">
       <el-form ref="form" :model="form" :rules="rules" label-width="80px">
         <el-form-item label="备注" prop="remark">
           <el-input v-model="form.remark" placeholder="请输入备注" />

+ 1 - 1
src/views/hierarchicalControl/hierarchicalControl/gradeManage/subjectList.vue

@@ -1,7 +1,7 @@
 <!--分级管控/实验室列表-->
 <template>
   <div class="subjectList" v-if="subjectOpen">
-    <el-dialog title="选择实验室" :visible.sync="subjectOpen" width="1500px" append-to-body>
+    <el-dialog title="选择实验室" :visible.sync="subjectOpen" width="1500px" append-to-body :close-on-click-modal="false">
       <div class="gradeManage-subjectList" style="height:626px;display: flex;flex-direction: column">
         <el-form :model="queryParams" ref="queryForm" :inline="true" v-show="showSearch">
           <el-form-item label="实验室" prop="name" label-width="80px">

+ 1 - 1
src/views/hierarchicalControl/hierarchicalControl/gradeManage/userList.vue

@@ -1,7 +1,7 @@
 <!--分级管控/人员列表-->
 <template>
   <div class="userList" v-if="userOpen">
-    <el-dialog title="选择用户" :visible.sync="userOpen" width="1500px" append-to-body>
+    <el-dialog title="选择用户" :visible.sync="userOpen" width="1500px" append-to-body :close-on-click-modal="false">
       <div class="gradeManage-userList" style="height:626px;display: flex;flex-direction: column">
         <el-form :model="queryParams" ref="queryForm" :inline="true" v-show="showSearch">
           <el-form-item label="关键字" prop="searchValue" label-width="80px">

+ 1 - 1
src/views/hierarchicalControl/hierarchicalControl/gradeManageRecord/index.vue

@@ -115,7 +115,7 @@
     </div>
     <info-page v-if="pageType == 2" :recordId="recordId"></info-page>
     <!-- 添加或修改管控执行记录对话框 -->
-    <el-dialog :title="title" :visible.sync="open" width="500px" append-to-body>
+    <el-dialog :title="title" :visible.sync="open" width="500px" append-to-body :close-on-click-modal="false">
       <el-form ref="form" :model="form" :rules="rules" label-width="80px">
         <el-form-item label="备注" prop="remark">
           <el-input v-model="form.remark" placeholder="请输入备注" />

+ 1 - 1
src/views/medicUniversity-3_1/chemicalManagement/InventoryManagement/OutboundRecord/index.vue

@@ -56,7 +56,7 @@
         </div>
       </div>
     </div>
-    <el-dialog :title="videoTitle" :visible.sync="videoType" v-if="videoType"
+    <el-dialog :title="videoTitle" :visible.sync="videoType" v-if="videoType" :close-on-click-modal="false"
                width="840px" append-to-body id="operationRecord-dialog-box">
       <video style="width:800px;height:450px;" controls="" autoplay="" name="media" :poster="videoCover">
         <source :src="videoData.url" type="video/mp4">

+ 1 - 1
src/views/medicUniversity-3_1/chemicalManagement/InventoryManagement/warehousingRecord/index.vue

@@ -62,7 +62,7 @@
         </div>
       </div>
     </div>
-    <el-dialog :title="videoTitle" :visible.sync="videoType" v-if="videoType"
+    <el-dialog :title="videoTitle" :visible.sync="videoType" v-if="videoType" :close-on-click-modal="false"
                width="840px" append-to-body id="operationRecord-dialog-box">
       <video style="width:800px;height:450px;" controls="" autoplay="" name="media" :poster="videoCover">
         <source :src="videoData.url" type="video/mp4">

+ 1 - 1
src/views/medicUniversity-3_1/chemicalManagement/alarmRecord/detailsPage.vue

@@ -77,7 +77,7 @@
       </div>
     </div>
     <!--查看图片-->
-    <el-dialog title="抓拍照片" :visible.sync="imgOpen" width="1200px" append-to-body>
+    <el-dialog title="抓拍照片" :visible.sync="imgOpen" width="1200px" append-to-body :close-on-click-modal="false">
       <div class="scrollbar-box" style="width:1160px;margin:0 auto;max-height:700px;overflow-y: scroll">
         <img :src="imgUrl" style="display:block;max-width:1156px;margin:0 auto;">
       </div>

+ 1 - 1
src/views/medicUniversity-3_1/chemicalManagement/chemicalLibrary/CabinetManagement/operationRecord.vue

@@ -78,7 +78,7 @@
         @pagination="getList"
       />
     </div>
-    <el-dialog title="操作视频" :visible.sync="videoType" v-if="videoType"
+    <el-dialog title="操作视频" :visible.sync="videoType" v-if="videoType" :close-on-click-modal="false"
                width="840px" append-to-body id="operationRecord-dialog-box">
       <video style="width:800px;height:450px;" controls="" autoplay="" name="media" :poster="videoCover">
         <source :src="videoData.url" type="video/mp4">

+ 2 - 2
src/views/medicUniversity-3_1/chemicalManagement/chemicalLibrary/CabinetManagement/smartLock.vue

@@ -87,7 +87,7 @@
       </div>
     </div>
     <!--新增/编辑-->
-    <el-dialog :title="dialogTitle" :visible.sync="addDialogType" v-if="addDialogType" width="520px" append-to-body class="add-dialog-box">
+    <el-dialog :title="dialogTitle" :visible.sync="addDialogType" v-if="addDialogType" width="520px" append-to-body class="add-dialog-box" :close-on-click-modal="false">
       <el-form ref="form" :model="form" :rules="rules" label-width="140px">
         <el-form-item label="智能终端编号:" prop="hardwareNum">
           <el-input v-model="form.hardwareNum" placeholder="最大20个字符,包含大小写字母、数字" onkeyup="value=value.replace(/[^\w\.\/]/ig,'')" maxlength="30" style="width:360px;"/>
@@ -131,7 +131,7 @@
       </div>
     </el-dialog>
     <!--柜锁设置-->
-    <el-dialog title="柜锁设置" :visible.sync="setUpType" v-if="setUpType" width="520px" append-to-body class="add-dialog-box">
+    <el-dialog title="柜锁设置" :visible.sync="setUpType" v-if="setUpType" width="520px" append-to-body class="add-dialog-box" :close-on-click-modal="false">
       <el-form ref="setUpForm" :model="setUpForm" :rules="rules" label-width="100px">
         <el-form-item label="操作时长:" prop="operateTime">
           <el-input v-model="setUpForm.operateTime" placeholder="请输入操作时长" min="1" max="999" maxlength="3" style="width:360px;">

+ 1 - 1
src/views/medicUniversity-3_1/chemicalManagement/chemicalLibrary/ChemicalInfo/index.vue

@@ -136,7 +136,7 @@
     <list-page v-if="pageType == 3" :listPropsData="listPropsData"></list-page>
     <msds-page v-if="pageType == 4" :msdsPropsData="msdsPropsData"></msds-page>
     <!--导入窗口-->
-    <el-dialog title="导入数据" :visible.sync="importOpen" @close="importOpenOff" width="600px" append-to-body class="import-dialog-box">
+    <el-dialog title="导入数据" :visible.sync="importOpen" @close="importOpenOff" width="600px" append-to-body class="import-dialog-box" :close-on-click-modal="false">
       <div class="el-upload__text" style="margin:0 0 20px 58px;">提示:导入后的数据将覆盖原有数据</div>
       <el-upload
         class="import-dialog-upLoad-box"

+ 1 - 1
src/views/medicUniversity-3_1/chemicalManagement/chemicalLibrary/ChemicalInfo/listPage.vue

@@ -72,7 +72,7 @@
         @pagination="getList"
       />
     </div>
-    <el-dialog title="化学品存放" :visible.sync="dialogType" v-if="dialogType" width="990px" append-to-body class="ChemicalInfo-listPage-dialog">
+    <el-dialog title="化学品存放" :visible.sync="dialogType" v-if="dialogType" width="990px" append-to-body class="ChemicalInfo-listPage-dialog" :close-on-click-modal="false">
       <!--<p class="dialog-title">{{dialogDeptName}}</p>-->
       <el-form :model="dialogData" ref="dialogForm" :inline="true" :rules="rules" label-width="70px">
         <el-form-item label="实验室" prop="subId">

+ 2 - 2
src/views/medicUniversity-3_1/chemicalManagement/chemicalLibrary/msds/index.vue

@@ -69,7 +69,7 @@
     <!--新增页面-->
     <add-page v-if="pageType == 2" :addPropsData="addPropsData"></add-page>
     <!-- 添加或修改危化品安全技术说明书对话框 -->
-    <el-dialog :title="title" :visible.sync="open" width="1000px" append-to-body>
+    <el-dialog :title="title" :visible.sync="open" width="1000px" append-to-body :close-on-click-modal="false">
       <el-form ref="form" :model="form" :rules="rules" label-width="100px">
         <el-form-item label="化学品名称" prop="name" style="width:498px;">
           <el-input v-model="form.name" placeholder="请输入化学品名称" maxLength="20"/>
@@ -100,7 +100,7 @@
       </div>
     </el-dialog>
     <!-- 二维码展示 -->
-    <el-dialog title="二维码" class="qr-codeUrl-dialog" :visible.sync="dialogQrCodeType" width="300px" append-to-body>
+    <el-dialog title="二维码" class="qr-codeUrl-dialog" :visible.sync="dialogQrCodeType" width="300px" append-to-body :close-on-click-modal="false">
       <vue-qr style="display: block;height:200px;width:200px;cursor:pointer;margin:0 auto;" :text="dialogQrCodeUrl" :size="200"></vue-qr>
     </el-dialog>
   </div>

+ 1 - 1
src/views/medicUniversity-3_1/chemicalManagement/chemicalProcurement/approvalProcess/index.vue

@@ -40,7 +40,7 @@
         </div>
       </div>
     </div>
-    <el-dialog title="选择人员" :visible.sync="userDialogType" v-if="userDialogType"
+    <el-dialog title="选择人员" :visible.sync="userDialogType" :close-on-click-modal="false" v-if="userDialogType"
                width="900px" append-to-body id="approvalProcess-dialog-box">
       <div class="dialog-max-big-box">
         <div class="dialog-left-max-big-box">

+ 2 - 2
src/views/medicUniversity-3_1/chemicalManagement/chemicalProcurement/purchaseRequisition/approvalPage.vue

@@ -194,7 +194,7 @@
         </div>
       </div>
     </div>
-    <el-dialog title="化学品详情" :visible.sync="infoDialogType" v-if="infoDialogType" width="900px" append-to-body class="approvalPage-info-dialog-box">
+    <el-dialog title="化学品详情" :visible.sync="infoDialogType" v-if="infoDialogType" :close-on-click-modal="false" width="900px" append-to-body class="approvalPage-info-dialog-box">
       <div class="approvalPage-info-dialog-text-big-box">
         <div class="approvalPage-info-dialog-box-text-box">
           <p>化学品名:</p>
@@ -241,7 +241,7 @@
         <el-button type="primary" @click="getHxpChemicalInfoOff">确 定</el-button>
       </div>
     </el-dialog>
-    <el-dialog title="拒绝审批意见" :visible.sync="approvalTextType" v-if="approvalTextType" width="900px" append-to-body class="approvalPage-info-dialog-box">
+    <el-dialog title="拒绝审批意见" :visible.sync="approvalTextType" :close-on-click-modal="false" v-if="approvalTextType" width="900px" append-to-body class="approvalPage-info-dialog-box">
       <el-form :model="formData" ref="form" :inline="true" label-width="120px">
         <el-form-item label="拒绝意见:" prop="refuseContent">
           <el-input

+ 4 - 2
src/views/medicUniversity-3_1/chemicalManagement/deviceManagement/IntelligentTerminal/index.vue

@@ -85,7 +85,8 @@
       @pagination="getList"
     />
     <!--导入窗口-->
-    <el-dialog title="导入数据" :visible.sync="importOpen" @close="importOpenOff" width="600px" append-to-body class="import-dialog-box">
+    <el-dialog title="导入数据" :visible.sync="importOpen" @close="importOpenOff" width="600px" append-to-body class="import-dialog-box"
+               :close-on-click-modal="false">
       <div class="el-upload__text" style="margin:0 0 20px 58px;">提示:导入后的数据将覆盖原有数据</div>
       <el-upload
         class="import-dialog-upLoad-box"
@@ -120,7 +121,8 @@
       <div class="teacher-import-dialog-position-box" v-if="loading"></div>
     </el-dialog>
     <!--新增/编辑-->
-    <el-dialog :title="dialogTitle" :visible.sync="addDialogType" v-if="addDialogType" width="520px" append-to-body class="add-dialog-box">
+    <el-dialog :title="dialogTitle" :visible.sync="addDialogType" v-if="addDialogType" width="520px" append-to-body class="add-dialog-box"
+               :close-on-click-modal="false">
       <el-form ref="form" :model="form" :rules="rules" label-width="120px">
         <el-form-item label="设备编号:" prop="hardwareNum">
           <el-input v-model="form.hardwareNum" placeholder="最大20个字符,包含大小写字母、数字" onkeyup="value=value.replace(/[^\w\.\/]/ig,'')" maxlength="20" style="width:360px;"/>

+ 1 - 1
src/views/medicUniversity-3_1/chemicalManagement/deviceManagement/SmartAccessControl/index.vue

@@ -73,7 +73,7 @@
     />
 
     <!--新增/编辑-->
-    <el-dialog :title="dialogTitle" :visible.sync="addDialogType" v-if="addDialogType" width="520px" append-to-body class="add-dialog-box">
+    <el-dialog :title="dialogTitle" :visible.sync="addDialogType" v-if="addDialogType" width="520px" append-to-body class="add-dialog-box" :close-on-click-modal="false">
       <el-form ref="form" :model="form" :rules="rules" label-width="110px">
         <el-form-item label="实验室:" prop="subjectId">
           <el-select

+ 2 - 2
src/views/medicUniversity-3_1/chemicalManagement/deviceManagement/rfidIdentifier/index.vue

@@ -85,7 +85,7 @@
       @pagination="getList"
     />
     <!--导入窗口-->
-    <el-dialog title="导入数据" :visible.sync="importOpen" @close="importOpenOff" width="600px" append-to-body class="import-dialog-box">
+    <el-dialog title="导入数据" :visible.sync="importOpen" @close="importOpenOff" :close-on-click-modal="false" width="600px" append-to-body class="import-dialog-box">
       <div class="el-upload__text" style="margin:0 0 20px 58px;">提示:导入后的数据将覆盖原有数据</div>
       <el-upload
         class="import-dialog-upLoad-box"
@@ -120,7 +120,7 @@
       <div class="teacher-import-dialog-position-box" v-if="loading"></div>
     </el-dialog>
     <!--新增/编辑-->
-    <el-dialog :title="dialogTitle" :visible.sync="addDialogType" v-if="addDialogType" width="540px" append-to-body class="add-dialog-box">
+    <el-dialog :title="dialogTitle" :visible.sync="addDialogType" v-if="addDialogType" :close-on-click-modal="false" width="540px" append-to-body class="add-dialog-box">
       <el-form ref="form" :model="form" :rules="rules" label-width="140px">
         <el-form-item label="RFID检测门编号:" prop="hardwareNum">
           <el-input v-model="form.hardwareNum" placeholder="最大20个字符,包含大小写字母、数字" onkeyup="value=value.replace(/[^\w\.\/]/ig,'')" maxlength="30" style="width:360px;"/>

+ 3 - 3
src/views/medicUniversity-3_1/chemicalManagement/deviceManagement/smartAlarm/index.vue

@@ -122,7 +122,7 @@
       </div>
     </div>
     <!--导入窗口-->
-    <el-dialog title="导入数据" :visible.sync="importOpen" @close="importOpenOff" width="600px" append-to-body class="import-dialog-box">
+    <el-dialog title="导入数据" :visible.sync="importOpen" :close-on-click-modal="false" @close="importOpenOff" width="600px" append-to-body class="import-dialog-box">
       <div class="el-upload__text" style="margin:0 0 20px 58px;">提示:导入后的数据将覆盖原有数据</div>
       <el-upload
         class="import-dialog-upLoad-box"
@@ -157,7 +157,7 @@
       <div class="teacher-import-dialog-position-box" v-if="loading"></div>
     </el-dialog>
     <!--新增/编辑-->
-    <el-dialog :title="dialogTitle" :visible.sync="addDialogType" v-if="addDialogType" width="550px" append-to-body class="add-dialog-box">
+    <el-dialog :title="dialogTitle" :visible.sync="addDialogType" :close-on-click-modal="false" v-if="addDialogType" width="550px" append-to-body class="add-dialog-box">
       <el-form ref="form" :model="form" :rules="rules" label-width="140px">
         <el-form-item label="智能报警器名称:" prop="name">
           <el-input v-model="form.name" placeholder="请输入智能报警器名称"  maxlength="30" style="width:360px;"/><!--onkeyup="value=value.replace(/[^\w\.\/]/ig,'')"-->
@@ -246,7 +246,7 @@
       </div>
     </el-dialog>
     <!--报警设置-->
-    <el-dialog title="报警设置" :visible.sync="setUpType" v-if="setUpType" width="550px" append-to-body class="add-dialog-box">
+    <el-dialog title="报警设置" :visible.sync="setUpType" :close-on-click-modal="false" v-if="setUpType" width="550px" append-to-body class="add-dialog-box">
       <el-form ref="setUpForm" :model="setUpForm" :rules="rules" label-width="120px">
         <el-form-item label="报警时长:" prop="ringTime">
           <el-input v-model="setUpForm.ringTime" placeholder="请输入报警时长" maxlength="3" style="width:360px;">

+ 3 - 3
src/views/medicUniversity-3_1/chemicalManagement/deviceManagement/smartLocker/index.vue

@@ -133,7 +133,7 @@
       </div>
     </div>
     <!--导入窗口-->
-    <el-dialog title="导入数据" :visible.sync="importOpen" @close="importOpenOff" width="600px" append-to-body class="import-dialog-box">
+    <el-dialog title="导入数据" :visible.sync="importOpen" @close="importOpenOff" width="600px" append-to-body class="import-dialog-box" :close-on-click-modal="false">
       <div class="el-upload__text" style="margin:0 0 20px 58px;">提示:导入后的数据将覆盖原有数据</div>
       <el-upload
         class="import-dialog-upLoad-box"
@@ -168,7 +168,7 @@
       <div class="teacher-import-dialog-position-box" v-if="loading"></div>
     </el-dialog>
     <!--新增/编辑-->
-    <el-dialog :title="dialogTitle" :visible.sync="addDialogType" v-if="addDialogType" width="540px" append-to-body class="add-dialog-box">
+    <el-dialog :title="dialogTitle" :visible.sync="addDialogType" v-if="addDialogType" width="540px" append-to-body class="add-dialog-box" :close-on-click-modal="false">
       <el-form ref="form" :model="form" :rules="rules" label-width="130px">
         <el-form-item label="智能柜锁编号:" prop="hardwareNum">
           <el-input v-model="form.hardwareNum" placeholder="最大20个字符,包含大小写字母、数字" onkeyup="value=value.replace(/[^\w\.\/]/ig,'')" maxlength="20" style="width:360px;"/>
@@ -213,7 +213,7 @@
       </div>
     </el-dialog>
     <!--柜锁设置-->
-    <el-dialog title="柜锁设置" :visible.sync="setUpType" v-if="setUpType" width="520px" append-to-body class="add-dialog-box">
+    <el-dialog title="柜锁设置" :visible.sync="setUpType" v-if="setUpType" width="520px" append-to-body class="add-dialog-box" :close-on-click-modal="false">
       <el-form ref="setUpForm" :model="setUpForm" :rules="rules" label-width="100px">
         <el-form-item label="操作时长:" prop="operateTime">
           <el-input v-model="setUpForm.operateTime" placeholder="请输入操作时长" min="1" max="999" maxlength="3" style="width:360px;">

+ 1 - 1
src/views/medicUniversity-3_1/chemicalManagement/deviceManagement/smartLocker/operationRecord.vue

@@ -78,7 +78,7 @@
         @pagination="getList"
       />
     </div>
-    <el-dialog title="操作视频" :visible.sync="videoType" v-if="videoType"
+    <el-dialog title="操作视频" :visible.sync="videoType" v-if="videoType" :close-on-click-modal="false"
                width="840px" append-to-body id="operationRecord-dialog-box">
       <video style="width:800px;height:450px;" controls="" autoplay="" name="media" :poster="videoCover">
         <source :src="videoData.url" type="video/mp4">

+ 1 - 1
src/views/medicUniversity-3_1/chemicalManagement/usageRecord/infoPage.vue

@@ -143,7 +143,7 @@
         </div>
       </div>
     </div>
-    <el-dialog :title="videoTitle" :visible.sync="videoType" v-if="videoType"
+    <el-dialog :title="videoTitle" :visible.sync="videoType" v-if="videoType" :close-on-click-modal="false"
                width="840px" append-to-body id="operationRecord-dialog-box">
       <video style="width:800px;height:450px;" controls="" autoplay="" name="media" :poster="videoCover">
         <source :src="videoData.url" type="video/mp4">

+ 1 - 1
src/views/medicUniversity-3_1/indexHome.vue

@@ -150,7 +150,7 @@
         </div>
       </div>
       <!--报警信息查看-->
-      <el-dialog title="报警信息" :visible.sync="homeDialogType" v-if="homeDialogType" @close="homeDialogOff" width="700px" append-to-body class="index-home-dialog-box">
+      <el-dialog title="报警信息" :visible.sync="homeDialogType" :close-on-click-modal="false" v-if="homeDialogType" @close="homeDialogOff" width="700px" append-to-body class="index-home-dialog-box">
         <div class="index-home-dialog-big-box">
           <p>报警时间:</p>
           <p>{{homeDialogData.alarmTime}}</p>

+ 2 - 2
src/views/mine/index.vue

@@ -175,7 +175,7 @@
       </div>
     </div>
     <!--电子签名-->
-    <el-dialog class="up-img-box" title="上传电子签名" :visible.sync="upImgOpen" width="600px" append-to-body>
+    <el-dialog class="up-img-box" title="上传电子签名" :visible.sync="upImgOpen" width="600px" append-to-body :close-on-click-modal="false">
       <p>示例</p>
       <img class="img-one" src="@/assets/ZDimages/icon_scdzqm_sl.png">
       <p>正楷签名</p>
@@ -227,7 +227,7 @@
       </div>
     </el-dialog>
     <!--上传照片-->
-    <el-dialog class="up-img-box" title="上传照片" :visible.sync="upFaceOpen" width="600px" append-to-body>
+    <el-dialog class="up-img-box" title="上传照片" :visible.sync="upFaceOpen" width="600px" append-to-body :close-on-click-modal="false">
       <el-upload
         ref="faceUpLoad"
         class="position-button"

+ 3 - 3
src/views/mine/indexOne.vue

@@ -177,7 +177,7 @@
       </div>
     </div>
     <!--电子签名-->
-    <el-dialog class="up-img-box" title="上传电子签名" :visible.sync="upImgOpen" width="600px" append-to-body>
+    <el-dialog class="up-img-box" title="上传电子签名" :visible.sync="upImgOpen" :close-on-click-modal="false" width="600px" append-to-body>
       <p>示例</p>
       <img class="img-one" src="@/assets/ZDimages/icon_scdzqm_sl.png">
       <p>正楷签名</p>
@@ -229,7 +229,7 @@
       </div>
     </el-dialog>
     <!--上传照片-->
-    <el-dialog class="up-img-box" title="上传照片" :visible.sync="upFaceOpen" width="600px" append-to-body>
+    <el-dialog class="up-img-box" title="上传照片" :visible.sync="upFaceOpen" :close-on-click-modal="false" width="600px" append-to-body>
       <el-upload
         ref="faceUpLoad"
         class="position-button"
@@ -254,7 +254,7 @@
       </div>
     </el-dialog>
     <!--修改手机号-->
-    <el-dialog class="revise-phone-box" @close="offPhone" title="修改手机号" :visible.sync="dialogPhoneType"
+    <el-dialog class="revise-phone-box" @close="offPhone" title="修改手机号" :close-on-click-modal="false" :visible.sync="dialogPhoneType"
                v-if="dialogPhoneType" width="400px" append-to-body>
       <el-form ref="phoneForm" :model="phoneForm" :rules="rules" label-width="0px">
         <el-form-item label="" prop="phone">

+ 1 - 1
src/views/mine/userAvatar.vue

@@ -4,7 +4,7 @@
       <img  v-if="options.img" :src="options.img" class="img-circle img-lg" />
       <img  v-if="!options.img" src="@/assets/ZDimages/tx_cion.png" class="img-circle img-lg" />
     </div>
-    <el-dialog :title="title" :visible.sync="open" width="800px" append-to-body @opened="modalOpened"  @close="closeDialog()">
+    <el-dialog :title="title" :visible.sync="open" width="800px" append-to-body @opened="modalOpened"  @close="closeDialog()" :close-on-click-modal="false">
       <el-row>
         <el-col :xs="24" :md="12" :style="{height: '350px'}">
           <vue-cropper

+ 1 - 1
src/views/oneKeyOutfire/outfireDevice/outfireDevice.vue

@@ -62,7 +62,7 @@
       />
     </div>
     <!--弹框-->
-    <el-dialog :title='dialogTitle' @close="handleClose"  :visible.sync="dialogVisible" width="600px" append-to-body>
+    <el-dialog :title='dialogTitle' @close="handleClose"  :visible.sync="dialogVisible" width="600px" append-to-body :close-on-click-modal="false">
       <el-form :model="dialogForm" ref="dialogForm" :rules="rules" :inline="true" label-width="140px">
         <el-form-item label="设备名称:" prop="deviceName" >
           <el-input

+ 1 - 0
src/views/safetyCheck/checkConfiguration/configDialog.vue

@@ -1,5 +1,6 @@
 <template>
   <el-dialog class="configDialog"
+             :close-on-click-modal="false"
              :title="configDialogData.staffType==1?'检查人员配置':'整改人员配置'" :visible.sync="configDialogType" v-if="configDialogType"
              @close="addDialogAllOff" width="1373px" append-to-body>
     <div class="configDialog-box" v-if="configPageType == 1">

+ 4 - 2
src/views/safetyCheck/checkItemLibrary/index.vue

@@ -77,7 +77,8 @@
       </el-table>
     </div>
     <!--导入窗口-->
-    <el-dialog title="导入数据" :visible.sync="importOpen" @close="importOpenOff" width="600px" append-to-body class="checkItemLibrary-dialog-box">
+    <el-dialog title="导入数据" :visible.sync="importOpen" @close="importOpenOff" width="600px" append-to-body class="checkItemLibrary-dialog-box"
+               :close-on-click-modal="false">
       <el-upload
         class="teacher-import-dialog-upLoad-box"
         :drag="true"
@@ -108,7 +109,8 @@
       <div class="teacher-import-dialog-position-box" v-if="loading"></div>
     </el-dialog>
     <!--添加窗口-->
-    <el-dialog :title="addDialogTitle" :visible.sync="addDialogType" v-if="addDialogType" @close="addDialogOff" width="780px" append-to-body class="checkItemLibrary-dialog-box">
+    <el-dialog :title="addDialogTitle" :visible.sync="addDialogType" v-if="addDialogType" @close="addDialogOff" width="780px" append-to-body class="checkItemLibrary-dialog-box"
+               :close-on-click-modal="false">
       <el-form ref="addDialogForm" :model="addDialogForm" :rules="rules" label-width="120px">
         <el-form-item label="上级指标" prop="parentId">
           <el-cascader

+ 0 - 1
src/views/safetyCheck/components/addPage/addPage.vue

@@ -565,7 +565,6 @@
         }
       }
       .for-big-box{
-        height:540px;
         padding-top:27px;
         .up-img-p{
           height:80px;

+ 1 - 0
src/views/safetyCheck/components/infoDialog/infoDialog.vue

@@ -32,6 +32,7 @@
 -->
 <template>
   <el-dialog class="safetyHazard-info-dialog-box" @close="outDialog"
+             :close-on-click-modal="false"
              :class="fullScreenType?'lookDocumentDataDialog-fullScreen':''"
              v-loading="loading"
              :title="infoDialogData.checkHazardApplyDto.rectifyStatus==1?'已完成':(infoDialogData.checkHazardApplyDto.rectifyStatus==2?'待整改':(infoDialogData.checkHazardApplyDto.rectifyStatus==3?'待复核':(infoDialogData.checkHazardApplyDto.rectifyStatus==4?'暂无法整改':'')))"

+ 2 - 1
src/views/safetyCheck/laboratorySelfTest/selfInspectionTask/addDialog.vue

@@ -1,5 +1,6 @@
 <template>
   <el-dialog class="inspectionPlan-dialog-box"
+             :close-on-click-modal="false"
              v-loading="loading"
              :title="addDialogTitle" :visible.sync="addDialogType" v-if="addDialogType"
              @close="addDialogAllOff" width="1303px" append-to-body>
@@ -383,7 +384,7 @@
     <div slot="footer" class="dialog-footer dialog-footer-box" style="display: flex">
       <p class="dialog-footer-button-null"></p>
       <p class="dialog-footer-button-info" @click="addDialogOff">{{addDialogBoxType==1?'取消':'返回'}}</p>
-      <p class="dialog-footer-button-primary" v-if="!lookInfoType" @click="addUserButton">确定</p>
+      <p class="dialog-footer-button-primary" v-if="!lookInfoType && addDialogBoxType==1" @click="addUserButton">确定</p>
       <p class="dialog-footer-button-null"></p>
     </div>
   </el-dialog>

+ 1 - 0
src/views/safetyCheck/safetyHazard/batchAudit.vue

@@ -81,6 +81,7 @@
     </div>
     <infoDialog v-if="infoDialogType" :propsInfoDialogData="propsInfoDialogData"></infoDialog>
     <el-dialog class="inspectionPlan-dialog-box"
+               :close-on-click-modal="false"
                title="批量审核" :visible.sync="dialogType" v-if="dialogType"
                @close="openDialogPage(2)" width="1303px" append-to-body>
 

+ 1 - 0
src/views/safetyCheck/schoolInspection/inspectionGroup/addDialog.vue

@@ -1,5 +1,6 @@
 <template>
   <el-dialog class="inspectionGroup-dialog-box"
+             :close-on-click-modal="false"
              :title="addDialogTitle" :visible.sync="addDialogType" v-if="addDialogType"
              @close="addDialogAllOff" width="1303px" append-to-body>
     <div class="add-max-box" v-if="addDialogBoxType == 1">

+ 1 - 1
src/views/safetyCheck/schoolInspection/inspectionGroup/index.vue

@@ -41,7 +41,7 @@
             <p class="inquire-button-one"
                style="width:130px;"
                @click="addDialogOpen(1)"
-            ><i class="el-icon-plus"></i>添加巡组</p>
+            ><i class="el-icon-plus"></i>添加巡组</p>
           </el-col>
         </el-form-item>
       </el-form>

+ 8 - 7
src/views/safetyCheck/schoolInspection/inspectionPlan/addDialog.vue

@@ -1,5 +1,6 @@
 <template>
   <el-dialog class="inspectionPlan-dialog-box"
+             :close-on-click-modal="false"
              v-loading="loading"
              :title="addDialogTitle" :visible.sync="addDialogType" v-if="addDialogType"
              @close="addDialogAllOff" width="1303px" append-to-body>
@@ -108,7 +109,7 @@
               </div>
             </div>
           </el-form-item>
-          <el-form-item label="巡组:">
+          <el-form-item label="巡组:">
             <div class="dialog-table-max-box" :class="lookInfoType?'dialog-table-max-box-look':''">
               <div v-if="!lookInfoType">
                 <el-select v-model="groupData" placeholder="请选择" @change="groupChange">
@@ -517,7 +518,7 @@
     <div slot="footer" class="dialog-footer dialog-footer-box" style="display: flex">
       <p class="dialog-footer-button-null"></p>
       <p class="dialog-footer-button-info" @click="addDialogOff">{{addDialogBoxType==1?'取消':'返回'}}</p>
-      <p class="dialog-footer-button-primary" v-if="!lookInfoType" @click="addUserButton">确定</p>
+      <p class="dialog-footer-button-primary" v-if="!lookInfoType && addDialogBoxType==1" @click="addUserButton">确定</p>
       <p class="dialog-footer-button-null"></p>
     </div>
   </el-dialog>
@@ -556,13 +557,13 @@
         },
         //标题快选数据
         quickSelectionList:[],
-        //巡组列表
+        //巡组列表
         dialogOptions:[],
         //上传文件名称暂存
         upDataName:"",
-        //巡
+        //巡
         groupData:"",
-        //巡组状态 院级/校级
+        //巡组状态 院级/校级
         groupDataType:"",
         //选中巡查人员列表
         dialogTableList:[],
@@ -732,7 +733,7 @@
             this.$set(this,'dialogRangeOptions',[{label:"全校",value:1},{label:"学院",value:2},{label:"实验室",value:3}]);
             this.$set(this,'groupDataType',0);
           }
-          //获取巡组 checkLevel: 0全部 1校级 2院级
+          //获取巡组 checkLevel: 0全部 1校级 2院级
           findGroupList({checkLevel:this.groupDataType}).then(response => {
             this.$set(this,'dialogOptions',response.data);
           });
@@ -795,7 +796,7 @@
           })
         }
       },
-      //选中巡
+      //选中巡
       groupChange(val){
         checkGroupFind({id:val,selectEnable:1}).then(response => {
           this.$set(this,'dialogTableList',response.data.checkGroupMemberList);

+ 1 - 0
src/views/safetyCheck/snapshotManagement/index.vue

@@ -113,6 +113,7 @@
     <listPage v-if="pageType == 2"></listPage>
     <infoPage v-if="pageType == 3" :infoPropsData="infoPropsData"></infoPage>
     <el-dialog class="safetyHazard-info-dialog-box" @close="outDialog"
+               :close-on-click-modal="false"
                v-loading="loading"
                title="随手拍上报" :visible.sync="addDialogType" v-if="addDialogType"
                width="787px" append-to-body>

+ 1 - 2
src/views/safetyCheck/startInspection/index.vue

@@ -199,7 +199,7 @@
                     <p class="el-icon-plus up-img-p" style="display: inline-block"></p>
                   </el-upload>
                 </el-form-item>
-                <el-form-item label="" label-width="123px" style="margin-bottom:40px;">
+                <el-form-item label="" label-width="123px" style="margin-bottom:40px;color:#999;">
                   <p>支持jpg/png/bmp/gif格式,且不超过2M,最多上传5张</p>
                 </el-form-item>
               </div>
@@ -854,7 +854,6 @@
         }
       }
       .for-big-box{
-        height:540px;
         padding-top:27px;
         .up-img-p{
           height:80px;

+ 1 - 1
src/views/safetyEducationExam/safeLearning/el_category/index.vue

@@ -49,7 +49,7 @@
     </el-table>
 
     <!-- 添加或修改学习分类对话框 -->
-    <el-dialog :title="title" :visible.sync="open" width="500px" append-to-body>
+    <el-dialog :title="title" :visible.sync="open" width="500px" append-to-body :close-on-click-modal="false">
       <el-form ref="form" :model="form" :rules="rules" label-width="80px">
         <el-form-item label="分类名称" prop="title">
           <el-input v-model="form.title" placeholder="请输入分类名称" maxLength="50"/>

+ 1 - 1
src/views/safetyEducationExam/safeLearning/el_course/edit.vue

@@ -426,7 +426,7 @@
       <el-button type="primary" style="width:200px;" @click="stepsClick">{{stepsType==0?'保存并进入下一步':(stepsType==1?'下一步':stepsType==2?'完成':'')}}</el-button>
     </div>
     <!--选择分类-->
-    <el-dialog title="选择分类" :visible.sync="openClassTree" width="700px" append-to-body>
+    <el-dialog title="选择分类" :visible.sync="openClassTree" width="700px" append-to-body :close-on-click-modal="false">
       <div style="height:500px;" class="scrollbar-box">
         <el-tree
           v-if="openClassTree"

+ 1 - 1
src/views/safetyEducationExam/safeLearning/el_course/index.vue

@@ -124,7 +124,7 @@
     <!--查看记录-->
     <detail-page v-if="pageType == 3" :infoId="infoId"></detail-page>
     <!-- 添加或修改学习资源对话框 -->
-    <el-dialog :title="title" :visible.sync="open" width="500px" append-to-body>
+    <el-dialog :title="title" :visible.sync="open" width="500px" append-to-body :close-on-click-modal="false">
       <el-form ref="form" :model="form" :rules="rules" label-width="80px">
         <el-form-item label="备注" prop="remark">
           <el-input v-model="form.remark" placeholder="请输入备注" />

+ 6 - 4
src/views/safetyEducationExam/safeLearning/el_resources/index.vue

@@ -102,7 +102,7 @@
         />
       </div>
       <!-- 添加资源对话框 -->
-      <el-dialog class="el_resources_dialog" @close="handleClose" :title="title" :visible.sync="open" width="700px" append-to-body :before-close="offUpPage">
+      <el-dialog class="el_resources_dialog" @close="handleClose" :title="title" :visible.sync="open" width="700px" append-to-body :before-close="offUpPage" :close-on-click-modal="false">
         <el-form ref="form" :model="form" v-loading="loading" :rules="rules" label-width="80px">
           <el-form-item label="分类" prop="title">
             <el-input
@@ -166,7 +166,7 @@
         </el-form>
       </el-dialog>
       <!--修改资源对话框-->
-      <el-dialog class="el_resources_dialog" @close="handleClose" :title="title" :visible.sync="openEdit" width="700px" append-to-body :before-close="offUpPage">
+      <el-dialog class="el_resources_dialog" @close="handleClose" :title="title" :visible.sync="openEdit" width="700px" append-to-body :before-close="offUpPage" :close-on-click-modal="false">
         <el-form ref="editForm" :model="editForm" v-loading="loading" :rules="rules" label-width="80px">
           <el-form-item label="分类" prop="title">
             <el-input
@@ -252,7 +252,8 @@
         </el-form>
       </el-dialog>
       <!--富文本新增课件-->
-      <el-dialog class="el_resources_dialog" @close="handleClose" :title="title" :visible.sync="richTextAddType" v-if="richTextAddType" width="1100px" append-to-body :before-close="offUpPage">
+      <el-dialog class="el_resources_dialog" @close="handleClose" :title="title" :visible.sync="richTextAddType"  :close-on-click-modal="false"
+                 v-if="richTextAddType" width="1100px" append-to-body :before-close="offUpPage">
         <el-form ref="richTextForm" :model="richTextForm" v-loading="loading" :rules="richTextRules" label-width="100px" style="flex-direction: column;display: flex;">
           <el-form-item label="分类">
             <el-input
@@ -284,7 +285,8 @@
         </div>
       </el-dialog>
       <!--富文本修改课件-->
-      <el-dialog class="el_resources_dialog" @close="handleClose" :title="title" :visible.sync="richTextEditType" v-if="richTextEditType" width="1100px" append-to-body :before-close="offUpPage">
+      <el-dialog class="el_resources_dialog" @close="handleClose" :title="title" :visible.sync="richTextEditType"  :close-on-click-modal="false"
+                 v-if="richTextEditType" width="1100px" append-to-body :before-close="offUpPage">
         <el-form ref="richTextForm" :model="richTextForm" v-loading="loading" :rules="richTextRules" label-width="80px">
           <el-form-item label="分类" prop="title">
             <el-input

+ 0 - 0
src/views/safetyEducationExam/safeLearning/hazard_book/index.vue


部分文件因为文件数量过多而无法显示