dedsudiyu 1 年間 前
コミット
7c5fe7fdd0
共有100 個のファイルを変更した235 個の追加1679 個の削除を含む
  1. 2 2
      src/views/basicsModules/mine.vue
  2. 1 1
      src/views/chemicalManage/components/addChemicals.vue
  3. 1 1
      src/views/chemicalManage/inventoryManagement/savePending/addPage.vue
  4. 1 1
      src/views/chemicalManage/purchaseManage/examineProcess/index.vue
  5. 1 1
      src/views/chemicalManage/purchaseManage/purchaseRegister/addPage.vue
  6. 4 4
      src/views/creditViolation/credit/violation/index.vue
  7. 1 1
      src/views/emergencyManagement/evacuation/emergencyEvacuation/newEvacuationBigData.vue
  8. 1 1
      src/views/emergencyManagement/functionManage/deviceFunction/index.vue
  9. 1 1
      src/views/emergencyManagement/functionManage/planMusic/index.vue
  10. 0 799
      src/views/emergencyManagement/plan/addPlan.vue
  11. 0 642
      src/views/emergencyManagement/plan/associationPage.vue
  12. 5 10
      src/views/emergencyManagement/plan/index.vue
  13. 1 1
      src/views/emergencyManagement/plan/newAddPlan.vue
  14. 112 110
      src/views/emergencyManagement/plan/newAssociatedPage.vue
  15. 1 1
      src/views/gasManage3_0/manage/recognizerManage/recognizerManage.vue
  16. 1 1
      src/views/gasManage_syd/manage/gasManage/gasManage.vue
  17. 2 2
      src/views/hazardManagement/hazard/addLaboratory.vue
  18. 1 1
      src/views/hierarchicalControl/hierarchicalControl/gradeManage/addPage.vue
  19. 1 1
      src/views/hierarchicalControl/hierarchicalControl/gradeManage/index.vue
  20. 1 1
      src/views/hierarchicalControl/hierarchicalControl/gradeManage/subjectList.vue
  21. 1 1
      src/views/hierarchicalControl/hierarchicalControl/gradeManage/userList.vue
  22. 1 1
      src/views/hierarchicalControl/hierarchicalControl/gradeManageRecord/index.vue
  23. 2 2
      src/views/integratedManagement/buildingManagement/index.vue
  24. 2 2
      src/views/integratedManagement/laboratoryManagement/accessAuthorization/lookImpower.vue
  25. 1 1
      src/views/integratedManagement/laboratoryManagement/classifiedGrading/classified.vue
  26. 1 1
      src/views/integratedManagement/laboratoryManagement/classifiedGrading/classtype.vue
  27. 1 1
      src/views/integratedManagement/laboratoryManagement/classifiedGrading/subjectClass.vue
  28. 1 1
      src/views/integratedManagement/laboratoryManagement/layoutManagement/buildingDetails.vue
  29. 2 2
      src/views/integratedManagement/laboratoryManagement/layoutManagement/buildingManagement.vue
  30. 1 1
      src/views/integratedManagement/laboratoryManagement/layoutManagement/index.vue
  31. 1 1
      src/views/integratedManagement/laboratoryManagement/record/myRecord.vue
  32. 1 1
      src/views/integratedManagement/laboratoryManagement/record_my/index.vue
  33. 1 1
      src/views/integratedManagement/laboratoryManagement/safetyInfoCategory/safetyInfoCategory.vue
  34. 1 1
      src/views/integratedManagement/laboratoryManagement/safetyInfoCategory/safetyInfoConfig.vue
  35. 1 1
      src/views/integratedManagement/laboratoryManagement/subject/deviceList.vue
  36. 2 2
      src/views/integratedManagement/laboratoryManagement/subject/index.vue
  37. 1 1
      src/views/integratedManagement/laboratoryManagement/subject/infoPage.vue
  38. 1 1
      src/views/integratedManagement/laboratoryManagement/timingExhaustAir/index.vue
  39. 2 2
      src/views/integratedManagement/messageNotice/warningNotice/forewarningConfig.vue
  40. 1 1
      src/views/integratedManagement/personnelManage/major/index.vue
  41. 1 1
      src/views/integratedManagement/personnelManage/major/listPage.vue
  42. 1 1
      src/views/integratedManagement/personnelManage/post/index.vue
  43. 1 1
      src/views/integratedManagement/personnelManage/post/selectUser.vue
  44. 1 1
      src/views/integratedManagement/personnelManage/studentInfo/addPage.vue
  45. 2 2
      src/views/integratedManagement/personnelManage/studentInfo/index.vue
  46. 4 4
      src/views/integratedManagement/personnelManage/teacherInfo/index.vue
  47. 1 1
      src/views/integratedManagement/personnelManage/teacherInfo/userList.vue
  48. 1 1
      src/views/iotDevice/appManage/applyList/batchUpDialog.vue
  49. 1 1
      src/views/iotDevice/appManage/applyList/index.vue
  50. 1 1
      src/views/iotDevice/hardwareManagement/hardwareClassification/index.vue
  51. 1 1
      src/views/iotDevice/hardwareManagement/hardwareEquipment/index.vue
  52. 1 1
      src/views/iotDevice/intelligenceIot/classConfig/addPage.vue
  53. 1 1
      src/views/iotDevice/intelligenceIot/classConfig/index.vue
  54. 1 1
      src/views/iotDevice/intelligenceIot/iotClassification/attributePage.vue
  55. 1 1
      src/views/iotDevice/intelligenceIot/iotClassification/functionPage.vue
  56. 1 1
      src/views/iotDevice/intelligenceIot/iotClassification/index.vue
  57. 1 1
      src/views/iotDevice/intelligenceIot/iotHardware/batchAddPage.vue
  58. 1 1
      src/views/iotDevice/monitoringWarning/receiver/index.vue
  59. 1 1
      src/views/iotDevice/monitoringWarning/warningConfig/index.vue
  60. 1 1
      src/views/iotDevice/operationManagement/networkComponent/index.vue
  61. 1 1
      src/views/iotDevice/operationManagement/protocolManagement/index.vue
  62. 1 1
      src/views/safetyEducationExam/safeLearning/el_category/index.vue
  63. 2 2
      src/views/safetyEducationExam/safeLearning/el_course/edit.vue
  64. 1 1
      src/views/safetyEducationExam/safeLearning/el_course/index.vue
  65. 2 2
      src/views/safetyEducationExam/safeLearning/el_resources/index.vue
  66. 1 1
      src/views/safetyEducationExam/safeLearning/hazard_book/index.vue
  67. 1 1
      src/views/safetyEducationExam/safeLearning/safe_book/index.vue
  68. 1 1
      src/views/safetyEducationExam/securityExam/certificate/index.vue
  69. 1 1
      src/views/safetyEducationExam/securityExam/el_classify/index.vue
  70. 2 2
      src/views/safetyEducationExam/securityExam/exam/addExamPage.vue
  71. 1 1
      src/views/safetyEducationExam/securityExam/exam/examInfo.vue
  72. 1 1
      src/views/safetyEducationExam/securityExam/exam/index.vue
  73. 1 1
      src/views/safetyEducationExam/trainingCourse/addDialog.vue
  74. 1 1
      src/views/secureAccess/approval/configuration.vue
  75. 1 1
      src/views/secureAccess/approval/failed.vue
  76. 1 1
      src/views/secureAccess/approval/infoPage.vue
  77. 1 1
      src/views/secureAccess/approval/passed.vue
  78. 1 1
      src/views/secureAccess/approval/pending.vue
  79. 1 1
      src/views/secureAccess/studentinfo/failed.vue
  80. 1 1
      src/views/secureAccess/studentinfo/passed.vue
  81. 1 1
      src/views/secureAccess/studentinfo/pending.vue
  82. 2 2
      src/views/secureAccess/whitelist/addPage.vue
  83. 1 1
      src/views/securityCheck/checkOption/index.vue
  84. 1 1
      src/views/securityCheck/checkRecord/CheckRecordInfo.vue
  85. 1 1
      src/views/securityCheck/checkRecord/CheckRecordInfoUp.vue
  86. 3 3
      src/views/securityCheck/checkRecord/addCheck.vue
  87. 2 2
      src/views/securityCheck/checkRecord/checkList.vue
  88. 1 1
      src/views/securityCheck/checkRecord/reformCheck.vue
  89. 3 3
      src/views/securityCheck/checkRecord/unsubmittedInfo.vue
  90. 1 1
      src/views/securityCheck/photonote/pending.vue
  91. 1 1
      src/views/securityCheck/photonote/processed.vue
  92. 1 1
      src/views/securityCheck/release/index.vue
  93. 1 1
      src/views/serviceCenter/apkManage/applyList/index.vue
  94. 1 1
      src/views/serviceCenter/certificationManagement/certificationAccredit/index.vue
  95. 1 1
      src/views/serviceCenter/certificationManagement/certificationInfo/index.vue
  96. 1 1
      src/views/serviceCenter/merchantManagement/index.vue
  97. 1 1
      src/views/serviceCenter/timingTask/index.vue
  98. 1 1
      src/views/systemManagement/dict/data.vue
  99. 1 1
      src/views/systemManagement/dict/index.vue
  100. 0 0
      src/views/systemManagement/menu/index.vue

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

@@ -224,7 +224,7 @@
       <div slot="footer" class="dialog-footer dialog-footer-box">
         <p class="dialog-footer-button-null"></p >
         <p class="dialog-footer-button-info" @click="upImgOpenClick(1)">取消</p >
-        <p class="dialog-footer-button-primary" @click="upSignatureData">确定</p >
+        <p class="dialog-footer-button-primary" @click="upSignatureData">提交</p >
         <p class="dialog-footer-button-null"></p >
       </div>
     </el-dialog>
@@ -252,7 +252,7 @@
       <div slot="footer" class="dialog-footer dialog-footer-box">
         <p class="dialog-footer-button-null"></p >
         <p class="dialog-footer-button-info" @click="faceButton(1)">取消</p >
-        <p class="dialog-footer-button-primary" @click="faceButton(2)">确定</p >
+        <p class="dialog-footer-button-primary" @click="faceButton(2)">提交</p >
         <p class="dialog-footer-button-null"></p >
       </div>
     </el-dialog>

+ 1 - 1
src/views/chemicalManage/components/addChemicals.vue

@@ -110,7 +110,7 @@
     <div slot="footer" class="dialog-footer dialog-footer-box">
       <p class="dialog-footer-button-null"></p>
       <p class="dialog-footer-button-info" @click="addChemicalsOpen(3)">取消</p>
-      <p class="dialog-footer-button-primary" @click="dialogSubmit">确定</p>
+      <p class="dialog-footer-button-primary" @click="dialogSubmit">提交</p>
       <p class="dialog-footer-button-null"></p>
     </div>
   </el-dialog>

+ 1 - 1
src/views/chemicalManage/inventoryManagement/savePending/addPage.vue

@@ -219,7 +219,7 @@
       <div slot="footer" class="dialog-footer dialog-footer-box">
         <p class="dialog-footer-button-null"></p>
         <p class="dialog-footer-button-info" @click="dialogOut">取消</p>
-        <p class="dialog-footer-button-primary" @click="dialogSubmit">确定</p>
+        <p class="dialog-footer-button-primary" @click="dialogSubmit">提交</p>
         <p class="dialog-footer-button-null"></p>
       </div>
     </el-dialog>

+ 1 - 1
src/views/chemicalManage/purchaseManage/examineProcess/index.vue

@@ -134,7 +134,7 @@
       <div slot="footer" class="dialog-footer dialog-footer-box">
         <p class="dialog-footer-button-null"></p>
         <p class="dialog-footer-button-info" @click="dialogOut">取消</p>
-        <p class="dialog-footer-button-primary" @click="dialogSubmit">确定</p>
+        <p class="dialog-footer-button-primary" @click="dialogSubmit">提交</p>
         <p class="dialog-footer-button-null"></p>
       </div>
     </el-dialog>

+ 1 - 1
src/views/chemicalManage/purchaseManage/purchaseRegister/addPage.vue

@@ -215,7 +215,7 @@
       <div slot="footer" class="dialog-footer dialog-footer-box">
         <p class="dialog-footer-button-null"></p>
         <p class="dialog-footer-button-info" @click="dialogOut">取消</p>
-        <p class="dialog-footer-button-primary" @click="dialogSubmit">确定</p>
+        <p class="dialog-footer-button-primary" @click="dialogSubmit">提交</p>
         <p class="dialog-footer-button-null"></p>
       </div>
     </el-dialog>

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

@@ -266,7 +266,7 @@
       <div slot="footer" class="dialog-footer dialog-footer-box">
         <p class="dialog-footer-button-null"></p >
         <p class="dialog-footer-button-info" @click="cancel">取消</p >
-        <p class="dialog-footer-button-primary" @click="submitForm">确定</p >
+        <p class="dialog-footer-button-primary" @click="submitForm">提交</p >
         <p class="dialog-footer-button-null"></p >
       </div>
     </el-dialog>
@@ -300,7 +300,7 @@
       <div slot="footer" class="dialog-footer dialog-footer-box">
         <p class="dialog-footer-button-null"></p >
         <p class="dialog-footer-button-info" @click="form1Off">取消</p >
-        <p class="dialog-footer-button-primary" @click="submitForm1">确定</p >
+        <p class="dialog-footer-button-primary" @click="submitForm1">提交</p >
         <p class="dialog-footer-button-null"></p >
       </div>
     </el-dialog>
@@ -341,7 +341,7 @@
       <div slot="footer" class="dialog-footer dialog-footer-box">
         <p class="dialog-footer-button-null"></p >
         <p class="dialog-footer-button-info" @click="form2Off">取消</p >
-        <p class="dialog-footer-button-primary" @click="submitForm2">确定</p >
+        <p class="dialog-footer-button-primary" @click="submitForm2">提交</p >
         <p class="dialog-footer-button-null"></p >
       </div>
     </el-dialog>
@@ -375,7 +375,7 @@
       <div slot="footer" class="dialog-footer dialog-footer-box">
         <p class="dialog-footer-button-null"></p >
         <p class="dialog-footer-button-info" @click="form3Off">取消</p >
-        <p class="dialog-footer-button-primary" @click="submitForm3">确定</p >
+        <p class="dialog-footer-button-primary" @click="submitForm3">提交</p >
         <p class="dialog-footer-button-null"></p >
       </div>
     </el-dialog>

+ 1 - 1
src/views/emergencyManagement/evacuation/emergencyEvacuation/newEvacuationBigData.vue

@@ -367,7 +367,7 @@
           <div class="button-box">
             <p class="button-null"></p>
             <p class="button-p" style="margin-right:39px;" @click="shadeButton(4)">取消</p>
-            <p class="button-p" @click="shadeButton(5)">确定</p>
+            <p class="button-p" @click="shadeButton(5)">提交</p>
             <p class="button-null"></p>
           </div>
         </div>

+ 1 - 1
src/views/emergencyManagement/functionManage/deviceFunction/index.vue

@@ -137,7 +137,7 @@
       <div slot="footer" class="dialog-footer dialog-footer-box">
         <p class="dialog-footer-button-null"></p>
         <p class="dialog-footer-button-info" @click="dialogOff()">取消</p>
-        <p class="dialog-footer-button-primary" @click="dialogSubmit">确定</p>
+        <p class="dialog-footer-button-primary" @click="dialogSubmit">提交</p>
         <p class="dialog-footer-button-null"></p>
       </div>
     </el-dialog>

+ 1 - 1
src/views/emergencyManagement/functionManage/planMusic/index.vue

@@ -125,7 +125,7 @@
       <div slot="footer" class="dialog-footer dialog-footer-box">
         <p class="dialog-footer-button-null"></p>
         <p class="dialog-footer-button-info" @click="dialogOff()">取消</p>
-        <p class="dialog-footer-button-primary" @click="dialogSubmit">确定</p>
+        <p class="dialog-footer-button-primary" @click="dialogSubmit">提交</p>
         <p class="dialog-footer-button-null"></p>
       </div>
     </el-dialog>

+ 0 - 799
src/views/emergencyManagement/plan/addPlan.vue

@@ -1,799 +0,0 @@
-<!--风险预案编辑-->
-<template>
-  <div class="addPlan">
-    <p class="reset-button-one" style="float: right;" @click="backPage"><i class="el-icon-arrow-left"></i>返回</p>
-    <p class="plan-title-p color_one">基本信息</p>
-    <el-form :model="form" ref="form" :rules="rules" :inline="true" label-width="100px" class="form-box">
-
-      <div class="plan-info-box">
-        <el-row >
-          <el-form-item label="预案名称:" prop="name">
-            <el-input
-              v-model="form.name"
-              placeholder="请输入预案名称"
-              clearable
-              size="small"
-              maxLength="50"
-            />
-          </el-form-item>
-          <el-form-item label="关联实验室:" v-if="labShow==true">
-            <el-input
-              v-model="form.labname"
-              placeholder="请选择关联实验室"
-              clearable
-              size="small"
-              @focus="labClick()"
-            />
-          </el-form-item>
-          <el-form-item label="同步执行疏散" prop="warehouse">
-            <el-radio-group v-model="form.evacuation">
-              <el-radio :label='0'>否</el-radio>
-              <el-radio :label='1'>是</el-radio>
-            </el-radio-group>
-          </el-form-item>
-        </el-row>
-      </div>
-      <p class="plan-title-p color_one">启动条件</p>
-      <div class="plan-info-box">
-        <el-row v-for="(item,index) in form.riskPlanSensorList" :key="index">
-          <div >
-            <div style="display: inline-block;">
-              <el-form-item label="选择传感器" :prop="'riskPlanSensorList.'+ index +'.funNum'" :rules="rules.funNum" style="margin-top: -10px;">
-                <el-select v-model="item.funNum" placeholder="请选择传感器" clearable @change="(val)=>selectFunNum(val,index)">
-                  <el-option
-                    v-for="sensor in sensorList"
-                    :key="sensor.funNum"
-                    :label="sensor.describe"
-                    :value="sensor.funNum"
-                  ></el-option>
-                </el-select>
-              </el-form-item>
-            </div>
-            <div style="display: inline-block;" class="for-sensor-input">
-              <el-form-item label="异常值区间:" style="width: 300px;" :prop="'riskPlanSensorList.'+ index +'.minMonitor'" :rules="rules.minMonitor">
-                <el-input
-                  type="number"
-                  v-model="item.minMonitor"
-                  oninput="if(value.length>6)value=value.slice(0,6)"
-                  placeholder="请输入异常值"
-                  clearable
-                  size="small"
-                />
-              </el-form-item>
-              <p style="margin:0; text-align:center;color:#E0E0E0;display:inline-block;margin-right:10px;line-height:40px;">-</p>
-              <el-form-item label=""  :prop="'riskPlanSensorList.'+ index +'.maxMonitor'" :rules="rules.maxMonitor">
-                <el-input
-                  type="number"
-                  v-model="item.maxMonitor"
-                  placeholder="请输入异常值"
-                  oninput="if(value.length>6)value=value.slice(0,6)"
-                  clearable
-                  size="small"
-                  @keyup.focus.native="handleQuery"
-                />
-              </el-form-item>
-              <i class="el-icon-delete" style="margin-left:20px;font-size:20px;color:#999;cursor:pointer;" @click="delSensor(index)"></i>
-            </div>
-          </div>
-        </el-row>
-        <p class="add-button-p color_99" @click="addSensor"><i class="el-icon-plus"></i>新增传感器规则</p>
-      </div>
-      <p class="plan-title-p color_one">执行动作</p>
-      <div class="plan-info-box">
-        <div v-for="(item,index) in form.riskPlanHardwareList" :key="index">
-          <div style="display: inline-block">
-            <el-form-item label="选择硬件" style="margin-top:-10px;" :prop="'riskPlanHardwareList.'+ index +'.hardwareType'" :rules="rules.hardwareType">
-              <el-select v-model="item.hardwareType" placeholder="请选择硬件" clearable size="small" @change="(val)=>controlTypeList(val,index)">
-                <el-option
-                  v-for="hardware in hardwareList"
-                  :key="hardware.id"
-                  :label="hardware.name"
-                  :value="hardware.id"
-                ></el-option>
-              </el-select>
-            </el-form-item>
-          </div>
-          <div style="display: inline-block">
-            <el-form-item label="执行操作" :prop="'riskPlanHardwareList.'+ index +'.operate'" :rules="rules.operate">
-              <el-select v-model="item.operate" placeholder="请选择执行操作" clearable size="small">
-                <el-option
-                  v-for="dict in item.controlTypeOptions"
-                  :key="dict.dictValue"
-                  :label="dict.dictLabel"
-                  :value="dict.dictValue"
-                ></el-option>
-              </el-select>
-            </el-form-item>
-            <el-form-item label="结束操作" :prop="'riskPlanHardwareList.'+ index +'.operate'" :rules="rules.overAct">
-              <el-select v-model="item.overAct" placeholder="请选择预案结束操作" clearable size="small">
-                <el-option
-                  v-for="dict in item.controlTypeOptions"
-                  :key="dict.dictValue"
-                  :label="dict.dictLabel"
-                  :value="dict.dictValue"
-                ></el-option>
-              </el-select>
-            </el-form-item>
-            <i class="el-icon-delete" style="font-size:20px;color:#999;cursor:pointer;margin:10px 0 0 20px;" @click="delHardware(index)"></i>
-          </div>
-        </div>
-        <p class="add-button-p color_99" @click="addHardware"><i class="el-icon-plus"></i>添加</p>
-      </div>
-      <div class="bottom-button-box">
-        <el-button class="color_99" @click="backPage">取消</el-button>
-        <el-button class="color_ff back_one" @click="submitForm">确定</el-button>
-      </div>
-    </el-form>
-    <!--关联实验室弹框-->
-    <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
-            v-model="dialogForm.name"
-            placeholder="请输入实验室名称"
-            clearable
-            size="small"
-          />
-        </el-form-item>
-        <el-form-item label="学院" prop="type" >
-          <el-select v-model="dialogForm.deptId" placeholder="请选择学院" clearable size="small">
-            <el-option
-              v-for="dict in deptOptions"
-              :key="dict.deptId"
-              :label="dict.deptName"
-              :value="dict.deptId"
-            ></el-option>
-          </el-select>
-        </el-form-item>
-        <el-form-item label="安全分类"  prop="typeId" class="form-item">
-          <el-select v-model="dialogForm.typeId" placeholder="请选择安全分类" clearable >
-            <el-option
-              v-for="dict in typeList"
-              :key="dict.id"
-              :label="dict.typeName"
-              :value="dict.id"
-            ></el-option>
-          </el-select>
-        </el-form-item>
-        <el-form-item label="安全分级"  prop="level" class="form-item">
-          <el-select v-model="dialogForm.level" placeholder="请选择安全分级" clearable >
-            <el-option
-              v-for="dict in levelList"
-              :key="dict.id"
-              :label="dict.classifiedName"
-              :value="dict.id"
-            ></el-option>
-          </el-select>
-        </el-form-item>
-        <el-form-item label="实验室负责人" prop="name" >
-          <el-input
-            v-model="dialogForm.adminName"
-            placeholder="请输入实验室负责人"
-            clearable
-            size="small"
-          />
-        </el-form-item>
-        <el-form-item>
-          <p class="inquire-button-one" style="margin-left:20px;" @click="onSearch">查询</p>
-          <p class="reset-button-one" style="margin-left:20px;" @click="resetForm">重置</p>
-        </el-form-item>
-      </el-form>
-      <div class="btn_list">
-        <i class="el-icon-warning"></i>
-        <i>已选择{{labRiskPlanjoinsubList.length}} 项</i>
-        <i @click="toggleSelection(dialogTable)">全选本页</i>
-<!--        <i>选择全部</i>-->
-        <i></i>
-        <i @click="toggleSelection()">清除选项</i>
-        <div class="bottom-button-box">
-          <el-button class="color_99" @click="closeDialog()">取消</el-button>
-          <el-button class="color_ff back_one" @click="confirmDialog()">确定</el-button>
-        </div>
-      </div>
-      <el-table ref="multipleTable" border  tooltip-effect="dark" :data="dialogTable" highlight-current-row @selection-change="handleSelectionChange" style="cursor: pointer;">
-        <el-table-column type="selection" width="55" align="center"></el-table-column>
-        <el-table-column label="实验室名称" show-overflow-tooltip align="left" prop="name"/>
-        <el-table-column label="学院" align="left" prop="deptName" />
-        <el-table-column label="安全分类" align="left" prop="typeName" />
-        <el-table-column label="安全分级" align="left" prop="levelName" >
-          <template slot-scope="scope">
-            <span :style="'color:'+scope.row.fiedColor+';'">{{scope.row.levelName}}</span>
-          </template>
-        </el-table-column>
-        <el-table-column label="实验室负责人" align="left" prop="adminName" />
-      </el-table>
-      <pagination :page-sizes="[20, 30, 40, 50]"
-        v-show="total>0"
-        :total="total"
-        :page.sync="dialogForm.pageNum"
-        :limit.sync="dialogForm.pageSize"
-        @pagination="getList"
-      />
-    </el-dialog>
-  </div>
-</template>
-
-<script>
-import {
-  getPlan,
-  addPlan,
-  updatePlan,
-  getUserRoleBySub,
-  getLabRiskPlanRepeat,
-  getUserRoleBySubOperation
-} from "@/apiDemo/laboratory/plan";
-import { optionHazard } from "@/apiDemo/laboratory/hazard";
-import { optionSensor } from "@/apiDemo/laboratory/sensor";
-import { optionHardware } from "@/apiDemo/laboratory/hardware";
-import {listDepartments} from "@/apiDemo/system/dept";
-import {listClassifiedAll} from "@/apiDemo/laboratory/classified";
-import {listClasstypeAll} from "@/apiDemo/laboratory/classtype";
-import {authListSubject} from "@/apiDemo/laboratory/subject";
-
-export default {
-  props:{
-    pageData:{},
-  },
-  name: "addPlan",
-  data() {
-    return {
-      form:{
-        evacuation: 0,
-        riskPlanSensorList:[],
-        riskPlanHardwareList:[],
-      },
-      dialogVisible:false,
-      //判断实验室框是否显示隐藏
-      labShow:false,
-      //实验室弹框
-      dialogForm:{
-        pageNum: 1,
-        pageSize:20,
-        name: null,
-        deptId: null,
-        typeId: null,
-        level: null,
-        adminName: null,
-
-      },
-      deptOptions:[],
-      typeList:[],
-      levelList:[],
-      dialogTable:[],
-      // 表单校验
-      rules: {
-        name: [
-          { required: true, message: "请输入预案名称", trigger: "blur" },
-          { required: true, message: "请输入预案名称", validator: this.spaceJudgment, trigger: "blur" }
-        ],
-        labname: [
-          { required: true, message: "请选择关联实验室", trigger: "blur" },
-          { required: true, message: "请选择关联实验室", validator: this.spaceJudgment, trigger: "blur" }
-        ],
-        hazardId: [
-          { required: true, message: "危险源不能为空", trigger: "blur" }
-        ],
-        message: [
-          { required: true, message: "短信提示不能为空", trigger: "change" },
-          { required: true, message: "短信提示不能为空", validator: this.spaceJudgment, trigger: "blur" }
-        ],
-        voicebroadcast: [
-          { required: true, message: "语音播报内容不能为空", trigger: "change" },
-          { required: true, message: "语音播报内容不能为空", validator: this.spaceJudgment, trigger: "blur" }
-        ],
-        information: [
-          { required: true, message: "消息推送内容不能为空", trigger: "blur" },
-          { required: true, message: "消息推送内容不能为空", validator: this.spaceJudgment, trigger: "blur" }
-        ],
-        remark: [
-          { required: true, message: "预案描述不能为空", trigger: "blur" },
-          { required: true, message: "预案描述不能为空", validator: this.spaceJudgment, trigger: "blur" }
-        ],
-        funNum: [
-          { required: true, message: "请选择传感器", trigger: "blur" }
-        ],
-        minMonitor: [
-          { required: true, message: "请输入异常值", trigger: "blur" },
-          { required: true, message: "请输入异常值", validator: this.spaceJudgment, trigger: "blur" },
-        ],
-        maxMonitor: [
-          { required: true, message: "请输入异常值", trigger: "blur" },
-          { required: true, message: "请输入异常值", validator: this.spaceJudgment, trigger: "blur" },
-        ],
-        hardwareType: [
-          { required: true, message: "请选择硬件", trigger: "blur" }
-        ],
-        operate: [
-          { required: true, message: "请选择执行操作", trigger: "blur" }
-        ],
-        overAct: [
-          { required: false,trigger: "blur" }
-        ],
-      },
-      // 危险源下拉
-      hazardList: [],
-      // 传感器下拉
-      sensorList: [],
-      sensorListData:[],
-      // 硬件下拉
-      hardwareList: [],
-      // 硬件操作字典
-      controlTypeOptions: [],
-      labRiskPlanjoinsubList:[],//所选实验室id
-      total: 0,
-      joinSubOper:null,//返回true是实验室管理员,false不是实验室管理员
-
-      arr:[],
-    };
-  },
-  methods: {
-    //select传感器选中
-    selectFunNum(val,index){
-      // let self = this;
-      // let num = 0;
-      // for(let i=0;i<self.form.riskPlanSensorList.length;i++){
-      //   if(val == self.form.riskPlanSensorList[i].funNum){
-      //     num++
-      //   }
-      // }
-      // if(num>1){
-      //   this.$set(this.form.riskPlanSensorList[index],'funNum','');
-      //   this.msgError('已存在相同的传感器');
-      // }
-    },
-    //查询
-    onSearch() {
-      this.dialogForm.pageNo = 1;
-      this.getList();
-    },
-    //重置
-    resetForm() {
-      this.dialogForm.name = '';
-      this.dialogForm.deptId = '';
-      this.dialogForm.typeId = '';
-      this.dialogForm.level = '';
-      this.dialogForm.adminName = '';
-      this.onSearch();
-    },
-    //实验室弹框
-    labClick(){
-      this.dialogVisible=true;
-
-      if(this.arr){
-        this.$nextTick(() => {
-          this.arr.forEach(row => {
-            this.$refs.multipleTable.toggleRowSelection(row);
-          });
-        })
-      }
-    },
-    //关闭实验室弹窗
-    closeDialog(){
-     // this.labRiskPlanjoinsubList=[];
-      this.dialogVisible=false;
-    },
-    //监听关联记录弹窗关闭
-    handleClose(){
-      if(this.arr){
-        this.$nextTick(() => {
-          this.arr.forEach(row => {
-            this.$refs.multipleTable.toggleRowSelection(row);
-          });
-        })
-      }
-    },
-    //实验室弹窗确认
-    confirmDialog(){
-      this.dialogVisible=false;
-    },
-    //切换页面
-    backPage(){
-      this.$parent.handleClick('','','back');
-    },
-    /** 查询学院列表 */
-    getDeptListTow() {
-      listDepartments().then(response => {
-        this.$set(this, 'deptOptions', response.data)
-      });
-    },
-    /**获取分级*/
-    getListClassifiedAll(){
-      listClassifiedAll().then(response=>{
-        if(response.code==200){
-          this.levelList = response.data
-        }
-      })
-    },
-    /**获取分类*/
-    getListClasstypeAll(){
-      listClasstypeAll().then(response=>{
-        if(response.code==200){
-          this.typeList = response.data;
-        }
-      });
-    },
-
-    /** 查询实验室列表 */
-    getList() {
-      this.loading = true;
-      let _this=this;
-      getUserRoleBySub(this.dialogForm).then(response => {
-        if(response.code==200){
-          this.dialogTable = response.rows;
-          this.total = response.total;
-          this.loading = false;
-
-        }
-      });
-    },
-    //选中实验室
-    handleSelectionChange(val){
-
-      let _this=this;
-      _this.labRiskPlanjoinsubList=[];
-
-      val.forEach(function (item,index){
-        _this.labRiskPlanjoinsubList.push({'subjectId':item.id})
-      })
-
-    },
-    //取消选中
-    toggleSelection(rows) {
-
-      if (rows) {
-        this.$refs.multipleTable.clearSelection();
-        rows.forEach(row => {
-          this.$refs.multipleTable.toggleRowSelection(row);
-        });
-      } else {
-        this.$refs.multipleTable.clearSelection();
-      }
-    },
-    //新增传感器
-    addSensor(){
-      if(this.form.riskPlanSensorList.length>4){
-        this.msgError('最多添加5项')
-        return
-      }
-      let obj = {};
-      this.form.riskPlanSensorList.push(obj);
-    },
-    delSensor(index){
-      this.form.riskPlanSensorList.splice(index,1)
-    },
-    //新增规则
-    addHardware(){
-      if(this.form.riskPlanHardwareList.length>4){
-        this.msgError('最多添加5项')
-        return
-      }
-      let obj = {};
-      this.form.riskPlanHardwareList.push(obj);
-    },
-    delHardware(index){
-      this.form.riskPlanHardwareList.splice(index,1)
-    },
-    /** 修改按钮操作 */
-    handleUpdate() {
-
-      let _this=this;
-      getPlan(this.form.id).then(response => {
-        this.form = response.data;
-        for(let i=0;i<response.data.riskPlanHardwareList.length;i++){
-          this.controlTypeList(response.data.riskPlanHardwareList[i].hardwareType,i);
-        }
-        response.data.labRiskPlanjoinsubList.forEach(function (item,index){
-          _this.labRiskPlanjoinsubList.push({'subjectId':item.subjectId})
-        })
-        _this.form.labRiskPlanjoinsubList=_this.labRiskPlanjoinsubList;
-          //根据详情返回的实验室信息循环匹配相同实验室信息
-
-          _this.dialogTable.forEach(function (item,index){
-            _this.labRiskPlanjoinsubList.forEach(function (item2,index){
-              if(item.id==item2.subjectId){
-                _this.arr.push(item)
-              }
-            })
-          })
-
-      });
-    },
-    /** 查询实验室根据实验室管理员用户权限是否有操作权限 */
-    getUserRoleBySubOperation(){
-      getUserRoleBySubOperation({}).then(response => {
-
-            if(response.code==200){
-                  this.labShow= response.data  //返回true是实验室管理员,false不是实验室管理员
-                  this.joinSubOper=response.data;
-            }
-      });
-    },
-    // 危险源下拉列表
-    getHazardList () {
-      optionHazard({}).then(response => {
-        this.hazardList = response.data;
-      });
-    },
-    /** 查询传感器列表 */
-    getSensorList() {
-      optionSensor({}).then(response => {
-        this.sensorList = response.data;
-        this.sensorListData = JSON.parse(JSON.stringify(response.data))
-      });
-    },
-    /** 查询硬件下拉列表 */
-    getHardwareList() {
-      optionHardware({}).then(response => {
-        var allDate = new Array();
-        for(const key in response.data){
-          allDate.push({"id":response.data[key].hardwareTypeEnum.code,"name":response.data[key].hardwareTypeEnum.name})
-        }
-        this.hardwareList = allDate;
-      });
-    },
-    /** 查询功能列表 */
-    controlTypeList(val,index) {
-
-      optionHardware({}).then(response => {
-        var allDate = new Array();
-        for(const key in response.data){
-          if(response.data[key].hardwareTypeEnum.code==val){
-            for(const sta in response.data[key].functionStatusList){
-              allDate.push({"dictLabel":response.data[key].functionStatusList[sta].describe,"dictValue":response.data[key].functionStatusList[sta].code})
-            }
-          }
-        }
-        this.$set(this.form.riskPlanHardwareList[index],'controlTypeOptions',allDate);
-      });
-    },
-    /** 提交按钮 */
-    submitForm() {
-      let _this=this;
-      this.$refs["form"].validate(valid => {
-        if (valid) {
-          for(let i=0;i<_this.form.riskPlanSensorList.length;i++){
-            if(parseInt(_this.form.riskPlanSensorList[i].minMonitor)>=parseInt(_this.form.riskPlanSensorList[i].maxMonitor)){
-              this.msgError('传感器异常区值的最小值无法超过最大值');
-              return
-            }
-          }
-          _this.form.labRiskPlanjoinsubList=_this.labRiskPlanjoinsubList
-          _this.form.joinSubOper=_this.joinSubOper
-
-          getLabRiskPlanRepeat(_this.form).then(response => {
-            if(response.code = 200){
-              if(response.data.repeat==true){//:如果为true,就是有重复的,如果为false,就表示没有重复的
-
-                this.$confirm(response.data.tipsStr, '提示', {
-                  confirmButtonText: '是',
-                  cancelButtonText: '否',
-                  type: 'warning'
-                }).then(() => {//确定
-                  _this.form.yesOrNo=true;//是否覆盖提交,true是,false否
-                  if (this.form.id != null) {
-                    updatePlan(this.form).then(response => {
-                      if(response.code = 200){
-                        this.msgSuccess("修改成功");
-                        this.$parent.handleClick('','','back');
-                      }
-                    });
-                  } else {
-                    addPlan(this.form).then(response => {
-                      if(response.code = 200){
-                        this.msgSuccess("新增成功");
-                        this.$parent.handleClick('','','back');
-                      }
-                    });
-                  }
-                }).catch(() => {
-                  _this.form.yesOrNo=false;//是否覆盖提交,true是,false否
-                  if (this.form.id != null) {
-                    updatePlan(this.form).then(response => {
-                      if(response.code = 200){
-                        this.msgSuccess("修改成功");
-                        this.$parent.handleClick('','','back');
-                      }
-                    });
-                  } else {
-                    addPlan(this.form).then(response => {
-                      if(response.code = 200){
-                        this.msgSuccess("新增成功");
-                        this.$parent.handleClick('','','back');
-                      }
-                    });
-                  }
-                });
-
-              }else if(response.data.repeat==false){//:如果为true,就是有重复的,如果为false,就表示没有重复的
-
-                _this.form.yesOrNo=false;//是否覆盖提交,true是,false否
-                if (_this.form.id != null) {
-
-                  updatePlan(_this.form).then(response => {
-                    if(response.code = 200){
-                      this.msgSuccess("修改成功");
-                      this.$parent.handleClick('','','back');
-                    }
-                  });
-                } else {
-                  addPlan(_this.form).then(response => {
-                    if(response.code = 200){
-                      this.msgSuccess("新增成功");
-                      this.$parent.handleClick('','','back');
-                    }
-                  });
-                }
-              }
-            }
-          });
-        }
-      });
-    },
-  },
-  beforeMount() {
-    this.getDeptListTow();
-    this.getListClassifiedAll();
-    this.getListClasstypeAll();
-    // this.controlTypeList();
-    this.getUserRoleBySubOperation();
-    this.getList();
-    this.getHazardList();
-    this.getSensorList();
-    this.getHardwareList();
-    if(this.pageData){
-      this.form.id = this.pageData.id
-    }
-    if(this.form.id){
-      this.handleUpdate()
-    }
-  },
-  mounted(){
-  },
-
-};
-</script>
-
-<style scoped lang="scss">
-  .addPlan{
-    position: relative;
-    margin-top:-11px;
-    p{
-      margin:0;
-    }
-    .plan-title-p{
-      height:80px;
-      line-height:80px;
-      font-size:18px;
-      padding-left:20px;
-      border-bottom:1px solid #E0E0E0;
-    }
-    .reset-button-one{
-     /* position: absolute;
-      top:20px;
-      right:0;*/
-    }
-    .plan-info-box{
-      padding-top:30px;
-      .add-button-p{
-        width:300px;
-        height:40px;
-        line-height:36px;
-        font-size:16px;
-        border:2px dashed #E0E0E0;
-        border-radius:4px;
-        cursor:pointer;
-        margin:20px auto 0;
-        text-align: center;
-        i{
-          margin-right:5px;
-        }
-      }
-    }
-    .bottom-button-box{
-      display: flex;
-      justify-content: flex-start;
-      width:220px;
-      margin:80px auto 20px;
-      p{
-        font-size:14px;
-        height:40px;
-        width:100px;
-        line-height:40px;
-        text-align: center;
-        border-radius:4px;
-      }
-      p:nth-child(1){
-        border:1px solid #E0E0E0;
-        margin-right:20px;
-      }
-      p:nth-child(2){
-        border:1px solid #0045AF;
-      }
-    }
-  }
-  .btn_list{
-    width: 100%;
-    height: 40px;
-    background: rgba(1,131,250,0.1);
-    border-radius: 6px;
-    display: flex;
-    justify-content: flex-start;
-    align-items: center;
-    margin-bottom: 32px;
-    >i{
-      font-style: normal;
-      display: inline-block;
-      cursor: pointer;
-    }
-    >i:nth-of-type(1){
-      font-size: 20px;
-      color: #0045AF;
-      margin: 0 16px 0 14px;
-    }
-    >i:nth-of-type(2){
-      font-size: 16px;
-      font-family: Source Han Sans CN;
-      font-weight: bold;
-      color: #999999;
-      line-height: 16px;
-    }
-    >i:nth-of-type(3){
-      font-size: 16px;
-      font-family: Source Han Sans CN;
-      font-weight: bold;
-      color: #0045AF;
-      line-height: 16px;
-      margin: 0 28px 0 46px;
-    }
-    >i:nth-of-type(4){
-      font-size: 16px;
-      font-family: Source Han Sans CN;
-      font-weight: bold;
-      color: #0045AF;
-      line-height: 16px;
-    }
-    >i:nth-of-type(5){
-      font-size: 16px;
-      font-family: Source Han Sans CN;
-      font-weight: bold;
-      color: #FFA312;
-      line-height: 16px;
-      margin: 0 40px 0 28px;
-    }
-    .bottom-button-box{
-      display: flex;
-      width:220px;
-      margin: 0;
-      p{
-        font-size:14px;
-        height:30px;
-        width:100px;
-        line-height:30px;
-        text-align: center;
-        border-radius:4px;
-      }
-      p:nth-child(1){
-        border:1px solid #E0E0E0;
-        margin-right:20px;
-      }
-      p:nth-child(2){
-        border:1px solid #0045AF;
-      }
-    }
-  }
-</style>
-<style lang="scss">
-  .addPlan{
-    .for-sensor-input{
-      input::-webkit-outer-spin-button,
-      input::-webkit-inner-spin-button {
-        -webkit-appearance: none!important;
-      }
-      /* 在Firefox浏览器下 */
-      input[type="number"]{
-        -moz-appearance: textfield!important;
-      }
-    }
-  }
-</style>

+ 0 - 642
src/views/emergencyManagement/plan/associationPage.vue

@@ -1,642 +0,0 @@
-<template>
-    <div class="associationPage">
-      <el-form :model="queryParams" ref="queryForm" :inline="true" label-width="40px">
-        <el-form-item label="关键字" prop="searchValue" label-width="60px">
-          <el-input
-            maxlength="10"
-            v-model="queryParams.searchValue"
-            placeholder="请输入实验室名称/负责人"
-            style="width:190px;"
-          />
-        </el-form-item>
-        <el-form-item label="学院" prop="type">
-          <el-select v-model="queryParams.deptId" placeholder="请选择学院" style="width:150px;">
-            <el-option
-              v-for="dict in deptOptions"
-              :key="dict.deptId"
-              :label="dict.deptName"
-              :value="dict.deptId"
-            ></el-option>
-          </el-select>
-        </el-form-item>
-        <el-form-item label="类型" prop="type">
-          <el-select v-model="queryParams.moldId" placeholder="请选择类型" style="width:150px;">
-            <el-option
-              v-for="dict in labMoldList"
-              :key="dict.id"
-              :label="dict.moldName"
-              :value="dict.id"
-            ></el-option>
-          </el-select>
-        </el-form-item>
-        <el-form-item label="安全分类" prop="typeId" label-width="70px">
-          <el-select v-model="queryParams.typeId" placeholder="请选择安全分类" style="width:150px;">
-            <el-option
-              v-for="dict in typeList"
-              :key="dict.id"
-              :label="dict.typeName"
-              :value="dict.id"
-            ></el-option>
-          </el-select>
-        </el-form-item>
-        <el-form-item label="安全分级" prop="level" label-width="70px">
-          <el-select v-model="queryParams.level" placeholder="请选择安全分级" style="width:150px;">
-            <el-option
-              v-for="dict in levelList"
-              :key="dict.id"
-              :label="dict.classifiedName"
-              :value="dict.id"
-            ></el-option>
-          </el-select>
-        </el-form-item>
-        <el-form-item style="float: right;">
-          <p class="reset-button-one" @click="backPage"><i class="el-icon-arrow-left"></i>返回</p>
-        </el-form-item>
-        <el-form-item style="float: right;">
-          <el-button
-            style="float: left;width:150px;"
-            type="primary"
-            plain
-            @click="associationButton"
-          >新增关联实验室</el-button>
-        </el-form-item>
-        <el-form-item>
-          <p class="inquire-button-one" @click="onSearch">查询</p>
-          <p class="reset-button-one" @click="resetForm">重置</p>
-        </el-form-item>
-      </el-form>
-      <el-table v-loading="loading" border :data="tableData">
-        <el-table-column label="预案名称" align="left" prop="name" />
-        <el-table-column label="学院" align="left" prop="deptName" width="200"/>
-        <el-table-column label="类型" align="left" prop="moldName" width="150"/>
-        <el-table-column label="安全分类" align="left" prop="typeName" width="150"/>
-        <el-table-column label="安全分级" align="left" prop="levelName" width="150"/>
-        <el-table-column label="实验室负责人" align="left" prop="adminName" width="150"/>
-        <el-table-column label="操作" align="center" class-name="small-padding fixed-width" width="160">
-          <template slot-scope="scope">
-            <div class="table-button-box">
-              <p class="table-button-null"></p>
-              <p class="table-button-p" @click="delClick(scope.row)">删除</p>
-              <p class="table-button-null"></p>
-            </div>
-          </template>
-        </el-table-column>
-      </el-table>
-      <pagination :page-sizes="[20, 30, 40, 50]"
-        v-show="total>0"
-        :total="total"
-        layout="total, prev, pager, next, sizes, jumper"
-        :page.sync="queryParams.pageNum"
-        :limit.sync="queryParams.pageSize"
-        @pagination="getListPlan"
-      />
-      <!--关联实验室-->
-      <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
-              style="width:160px;"
-              v-model="dialogForm.name"
-              placeholder="请输入实验室名称"
-              clearable
-              size="small"
-            />
-          </el-form-item>
-          <el-form-item label="学院" prop="type" >
-            <el-select v-model="dialogForm.deptId" placeholder="请选择学院" clearable
-                       style="width:160px;">
-              <el-option
-                v-for="dict in deptOptions"
-                :key="dict.deptId"
-                :label="dict.deptName"
-                :value="dict.deptId"
-              ></el-option>
-            </el-select>
-          </el-form-item>
-          <el-form-item label="安全分类"  prop="typeId" class="form-item">
-            <el-select v-model="dialogForm.typeId" placeholder="请选择安全分类" clearable
-                       style="width:160px;">
-              <el-option
-                v-for="dict in typeList"
-                :key="dict.id"
-                :label="dict.typeName"
-                :value="dict.id"
-              ></el-option>
-            </el-select>
-          </el-form-item>
-          <el-form-item label="安全分级"  prop="level" class="form-item">
-            <el-select v-model="dialogForm.level" placeholder="请选择安全分级" clearable
-                       style="width:160px;">
-              <el-option
-                v-for="dict in levelList"
-                :key="dict.id"
-                :label="dict.classifiedName"
-                :value="dict.id"
-              ></el-option>
-            </el-select>
-          </el-form-item>
-          <el-form-item label="实验室负责人" prop="name" >
-            <el-input
-              style="width:160px;"
-              v-model="dialogForm.adminName"
-              placeholder="请输入实验室负责人"
-              clearable
-              size="small"
-            />
-          </el-form-item>
-          <el-form-item>
-            <p class="inquire-button-one" style="margin-left:20px;" @click="onSearch2">查询</p>
-            <p class="reset-button-one" @click="resetForm2">重置</p>
-          </el-form-item>
-        </el-form>
-        <div class="btn_list">
-          <i class="el-icon-warning"></i>
-          <i>已选择 {{labRiskPlanjoinsubList.length}} 项</i>
-          <i @click="toggleSelection(dialogTable)">全选本页</i>
-          <i @click="submitFormAll">选择全部</i>
-          <i></i>
-          <i @click="toggleSelection()">清除选项</i>
-          <div class="bottom-button-box">
-            <p @click="handleClick">取消</p>
-            <p @click="submitForm">确定</p>
-            <!--<el-button class="color_99" @click="handleClick('','','back')">取消</el-button>-->
-            <!--<el-button class="color_ff back_one" @click="submitForm">确定</el-button>-->
-          </div>
-        </div>
-        <el-table ref="multipleTable" border :data="dialogTable" highlight-current-row @selection-change="handleSelectionChange" :row-key="getRowKeys" style="height:500px;cursor: pointer;">
-          <el-table-column
-            :reserve-selection="true"
-            type="selection"
-            align="center"
-            width="55">
-          </el-table-column>
-          <el-table-column label="实验室" show-overflow-tooltip align="left" prop="name"/>
-          <el-table-column label="学院" align="left" prop="deptName" />
-          <el-table-column label="安全分类" align="left" prop="typeName" />
-          <el-table-column label="安全分级" align="left" prop="levelName" >
-            <template slot-scope="scope">
-              <span :style="'color:'+scope.row.fiedColor+';'">{{scope.row.levelName}}</span>
-            </template>
-          </el-table-column>
-          <el-table-column label="实验室负责人" align="left" prop="adminName" />
-        </el-table>
-        <pagination :page-sizes="[20, 30, 40, 50]"
-          v-show="total2>0"
-          :total="total2"
-          :page.sync="dialogForm.pageNum"
-          :limit.sync="dialogForm.pageSize"
-          @pagination="getList"
-        />
-      </el-dialog>
-    </div>
-</template>
-
-<script>
-  import {
-    addPlan,
-    updatePlan,
-    listPlan,
-    getUserRoleBySub,
-    getLabRiskPlanRepeat,
-    getLabRiskPlanJoinSub,
-    riskPlanJoinSub,
-    delPlan,
-    getUserRoleBySubOperation,
-    getUserRoleBySubBindRisk,
-    removeByPlanJoinSub,
-  } from "@/apiDemo/laboratory/plan";
-  import {listDepartments} from "@/apiDemo/system/dept";
-  import {listClassifiedAll} from "@/apiDemo/laboratory/classified";
-  import {listClasstypeAll} from "@/apiDemo/laboratory/classtype";
-  import { queryOption } from "@/apiDemo/laboratory/labMold";
-  export default {
-    name: "associationPage",
-    props:{
-      associationData:{},
-    },
-    data() {
-      return {
-        loading:true,
-        deptOptions:[],
-        typeList:[],
-        levelList:[],
-        total:0,
-        queryParams:{
-          searchValue:'',
-          deptId:'',
-          moldId:'',
-          typeId:'',
-          level:'',
-          pageNum:1,
-          pageSize:20,
-        },
-        tableData:[],
-        //实验室弹框
-        dialogVisible:false,
-        dialogSub:{},//关联实验室提交对象
-        dialogTable:[],
-        total2:0,
-        dialogForm:{
-          pageNum: 1,
-          pageSize:20,
-          name: null,
-          deptId: null,
-          typeId: null,
-          level: null,
-          adminName: null,
-        },
-        labRiskPlanjoinsubList:[],//选中实验室
-        //实验室类型
-        labMoldList:[],
-      }
-    },
-    mounted(){
-      this.getListPlan();
-      this.getDeptListTow();
-      this.getListClassifiedAll();
-      this.getListClasstypeAll();
-      this.getUserRoleBySubOperation();
-      this.queryOption();
-    },
-    methods:{
-      queryOption(){
-        queryOption({}).then(response=>{
-          if(response.code==200){
-            this.labMoldList=response.data
-          }
-        })
-      },
-      /** 查询学院列表 */
-      getDeptListTow() {
-        listDepartments().then(response => {
-          // this.deptOptionsTwo = response.data;
-          this.$set(this, 'deptOptions', response.data)
-        });
-      },
-      /**获取分级*/
-      getListClassifiedAll(){
-        listClassifiedAll().then(response=>{
-          if(response.code==200){
-            this.levelList = response.data
-          }
-        })
-      },
-      /**获取分类*/
-      getListClasstypeAll(){
-        listClasstypeAll().then(response=>{
-          if(response.code==200){
-            this.typeList = response.data;
-          }
-        });
-      },
-      /** 查询实验室根据实验室管理员用户权限是否有操作权限 */
-      getUserRoleBySubOperation(){
-        getUserRoleBySubOperation({}).then(response => {
-
-          if(response.code==200){
-            this.labShow= response.data  //返回true是实验室管理员,false不是实验室管理员
-            this.joinSubOper=response.data;
-          }
-        });
-      },
-      associationButton(){
-        let  _this = this;
-        //关联实验室
-        this.dialogSub.id = _this.associationData.row.id;
-        this.dialogVisible = true;
-        this.checkedLabList=[];
-        //根据列表返回的实验室信息循环匹配相同实验室信息
-        setTimeout(function(){
-          let newList = [];
-          _this.tableData.forEach(function (item2,index){
-            _this.$refs.multipleTable.toggleRowSelection(item2,true);
-            newList.push(item2)
-          })
-          _this.$set(_this,'checkedLabList',newList)
-          _this.getList();
-        },100);
-      },
-      /** 查询实验室列表 */
-      getList() {
-        let _this=this;
-        getUserRoleBySub(this.dialogForm).then(response => {
-          this.dialogTable = response.rows;
-          this.total2 = response.total;
-          // for(let i=0;i<_this.checkedLabList.length;i++){
-          //   _this.$refs.multipleTable.toggleRowSelection(_this.checkedLabList[i],true)
-          // }
-        });
-      },
-      //选中实验室
-      handleSelectionChange(val){
-        let _this=this;
-        _this.labRiskPlanjoinsubList=[];
-        let newList = [];
-        val.forEach(function (item,index){
-          newList.push({'subjectId':item.id})
-        })
-        this.$set(this,'labRiskPlanjoinsubList',newList)
-
-      },
-      /*===记录勾选数据===
-        需要再el-table 添加  :row-key="getRowKeys"
-        需要在selection 添加 :reserve-selection="true"
-      */
-      getRowKeys(row) {
-        return row.subjectId
-      },
-      //查询
-      onSearch2() {
-        this.dialogForm.pageNo = 1;
-        this.getList();
-      },
-      //重置
-      resetForm2() {
-        this.dialogForm.name = '';
-        this.dialogForm.deptId = '';
-        this.dialogForm.typeId = '';
-        this.dialogForm.level = '';
-        this.dialogForm.adminName = '';
-        this.onSearch2();
-      },
-      //全部实验室关联
-      submitFormAll(){
-        let _this=this;
-        _this.dialogSub.labRiskPlanjoinsubList=_this.labRiskPlanjoinsubList
-        _this.dialogSub.joinSubOper=this.joinSubOper;
-        let obj1 = JSON.parse(JSON.stringify(_this.dialogSub))
-        obj1.allSelect = true;
-        getLabRiskPlanJoinSub(obj1).then(response => {
-          if(response.code = 200){
-            if(response.data.repeat==true){//:如果为true,就是有重复的,如果为false,就表示没有重复的
-              this.$confirm(response.data.tipsStr, '提示', {
-                distinguishCancelAndClose:true,
-                confirmButtonText: '是',
-                cancelButtonText: '否',
-                type: 'warning'
-              }).then(() => {//确定
-                _this.dialogSub.yesOrNo=true;//是否覆盖提交,true是,false否
-                let obj2 = JSON.parse(JSON.stringify(this.dialogSub))
-                obj2.allSelect = true;
-                riskPlanJoinSub(obj2).then(response => {
-                  if(response.code = 200){
-                    this.getListPlan();
-                    this.msgSuccess("修改成功");
-                    this.dialogVisible = false;
-                  }
-                });
-              }).catch(action => {
-                if(action === 'cancel'){
-                  _this.dialogSub.yesOrNo=false;//是否覆盖提交,true是,false否
-                  let obj3 = JSON.parse(JSON.stringify(this.dialogSub))
-                  obj3.allSelect = true;
-                  riskPlanJoinSub(obj3).then(response => {
-                    if(response.code = 200){
-                      this.getListPlan();
-                      this.msgSuccess("修改成功");
-                      this.dialogVisible = false;
-                    }
-                  });
-                }
-              });
-            }else if(response.data.repeat==false){//:如果为true,就是有重复的,如果为false,就表示没有重复的
-              _this.dialogSub.yesOrNo=false;//是否覆盖提交,true是,false否
-              let obj4 = JSON.parse(JSON.stringify(this.dialogSub))
-              obj4.allSelect = true;
-              riskPlanJoinSub(obj4).then(response => {
-                if(response.code = 200){
-                  this.getListPlan();
-                  this.msgSuccess("修改成功");
-                  this.dialogVisible = false;
-                }
-              });
-            }
-          }
-        });
-      },
-      /** 关联实验室 */
-      submitForm() {
-        let _this=this;
-        _this.dialogSub.labRiskPlanjoinsubList=_this.labRiskPlanjoinsubList
-        _this.dialogSub.joinSubOper=this.joinSubOper;
-        let obj1 = JSON.parse(JSON.stringify(_this.dialogSub))
-        obj1.allSelect = false;
-        getLabRiskPlanJoinSub(obj1).then(response => {
-          if(response.code = 200){
-            if(response.data.repeat==true){//:如果为true,就是有重复的,如果为false,就表示没有重复的
-              this.$confirm(response.data.tipsStr, '提示', {
-                distinguishCancelAndClose:true,
-                confirmButtonText: '是',
-                cancelButtonText: '否',
-                type: 'warning'
-              }).then(() => {//确定
-                _this.dialogSub.yesOrNo=true;//是否覆盖提交,true是,false否
-                let obj2 = JSON.parse(JSON.stringify(this.dialogSub))
-                obj2.allSelect = false;
-                riskPlanJoinSub(obj2).then(response => {
-                  if(response.code = 200){
-                    this.msgSuccess("修改成功");
-                    this.getListPlan();
-                    this.dialogVisible = false;
-                  }
-                });
-              }).catch(action => {
-                if(action === 'cancel'){
-                  _this.dialogSub.yesOrNo=false;//是否覆盖提交,true是,false否
-                  let obj3 = JSON.parse(JSON.stringify(this.dialogSub))
-                  obj3.allSelect = false;
-                  riskPlanJoinSub(obj3).then(response => {
-                    if(response.code = 200){
-                      this.msgSuccess("修改成功");
-                      this.getListPlan();
-                      this.dialogVisible = false;
-                    }
-                  });
-                }
-              });
-            }else if(response.data.repeat==false){//:如果为true,就是有重复的,如果为false,就表示没有重复的
-              _this.dialogSub.yesOrNo=false;//是否覆盖提交,true是,false否
-              let obj4 = JSON.parse(JSON.stringify(this.dialogSub))
-              obj4.allSelect = false;
-              riskPlanJoinSub(obj4).then(response => {
-                if(response.code = 200){
-                  this.msgSuccess("修改成功");
-                  this.getListPlan();
-                  this.dialogVisible = false;
-                }
-              });
-            }
-          }
-        });
-      },
-      handleClick() {
-        this.dialogVisible=false;
-        this.getListPlan();
-        this.$forceUpdate();
-      },
-      //取消选中
-      toggleSelection(rows) {
-        if (rows) {
-          this.$refs.multipleTable.clearSelection();
-          rows.forEach(row => {
-            this.$refs.multipleTable.toggleRowSelection(row);
-          });
-        } else {
-          this.$refs.multipleTable.clearSelection();
-        }
-      },
-      //监听实验室弹窗关闭
-      handleLabClose(){
-        this.getListPlan();
-        this.dialogForm.pageNum = 1;
-        this.$refs.multipleTable.clearSelection()
-        // if(this.checkedLabList){
-        //   this.$nextTick(() => {
-        //     this.checkedLabList.forEach(row => {
-        //       this.$refs.multipleTable.toggleRowSelection(row);
-        //     });
-        //   })
-        // }
-      },
-      backPage(){
-        this.$parent.handleClose();
-
-      },
-      getListPlan(){
-        //?pageNum=1&pageSize = 20&pageNo=1&riskId=25
-        let obj = JSON.parse(JSON.stringify(this.queryParams));
-        obj.pageNo = '';
-        obj.riskId = this.associationData.row.id;
-        getUserRoleBySubBindRisk(obj).then(response => {
-          this.tableData = response.rows;
-          this.loading = false;
-        })
-      },
-      //删除
-      delClick(item){
-        let self = this;
-        this.$confirm('是否确认删除?', "警告", {
-          confirmButtonText: "确定",
-          cancelButtonText: "取消",
-          type: "warning"
-        }).then(function() {
-          let obj = {
-            riskPlanId:self.associationData.row.id,
-            subjectId:item.subjectId
-          };
-          removeByPlanJoinSub(obj).then(response => {
-            self.getListPlan();
-            self.msgSuccess("删除成功");
-          })
-        }).then(() => {
-        }).catch(() => {});
-      },
-      //查询
-      onSearch() {
-        this.queryParams.pageNum = 1;
-        this.getListPlan();
-      },
-      //重置
-      resetForm() {
-        this.dateRange=[];
-        this.queryParams.searchValue = '';
-        this.queryParams.deptId = '';
-        this.queryParams.moldId = '';
-        this.queryParams.typeId = '';
-        this.queryParams.level = '';
-        this.onSearch();
-      },
-    }
-  }
-</script>
-
-<style scoped lang="scss">
-  .associationPage{
-    flex:1;
-    display: flex;
-    flex-direction: column;
-
-    .btn_list{
-      width: 100%;
-      height: 40px;
-      background: rgba(1,131,250,0.1);
-      border-radius: 6px;
-      display: flex;
-      justify-content: flex-start;
-      align-items: center;
-      margin-bottom: 32px;
-      >i{
-        font-style: normal;
-        display: inline-block;
-        cursor: pointer;
-      }
-      >i:nth-of-type(1){
-        font-size: 20px;
-        color: #0045AF;
-        margin: 0 16px 0 14px;
-      }
-      >i:nth-of-type(2){
-        font-size: 16px;
-        font-family: Source Han Sans CN;
-        font-weight: bold;
-        color: #999999;
-        line-height: 16px;
-      }
-      >i:nth-of-type(3){
-        font-size: 16px;
-        font-family: Source Han Sans CN;
-        font-weight: bold;
-        color: #0045AF;
-        line-height: 16px;
-        margin: 0 28px 0 46px;
-      }
-      >i:nth-of-type(4){
-        font-size: 16px;
-        font-family: Source Han Sans CN;
-        font-weight: bold;
-        color: #0045AF;
-        line-height: 16px;
-        margin: 0 28px 0 46px;
-      }
-      >i:nth-of-type(5){
-        font-size: 16px;
-        font-family: Source Han Sans CN;
-        font-weight: bold;
-        color: #0045AF;
-        line-height: 16px;
-      }
-      >i:nth-of-type(6){
-        font-size: 16px;
-        font-family: Source Han Sans CN;
-        font-weight: bold;
-        color: #FFA312;
-        line-height: 16px;
-        margin: 0 40px 0 28px;
-      }
-      .bottom-button-box{
-        display: flex;
-        width:220px;
-        p{
-          font-size:14px;
-          height:30px;
-          width:100px;
-          line-height:30px;
-          text-align: center;
-          border-radius:4px;
-          cursor: pointer;
-        }
-        p:nth-child(1){
-          border:1px solid #E0E0E0;
-          margin-right:20px;
-          color: #666;
-        }
-        p:nth-child(2){
-          background: #0183FA;
-          border:1px solid #0183FA;
-          color:#fff;
-        }
-      }
-    }
-  }
-</style>

+ 5 - 10
src/views/emergencyManagement/plan/index.vue

@@ -1,4 +1,4 @@
-<!--控制记录-->
+<!--预案管理-->
 <template>
   <div class="app-container control">
     <div class="scrollbar-box" v-if="pageType == 0">
@@ -118,20 +118,20 @@ import {
   delPlan,
   getUserRoleBySubOperation
 } from "@/apiDemo/laboratory/plan";
-import addPlanPage from "./newAddPlan.vue";
-import detailPlanPage from "./detailPlan.vue";
-import associationPage from "./newAssociatedPage.vue";
-import relevanceRecordPage from "../distribution/index";
 import {listDepartments} from "@/apiDemo/system/dept";
 import {listClassifiedAll} from "@/apiDemo/laboratory/classified";
 import {listClasstypeAll} from "@/apiDemo/laboratory/classtype";
 import {authListSubject} from "@/apiDemo/laboratory/subject";
 import { selectRiskPlanLeveList, addPlan, delPlanData } from "@/apiDemo/evacuation3_2/index";
 import { riskOptionSensor } from "@/apiDemo/laboratory/sensor";
+import detailPlanPage from "./detailPlan.vue";
+import relevanceRecordPage from "../distribution/index";
 //                        V3
 import { laboratoryMusicFindByType,laboratoryPlanList,laboratoryPlanAdd,
   laboratoryPlanDelete } from "@/api/emergencyManagement/index";
 import { iotAttributeGetByTypeId } from "@/api/iotDevice/index";
+import addPlanPage from "./newAddPlan.vue";
+import associationPage from "./newAssociatedPage.vue";
 
 export default {
   components: {
@@ -311,11 +311,6 @@ export default {
 
 
   .control{
-    flex: 1;
-    display: flex!important;
-    flex-direction: column;
-    overflow: hidden;
-    box-shadow: 0 0 8px 2px rgba(0, 0, 0, 0.1);
     .scrollbar-box{
       overflow: hidden;
       display: flex!important;

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

@@ -211,7 +211,7 @@
       <div slot="footer" class="dialog-footer dialog-footer-box">
         <p class="dialog-footer-button-null"></p >
         <p class="dialog-footer-button-info" @click="cancel">取消</p >
-        <p class="dialog-footer-button-primary" @click="submitForm">确定</p >
+        <p class="dialog-footer-button-primary" @click="submitForm">提交</p >
         <p class="dialog-footer-button-null"></p >
       </div>
     </el-dialog>

+ 112 - 110
src/views/emergencyManagement/plan/newAssociatedPage.vue

@@ -1,120 +1,123 @@
 <template>
     <div class="newAssociatedPage">
-      <el-form :model="queryParams" ref="queryForm" :inline="true" class="form-box">
-        <el-form-item label="关键字" prop="name">
-          <el-input
-            style="width:160px;"
-            maxlength="10"
-            v-model="queryParams.searchValue"
-            placeholder="实验室"
-            clearable
-            size="small"
-          />
-        </el-form-item>
-        <el-form-item label="安全分类" prop="typeId">
-          <el-select v-model="queryParams.typeId" placeholder="请选择安全分类" style="width:160px;">
-            <el-option
-              v-for="dict in typeList"
-              :key="dict.id"
-              :label="dict.typeName"
-              :value="dict.id"
-            ></el-option>
-          </el-select>
-        </el-form-item>
-        <el-form-item label="安全分级" prop="level">
-          <el-select v-model="queryParams.level" placeholder="请选择安全分级" style="width:160px;">
-            <el-option
-              v-for="item in levelList"
-              :key="item.id"
-              :label="item.classifiedName"
-              :value="item.id">
-            </el-option>
-          </el-select>
-        </el-form-item>
-        <el-form-item label="关联时间" prop="senseState">
-          <el-date-picker
-            :clearable="false"
-            v-model="dateRange"
-            size="small"
-            style="width: 240px"
-            value-format="yyyy-MM-dd"
-            type="daterange"
-            range-separator="-"
-            start-placeholder="开始日期"
-            end-placeholder="结束日期"
-          ></el-date-picker>
-        </el-form-item>
-        <el-form-item style="float: right;">
-          <el-col :span="1.5">
-            <p class="reset-button-one"
-               @click="backButton"
-               style="float: right;"
-            >返回</p>
-            <p class="add-button-one-90"
-               @click="handleAdd(1)"
-               style="float: right;margin-right:20px;"
-            >新增</p>
-          </el-col>
-        </el-form-item>
-        <el-form-item>
-          <p class="inquire-button-one" style="margin-right:10px;" @click="handleQuery">查询</p>
-          <p class="reset-button-one" @click="resetQuery">重置</p>
-        </el-form-item>
-      </el-form>
-
-      <el-table v-loading="loading" border :data="tableData">
-        <el-table-column label="实验室" align="left" prop="name" width="300" show-overflow-tooltip/>
-        <el-table-column label="安全分类" align="left" prop="typeName" width="140">
-          <template slot-scope="scope">
-            <span v-for="(item,index) in typeList" :key="index" v-if="item.id == scope.row.typeId">{{item.typeName}}</span>
-          </template>
-        </el-table-column>
-        <el-table-column label="安全分级" align="left" prop="leveName" width="140">
-          <template slot-scope="scope">
-            <span v-for="(item,index) in levelList" :key="index" v-if="item.id == scope.row.level">{{item.classifiedName}}</span>
-          </template>
-        </el-table-column>
-        <el-table-column label="危险源" align="left" prop="labSensorHazardRelationsList" show-overflow-tooltip>
-          <template slot-scope="scope">
+      <div class="page-form-title-box">
+        <el-form :model="queryParams" ref="queryForm" :inline="true" class="form-box">
+          <el-form-item label="" prop="name">
+            <el-input
+              style="width:160px;"
+              maxlength="10"
+              v-model="queryParams.searchValue"
+              placeholder="请输入实验室"
+              clearable
+              size="small"
+            />
+          </el-form-item>
+          <el-form-item label="" prop="typeId">
+            <el-select v-model="queryParams.typeId" placeholder="请选择安全分类" style="width:160px;">
+              <el-option
+                v-for="dict in typeList"
+                :key="dict.id"
+                :label="dict.typeName"
+                :value="dict.id"
+              ></el-option>
+            </el-select>
+          </el-form-item>
+          <el-form-item label="" prop="level">
+            <el-select v-model="queryParams.level" placeholder="请选择安全分级" style="width:160px;">
+              <el-option
+                v-for="item in levelList"
+                :key="item.id"
+                :label="item.classifiedName"
+                :value="item.id">
+              </el-option>
+            </el-select>
+          </el-form-item>
+          <el-form-item label="" prop="senseState">
+            <el-date-picker
+              :clearable="false"
+              v-model="dateRange"
+              size="small"
+              style="width: 240px"
+              value-format="yyyy-MM-dd"
+              type="daterange"
+              range-separator="-"
+              start-placeholder="开始日期"
+              end-placeholder="结束日期"
+            ></el-date-picker>
+          </el-form-item>
+          <el-form-item style="float: right;">
+            <el-col :span="1.5">
+              <p class="page-submit-common-style-button"
+                 @click="handleAdd(1)"
+                 style="float: right;"
+              >新增</p>
+              <p class="page-reset-common-style-button"
+                 @click="backButton"
+                 style="float: right;margin-right:20px;"
+              >返回</p>
+            </el-col>
+          </el-form-item>
+          <el-form-item>
+            <p class="page-inquire-common-style-button" style="margin-right:10px;" @click="handleQuery">查询</p>
+            <p class="page-reset-common-style-button" @click="resetQuery">重置</p>
+          </el-form-item>
+        </el-form>
+      </div>
+      <div class="page-content-box">
+        <el-table class="table-box" v-loading="loading" border :data="tableData">
+          <el-table-column label="实验室" align="left" prop="name" width="300" show-overflow-tooltip/>
+          <el-table-column label="安全分类" align="left" prop="typeName" width="140">
+            <template slot-scope="scope">
+              <span v-for="(item,index) in typeList" :key="index" v-if="item.id == scope.row.typeId">{{item.typeName}}</span>
+            </template>
+          </el-table-column>
+          <el-table-column label="安全分级" align="left" prop="leveName" width="140">
+            <template slot-scope="scope">
+              <span v-for="(item,index) in levelList" :key="index" v-if="item.id == scope.row.level">{{item.classifiedName}}</span>
+            </template>
+          </el-table-column>
+          <el-table-column label="危险源" align="left" prop="labSensorHazardRelationsList" show-overflow-tooltip>
+            <template slot-scope="scope">
             <span style="margin-right:10px;" v-for="(item,index) in scope.row.labSensorHazardRelationsList" :key="index">
               {{item.hazardName}} - {{item.sensorName}}
             </span>
-          </template>
-        </el-table-column>
-        <el-table-column label="关联时间" align="left" prop="relationTime" width="200"/>
-        <el-table-column label="状态" align="left" prop="senseState" width="140"/>
-        <el-table-column label="操作" align="left" class-name="small-padding fixed-width" width="100">
-          <template slot-scope="scope">
-            <div class="table-button-box">
-              <p class="table-button-null"></p>
-              <p class="table-button-p" @click="handleDelete(scope.row)">移除</p>
-              <p class="table-button-null"></p>
-            </div>
-          </template>
-        </el-table-column>
-      </el-table>
-      <pagination :page-sizes="[20, 30, 40, 50]"
-                  v-show="total>0"
-                  :total="total"
-                  layout="total, prev, pager, next, sizes, jumper"
-                  :page.sync="queryParams.pageNum"
-                  :limit.sync="queryParams.pageSize"
-                  @pagination="getList"
-      />
-      <el-dialog title='关联实验室' v-if="dialogAssociatedOpen" :visible.sync="dialogAssociatedOpen" width="1200px"
-                 :close-on-click-modal="false">
+            </template>
+          </el-table-column>
+          <el-table-column label="关联时间" align="left" prop="relationTime" width="200"/>
+          <el-table-column label="状态" align="left" prop="senseState" width="140"/>
+          <el-table-column label="操作" align="left" class-name="small-padding fixed-width" width="100">
+            <template slot-scope="scope">
+              <div class="table-button-box">
+                <p class="table-button-null"></p>
+                <p class="table-button-p" @click="handleDelete(scope.row)">移除</p>
+                <p class="table-button-null"></p>
+              </div>
+            </template>
+          </el-table-column>
+        </el-table>
+        <pagination :page-sizes="[20, 30, 40, 50]"
+                    v-show="total>0"
+                    :total="total"
+                    layout="total, prev, pager, next, sizes, jumper"
+                    :page.sync="queryParams.pageNum"
+                    :limit.sync="queryParams.pageSize"
+                    @pagination="getList"
+        />
+      </div>
+      <el-dialog title='关联实验室' v-if="dialogAssociatedOpen" :visible.sync="dialogAssociatedOpen"
+                 append-to-body 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">
+            <el-form-item label="" prop="searchValue">
               <el-input
                 maxlength="10"
                 v-model="param.searchValue"
-                placeholder="实验室"
+                placeholder="请输入实验室"
                 clearable
                 size="small"
               />
             </el-form-item>
-            <el-form-item label="安全分类" prop="typeId" label-width="80px">
+            <el-form-item label="" prop="typeId" label-width="80px">
               <el-select v-model="param.typeId" placeholder="请选择安全分类" clearable size="small">
                 <el-option
                   v-for="dict in typeList"
@@ -124,7 +127,7 @@
                 ></el-option>
               </el-select>
             </el-form-item>
-            <el-form-item label="安全分级" prop="level" label-width="80px">
+            <el-form-item label="" prop="level" label-width="80px">
               <el-select v-model="param.level" placeholder="请选择安全分级" clearable size="small">
                 <el-option
                   v-for="dict in levelList"
@@ -199,7 +202,7 @@
                   display: inline-block;margin:5px 0 0 10px;text-align: center;cursor: pointer;" @click="addObjButton(2,scope.row)">取消</p>
                     <p style="color:#0183FA;font-size:16px;border:1px solid #0183FA;
                   border-radius:4px;width:80px;height:30px;line-height:30px;
-                  display: inline-block;margin:5px 0 0 10px;text-align: center;cursor: pointer;" @click="addObjButton(3,scope.row)">确定</p>
+                  display: inline-block;margin:5px 0 0 10px;text-align: center;cursor: pointer;" @click="addObjButton(3,scope.row)">提交</p>
                   </div>
                 </div>
               </template>
@@ -216,7 +219,7 @@
         <div slot="footer" class="dialog-footer dialog-footer-box">
           <p class="dialog-footer-button-null"></p >
           <p class="dialog-footer-button-info" @click="handleAdd(2)">取消</p >
-          <p class="dialog-footer-button-primary" @click="handleAdd(3)">确定</p >
+          <p class="dialog-footer-button-primary" @click="handleAdd(3)">提交</p >
           <p class="dialog-footer-button-null"></p >
         </div>
       </el-dialog>
@@ -588,11 +591,10 @@
 
 <style scoped lang="scss">
   .newAssociatedPage{
-    flex: 1;
-    display: flex !important;
-    flex-direction: column;
+    flex:1;
     overflow: hidden;
-    padding:20px;
+    display: flex;
+    flex-direction: column;
     p {
       margin: 0;
       font-weight: 500;

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

@@ -150,7 +150,7 @@
       <div slot="footer" class="dialog-footer dialog-footer-box">
         <p class="dialog-footer-button-null"></p>
         <p class="dialog-footer-button-info" @click="cancel">取消</p>
-        <p class="dialog-footer-button-primary" @click="submitForm">确定</p>
+        <p class="dialog-footer-button-primary" @click="submitForm">提交</p>
         <p class="dialog-footer-button-null"></p>
       </div>
     </el-dialog>

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

@@ -98,7 +98,7 @@
       <div slot="footer" class="dialog-footer dialog-footer-box">
         <p class="dialog-footer-button-null"></p>
         <p class="dialog-footer-button-info" @click="cancel">取消</p>
-        <p class="dialog-footer-button-primary" @click="submitForm">确定</p>
+        <p class="dialog-footer-button-primary" @click="submitForm">提交</p>
         <p class="dialog-footer-button-null"></p>
       </div>
     </el-dialog>

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

@@ -32,7 +32,7 @@
       </el-form-item>
       <div class="button-box">
         <el-button class="color_99" @click="leftButtonClick">取消</el-button>
-        <el-button class="color_ff back_one" @click="previewButton">确定</el-button>
+        <el-button class="color_ff back_one" @click="previewButton">提交</el-button>
       </div>
     </el-form>
     <el-dialog title="预览" class="richTextDialog" v-if="richTextDialogType" :close-on-click-modal="false" :visible.sync="richTextDialogType" append-to-body>
@@ -45,7 +45,7 @@
             :value="item.key">
           </el-option>
         </el-select>
-        <p class="add-button-one-90" style="margin-left:20px;" @click="rightButtonClick">确定</p>
+        <p class="add-button-one-90" style="margin-left:20px;" @click="rightButtonClick">提交</p>
       </div>
       <div class="text-max-box" :class="previewKey!=2?'move-text-max-box':''">
         <p class="text-max-null-p"></p>

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

@@ -175,7 +175,7 @@
         <div class="button-top-box">
           <p></p>
           <p class="add-button-two-90" @click="addUser">+ 新增管控人员</p>
-          <p class="inquire-button-one" @click="okUserClick">确定</p>
+          <p class="inquire-button-one" @click="okUserClick">提交</p>
         </div>
         <div class="table-user-list-box">
           <el-table border :data="tableUserListMin">

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

@@ -71,7 +71,7 @@
       <div slot="footer" class="dialog-footer dialog-footer-box">
         <p class="dialog-footer-button-null"></p >
         <p class="dialog-footer-button-info" @click="cancel">取消</p >
-        <p class="dialog-footer-button-primary" @click="submitForm">确定</p >
+        <p class="dialog-footer-button-primary" @click="submitForm">提交</p >
         <p class="dialog-footer-button-null"></p >
       </div>
     </el-dialog>

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

@@ -83,7 +83,7 @@
         <div style="margin-top:30px;padding-top:20px;display: flex;border-top:1px solid #dedede">
           <p style="flex:1;"></p>
           <p style="margin-right:20px;" class="reset-button-one" @click="show(2)">取消</p>
-          <p class="inquire-button-one" @click="okButton">确定</p>
+          <p class="inquire-button-one" @click="okButton">提交</p>
         </div>
       </div>
     </el-dialog>

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

@@ -78,7 +78,7 @@
         <div style="margin-top:30px;padding-top:20px;display: flex;border-top:1px solid #dedede">
           <p style="flex:1;"></p>
           <p style="margin-right:20px;" class="reset-button-one" @click="show(2)">取消</p>
-          <p class="inquire-button-one" @click="okButton">确定</p>
+          <p class="inquire-button-one" @click="okButton">提交</p>
         </div>
       </div>
     </el-dialog>

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

@@ -152,7 +152,7 @@
       <div slot="footer" class="dialog-footer dialog-footer-box">
         <p class="dialog-footer-button-null"></p >
         <p class="dialog-footer-button-info" @click="cancel">取消</p >
-        <p class="dialog-footer-button-primary" @click="submitForm">确定</p >
+        <p class="dialog-footer-button-primary" @click="submitForm">提交</p >
         <p class="dialog-footer-button-null"></p >
       </div>
     </el-dialog>

+ 2 - 2
src/views/integratedManagement/buildingManagement/index.vue

@@ -205,7 +205,7 @@
       <div slot="footer" class="dialog-footer dialog-footer-box">
         <p class="dialog-footer-button-null"></p>
         <p class="dialog-footer-button-info" @click="cancel">取消</p>
-        <p class="dialog-footer-button-primary" @click="submitForm">确定</p>
+        <p class="dialog-footer-button-primary" @click="submitForm">提交</p>
         <p class="dialog-footer-button-null"></p>
       </div>
     </el-dialog>
@@ -232,7 +232,7 @@
       <div slot="footer" class="dialog-footer dialog-footer-box">
         <p class="dialog-footer-button-null"></p>
         <p class="dialog-footer-button-info" @click="roomCancel">取消</p>
-        <p class="dialog-footer-button-primary" @click="roomSubmitForm">确定</p>
+        <p class="dialog-footer-button-primary" @click="roomSubmitForm">提交</p>
         <p class="dialog-footer-button-null"></p>
       </div>
     </el-dialog>

+ 2 - 2
src/views/integratedManagement/laboratoryManagement/accessAuthorization/lookImpower.vue

@@ -72,7 +72,7 @@
         </div>
       </div>
       <div style="text-align: center;">
-        <el-button class="color_ff back_one" style="width: 300px;" @click="loseTimeSubmitForm()">确定</el-button>
+        <el-button class="color_ff back_one" style="width: 300px;" @click="loseTimeSubmitForm()">提交</el-button>
       </div>
 
     </div>
@@ -172,7 +172,7 @@
           </el-form-item>
         </el-form>
         <p :class="unifyDeploy?'add-button-one-120':'inquire-button-one'"  @click="unifyDeployFun()">{{unifyDeploy?'取消统一配置':'统一配置'}}</p>
-        <el-button class="color_ff back_one" style="height: 42px" @click="submitForm()">确定</el-button>
+        <el-button class="color_ff back_one" style="height: 42px" @click="submitForm()">提交</el-button>
       </div>
     </el-dialog>
   </div>

+ 1 - 1
src/views/integratedManagement/laboratoryManagement/classifiedGrading/classified.vue

@@ -69,7 +69,7 @@
       <div slot="footer" class="dialog-footer dialog-footer-box">
         <p class="dialog-footer-button-null"></p>
         <p class="dialog-footer-button-info" @click="cancel">取消</p>
-        <p class="dialog-footer-button-primary" @click="submitForm">确定</p>
+        <p class="dialog-footer-button-primary" @click="submitForm">提交</p>
         <p class="dialog-footer-button-null"></p>
       </div>
     </el-dialog>

+ 1 - 1
src/views/integratedManagement/laboratoryManagement/classifiedGrading/classtype.vue

@@ -65,7 +65,7 @@
       <div slot="footer" class="dialog-footer dialog-footer-box">
         <p class="dialog-footer-button-null"></p>
         <p class="dialog-footer-button-info" @click="cancel">取消</p>
-        <p class="dialog-footer-button-primary" @click="submitForm">确定</p>
+        <p class="dialog-footer-button-primary" @click="submitForm">提交</p>
         <p class="dialog-footer-button-null"></p>
       </div>
     </el-dialog>

+ 1 - 1
src/views/integratedManagement/laboratoryManagement/classifiedGrading/subjectClass.vue

@@ -58,7 +58,7 @@
           <div slot="footer" class="dialog-footer dialog-footer-box">
             <p class="dialog-footer-button-null"></p>
             <p class="dialog-footer-button-info" @click="cancel">取消</p>
-            <p class="dialog-footer-button-primary" @click="submitForm">确定</p>
+            <p class="dialog-footer-button-primary" @click="submitForm">提交</p>
             <p class="dialog-footer-button-null"></p>
           </div>
         </el-dialog>

+ 1 - 1
src/views/integratedManagement/laboratoryManagement/layoutManagement/buildingDetails.vue

@@ -225,7 +225,7 @@
       <div slot="footer" class="dialog-footer dialog-footer-box">
         <p class="dialog-footer-button-null"></p>
         <p class="dialog-footer-button-info" @click="buttonSetButton(1)">取消</p>
-        <p class="dialog-footer-button-primary" @click="buttonSetButton(2)">确定</p>
+        <p class="dialog-footer-button-primary" @click="buttonSetButton(2)">提交</p>
         <p class="dialog-footer-button-null"></p>
       </div>
     </el-dialog>

+ 2 - 2
src/views/integratedManagement/laboratoryManagement/layoutManagement/buildingManagement.vue

@@ -178,7 +178,7 @@
       <div slot="footer" class="dialog-footer dialog-footer-box">
         <p class="dialog-footer-button-null"></p>
         <p class="dialog-footer-button-info" @click="cancel">取消</p>
-        <p class="dialog-footer-button-primary" @click="submitForm">确定</p>
+        <p class="dialog-footer-button-primary" @click="submitForm">提交</p>
         <p class="dialog-footer-button-null"></p>
       </div>
     </el-dialog>
@@ -209,7 +209,7 @@
       <div slot="footer" class="dialog-footer dialog-footer-box">
         <p class="dialog-footer-button-null"></p>
         <p class="dialog-footer-button-info" @click="cancel">取消</p>
-        <p class="dialog-footer-button-primary" @click="submitForm">确定</p>
+        <p class="dialog-footer-button-primary" @click="submitForm">提交</p>
         <p class="dialog-footer-button-null"></p>
       </div>
     </el-dialog>

+ 1 - 1
src/views/integratedManagement/laboratoryManagement/layoutManagement/index.vue

@@ -330,7 +330,7 @@
         <div slot="footer" class="dialog-footer dialog-footer-box">
           <p class="dialog-footer-button-null"></p>
           <p class="dialog-footer-button-info" @click="roomCancel">取消</p>
-          <p class="dialog-footer-button-primary" @click="roomSubmitForm">确定</p>
+          <p class="dialog-footer-button-primary" @click="roomSubmitForm">提交</p>
           <p class="dialog-footer-button-null"></p>
         </div>
       </el-dialog>

+ 1 - 1
src/views/integratedManagement/laboratoryManagement/record/myRecord.vue

@@ -133,7 +133,7 @@
       <div slot="footer" class="dialog-footer dialog-footer-box">
         <p class="dialog-footer-button-null"></p>
         <p class="dialog-footer-button-info" @click="cancel">取消</p>
-        <p class="dialog-footer-button-primary" @click="submitForm">确定</p>
+        <p class="dialog-footer-button-primary" @click="submitForm">提交</p>
         <p class="dialog-footer-button-null"></p>
       </div>
     </el-dialog>

+ 1 - 1
src/views/integratedManagement/laboratoryManagement/record_my/index.vue

@@ -104,7 +104,7 @@
       <div slot="footer" class="dialog-footer dialog-footer-box">
         <p class="dialog-footer-button-null"></p>
         <p class="dialog-footer-button-info" @click="cancel">取消</p>
-        <p class="dialog-footer-button-primary" @click="submitForm">确定</p>
+        <p class="dialog-footer-button-primary" @click="submitForm">提交</p>
         <p class="dialog-footer-button-null"></p>
       </div>
     </el-dialog>

+ 1 - 1
src/views/integratedManagement/laboratoryManagement/safetyInfoCategory/safetyInfoCategory.vue

@@ -123,7 +123,7 @@
       <div slot="footer" class="dialog-footer dialog-footer-box">
         <p class="dialog-footer-button-null"></p>
         <p class="dialog-footer-button-info" @click="cancel">取消</p>
-        <p class="dialog-footer-button-primary" @click="submitForm">确定</p>
+        <p class="dialog-footer-button-primary" @click="submitForm">提交</p>
         <p class="dialog-footer-button-null"></p>
       </div>
     </el-dialog>

+ 1 - 1
src/views/integratedManagement/laboratoryManagement/safetyInfoCategory/safetyInfoConfig.vue

@@ -136,7 +136,7 @@
       <div slot="footer" class="dialog-footer dialog-footer-box">
         <p class="dialog-footer-button-null"></p>
         <p class="dialog-footer-button-info" @click="cancel">取消</p>
-        <p class="dialog-footer-button-primary" @click="submitForm">确定</p>
+        <p class="dialog-footer-button-primary" @click="submitForm">提交</p>
         <p class="dialog-footer-button-null"></p>
       </div>
     </el-dialog>

+ 1 - 1
src/views/integratedManagement/laboratoryManagement/subject/deviceList.vue

@@ -420,7 +420,7 @@
       <div slot="footer" class="dialog-footer dialog-footer-box">
         <p class="dialog-footer-button-null"></p>
         <p class="dialog-footer-button-info" @click="cancel">取消</p>
-        <p class="dialog-footer-button-primary" @click="submitForm">确定</p>
+        <p class="dialog-footer-button-primary" @click="submitForm">提交</p>
         <p class="dialog-footer-button-null"></p>
       </div>
     </el-dialog>

+ 2 - 2
src/views/integratedManagement/laboratoryManagement/subject/index.vue

@@ -352,7 +352,7 @@
       <div slot="footer" class="dialog-footer dialog-footer-box">
         <p class="dialog-footer-button-null"></p>
         <p class="dialog-footer-button-info" @click="cancel">取消</p>
-        <p class="dialog-footer-button-primary" @click="submitFormOne">确定</p>
+        <p class="dialog-footer-button-primary" @click="submitFormOne">提交</p>
         <p class="dialog-footer-button-null"></p>
       </div>
     </el-dialog>
@@ -384,7 +384,7 @@
       </el-upload>
       <div slot="footer" class="dialog-footer dialog-footer-box">
         <p class="dialog-footer-button-null"></p>
-        <p class="dialog-footer-button-primary" @click="importOpenOff">确定</p>
+        <p class="dialog-footer-button-primary" @click="importOpenOff">提交</p>
         <p class="dialog-footer-button-null"></p>
       </div>
       <div class="teacher-import-dialog-position-box" v-if="loading"></div>

+ 1 - 1
src/views/integratedManagement/laboratoryManagement/subject/infoPage.vue

@@ -174,7 +174,7 @@
         <div slot="footer" class="dialog-footer dialog-footer-box">
           <p class="dialog-footer-button-null"></p>
           <p class="dialog-footer-button-info" @click="cancel">取消</p>
-          <p class="dialog-footer-button-primary" @click="submitFormOne">确定</p>
+          <p class="dialog-footer-button-primary" @click="submitFormOne">提交</p>
           <p class="dialog-footer-button-null"></p>
         </div>
       </el-dialog>

+ 1 - 1
src/views/integratedManagement/laboratoryManagement/timingExhaustAir/index.vue

@@ -206,7 +206,7 @@
         <div slot="footer" class="dialog-footer dialog-footer-box">
           <p class="dialog-footer-button-null"></p>
           <p class="dialog-footer-button-info" @click="cancel">取消</p>
-          <p class="dialog-footer-button-primary" @click="joinsubButton">确定</p>
+          <p class="dialog-footer-button-primary" @click="joinsubButton">提交</p>
           <p class="dialog-footer-button-null"></p>
         </div>
       </el-dialog>

+ 2 - 2
src/views/integratedManagement/messageNotice/warningNotice/forewarningConfig.vue

@@ -350,7 +350,7 @@
           <div class="dialog-footer dialog-footer-box">
             <p class="dialog-footer-button-null"></p>
             <p class="dialog-footer-button-info" @click="shadeOut()">取消</p>
-            <p class="dialog-footer-button-primary" @click="shadeUp">确定</p>
+            <p class="dialog-footer-button-primary" @click="shadeUp">提交</p>
             <p class="dialog-footer-button-null"></p>
           </div>
         </div>
@@ -420,7 +420,7 @@
       <div class="dialog-footer dialog-footer-box">
         <p class="dialog-footer-button-null"></p>
         <p class="dialog-footer-button-info" @click="dialogOff()">取消</p>
-        <p class="dialog-footer-button-primary" @click="dialogSubmit">确定</p>
+        <p class="dialog-footer-button-primary" @click="dialogSubmit">提交</p>
         <p class="dialog-footer-button-null"></p>
       </div>
     </el-dialog>

+ 1 - 1
src/views/integratedManagement/personnelManage/major/index.vue

@@ -80,7 +80,7 @@
       <div slot="footer" class="dialog-footer dialog-footer-box">
         <p class="dialog-footer-button-null"></p>
         <p class="dialog-footer-button-info" @click="cancel">取消</p>
-        <p class="dialog-footer-button-primary" @click="submitForm">确定</p>
+        <p class="dialog-footer-button-primary" @click="submitForm">提交</p>
         <p class="dialog-footer-button-null"></p>
       </div>
     </el-dialog>

+ 1 - 1
src/views/integratedManagement/personnelManage/major/listPage.vue

@@ -41,7 +41,7 @@
       <div slot="footer" class="dialog-footer dialog-footer-box">
         <p class="dialog-footer-button-null"></p>
         <p class="dialog-footer-button-info" @click="cancel">取消</p>
-        <p class="dialog-footer-button-primary" @click="submitForm">确定</p>
+        <p class="dialog-footer-button-primary" @click="submitForm">提交</p>
         <p class="dialog-footer-button-null"></p>
       </div>
     </el-dialog>

+ 1 - 1
src/views/integratedManagement/personnelManage/post/index.vue

@@ -99,7 +99,7 @@
       <div slot="footer" class="dialog-footer dialog-footer-box">
         <p class="dialog-footer-button-null"></p>
         <p class="dialog-footer-button-info" @click="cancel">取消</p>
-        <p class="dialog-footer-button-primary" @click="submitForm">确定</p>
+        <p class="dialog-footer-button-primary" @click="submitForm">提交</p>
         <p class="dialog-footer-button-null"></p>
       </div>
     </el-dialog>

+ 1 - 1
src/views/integratedManagement/personnelManage/post/selectUser.vue

@@ -65,7 +65,7 @@
     <div slot="footer" class="dialog-footer dialog-footer-box">
       <p class="dialog-footer-button-null"></p>
       <p class="dialog-footer-button-info" @click="visible = false">取消</p>
-      <p class="dialog-footer-button-primary" @click="handleSelectUser">确定</p>
+      <p class="dialog-footer-button-primary" @click="handleSelectUser">提交</p>
       <p class="dialog-footer-button-null"></p>
     </div>
   </el-dialog>

+ 1 - 1
src/views/integratedManagement/personnelManage/studentInfo/addPage.vue

@@ -239,7 +239,7 @@
       <div slot="footer" class="dialog-footer dialog-footer-box">
         <p class="dialog-footer-button-null"></p>
         <p class="dialog-footer-button-info" @click="gradeOpenOff">取消</p>
-        <p class="dialog-footer-button-primary" @click="gradeOpenUp">确定</p>
+        <p class="dialog-footer-button-primary" @click="gradeOpenUp">提交</p>
         <p class="dialog-footer-button-null"></p>
       </div>
     </el-dialog>

+ 2 - 2
src/views/integratedManagement/personnelManage/studentInfo/index.vue

@@ -166,7 +166,7 @@
       <div slot="footer" class="dialog-footer dialog-footer-box">
         <p class="dialog-footer-button-null"></p>
         <p class="dialog-footer-button-info" @click="offTeacherResetPwd">取消</p>
-        <p class="dialog-footer-button-primary" @click="teacherResetPwd">确定</p>
+        <p class="dialog-footer-button-primary" @click="teacherResetPwd">提交</p>
         <p class="dialog-footer-button-null"></p>
       </div>
     </el-dialog>
@@ -201,7 +201,7 @@
       </el-upload>>
       <div slot="footer" class="dialog-footer dialog-footer-box">
         <p class="dialog-footer-button-null"></p>
-        <p class="dialog-footer-button-primary" @click="importOpenOff">确定</p>
+        <p class="dialog-footer-button-primary" @click="importOpenOff">提交</p>
         <p class="dialog-footer-button-null"></p>
       </div>
       <div class="teacher-import-dialog-position-box" v-if="loading"></div>

+ 4 - 4
src/views/integratedManagement/personnelManage/teacherInfo/index.vue

@@ -244,7 +244,7 @@
       <div slot="footer" class="dialog-footer dialog-footer-box">
         <p class="dialog-footer-button-null"></p>
         <p class="dialog-footer-button-info" @click="offTeacherResetPwd">取消</p>
-        <p class="dialog-footer-button-primary" @click="teacherResetPwd">确定</p>
+        <p class="dialog-footer-button-primary" @click="teacherResetPwd">提交</p>
         <p class="dialog-footer-button-null"></p>
       </div>
     </el-dialog>
@@ -279,7 +279,7 @@
       </el-upload>
       <div slot="footer" class="dialog-footer dialog-footer-box">
         <p class="dialog-footer-button-null"></p>
-        <p class="dialog-footer-button-primary" @click="importOpenOff">确定</p>
+        <p class="dialog-footer-button-primary" @click="importOpenOff">提交</p>
         <p class="dialog-footer-button-null"></p>
       </div>
       <div class="teacher-import-dialog-position-box" v-if="loading"></div>
@@ -315,7 +315,7 @@
       <div slot="footer" class="dialog-footer dialog-footer-box">
         <p class="dialog-footer-button-null"></p>
         <p class="dialog-footer-button-info" @click="treeOpenOff">取消</p>
-        <p class="dialog-footer-button-primary" @click="editDeptButton">确定</p>
+        <p class="dialog-footer-button-primary" @click="editDeptButton">提交</p>
         <p class="dialog-footer-button-null"></p>
       </div>
     </el-dialog>
@@ -356,7 +356,7 @@
       <div slot="footer" class="dialog-footer dialog-footer-box">
         <p class="dialog-footer-button-null"></p>
         <p class="dialog-footer-button-info" @click="treeAddOpenOff">取消</p>
-        <p class="dialog-footer-button-primary" @click="addDeptButton">确定</p>
+        <p class="dialog-footer-button-primary" @click="addDeptButton">提交</p>
         <p class="dialog-footer-button-null"></p>
       </div>
     </el-dialog>

+ 1 - 1
src/views/integratedManagement/personnelManage/teacherInfo/userList.vue

@@ -76,7 +76,7 @@
         <div slot="footer" class="dialog-footer dialog-footer-box">
           <p class="dialog-footer-button-null"></p>
           <p class="dialog-footer-button-info" @click="show(2)">取消</p>
-          <p class="dialog-footer-button-primary" @click="okButton">确定</p>
+          <p class="dialog-footer-button-primary" @click="okButton">提交</p>
           <p class="dialog-footer-button-null"></p>
         </div>
       </div>

+ 1 - 1
src/views/iotDevice/appManage/applyList/batchUpDialog.vue

@@ -71,7 +71,7 @@
       <div slot="footer" class="dialog-footer dialog-footer-box">
         <p class="dialog-footer-button-null"></p>
         <p class="dialog-footer-button-info" @click="dialogOff">取消</p>
-        <p class="dialog-footer-button-primary" @click="dialogSubmit">确定</p>
+        <p class="dialog-footer-button-primary" @click="dialogSubmit">提交</p>
         <p class="dialog-footer-button-null"></p>
       </div>
     </el-dialog>

+ 1 - 1
src/views/iotDevice/appManage/applyList/index.vue

@@ -170,7 +170,7 @@
       <div slot="footer" class="dialog-footer dialog-footer-box">
         <p class="dialog-footer-button-null"></p>
         <p class="dialog-footer-button-info" @click="dialogCancel">取消</p>
-        <p class="dialog-footer-button-primary" @click="dialogSubmit">确定</p>
+        <p class="dialog-footer-button-primary" @click="dialogSubmit">提交</p>
         <p class="dialog-footer-button-null"></p>
       </div>
     </el-dialog>

+ 1 - 1
src/views/iotDevice/hardwareManagement/hardwareClassification/index.vue

@@ -121,7 +121,7 @@
       <div slot="footer" class="dialog-footer dialog-footer-box">
         <p class="dialog-footer-button-null"></p>
         <p class="dialog-footer-button-info" @click="dialogOff()">取消</p>
-        <p class="dialog-footer-button-primary" @click="dialogSubmit">确定</p>
+        <p class="dialog-footer-button-primary" @click="dialogSubmit">提交</p>
         <p class="dialog-footer-button-null"></p>
       </div>
     </el-dialog>

+ 1 - 1
src/views/iotDevice/hardwareManagement/hardwareEquipment/index.vue

@@ -204,7 +204,7 @@
       <div slot="footer" class="dialog-footer dialog-footer-box">
         <p class="dialog-footer-button-null"></p>
         <p class="dialog-footer-button-info" @click="dialogOff()">取消</p>
-        <p class="dialog-footer-button-primary" @click="dialogSubmit">确定</p>
+        <p class="dialog-footer-button-primary" @click="dialogSubmit">提交</p>
         <p class="dialog-footer-button-null"></p>
       </div>
     </el-dialog>

+ 1 - 1
src/views/iotDevice/intelligenceIot/classConfig/addPage.vue

@@ -98,7 +98,7 @@
       <div slot="footer" class="dialog-footer dialog-footer-box">
         <p class="dialog-footer-button-null"></p>
         <p class="dialog-footer-button-info" @click="dialogOff()">取消</p>
-        <p class="dialog-footer-button-primary" @click="dialogSubmit">确定</p>
+        <p class="dialog-footer-button-primary" @click="dialogSubmit">提交</p>
         <p class="dialog-footer-button-null"></p>
       </div>
     </el-dialog>

+ 1 - 1
src/views/iotDevice/intelligenceIot/classConfig/index.vue

@@ -137,7 +137,7 @@
       <div slot="footer" class="dialog-footer dialog-footer-box">
         <p class="dialog-footer-button-null"></p>
         <p class="dialog-footer-button-info" @click="dialogOff()">取消</p>
-        <p class="dialog-footer-button-primary" @click="dialogSubmit">确定</p>
+        <p class="dialog-footer-button-primary" @click="dialogSubmit">提交</p>
         <p class="dialog-footer-button-null"></p>
       </div>
     </el-dialog>

+ 1 - 1
src/views/iotDevice/intelligenceIot/iotClassification/attributePage.vue

@@ -243,7 +243,7 @@
       <div slot="footer" class="dialog-footer dialog-footer-box">
         <p class="dialog-footer-button-null"></p>
         <p class="dialog-footer-button-info" @click="dialogOff()">取消</p>
-        <p class="dialog-footer-button-primary" @click="dialogSubmit">确定</p>
+        <p class="dialog-footer-button-primary" @click="dialogSubmit">提交</p>
         <p class="dialog-footer-button-null"></p>
       </div>
     </el-dialog>

+ 1 - 1
src/views/iotDevice/intelligenceIot/iotClassification/functionPage.vue

@@ -140,7 +140,7 @@
       <div slot="footer" class="dialog-footer dialog-footer-box">
         <p class="dialog-footer-button-null"></p>
         <p class="dialog-footer-button-info" @click="dialogOff()">取消</p>
-        <p class="dialog-footer-button-primary" @click="dialogSubmit">确定</p>
+        <p class="dialog-footer-button-primary" @click="dialogSubmit">提交</p>
         <p class="dialog-footer-button-null"></p>
       </div>
     </el-dialog>

+ 1 - 1
src/views/iotDevice/intelligenceIot/iotClassification/index.vue

@@ -112,7 +112,7 @@
       <div slot="footer" class="dialog-footer dialog-footer-box">
         <p class="dialog-footer-button-null"></p>
         <p class="dialog-footer-button-info" @click="dialogOff()">取消</p>
-        <p class="dialog-footer-button-primary" @click="dialogSubmit">确定</p>
+        <p class="dialog-footer-button-primary" @click="dialogSubmit">提交</p>
         <p class="dialog-footer-button-null"></p>
       </div>
     </el-dialog>

+ 1 - 1
src/views/iotDevice/intelligenceIot/iotHardware/batchAddPage.vue

@@ -202,7 +202,7 @@
       <div slot="footer" class="dialog-footer dialog-footer-box">
         <p class="dialog-footer-button-null"></p>
         <p class="dialog-footer-button-info" @click="dialogOff()">取消</p>
-        <p class="dialog-footer-button-primary" @click="dialogSubmit">确定</p>
+        <p class="dialog-footer-button-primary" @click="dialogSubmit">提交</p>
         <p class="dialog-footer-button-null"></p>
       </div>
     </el-dialog>

+ 1 - 1
src/views/iotDevice/monitoringWarning/receiver/index.vue

@@ -121,7 +121,7 @@
       <div slot="footer" class="dialog-footer dialog-footer-box">
         <p class="dialog-footer-button-null"></p>
         <p class="dialog-footer-button-info" @click="dialogOff()">取消</p>
-        <p class="dialog-footer-button-primary" @click="dialogSubmit">确定</p>
+        <p class="dialog-footer-button-primary" @click="dialogSubmit">提交</p>
         <p class="dialog-footer-button-null"></p>
       </div>
     </el-dialog>

+ 1 - 1
src/views/iotDevice/monitoringWarning/warningConfig/index.vue

@@ -79,7 +79,7 @@
       <div slot="footer" class="dialog-footer dialog-footer-box">
         <p class="dialog-footer-button-null"></p>
         <p class="dialog-footer-button-info" @click="dialogOff()">取消</p>
-        <p class="dialog-footer-button-primary" @click="dialogSubmit">确定</p>
+        <p class="dialog-footer-button-primary" @click="dialogSubmit">提交</p>
         <p class="dialog-footer-button-null"></p>
       </div>
     </el-dialog>

+ 1 - 1
src/views/iotDevice/operationManagement/networkComponent/index.vue

@@ -314,7 +314,7 @@
       <div slot="footer" class="dialog-footer dialog-footer-box">
         <p class="dialog-footer-button-null"></p>
         <p class="dialog-footer-button-info" @click="dialogOff()">{{dialogLookType?'关闭':'取消'}}</p>
-        <p class="dialog-footer-button-primary" v-if="!dialogLookType" @click="dialogSubmit">确定</p>
+        <p class="dialog-footer-button-primary" v-if="!dialogLookType" @click="dialogSubmit">提交</p>
         <p class="dialog-footer-button-null"></p>
       </div>
     </el-dialog>

+ 1 - 1
src/views/iotDevice/operationManagement/protocolManagement/index.vue

@@ -126,7 +126,7 @@
       <div slot="footer" class="dialog-footer dialog-footer-box">
         <p class="dialog-footer-button-null"></p>
         <p class="dialog-footer-button-info" @click="dialogOff()">取消</p>
-        <p class="dialog-footer-button-primary" @click="dialogSubmit">确定</p>
+        <p class="dialog-footer-button-primary" @click="dialogSubmit">提交</p>
         <p class="dialog-footer-button-null"></p>
       </div>
     </el-dialog>

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

@@ -52,7 +52,7 @@
       <div slot="footer" class="dialog-footer dialog-footer-box">
         <p class="dialog-footer-button-null"></p >
         <p class="dialog-footer-button-info" @click="cancel">取消</p >
-        <p class="dialog-footer-button-primary" @click="submitForm">确定</p >
+        <p class="dialog-footer-button-primary" @click="submitForm">提交</p >
         <p class="dialog-footer-button-null"></p >
       </div>
     </el-dialog>

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

@@ -253,7 +253,7 @@
           <div class="center-content-box-two-bottom-button">
             <p></p>
             <p class="reset-button-one" @click="exerciseAddClickOff">取消</p>
-            <p class="inquire-button-one" @click="exerciseAddClickSave">确定</p>
+            <p class="inquire-button-one" @click="exerciseAddClickSave">提交</p>
           </div>
         </div>
       </div>
@@ -363,7 +363,7 @@
       <div slot="footer" class="dialog-footer dialog-footer-box">
         <p class="dialog-footer-button-null"></p >
         <p class="dialog-footer-button-info" @click="openClassTreeClickOff">取消</p >
-        <p class="dialog-footer-button-primary" @click="openClassSubmit">确定</p >
+        <p class="dialog-footer-button-primary" @click="openClassSubmit">提交</p >
         <p class="dialog-footer-button-null"></p >
       </div>
     </el-dialog>

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

@@ -183,7 +183,7 @@
       <div slot="footer" class="dialog-footer dialog-footer-box">
         <p class="dialog-footer-button-null"></p >
         <p class="dialog-footer-button-info" @click="cancel">取消</p >
-        <p class="dialog-footer-button-primary" @click="submitForm">确定</p >
+        <p class="dialog-footer-button-primary" @click="submitForm">提交</p >
         <p class="dialog-footer-button-null"></p >
       </div>
     </el-dialog>

+ 2 - 2
src/views/safetyEducationExam/safeLearning/el_resources/index.vue

@@ -265,7 +265,7 @@
         <div slot="footer" class="dialog-footer dialog-footer-box">
           <p class="dialog-footer-button-null"></p >
           <p class="dialog-footer-button-info" @click="richTextCancel">取消</p >
-          <p class="dialog-footer-button-primary" @click="richTextClick">确定</p >
+          <p class="dialog-footer-button-primary" @click="richTextClick">提交</p >
           <p class="dialog-footer-button-null"></p >
         </div>
       </el-dialog>
@@ -300,7 +300,7 @@
         <div slot="footer" class="dialog-footer dialog-footer-box">
           <p class="dialog-footer-button-null"></p >
           <p class="dialog-footer-button-info" @click="richTextCancel">取消</p >
-          <p class="dialog-footer-button-primary" @click="richTextClick">确定</p >
+          <p class="dialog-footer-button-primary" @click="richTextClick">提交</p >
           <p class="dialog-footer-button-null"></p >
         </div>
       </el-dialog>

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

@@ -94,7 +94,7 @@
       <div slot="footer" class="dialog-footer dialog-footer-box">
         <p class="dialog-footer-button-null"></p>
         <p class="dialog-footer-button-info" @click="cancel">取消</p>
-        <p class="dialog-footer-button-primary" @click="submitForm">确定</p>
+        <p class="dialog-footer-button-primary" @click="submitForm">提交</p>
         <p class="dialog-footer-button-null"></p>
       </div>
     </el-dialog>

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

@@ -142,7 +142,7 @@
       <div slot="footer" class="dialog-footer dialog-footer-box">
         <p class="dialog-footer-button-null"></p >
         <p class="dialog-footer-button-info" @click="cancel">取消</p >
-        <p class="dialog-footer-button-primary" @click="submitForm">确定</p >
+        <p class="dialog-footer-button-primary" @click="submitForm">提交</p >
         <p class="dialog-footer-button-null"></p >
       </div>
     </el-dialog>

+ 1 - 1
src/views/safetyEducationExam/securityExam/certificate/index.vue

@@ -85,7 +85,7 @@
       <div slot="footer" class="dialog-footer dialog-footer-box">
         <p class="dialog-footer-button-null"></p>
         <p class="dialog-footer-button-info" @click="cancel">取消</p>
-        <p class="dialog-footer-button-primary" @click="submitForm">确定</p>
+        <p class="dialog-footer-button-primary" @click="submitForm">提交</p>
         <p class="dialog-footer-button-null"></p>
       </div>
     </el-dialog>

+ 1 - 1
src/views/safetyEducationExam/securityExam/el_classify/index.vue

@@ -70,7 +70,7 @@
       <div slot="footer" class="dialog-footer dialog-footer-box">
         <p class="dialog-footer-button-null"></p >
         <p class="dialog-footer-button-info" @click="cancel">取消</p >
-        <p class="dialog-footer-button-primary" @click="submitForm">确定</p >
+        <p class="dialog-footer-button-primary" @click="submitForm">提交</p >
         <p class="dialog-footer-button-null"></p >
       </div>
     </el-dialog>

+ 2 - 2
src/views/safetyEducationExam/securityExam/exam/addExamPage.vue

@@ -4,7 +4,7 @@
     <div class="page-top-title-box">
       <p class="page-top-title-name-p"></p>
       <p class="page-top-title-out-p" @click="backPage">取消</p>
-      <p class="page-top-title-submit-p" @click="submitForm">确定</p>
+      <p class="page-top-title-submit-p" @click="submitForm">提交</p>
     </div>
     <div class="content-box scrollbar-box">
       <p class="title-p">组卷信息</p>
@@ -362,7 +362,7 @@
       <div slot="footer" class="dialog-footer dialog-footer-box">
         <p class="dialog-footer-button-null"></p>
         <p class="dialog-footer-button-info" @click="offManualBox">取消</p>
-        <p class="dialog-footer-button-primary" @click="addManualObj">确定</p>
+        <p class="dialog-footer-button-primary" @click="addManualObj">提交</p>
         <p class="dialog-footer-button-null"></p>
       </div>
     </el-dialog>

+ 1 - 1
src/views/safetyEducationExam/securityExam/exam/examInfo.vue

@@ -76,7 +76,7 @@
       </div>
       <div slot="footer" class="dialog-footer dialog-footer-box">
         <p class="dialog-footer-button-null"></p>
-        <p class="dialog-footer-button-primary" @click="cancel">确定</p>
+        <p class="dialog-footer-button-primary" @click="cancel">提交</p>
         <p class="dialog-footer-button-null"></p>
       </div>
     </el-dialog>

+ 1 - 1
src/views/safetyEducationExam/securityExam/exam/index.vue

@@ -132,7 +132,7 @@
       <div slot="footer" class="dialog-footer dialog-footer-box" v-if="dialogType==1||dialogType==2">
         <p class="dialog-footer-button-null"></p>
         <p class="dialog-footer-button-info" @click="cancel">取消</p>
-        <p class="dialog-footer-button-primary" @click="submitForm">确定</p>
+        <p class="dialog-footer-button-primary" @click="submitForm">提交</p>
         <p class="dialog-footer-button-null"></p>
       </div>
     </el-dialog>

+ 1 - 1
src/views/safetyEducationExam/trainingCourse/addDialog.vue

@@ -246,7 +246,7 @@
     <div slot="footer" class="dialog-footer dialog-footer-box">
       <p class="dialog-footer-button-null"></p >
       <p class="dialog-footer-button-info" @click="dialogClose">取消</p >
-      <p class="dialog-footer-button-primary" @click="dialogSubmit">确定</p >
+      <p class="dialog-footer-button-primary" @click="dialogSubmit">提交</p >
       <p class="dialog-footer-button-null"></p >
     </div>
   </el-dialog>

+ 1 - 1
src/views/secureAccess/approval/configuration.vue

@@ -83,7 +83,7 @@
       <div slot="footer" class="dialog-footer dialog-footer-box">
         <p class="dialog-footer-button-null"></p>
         <p class="dialog-footer-button-info" @click="cancel">取消</p>
-        <p class="dialog-footer-button-primary">确定</p>
+        <p class="dialog-footer-button-primary">提交</p>
         <p class="dialog-footer-button-null"></p>
       </div>
     </el-dialog>

+ 1 - 1
src/views/secureAccess/approval/failed.vue

@@ -61,7 +61,7 @@
       <div slot="footer" class="dialog-footer dialog-footer-box">
         <p class="dialog-footer-button-null"></p>
         <p class="dialog-footer-button-info" @click="cancel">取消</p>
-        <p class="dialog-footer-button-primary" @click="submitForm">确定</p>
+        <p class="dialog-footer-button-primary" @click="submitForm">提交</p>
         <p class="dialog-footer-button-null"></p>
       </div>
     </el-dialog>

+ 1 - 1
src/views/secureAccess/approval/infoPage.vue

@@ -52,7 +52,7 @@
       <el-input type="textarea" style="margin-top: 20px" v-model="rejectCause" placeholder="请输入审核备注" maxlength="50" v-if="subjectData.labSecurityApply.auditStatus!=2"/>
       <div class="btn_list">
         <p v-if="isLook" class="button-p reset-button-one" style="width:100px;" @click="handleExport(2,'')">打包下载</p>
-        <p v-if="isLook&&subjectData.labSecurityApply.auditStatus!=2" class="inquire-button-one" style="width:100px;" @click="backPage()">确定</p>
+        <p v-if="isLook&&subjectData.labSecurityApply.auditStatus!=2" class="inquire-button-one" style="width:100px;" @click="backPage()">提交</p>
         <addPageSubPageSZDX v-if="!isLook && versionField() === 'suZhouDaXue'" :buttonData="{type:0}"></addPageSubPageSZDX>
         <addPageSubPagePublic v-if="!isLook && versionField() !== 'suZhouDaXue'" :buttonData="{type:0}"></addPageSubPagePublic>
         <addPageSubPageSZDX v-if="!isLook && versionField() === 'suZhouDaXue'" :buttonData="{type:1}"></addPageSubPageSZDX>

+ 1 - 1
src/views/secureAccess/approval/passed.vue

@@ -118,7 +118,7 @@
       <div slot="footer" class="dialog-footer dialog-footer-box">
         <p class="dialog-footer-button-null"></p>
         <p class="dialog-footer-button-info" @click="cancel">取消</p>
-        <p class="dialog-footer-button-primary" @click="submitForm">确定</p>
+        <p class="dialog-footer-button-primary" @click="submitForm">提交</p>
         <p class="dialog-footer-button-null"></p>
       </div>
     </el-dialog>

+ 1 - 1
src/views/secureAccess/approval/pending.vue

@@ -69,7 +69,7 @@
       <div slot="footer" class="dialog-footer dialog-footer-box">
         <p class="dialog-footer-button-null"></p>
         <p class="dialog-footer-button-info" @click="cancel">取消</p>
-        <p class="dialog-footer-button-primary" @click="submitForm">确定</p>
+        <p class="dialog-footer-button-primary" @click="submitForm">提交</p>
         <p class="dialog-footer-button-null"></p>
       </div>
     </el-dialog>

+ 1 - 1
src/views/secureAccess/studentinfo/failed.vue

@@ -58,7 +58,7 @@
       <div slot="footer" class="dialog-footer dialog-footer-box">
         <p class="dialog-footer-button-null"></p>
         <p class="dialog-footer-button-info" @click="cancel">取消</p>
-        <p class="dialog-footer-button-primary" @click="submitForm">确定</p>
+        <p class="dialog-footer-button-primary" @click="submitForm">提交</p>
         <p class="dialog-footer-button-null"></p>
       </div>
     </el-dialog>

+ 1 - 1
src/views/secureAccess/studentinfo/passed.vue

@@ -58,7 +58,7 @@
       <div slot="footer" class="dialog-footer dialog-footer-box">
         <p class="dialog-footer-button-null"></p>
         <p class="dialog-footer-button-info" @click="cancel">取消</p>
-        <p class="dialog-footer-button-primary" @click="submitForm">确定</p>
+        <p class="dialog-footer-button-primary" @click="submitForm">提交</p>
         <p class="dialog-footer-button-null"></p>
       </div>
     </el-dialog>

+ 1 - 1
src/views/secureAccess/studentinfo/pending.vue

@@ -106,7 +106,7 @@
       <div slot="footer" class="dialog-footer dialog-footer-box">
         <p class="dialog-footer-button-null"></p>
         <p class="dialog-footer-button-info" @click="cancel">取消</p>
-        <p class="dialog-footer-button-primary" @click="submitForm">确定</p>
+        <p class="dialog-footer-button-primary" @click="submitForm">提交</p>
         <p class="dialog-footer-button-null"></p>
       </div>
     </el-dialog>

+ 2 - 2
src/views/secureAccess/whitelist/addPage.vue

@@ -102,7 +102,7 @@
         <i @click="toggleSelection()">清除选项</i>
         <div class="bottom-button-box">
           <el-button class="color_99" @click="closeDialog(1)">关闭</el-button>
-          <el-button class="color_ff back_one" @click="closeDialog(2)">确定</el-button>
+          <el-button class="color_ff back_one" @click="closeDialog(2)">提交</el-button>
         </div>
       </div>
       <el-table class="table-box" ref="multipleTable" border tooltip-effect="dark" :row-key="getRowKeys" :data="dialogTable"
@@ -129,7 +129,7 @@
       />
       <!--      <div class="bottom-button-box" style="padding-top: 20px;text-align: right;">
               <el-button class="color_99" @click="closeDialog()">取消</el-button>
-              <el-button class="color_ff back_one" @click="confirmDialog()">确定</el-button>
+              <el-button class="color_ff back_one" @click="confirmDialog()">提交</el-button>
             </div>-->
     </el-dialog>
   </div>

+ 1 - 1
src/views/securityCheck/checkOption/index.vue

@@ -105,7 +105,7 @@
       <div slot="footer" class="dialog-footer dialog-footer-box">
         <p class="dialog-footer-button-null"></p>
         <p class="dialog-footer-button-info" @click="cancel">取消</p>
-        <p class="dialog-footer-button-primary" @click="submitForm">确定</p>
+        <p class="dialog-footer-button-primary" @click="submitForm">提交</p>
         <p class="dialog-footer-button-null"></p>
       </div>
     </el-dialog>

+ 1 - 1
src/views/securityCheck/checkRecord/CheckRecordInfo.vue

@@ -292,7 +292,7 @@
       <div slot="footer" class="dialog-footer dialog-footer-box">
         <p class="dialog-footer-button-null"></p>
         <p class="dialog-footer-button-info" @click="upImgOpenClick(1)">取消</p>
-        <p class="dialog-footer-button-primary" @click="upSignatureData">确定</p>
+        <p class="dialog-footer-button-primary" @click="upSignatureData">提交</p>
         <p class="dialog-footer-button-null"></p>
       </div>
     </el-dialog>

+ 1 - 1
src/views/securityCheck/checkRecord/CheckRecordInfoUp.vue

@@ -117,7 +117,7 @@
         <div slot="footer" class="dialog-footer dialog-footer-box">
           <p class="dialog-footer-button-null"></p >
           <p class="dialog-footer-button-info" @click="cancel">取消</p >
-          <p class="dialog-footer-button-primary" @click="submitForm">确定</p >
+          <p class="dialog-footer-button-primary" @click="submitForm">提交</p >
           <p class="dialog-footer-button-null"></p >
         </div>
       </el-dialog>

+ 3 - 3
src/views/securityCheck/checkRecord/addCheck.vue

@@ -183,7 +183,7 @@
       <div slot="footer" class="dialog-footer dialog-footer-box">
         <p class="dialog-footer-button-null"></p>
         <p class="dialog-footer-button-info" @click="cancel">取消</p>
-        <p class="dialog-footer-button-primary" @click="dialogSubmitForm">确定</p>
+        <p class="dialog-footer-button-primary" @click="dialogSubmitForm">提交</p>
         <p class="dialog-footer-button-null"></p>
       </div>
     </el-dialog>
@@ -210,7 +210,7 @@
       <div slot="footer" class="dialog-footer dialog-footer-box">
         <p class="dialog-footer-button-null"></p>
         <!--<p class="dialog-footer-button-info" @click="remindOff">取消</p>-->
-        <p class="dialog-footer-button-primary" @click="remindButton">确定</p>
+        <p class="dialog-footer-button-primary" @click="remindButton">提交</p>
         <p class="dialog-footer-button-null"></p>
       </div>
     </el-dialog>
@@ -223,7 +223,7 @@
       <div slot="footer" class="dialog-footer dialog-footer-box">
         <p class="dialog-footer-button-null"></p>
         <p class="dialog-footer-button-info" @click="nameFormButton(1)">取消</p>
-        <p class="dialog-footer-button-primary" @click="nameFormButton(2)">确定</p>
+        <p class="dialog-footer-button-primary" @click="nameFormButton(2)">提交</p>
         <p class="dialog-footer-button-null"></p>
       </div>
     </el-dialog>

+ 2 - 2
src/views/securityCheck/checkRecord/checkList.vue

@@ -112,7 +112,7 @@
         <el-col :span="1.5">
           <p class="add-button-one-90"
              @click="okButton"
-          >确定</p>
+          >提交</p>
         </el-col>
       </div>
     </div>
@@ -134,7 +134,7 @@
       <div slot="footer" class="dialog-footer dialog-footer-box">
         <p class="dialog-footer-button-null"></p>
         <p class="dialog-footer-button-info" @click="cancel">取消</p>
-        <p class="dialog-footer-button-primary" @click="submitForm">确定</p>
+        <p class="dialog-footer-button-primary" @click="submitForm">提交</p>
         <p class="dialog-footer-button-null"></p>
       </div>
     </el-dialog>

+ 1 - 1
src/views/securityCheck/checkRecord/reformCheck.vue

@@ -186,7 +186,7 @@
       <div slot="footer" class="dialog-footer dialog-footer-box">
         <p class="dialog-footer-button-null"></p>
         <p class="dialog-footer-button-info" @click="cancel">取消</p>
-        <p class="dialog-footer-button-primary" @click="submitForm">确定</p>
+        <p class="dialog-footer-button-primary" @click="submitForm">提交</p>
         <p class="dialog-footer-button-null"></p>
       </div>
     </el-dialog>

+ 3 - 3
src/views/securityCheck/checkRecord/unsubmittedInfo.vue

@@ -192,7 +192,7 @@
       <div slot="footer" class="dialog-footer dialog-footer-box">
         <p class="dialog-footer-button-null"></p>
         <p class="dialog-footer-button-info" @click="cancel">取消</p>
-        <p class="dialog-footer-button-primary" @click="dialogSubmitForm">确定</p>
+        <p class="dialog-footer-button-primary" @click="dialogSubmitForm">提交</p>
         <p class="dialog-footer-button-null"></p>
       </div>
     </el-dialog>
@@ -220,7 +220,7 @@
       <div slot="footer" class="dialog-footer dialog-footer-box">
         <p class="dialog-footer-button-null"></p>
         <p class="dialog-footer-button-info" @click="remindOff">取消</p>
-        <p class="dialog-footer-button-primary" @click="remindButton">确定</p>
+        <p class="dialog-footer-button-primary" @click="remindButton">提交</p>
         <p class="dialog-footer-button-null"></p>
       </div>
     </el-dialog>
@@ -234,7 +234,7 @@
       <div slot="footer" class="dialog-footer dialog-footer-box">
         <p class="dialog-footer-button-null"></p>
         <p class="dialog-footer-button-info" @click="nameFormButton(1)">取消</p>
-        <p class="dialog-footer-button-primary" @click="nameFormButton(2)">确定</p>
+        <p class="dialog-footer-button-primary" @click="nameFormButton(2)">提交</p>
         <p class="dialog-footer-button-null"></p>
       </div>
     </el-dialog>

+ 1 - 1
src/views/securityCheck/photonote/pending.vue

@@ -72,7 +72,7 @@
         <div slot="footer" class="dialog-footer dialog-footer-box">
           <p class="dialog-footer-button-null"></p>
           <p class="dialog-footer-button-info" @click="cancel">取消</p>
-          <p class="dialog-footer-button-primary" @click="submitForm">确定</p>
+          <p class="dialog-footer-button-primary" @click="submitForm">提交</p>
           <p class="dialog-footer-button-null"></p>
         </div>
       </el-dialog> -->

+ 1 - 1
src/views/securityCheck/photonote/processed.vue

@@ -71,7 +71,7 @@
       <div slot="footer" class="dialog-footer dialog-footer-box">
         <p class="dialog-footer-button-null"></p>
         <p class="dialog-footer-button-info" @click="cancel">取消</p>
-        <p class="dialog-footer-button-primary" @click="submitForm">确定</p>
+        <p class="dialog-footer-button-primary" @click="submitForm">提交</p>
         <p class="dialog-footer-button-null"></p>
       </div>
     </el-dialog>

+ 1 - 1
src/views/securityCheck/release/index.vue

@@ -78,7 +78,7 @@
       <div slot="footer" class="dialog-footer dialog-footer-box">
         <p class="dialog-footer-button-null"></p>
         <p class="dialog-footer-button-info" @click="cancel">取消</p>
-        <p class="dialog-footer-button-primary" @click="submitForm">确定</p>
+        <p class="dialog-footer-button-primary" @click="submitForm">提交</p>
         <p class="dialog-footer-button-null"></p>
       </div>
     </el-dialog>

+ 1 - 1
src/views/serviceCenter/apkManage/applyList/index.vue

@@ -163,7 +163,7 @@
       <div slot="footer" class="dialog-footer dialog-footer-box">
         <p class="dialog-footer-button-null"></p>
         <p class="dialog-footer-button-info" @click="dialogCancel">取消</p>
-        <p class="dialog-footer-button-primary" @click="dialogSubmit">确定</p>
+        <p class="dialog-footer-button-primary" @click="dialogSubmit">提交</p>
         <p class="dialog-footer-button-null"></p>
       </div>
     </el-dialog>

+ 1 - 1
src/views/serviceCenter/certificationManagement/certificationAccredit/index.vue

@@ -187,7 +187,7 @@
       <div slot="footer" class="dialog-footer dialog-footer-box">
         <p class="dialog-footer-button-null"></p>
         <p class="dialog-footer-button-info" @click="dialogOff()">取消</p>
-        <p class="dialog-footer-button-primary" @click="dialogSubmit">确定</p>
+        <p class="dialog-footer-button-primary" @click="dialogSubmit">提交</p>
         <p class="dialog-footer-button-null"></p>
       </div>
     </el-dialog>

+ 1 - 1
src/views/serviceCenter/certificationManagement/certificationInfo/index.vue

@@ -144,7 +144,7 @@
       <div slot="footer" class="dialog-footer dialog-footer-box">
         <p class="dialog-footer-button-null"></p>
         <p class="dialog-footer-button-info" @click="dialogOff()">取消</p>
-        <p class="dialog-footer-button-primary" @click="dialogSubmit">确定</p>
+        <p class="dialog-footer-button-primary" @click="dialogSubmit">提交</p>
         <p class="dialog-footer-button-null"></p>
       </div>
     </el-dialog>

+ 1 - 1
src/views/serviceCenter/merchantManagement/index.vue

@@ -72,7 +72,7 @@
         <div slot="footer" class="dialog-footer dialog-footer-box">
           <p class="dialog-footer-button-null"></p>
           <p class="dialog-footer-button-info" @click="dialogOff()">取消</p>
-          <p class="dialog-footer-button-primary" @click="dialogSubmit">确定</p>
+          <p class="dialog-footer-button-primary" @click="dialogSubmit">提交</p>
           <p class="dialog-footer-button-null"></p>
         </div>
       </el-dialog>

+ 1 - 1
src/views/serviceCenter/timingTask/index.vue

@@ -85,7 +85,7 @@
       <div slot="footer" class="dialog-footer dialog-footer-box">
         <p class="dialog-footer-button-null"></p>
         <p class="dialog-footer-button-info" @click="dialogOff">取消</p>
-        <p class="dialog-footer-button-primary" @click="dialogSubmit">确定</p>
+        <p class="dialog-footer-button-primary" @click="dialogSubmit">提交</p>
         <p class="dialog-footer-button-null"></p>
       </div>
     </el-dialog>

+ 1 - 1
src/views/systemManagement/dict/data.vue

@@ -116,7 +116,7 @@
       <div slot="footer" class="dialog-footer dialog-footer-box">
         <p class="dialog-footer-button-null"></p>
         <p class="dialog-footer-button-info" @click="cancel">取消</p>
-        <p class="dialog-footer-button-primary" @click="submitForm">确定</p>
+        <p class="dialog-footer-button-primary" @click="submitForm">提交</p>
         <p class="dialog-footer-button-null"></p>
       </div>
     </el-dialog>

+ 1 - 1
src/views/systemManagement/dict/index.vue

@@ -123,7 +123,7 @@
       <div slot="footer" class="dialog-footer dialog-footer-box">
         <p class="dialog-footer-button-null"></p>
         <p class="dialog-footer-button-info" @click="cancel">取消</p>
-        <p class="dialog-footer-button-primary" @click="submitForm">确定</p>
+        <p class="dialog-footer-button-primary" @click="submitForm">提交</p>
         <p class="dialog-footer-button-null"></p>
       </div>
     </el-dialog>

+ 0 - 0
src/views/systemManagement/menu/index.vue


この差分においてかなりの量のファイルが変更されているため、一部のファイルを表示していません