diff --git a/ruoyi-admin/src/main/resources/application-druid.yml b/ruoyi-admin/src/main/resources/application-druid.yml
index 0a4cb247..df613172 100644
--- a/ruoyi-admin/src/main/resources/application-druid.yml
+++ b/ruoyi-admin/src/main/resources/application-druid.yml
@@ -40,7 +40,7 @@ spring:
         druid:
             # 主库数据源
             master:
-                url: jdbc:mysql://cd-cynosdbmysql-grp-9rqrhxsm.sql.tencentcdb.com:27981/yanzhu_jh_test?useSSL=false&characterEncoding=UTF-8&serverTimezone=GMT%2B8
+                url: jdbc:mysql://cd-cynosdbmysql-grp-9rqrhxsm.sql.tencentcdb.com:27981/yanzhu_jh?useSSL=false&characterEncoding=UTF-8&serverTimezone=GMT%2B8
                 username: root
                 password: Sxyanzhu@cf
             # 从库数据源
diff --git a/ruoyi-ui/src/components/ImageUpload/index.vue b/ruoyi-ui/src/components/ImageUpload/index.vue
index 43c13075..cb2b93b9 100644
--- a/ruoyi-ui/src/components/ImageUpload/index.vue
+++ b/ruoyi-ui/src/components/ImageUpload/index.vue
@@ -28,7 +28,7 @@
       的文件
     </div>
 
-    <el-dialog
+    <el-dialog :close-on-click-modal="false" :close-on-press-escape="false"
       :visible.sync="dialogVisible"
       title="预览"
       width="800"
diff --git a/ruoyi-ui/src/components/Process/components/nodePanel/task.vue b/ruoyi-ui/src/components/Process/components/nodePanel/task.vue
index d401e00d..75c9496d 100644
--- a/ruoyi-ui/src/components/Process/components/nodePanel/task.vue
+++ b/ruoyi-ui/src/components/Process/components/nodePanel/task.vue
@@ -73,8 +73,8 @@
       title="选择人员"
       :visible.sync="userVisible"
       width="60%"
-      :close-on-press-escape="false"
-      :show-close="false"
+      :close-on-click-modal="false" :close-on-press-escape="false"
+      :show-close="false" 
     >
     <flow-user :checkType="checkType" :selectValues="selectValues" @handleUserSelect="handleUserSelect"></flow-user>
     <span slot="footer" class="dialog-footer">
@@ -87,7 +87,7 @@
       title="选择表达式"
       :visible.sync="expVisible"
       width="60%"
-      :close-on-press-escape="false"
+      :close-on-click-modal="false" :close-on-press-escape="false"
       :show-close="false"
     >
       <flow-exp :selectValues="selectValues" @handleSingleExpSelect="handleSingleExpSelect"></flow-exp>
@@ -101,7 +101,7 @@
       title="选择候选角色"
       :visible.sync="roleVisible"
       width="60%"
-      :close-on-press-escape="false"
+      :close-on-click-modal="false" :close-on-press-escape="false"
       :show-close="false"
     >
       <flow-role :checkType="checkType" :selectValues="selectValues" @handleRoleSelect="handleRoleSelect"></flow-role>
diff --git a/ruoyi-ui/src/components/RightToolbar/index.vue b/ruoyi-ui/src/components/RightToolbar/index.vue
index 8eaa91f6..78c61053 100644
--- a/ruoyi-ui/src/components/RightToolbar/index.vue
+++ b/ruoyi-ui/src/components/RightToolbar/index.vue
@@ -13,7 +13,7 @@
       </el-tooltip>
       <slot name="right"></slot>
     </el-row>
-    <el-dialog :title="title" :visible.sync="open" append-to-body>
+    <el-dialog :title="title" :visible.sync="open" append-to-body :close-on-click-modal="false" :close-on-press-escape="false">
       <el-transfer :titles="['显示', '隐藏']" v-model="value" :data="columns" @change="dataChange"></el-transfer>
     </el-dialog>
   </div>
diff --git a/ruoyi-ui/src/views/flowable/definition/index.vue b/ruoyi-ui/src/views/flowable/definition/index.vue
index 80df81ed..a755b021 100644
--- a/ruoyi-ui/src/views/flowable/definition/index.vue
+++ b/ruoyi-ui/src/views/flowable/definition/index.vue
@@ -169,7 +169,7 @@
     />
 
     <!-- 添加或修改流程定义对话框 -->
-    <el-dialog :title="title" :visible.sync="open" width="500px" append-to-body>
+    <el-dialog :title="title" :visible.sync="open" width="500px" append-to-body :close-on-click-modal="false" :close-on-press-escape="false">
       <el-form ref="form" :model="form" :rules="rules" label-width="80px">
         <el-form-item label="看看" prop="name">
           <el-input v-model="form.name" placeholder="请输入看看" />
@@ -182,7 +182,7 @@
     </el-dialog>
 
     <!-- bpmn20.xml导入对话框 -->
-    <el-dialog :title="upload.title" :visible.sync="upload.open" width="400px" append-to-body>
+    <el-dialog :title="upload.title" :visible.sync="upload.open" width="400px" append-to-body :close-on-click-modal="false" :close-on-press-escape="false">
       <el-upload
         ref="upload"
         :limit="1"
@@ -224,20 +224,20 @@
     </el-dialog>
 
     <!-- 流程图 -->
-    <el-dialog :title="readImage.title" :visible.sync="readImage.open" width="70%" append-to-body>
+    <el-dialog :title="readImage.title" :visible.sync="readImage.open" width="70%" append-to-body :close-on-click-modal="false" :close-on-press-escape="false">
       <!-- <el-image :src="readImage.src"></el-image> -->
       <flow :flowData="flowData"/>
     </el-dialog>
 
     <!--表单配置详情-->
-    <el-dialog :title="formTitle" :visible.sync="formConfOpen" width="50%" append-to-body>
+    <el-dialog :title="formTitle" :visible.sync="formConfOpen" width="50%" append-to-body :close-on-click-modal="false" :close-on-press-escape="false">
       <div class="test-form">
         <parser :key="new Date().getTime()"  :form-conf="formConf" />
       </div>
     </el-dialog>
 
     <!--挂载表单-->
-    <el-dialog :title="formDeployTitle" :visible.sync="formDeployOpen" width="60%" append-to-body>
+    <el-dialog :title="formDeployTitle" :visible.sync="formDeployOpen" width="60%" append-to-body :close-on-click-modal="false" :close-on-press-escape="false">
       <el-row :gutter="24">
         <el-col :span="10" :xs="24">
           <el-table
diff --git a/ruoyi-ui/src/views/flowable/task/form/index.vue b/ruoyi-ui/src/views/flowable/task/form/index.vue
index 6591899f..b6c00f0f 100644
--- a/ruoyi-ui/src/views/flowable/task/form/index.vue
+++ b/ruoyi-ui/src/views/flowable/task/form/index.vue
@@ -102,7 +102,7 @@
     />
 
     <!-- 添加或修改流程表单对话框 -->
-    <el-dialog :title="title" :visible.sync="open" width="500px" append-to-body>
+    <el-dialog :title="title" :visible.sync="open" width="500px" append-to-body :close-on-click-modal="false" :close-on-press-escape="false">
       <el-form ref="form" :model="form" :rules="rules" label-width="80px">
         <el-form-item label="表单名称" prop="formName">
           <el-input v-model="form.formName" placeholder="请输入表单名称" />
@@ -121,7 +121,7 @@
     </el-dialog>
 
     <!--表单配置详情-->
-    <el-dialog :title="formTitle" :visible.sync="formConfOpen" width="60%" append-to-body>
+    <el-dialog :title="formTitle" :visible.sync="formConfOpen" width="60%" append-to-body :close-on-click-modal="false" :close-on-press-escape="false">
       <div class="test-form">
         <parser :key="new Date().getTime()"  :form-conf="formConf" />
       </div>
diff --git a/ruoyi-ui/src/views/flowable/task/myProcess/index.vue b/ruoyi-ui/src/views/flowable/task/myProcess/index.vue
index 62e10d18..6e70a5ef 100644
--- a/ruoyi-ui/src/views/flowable/task/myProcess/index.vue
+++ b/ruoyi-ui/src/views/flowable/task/myProcess/index.vue
@@ -148,7 +148,7 @@
     />
 
     <!-- 发起流程 -->
-    <el-dialog :title="title" :visible.sync="open" width="60%" append-to-body>
+    <el-dialog :title="title" :visible.sync="open" width="60%" append-to-body :close-on-click-modal="false" :close-on-press-escape="false">
       <el-form :model="queryProcessParams" ref="queryProcessForm" :inline="true" v-show="showSearch" label-width="68px">
         <el-form-item label="流程名称" prop="name">
           <el-input
@@ -214,7 +214,7 @@
       />
     </el-dialog>
     <!-- 终止流程 -->
-    <el-dialog :title="title" :visible.sync="stopOpen" width="30%" append-to-body>
+    <el-dialog :title="title" :visible.sync="stopOpen" width="30%" append-to-body :close-on-click-modal="false" :close-on-press-escape="false">
       <el-form ref="form"
         :model="form"
         :rules="rules"
diff --git a/ruoyi-ui/src/views/flowable/task/myProcess/send/index.vue b/ruoyi-ui/src/views/flowable/task/myProcess/send/index.vue
index b66f1af1..0e87f29c 100644
--- a/ruoyi-ui/src/views/flowable/task/myProcess/send/index.vue
+++ b/ruoyi-ui/src/views/flowable/task/myProcess/send/index.vue
@@ -21,7 +21,7 @@
         </el-tab-pane>
       </el-tabs>
       <!--选择流程接收人-->
-      <el-dialog :title="taskTitle" :visible.sync="taskOpen" width="65%" append-to-body>
+      <el-dialog :title="taskTitle" :visible.sync="taskOpen" width="65%" append-to-body :close-on-click-modal="false" :close-on-press-escape="false">
         <flow-user v-if="checkSendUser" :checkType="checkType"  @handleUserSelect="handleUserSelect"/>
         <flow-role v-if="checkSendRole" @handleRoleSelect="handleRoleSelect"/>
         <span slot="footer" class="dialog-footer">
diff --git a/ruoyi-ui/src/views/flowable/task/record/index.vue b/ruoyi-ui/src/views/flowable/task/record/index.vue
index 6f1f42ea..f3e999eb 100644
--- a/ruoyi-ui/src/views/flowable/task/record/index.vue
+++ b/ruoyi-ui/src/views/flowable/task/record/index.vue
@@ -92,7 +92,7 @@
     </el-card>
 
     <!--审批正常流程-->
-    <el-dialog :title="completeTitle" :visible.sync="completeOpen" :width="checkSendUser? '60%':'40%'" append-to-body>
+    <el-dialog :title="completeTitle" :visible.sync="completeOpen" :width="checkSendUser? '60%':'40%'" append-to-body :close-on-click-modal="false" :close-on-press-escape="false">
       <el-form ref="taskForm" :model="taskForm" label-width="80px" >
         <el-form-item  v-if="checkSendUser" prop="targetKey">
           <el-row :gutter="20">
@@ -157,7 +157,7 @@
     </el-dialog>
 
     <!--退回流程-->
-    <el-dialog :title="returnTitle" :visible.sync="returnOpen" width="40%" append-to-body>
+    <el-dialog :title="returnTitle" :visible.sync="returnOpen" width="40%" append-to-body :close-on-click-modal="false" :close-on-press-escape="false">
         <el-form ref="taskForm" :model="taskForm" label-width="80px" >
             <el-form-item label="退回节点" prop="targetKey">
               <el-radio-group v-model="taskForm.targetKey">
@@ -179,7 +179,7 @@
     </el-dialog>
 
     <!--驳回流程-->
-    <el-dialog :title="rejectTitle" :visible.sync="rejectOpen" width="40%" append-to-body>
+    <el-dialog :title="rejectTitle" :visible.sync="rejectOpen" width="40%" append-to-body :close-on-click-modal="false" :close-on-press-escape="false">
       <el-form ref="taskForm" :model="taskForm" label-width="80px" >
         <el-form-item label="驳回意见" prop="comment" :rules="[{ required: true, message: '请输入意见', trigger: 'blur' }]">
           <el-input style="width: 50%" type="textarea" v-model="taskForm.comment" placeholder="请输入意见"/>
diff --git a/ruoyi-ui/src/views/flowable/task/todo/detail/index.vue b/ruoyi-ui/src/views/flowable/task/todo/detail/index.vue
index 25d4ab38..3323b7bc 100644
--- a/ruoyi-ui/src/views/flowable/task/todo/detail/index.vue
+++ b/ruoyi-ui/src/views/flowable/task/todo/detail/index.vue
@@ -81,7 +81,7 @@
         </el-tab-pane>
       </el-tabs>
       <!--审批任务-->
-      <el-dialog :title="completeTitle" :visible.sync="completeOpen" width="60%" append-to-body>
+      <el-dialog :title="completeTitle" :visible.sync="completeOpen" width="60%" append-to-body :close-on-click-modal="false" :close-on-press-escape="false">
         <el-form ref="taskForm" :model="taskForm">
           <el-form-item prop="targetKey">
             <flow-user v-if="checkSendUser" :checkType="checkType" @handleUserSelect="handleUserSelect"></flow-user>
@@ -98,7 +98,7 @@
         </span>
       </el-dialog>
       <!--退回流程-->
-      <el-dialog :title="returnTitle" :visible.sync="returnOpen" width="40%" append-to-body>
+      <el-dialog :title="returnTitle" :visible.sync="returnOpen" width="40%" append-to-body :close-on-click-modal="false" :close-on-press-escape="false">
         <el-form ref="taskForm" :model="taskForm" label-width="80px">
           <el-form-item label="退回节点" prop="targetKey">
             <el-radio-group v-model="taskForm.targetKey">
@@ -121,7 +121,7 @@
           </span>
       </el-dialog>
       <!--驳回流程-->
-      <el-dialog :title="rejectTitle" :visible.sync="rejectOpen" width="40%" append-to-body>
+      <el-dialog :title="rejectTitle" :visible.sync="rejectOpen" width="40%" append-to-body :close-on-click-modal="false" :close-on-press-escape="false">
         <el-form ref="taskForm" :model="taskForm" label-width="80px">
           <el-form-item label="驳回意见" prop="comment"
                         :rules="[{ required: true, message: '请输入意见', trigger: 'blur' }]">
diff --git a/ruoyi-ui/src/views/monitor/job/index.vue b/ruoyi-ui/src/views/monitor/job/index.vue
index b7bc4381..ba00baef 100644
--- a/ruoyi-ui/src/views/monitor/job/index.vue
+++ b/ruoyi-ui/src/views/monitor/job/index.vue
@@ -152,7 +152,7 @@
     />
 
     <!-- 添加或修改定时任务对话框 -->
-    <el-dialog :title="title" :visible.sync="open" width="800px" append-to-body>
+    <el-dialog :title="title" :visible.sync="open" width="800px" append-to-body :close-on-click-modal="false" :close-on-press-escape="false">
       <el-form ref="form" :model="form" :rules="rules" label-width="120px">
         <el-row>
           <el-col :span="12">
@@ -236,12 +236,12 @@
       </div>
     </el-dialog>
 
-    <el-dialog title="Cron表达式生成器" :visible.sync="openCron" append-to-body destroy-on-close class="scrollbar">
+    <el-dialog title="Cron表达式生成器" :visible.sync="openCron" append-to-body destroy-on-close class="scrollbar" :close-on-click-modal="false" :close-on-press-escape="false">
       <crontab @hide="openCron=false" @fill="crontabFill" :expression="expression"></crontab>
     </el-dialog>
 
     <!-- 任务日志详细 -->
-    <el-dialog title="任务详细" :visible.sync="openView" width="700px" append-to-body>
+    <el-dialog title="任务详细" :visible.sync="openView" width="700px" append-to-body :close-on-click-modal="false" :close-on-press-escape="false">
       <el-form ref="form" :model="form" label-width="120px" size="mini">
         <el-row>
           <el-col :span="12">
diff --git a/ruoyi-ui/src/views/monitor/job/log.vue b/ruoyi-ui/src/views/monitor/job/log.vue
index 3f83d1ad..303cbaa6 100644
--- a/ruoyi-ui/src/views/monitor/job/log.vue
+++ b/ruoyi-ui/src/views/monitor/job/log.vue
@@ -144,7 +144,7 @@
     />
 
     <!-- 调度日志详细 -->
-    <el-dialog title="调度日志详细" :visible.sync="open" width="700px" append-to-body>
+    <el-dialog title="调度日志详细" :visible.sync="open" width="700px" append-to-body :close-on-click-modal="false" :close-on-press-escape="false">
       <el-form ref="form" :model="form" label-width="100px" size="mini">
         <el-row>
           <el-col :span="12">
diff --git a/ruoyi-ui/src/views/monitor/operlog/index.vue b/ruoyi-ui/src/views/monitor/operlog/index.vue
index e4b0c56e..6dc5a296 100644
--- a/ruoyi-ui/src/views/monitor/operlog/index.vue
+++ b/ruoyi-ui/src/views/monitor/operlog/index.vue
@@ -151,7 +151,7 @@
     />
 
     <!-- 操作日志详细 -->
-    <el-dialog title="操作日志详细" :visible.sync="open" width="700px" append-to-body>
+    <el-dialog title="操作日志详细" :visible.sync="open" width="700px" append-to-body :close-on-click-modal="false" :close-on-press-escape="false">
       <el-form ref="form" :model="form" label-width="100px" size="mini">
         <el-row>
           <el-col :span="12">
diff --git a/ruoyi-ui/src/views/project/attendance/index.vue b/ruoyi-ui/src/views/project/attendance/index.vue
index 072fc9da..4ab436cb 100644
--- a/ruoyi-ui/src/views/project/attendance/index.vue
+++ b/ruoyi-ui/src/views/project/attendance/index.vue
@@ -87,7 +87,7 @@
       @pagination="getList" />
 
     <!-- 添加或修改劳务实名制管理对话框 -->
-    <el-dialog :title="title" :visible.sync="open" width="500px" append-to-body>
+    <el-dialog :title="title" :visible.sync="open" width="500px" append-to-body :close-on-click-modal="false" :close-on-press-escape="false">
       <el-form ref="form" :model="form" :rules="rules" label-width="80px">
         <el-form-item label="厂商编号参考字典attendance_vendors" prop="vendorsCode">
           <el-input v-model="form.vendorsCode" placeholder="请输入厂商编号参考字典attendance_vendors" />
diff --git a/ruoyi-ui/src/views/project/attendanceConfig/attendanceConfigDialog.vue b/ruoyi-ui/src/views/project/attendanceConfig/attendanceConfigDialog.vue
index 4fa6ded0..bfaacfe1 100644
--- a/ruoyi-ui/src/views/project/attendanceConfig/attendanceConfigDialog.vue
+++ b/ruoyi-ui/src/views/project/attendanceConfig/attendanceConfigDialog.vue
@@ -1,6 +1,6 @@
 <template>
     <div class="attendance-config-dialog">
-        <el-dialog :title="title" :visible.sync="open" width="800px" append-to-body>
+        <el-dialog :title="title" :visible.sync="open" width="800px" append-to-body :close-on-click-modal="false" :close-on-press-escape="false">
             <el-form ref="form" :model="form" :rules="rules" label-width="100px">
                 <el-form-item label="项目名称" prop="projectId">
                     <el-select v-if="mode != 'edit'" v-model="form.projectId" placeholder="请选择项目" clearable
diff --git a/ruoyi-ui/src/views/project/checkDetection/index.vue b/ruoyi-ui/src/views/project/checkDetection/index.vue
index 4049b327..492a90fa 100644
--- a/ruoyi-ui/src/views/project/checkDetection/index.vue
+++ b/ruoyi-ui/src/views/project/checkDetection/index.vue
@@ -355,7 +355,7 @@
     />
 
     <!-- 添加或修改材料取样复试对话框 -->
-    <el-dialog :title="title" :visible.sync="open" width="680px" append-to-body>
+    <el-dialog :title="title" :visible.sync="open" width="680px" append-to-body :close-on-click-modal="false" :close-on-press-escape="false">
       <el-form ref="form" :model="form" :rules="rules" label-width="100px">
         <el-form-item label="项目名称" prop="projectName">
           <el-input
@@ -457,7 +457,7 @@
       v-if="resultopen"
       :visible.sync="resultopen"
       width="680px"
-      append-to-body
+      append-to-body :close-on-click-modal="false" :close-on-press-escape="false"
     >
       <el-form
         ref="resultform"
diff --git a/ruoyi-ui/src/views/project/costOutput/costMonth.vue b/ruoyi-ui/src/views/project/costOutput/costMonth.vue
index b3f4c71b..6736e226 100644
--- a/ruoyi-ui/src/views/project/costOutput/costMonth.vue
+++ b/ruoyi-ui/src/views/project/costOutput/costMonth.vue
@@ -1,6 +1,6 @@
 <template>
     <div class="cost-month" style="border:solid 1px #409eff;margin: 12px 0px;padding: 6px 12px 0px;position: relative;">
-        <el-popover placement="top" v-model="showPop2">
+        <el-popover placement="top" v-model="showPop2" ref="pop">
                     <p>选择年份</p>
                     <div style="margin-bottom: 12px;">
                         <el-date-picker v-model="selYear" type="year" placeholder="选择年" :picker-options="{disabledDate:doPick}" >
@@ -32,7 +32,7 @@ export default {
     name: 'RuoyiUiCostMonth',
 
     data() {
-        return {
+        return {            
             selYear:'',
             names:['','一月','二月','三月','四月','五月','六月','七月','八月','九月','十月','十一月','十二月'],
             activeName:'',
@@ -47,15 +47,17 @@ export default {
 
     methods: {
         doPick(a,b){            
-            return this.yearInv.filter(d=>d.year==a.getFullYear()).length>0;
+            return this.monthInv.filter(d=>d.year==a.getFullYear()).length>0;
         },
-        doAddYear(){
+        doAddYear(){            
             addMonthInvestment({year:this.$dt(this.selYear).$y,projectId:this.prj.id,costType:9}).then(d=>{
+                this.$refs.pop.showPopper=false
                 this.$emit('success');
             });
         },
-        init(d){
+        init(d,prj){
             this.monthInv=d;
+            this.prj=prj;
             if(d.filter(it=>it.year==new Date().getFullYear()).length>0){
                 this.activeName=""+new Date().getFullYear()
             }else{
diff --git a/ruoyi-ui/src/views/project/costOutput/costOutputDrawer.vue b/ruoyi-ui/src/views/project/costOutput/costOutputDrawer.vue
index 3a2561d4..a0ac6428 100644
--- a/ruoyi-ui/src/views/project/costOutput/costOutputDrawer.vue
+++ b/ruoyi-ui/src/views/project/costOutput/costOutputDrawer.vue
@@ -119,9 +119,11 @@ export default {
                 obj.money=obj.money?obj.money*10000:0;
                 return obj;
             });
-            batchUpdate(objs).then(d=>{
+            batchUpdate(objs).then(d=>{                
                 if(d.code!=200){
-                    this.loadData();
+                    this.loadData();                    
+                }else{
+                    this.$modal.msgSuccess("保存成功");
                 }
             });
         },
diff --git a/ruoyi-ui/src/views/project/costOutput/index.vue b/ruoyi-ui/src/views/project/costOutput/index.vue
index 37efeb0a..d7cb138f 100644
--- a/ruoyi-ui/src/views/project/costOutput/index.vue
+++ b/ruoyi-ui/src/views/project/costOutput/index.vue
@@ -132,7 +132,7 @@
     />
 
     <!-- 添加或修改项目成本产值对话框 -->
-    <el-dialog :title="title" :visible.sync="open" width="500px" append-to-body>
+    <el-dialog :title="title" :visible.sync="open" width="500px" append-to-body :close-on-click-modal="false" :close-on-press-escape="false">
       <el-form ref="form" :model="form" :rules="rules" label-width="80px">
         <el-form-item label="项目编号" prop="projectId">
           <el-input v-model="form.projectId" placeholder="请输入项目编号" />
diff --git a/ruoyi-ui/src/views/project/gldAttendanceGroup/index.vue b/ruoyi-ui/src/views/project/gldAttendanceGroup/index.vue
index 62dea957..e15a9811 100644
--- a/ruoyi-ui/src/views/project/gldAttendanceGroup/index.vue
+++ b/ruoyi-ui/src/views/project/gldAttendanceGroup/index.vue
@@ -276,7 +276,7 @@
     />
 
     <!-- 添加或修改广联达班组信息对话框 -->
-    <el-dialog :title="title" :visible.sync="open" width="500px" append-to-body>
+    <el-dialog :title="title" :visible.sync="open" width="500px" append-to-body :close-on-click-modal="false" :close-on-press-escape="false">
       <el-form ref="form" :model="form" :rules="rules" label-width="80px">
         <el-form-item label="${comment}" prop="cfgid">
           <el-input v-model="form.cfgid" placeholder="请输入${comment}" />
diff --git a/ruoyi-ui/src/views/project/materialSeal/index.vue b/ruoyi-ui/src/views/project/materialSeal/index.vue
index 091544bb..9fd56bfd 100644
--- a/ruoyi-ui/src/views/project/materialSeal/index.vue
+++ b/ruoyi-ui/src/views/project/materialSeal/index.vue
@@ -341,7 +341,7 @@
     />
 
     <!-- 添加或修改材料封样对话框 -->
-    <el-dialog :title="title" :visible.sync="open" width="780px" append-to-body>
+    <el-dialog :title="title" :visible.sync="open" width="780px" append-to-body :close-on-click-modal="false" :close-on-press-escape="false">
       <el-form ref="form" :model="form" :rules="rules" label-width="80px">
         <el-form-item label="项目名称" prop="projectName">
           <el-input
diff --git a/ruoyi-ui/src/views/project/materialSeal/projectMaterialSealDrawer.vue b/ruoyi-ui/src/views/project/materialSeal/projectMaterialSealDrawer.vue
index a9a81815..ca494226 100644
--- a/ruoyi-ui/src/views/project/materialSeal/projectMaterialSealDrawer.vue
+++ b/ruoyi-ui/src/views/project/materialSeal/projectMaterialSealDrawer.vue
@@ -215,7 +215,7 @@
       />
 
       <!-- 添加或修改项目材料封样对话框 -->
-      <el-dialog :title="title" :visible.sync="open" width="780px" append-to-body>
+      <el-dialog :title="title" :visible.sync="open" width="780px" append-to-body :close-on-click-modal="false" :close-on-press-escape="false">
         <el-form ref="form" :model="form" :rules="rules" label-width="80px">
           <el-form-item label="项目名称" prop="projectName">
             <el-input
diff --git a/ruoyi-ui/src/views/project/projectChecking/index.vue b/ruoyi-ui/src/views/project/projectChecking/index.vue
index f0a71b33..6f356a04 100644
--- a/ruoyi-ui/src/views/project/projectChecking/index.vue
+++ b/ruoyi-ui/src/views/project/projectChecking/index.vue
@@ -321,7 +321,7 @@
     />
 
     <!-- 添加或修改项目验收对话框 -->
-    <el-dialog :title="title" :visible.sync="open" width="780px" append-to-body>
+    <el-dialog :title="title" :visible.sync="open" width="780px" append-to-body :close-on-click-modal="false" :close-on-press-escape="false">
       <el-form ref="form" :model="form" :rules="rules" label-width="80px">
         <el-form-item label="验收图片" prop="imageUrls">
           <image-upload v-model="form.imageUrls" :limit="9" />
diff --git a/ruoyi-ui/src/views/project/projectChecking/projectCheckingDrawer.vue b/ruoyi-ui/src/views/project/projectChecking/projectCheckingDrawer.vue
index 4e66628c..e8982101 100644
--- a/ruoyi-ui/src/views/project/projectChecking/projectCheckingDrawer.vue
+++ b/ruoyi-ui/src/views/project/projectChecking/projectCheckingDrawer.vue
@@ -212,7 +212,7 @@
       />
 
       <!-- 添加或修改项目举牌验收对话框 -->
-      <el-dialog :title="title" :visible.sync="open" width="780px" append-to-body>
+      <el-dialog :title="title" :visible.sync="open" width="780px" append-to-body :close-on-click-modal="false" :close-on-press-escape="false">
         <el-form ref="form" :model="form" :rules="rules" label-width="80px">
           <el-form-item label="项目名称" prop="projectName">
             <el-input
diff --git a/ruoyi-ui/src/views/project/projectDeptWroks/index.vue b/ruoyi-ui/src/views/project/projectDeptWroks/index.vue
index dc95bc2a..4234fe88 100644
--- a/ruoyi-ui/src/views/project/projectDeptWroks/index.vue
+++ b/ruoyi-ui/src/views/project/projectDeptWroks/index.vue
@@ -126,7 +126,7 @@
     />
 
     <!-- 添加或修改在岗人员对话框 -->
-    <el-dialog :title="title" :visible.sync="open" width="500px" append-to-body>
+    <el-dialog :title="title" :visible.sync="open" width="500px" append-to-body :close-on-click-modal="false" :close-on-press-escape="false">
       <el-form ref="form" :model="form" :rules="rules" label-width="80px">
         <el-form-item label="项目主键" prop="projectId">
           <el-input v-model="form.projectId" placeholder="请输入项目主键" />
diff --git a/ruoyi-ui/src/views/project/projectMeasure/index.vue b/ruoyi-ui/src/views/project/projectMeasure/index.vue
index c4ac546a..fc1d295d 100644
--- a/ruoyi-ui/src/views/project/projectMeasure/index.vue
+++ b/ruoyi-ui/src/views/project/projectMeasure/index.vue
@@ -351,7 +351,7 @@
     />
 
     <!-- 添加或修改实测实量对话框 -->
-    <el-dialog :title="title" :visible.sync="open" width="780px" append-to-body>
+    <el-dialog :title="title" :visible.sync="open" width="780px" append-to-body :close-on-click-modal="false" :close-on-press-escape="false">
       <el-form ref="form" :model="form" :rules="rules" label-width="80px">
         <el-form-item label="项目名称" prop="projectName">
           <el-input
diff --git a/ruoyi-ui/src/views/project/projectMeasure/projectMeasureDrawer.vue b/ruoyi-ui/src/views/project/projectMeasure/projectMeasureDrawer.vue
index 6617fd0b..b14cfe52 100644
--- a/ruoyi-ui/src/views/project/projectMeasure/projectMeasureDrawer.vue
+++ b/ruoyi-ui/src/views/project/projectMeasure/projectMeasureDrawer.vue
@@ -220,7 +220,7 @@
       />
 
       <!-- 添加或修改实测实量对话框 -->
-      <el-dialog :title="title" :visible.sync="open" width="780px" append-to-body>
+      <el-dialog :title="title" :visible.sync="open" width="780px" append-to-body :close-on-click-modal="false" :close-on-press-escape="false">
         <el-form ref="form" :model="form" :rules="rules" label-width="80px">
           <el-form-item label="项目名称" prop="projectName">
             <el-input
diff --git a/ruoyi-ui/src/views/project/projectPlan/index copy.vue b/ruoyi-ui/src/views/project/projectPlan/index copy.vue
index 163b568a..fc70b39c 100644
--- a/ruoyi-ui/src/views/project/projectPlan/index copy.vue	
+++ b/ruoyi-ui/src/views/project/projectPlan/index copy.vue	
@@ -152,7 +152,7 @@
     />
 
     <!-- 添加或修改项目跟进计划对话框 -->
-    <el-dialog :title="title" :visible.sync="open" width="500px" append-to-body>
+    <el-dialog :title="title" :visible.sync="open" width="500px" append-to-body :close-on-click-modal="false" :close-on-press-escape="false">
       <el-form ref="form" :model="form" :rules="rules" label-width="80px">
         <el-form-item label="项目名称" prop="projectName">
           <el-input v-model="form.projectName" type="textarea" placeholder="请输入内容" />
diff --git a/ruoyi-ui/src/views/project/projectStandard/index.vue b/ruoyi-ui/src/views/project/projectStandard/index.vue
index fa063b49..71121a8a 100644
--- a/ruoyi-ui/src/views/project/projectStandard/index.vue
+++ b/ruoyi-ui/src/views/project/projectStandard/index.vue
@@ -132,7 +132,7 @@
     />
 
     <!-- 添加或修改标准化管理对话框 -->
-    <el-dialog :title="title" :visible.sync="open" width="500px" append-to-body>
+    <el-dialog :title="title" :visible.sync="open" width="500px" append-to-body :close-on-click-modal="false" :close-on-press-escape="false">
       <el-form ref="form" :model="form" :rules="rules" label-width="80px">
         <el-form-item label="项目ID" prop="projectId">
           <el-input v-model="form.projectId" placeholder="请输入项目ID" />
diff --git a/ruoyi-ui/src/views/project/projectStandard/projectStandardDlg.vue b/ruoyi-ui/src/views/project/projectStandard/projectStandardDlg.vue
index caeeeaf2..2202b6bd 100644
--- a/ruoyi-ui/src/views/project/projectStandard/projectStandardDlg.vue
+++ b/ruoyi-ui/src/views/project/projectStandard/projectStandardDlg.vue
@@ -1,5 +1,5 @@
 <template>
-    <el-dialog :title="title" :visible.sync="open" width="500px" append-to-body custom-class="project-standard-dlg">
+    <el-dialog :title="title" :visible.sync="open" width="500px" append-to-body custom-class="project-standard-dlg" :close-on-click-modal="false" :close-on-press-escape="false">
         <el-form ref="form" :model="form" :rules="rules" label-width="80px">
             <el-form-item label="项目名称:">
                 {{ prj.projectName }}
diff --git a/ruoyi-ui/src/views/project/surProjectAttendance/index.vue b/ruoyi-ui/src/views/project/surProjectAttendance/index.vue
index eee67c92..5bb82a82 100644
--- a/ruoyi-ui/src/views/project/surProjectAttendance/index.vue
+++ b/ruoyi-ui/src/views/project/surProjectAttendance/index.vue
@@ -150,7 +150,7 @@
     />
 
     <!-- 添加或修改项目出勤对话框 -->
-    <el-dialog :title="title" :visible.sync="open" width="500px" append-to-body>
+    <el-dialog :title="title" :visible.sync="open" width="500px" append-to-body :close-on-click-modal="false" :close-on-press-escape="false">
       <el-form ref="form" :model="form" :rules="rules" label-width="80px">
         <el-form-item label="项目主键" prop="projectId">
           <el-input v-model="form.projectId" placeholder="请输入项目主键" />
diff --git a/ruoyi-ui/src/views/project/surProjectInsurance/index.vue b/ruoyi-ui/src/views/project/surProjectInsurance/index.vue
index 2b2f631b..7b3107ad 100644
--- a/ruoyi-ui/src/views/project/surProjectInsurance/index.vue
+++ b/ruoyi-ui/src/views/project/surProjectInsurance/index.vue
@@ -249,7 +249,7 @@
     />
 
     <!-- 添加或修改项目保险对话框 -->
-    <el-dialog :title="title" :visible.sync="open" width="680px" append-to-body>
+    <el-dialog :title="title" :visible.sync="open" width="680px" append-to-body :close-on-click-modal="false" :close-on-press-escape="false">
       <el-form ref="form" :model="form" :rules="rules" label-width="80px">
         <el-form-item label="保险类型" prop="insuranceType">
           <el-select
diff --git a/ruoyi-ui/src/views/project/surProjectInsurance/insuranceDrawer.vue b/ruoyi-ui/src/views/project/surProjectInsurance/insuranceDrawer.vue
index 59e75c46..5a1a3c62 100644
--- a/ruoyi-ui/src/views/project/surProjectInsurance/insuranceDrawer.vue
+++ b/ruoyi-ui/src/views/project/surProjectInsurance/insuranceDrawer.vue
@@ -106,7 +106,7 @@
       />
 
       <!-- 添加或修改项目保险对话框 -->
-      <el-dialog :title="title" :visible.sync="open" width="680px" append-to-body>
+      <el-dialog :title="title" :visible.sync="open" width="680px" append-to-body :close-on-click-modal="false" :close-on-press-escape="false">
         <el-form ref="form" :model="form" :rules="rules" label-width="80px">
           <el-form-item label="项目名称" prop="projectName">
             <el-input
diff --git a/ruoyi-ui/src/views/project/surProjectQuarterlyAssess/index.vue b/ruoyi-ui/src/views/project/surProjectQuarterlyAssess/index.vue
index c3119212..1fdb7ae8 100644
--- a/ruoyi-ui/src/views/project/surProjectQuarterlyAssess/index.vue
+++ b/ruoyi-ui/src/views/project/surProjectQuarterlyAssess/index.vue
@@ -166,7 +166,7 @@
     />
 
     <!-- 添加或修改项目季度考核对话框 -->
-    <el-dialog :title="title" :visible.sync="open" width="500px" append-to-body>
+    <el-dialog :title="title" :visible.sync="open" width="500px" append-to-body :close-on-click-modal="false" :close-on-press-escape="false">
       <el-form ref="form" :model="form" :rules="rules" label-width="80px">
         <el-form-item label="项目编号" prop="projectId">
           <el-input v-model="form.projectId" placeholder="请输入项目编号" />
diff --git a/ruoyi-ui/src/views/project/surProjectSpecial/index.vue b/ruoyi-ui/src/views/project/surProjectSpecial/index.vue
index 1fec2a40..5a4c58cf 100644
--- a/ruoyi-ui/src/views/project/surProjectSpecial/index.vue
+++ b/ruoyi-ui/src/views/project/surProjectSpecial/index.vue
@@ -259,7 +259,7 @@
       />
     </el-tabs>
     <!-- 添加或修改项目特种人员对话框 -->
-    <el-dialog :title="title" :visible.sync="open" width="500px" append-to-body>
+    <el-dialog :title="title" :visible.sync="open" width="500px" append-to-body :close-on-click-modal="false" :close-on-press-escape="false">
       <el-form ref="form" :model="form" :rules="rules" label-width="80px">
         <el-form-item label="项目名称" prop="projectName">
           <el-input v-model="form.projectName" placeholder="请输入项目名称" disabled />
diff --git a/ruoyi-ui/src/views/system/applyConfig/index.vue b/ruoyi-ui/src/views/system/applyConfig/index.vue
index 291a5e8a..260ade70 100644
--- a/ruoyi-ui/src/views/system/applyConfig/index.vue
+++ b/ruoyi-ui/src/views/system/applyConfig/index.vue
@@ -148,7 +148,7 @@
     />
 
     <!-- 添加或修改系统应用注册对话框 -->
-    <el-dialog :title="title" :visible.sync="open" width="680px" append-to-body>
+    <el-dialog :title="title" :visible.sync="open" width="680px" append-to-body :close-on-click-modal="false" :close-on-press-escape="false">
       <el-form ref="form" :model="form" :rules="rules" label-width="80px">
         <div class="page-warning">
           <p><strong style="color: #E6A23C;">“应用公钥”</strong> 在注册应用后由系统生成，请在保存后查看。</p>
diff --git a/ruoyi-ui/src/views/system/config/index.vue b/ruoyi-ui/src/views/system/config/index.vue
index 632bcc46..edd71023 100644
--- a/ruoyi-ui/src/views/system/config/index.vue
+++ b/ruoyi-ui/src/views/system/config/index.vue
@@ -148,7 +148,7 @@
     />
 
     <!-- 添加或修改参数配置对话框 -->
-    <el-dialog :title="title" :visible.sync="open" width="500px" append-to-body>
+    <el-dialog :title="title" :visible.sync="open" width="500px" append-to-body :close-on-click-modal="false" :close-on-press-escape="false">
       <el-form ref="form" :model="form" :rules="rules" label-width="80px">
         <el-form-item label="参数名称" prop="configName">
           <el-input v-model="form.configName" placeholder="请输入参数名称" />
diff --git a/ruoyi-ui/src/views/system/dept/index.vue b/ruoyi-ui/src/views/system/dept/index.vue
index 6b17e6a7..6543e576 100644
--- a/ruoyi-ui/src/views/system/dept/index.vue
+++ b/ruoyi-ui/src/views/system/dept/index.vue
@@ -97,7 +97,7 @@
     </el-table>
 
     <!-- 添加或修改部门对话框 -->
-    <el-dialog :title="title" :visible.sync="open" width="600px" append-to-body>
+    <el-dialog :title="title" :visible.sync="open" width="600px" append-to-body :close-on-click-modal="false" :close-on-press-escape="false">
       <el-form ref="form" :model="form" :rules="rules" label-width="80px">
         <el-row>
           <el-col :span="24" v-if="form.parentId !== 0">
diff --git a/ruoyi-ui/src/views/system/dict/data.vue b/ruoyi-ui/src/views/system/dict/data.vue
index a4f45ad7..131f32cc 100644
--- a/ruoyi-ui/src/views/system/dict/data.vue
+++ b/ruoyi-ui/src/views/system/dict/data.vue
@@ -141,7 +141,7 @@
     />
 
     <!-- 添加或修改参数配置对话框 -->
-    <el-dialog :title="title" :visible.sync="open" width="500px" append-to-body>
+    <el-dialog :title="title" :visible.sync="open" width="500px" append-to-body :close-on-click-modal="false" :close-on-press-escape="false">
       <el-form ref="form" :model="form" :rules="rules" label-width="80px">
         <el-form-item label="字典类型">
           <el-input v-model="form.dictType" :disabled="true" />
diff --git a/ruoyi-ui/src/views/system/dict/index.vue b/ruoyi-ui/src/views/system/dict/index.vue
index b64b9ba2..5a0058e8 100644
--- a/ruoyi-ui/src/views/system/dict/index.vue
+++ b/ruoyi-ui/src/views/system/dict/index.vue
@@ -158,7 +158,7 @@
     />
 
     <!-- 添加或修改参数配置对话框 -->
-    <el-dialog :title="title" :visible.sync="open" width="500px" append-to-body>
+    <el-dialog :title="title" :visible.sync="open" width="500px" append-to-body :close-on-click-modal="false" :close-on-press-escape="false">
       <el-form ref="form" :model="form" :rules="rules" label-width="80px">
         <el-form-item label="字典名称" prop="dictName">
           <el-input v-model="form.dictName" placeholder="请输入字典名称" />
diff --git a/ruoyi-ui/src/views/system/expression/index.vue b/ruoyi-ui/src/views/system/expression/index.vue
index 46309c07..51a5abc5 100644
--- a/ruoyi-ui/src/views/system/expression/index.vue
+++ b/ruoyi-ui/src/views/system/expression/index.vue
@@ -106,7 +106,7 @@
     />
 
     <!-- 添加或修改流程达式对话框 -->
-    <el-dialog :title="title" :visible.sync="open" width="500px" append-to-body>
+    <el-dialog :title="title" :visible.sync="open" width="500px" append-to-body :close-on-click-modal="false" :close-on-press-escape="false">
       <el-form ref="form" :model="form" :rules="rules" label-width="80px">
         <el-form-item label="名称" prop="name">
           <el-input v-model="form.name" placeholder="请输入表达式名称" />
diff --git a/ruoyi-ui/src/views/system/listener/index.vue b/ruoyi-ui/src/views/system/listener/index.vue
index d253d863..ac838ff5 100644
--- a/ruoyi-ui/src/views/system/listener/index.vue
+++ b/ruoyi-ui/src/views/system/listener/index.vue
@@ -115,7 +115,7 @@
     />
 
     <!-- 添加或修改流程监听对话框 -->
-    <el-dialog :title="title" :visible.sync="open" width="500px" append-to-body>
+    <el-dialog :title="title" :visible.sync="open" width="500px" append-to-body :close-on-click-modal="false" :close-on-press-escape="false">
       <el-form ref="form" :model="form" :rules="rules" label-width="80px">
         <el-form-item label="名称" prop="name">
           <el-input v-model="form.name" placeholder="请输入名称" />
diff --git a/ruoyi-ui/src/views/system/menu/index.vue b/ruoyi-ui/src/views/system/menu/index.vue
index 2a83f9e9..4a6dbe12 100644
--- a/ruoyi-ui/src/views/system/menu/index.vue
+++ b/ruoyi-ui/src/views/system/menu/index.vue
@@ -103,7 +103,7 @@
     </el-table>
 
     <!-- 添加或修改菜单对话框 -->
-    <el-dialog :title="title" :visible.sync="open" width="680px" append-to-body>
+    <el-dialog :title="title" :visible.sync="open" width="680px" append-to-body :close-on-click-modal="false" :close-on-press-escape="false">
       <el-form ref="form" :model="form" :rules="rules" label-width="100px">
         <el-row>
           <el-col :span="24">
diff --git a/ruoyi-ui/src/views/system/notice/index.vue b/ruoyi-ui/src/views/system/notice/index.vue
index a63c0439..b627a545 100644
--- a/ruoyi-ui/src/views/system/notice/index.vue
+++ b/ruoyi-ui/src/views/system/notice/index.vue
@@ -123,7 +123,7 @@
     />
 
     <!-- 添加或修改公告对话框 -->
-    <el-dialog :title="title" :visible.sync="open" width="780px" append-to-body>
+    <el-dialog :title="title" :visible.sync="open" width="780px" append-to-body :close-on-click-modal="false" :close-on-press-escape="false">
       <el-form ref="form" :model="form" :rules="rules" label-width="80px">
         <el-row>
           <el-col :span="12">
diff --git a/ruoyi-ui/src/views/system/post/index.vue b/ruoyi-ui/src/views/system/post/index.vue
index 72be725d..90229a63 100644
--- a/ruoyi-ui/src/views/system/post/index.vue
+++ b/ruoyi-ui/src/views/system/post/index.vue
@@ -124,7 +124,7 @@
     />
 
     <!-- 添加或修改岗位对话框 -->
-    <el-dialog :title="title" :visible.sync="open" width="500px" append-to-body>
+    <el-dialog :title="title" :visible.sync="open" width="500px" append-to-body :close-on-click-modal="false" :close-on-press-escape="false">
       <el-form ref="form" :model="form" :rules="rules" label-width="80px">
         <el-form-item label="岗位名称" prop="postName">
           <el-input v-model="form.postName" placeholder="请输入岗位名称" />
diff --git a/ruoyi-ui/src/views/system/role/index.vue b/ruoyi-ui/src/views/system/role/index.vue
index f12e21eb..88fdc5ad 100644
--- a/ruoyi-ui/src/views/system/role/index.vue
+++ b/ruoyi-ui/src/views/system/role/index.vue
@@ -156,7 +156,7 @@
     />
 
     <!-- 添加或修改角色配置对话框 -->
-    <el-dialog :title="title" :visible.sync="open" width="500px" append-to-body>
+    <el-dialog :title="title" :visible.sync="open" width="500px" append-to-body :close-on-click-modal="false" :close-on-press-escape="false">
       <el-form ref="form" :model="form" :rules="rules" label-width="100px">
         <el-form-item label="角色名称" prop="roleName">
           <el-input v-model="form.roleName" placeholder="请输入角色名称" />
@@ -208,7 +208,7 @@
     </el-dialog>
 
     <!-- 分配角色数据权限对话框 -->
-    <el-dialog :title="title" :visible.sync="openDataScope" width="500px" append-to-body>
+    <el-dialog :title="title" :visible.sync="openDataScope" width="500px" append-to-body :close-on-click-modal="false" :close-on-press-escape="false">
       <el-form :model="form" label-width="80px">
         <el-form-item label="角色名称">
           <el-input v-model="form.roleName" :disabled="true" />
diff --git a/ruoyi-ui/src/views/system/role/selectUser.vue b/ruoyi-ui/src/views/system/role/selectUser.vue
index 1ad3b161..efd3c4fd 100644
--- a/ruoyi-ui/src/views/system/role/selectUser.vue
+++ b/ruoyi-ui/src/views/system/role/selectUser.vue
@@ -24,7 +24,7 @@
       </el-form-item>
     </el-form>
     <el-row>
-      <el-table @row-click="clickRow" ref="table" :data="userList" @selection-change="handleSelectionChange" stripe height="260px">
+      <el-table @row-click="clickRow" ref="table" :data="userList" @selection-change="handleSelectionChange" stripe height="260px" :close-on-click-modal="false" :close-on-press-escape="false">
         <el-table-column type="selection" width="55"></el-table-column>
         <el-table-column label="登录账号" prop="userName" :show-overflow-tooltip="true" />
         <el-table-column label="姓名" prop="nickName" :show-overflow-tooltip="true" />
diff --git a/ruoyi-ui/src/views/system/user/index.vue b/ruoyi-ui/src/views/system/user/index.vue
index 834df7c6..9c90a28d 100644
--- a/ruoyi-ui/src/views/system/user/index.vue
+++ b/ruoyi-ui/src/views/system/user/index.vue
@@ -214,7 +214,7 @@
     </el-row>
 
     <!-- 添加或修改用户配置对话框 -->
-    <el-dialog :title="title" :visible.sync="open" width="600px" append-to-body>
+    <el-dialog :title="title" :visible.sync="open" width="600px" append-to-body :close-on-click-modal="false" :close-on-press-escape="false">
       <el-form ref="form" :model="form" :rules="rules" label-width="80px">
         <el-row>
           <el-col :span="12">
@@ -325,7 +325,7 @@
     </el-dialog>
 
     <!-- 用户导入对话框 -->
-    <el-dialog :title="upload.title" :visible.sync="upload.open" width="400px" append-to-body>
+    <el-dialog :title="upload.title" :visible.sync="upload.open" width="400px" append-to-body :close-on-click-modal="false" :close-on-press-escape="false">
       <el-upload
         ref="upload"
         :limit="1"
diff --git a/ruoyi-ui/src/views/system/user/profile/userAvatar.vue b/ruoyi-ui/src/views/system/user/profile/userAvatar.vue
index 70d8487f..fbc66e9f 100644
--- a/ruoyi-ui/src/views/system/user/profile/userAvatar.vue
+++ b/ruoyi-ui/src/views/system/user/profile/userAvatar.vue
@@ -1,7 +1,7 @@
 <template>
   <div>
     <div class="user-info-head" @click="editCropper()"><img v-bind:src="options.img" title="点击上传头像" class="img-circle img-lg" /></div>
-    <el-dialog :title="title" :visible.sync="open" width="800px" append-to-body @opened="modalOpened"  @close="closeDialog">
+    <el-dialog :title="title" :visible.sync="open" width="800px" append-to-body @opened="modalOpened"  @close="closeDialog" :close-on-click-modal="false" :close-on-press-escape="false">
       <el-row>
         <el-col :xs="24" :md="12" :style="{height: '350px'}">
           <vue-cropper
diff --git a/ruoyi-ui/src/views/tool/build/IconsDialog.vue b/ruoyi-ui/src/views/tool/build/IconsDialog.vue
index 958be50c..178883a7 100644
--- a/ruoyi-ui/src/views/tool/build/IconsDialog.vue
+++ b/ruoyi-ui/src/views/tool/build/IconsDialog.vue
@@ -3,7 +3,7 @@
     <el-dialog
       v-bind="$attrs"
       width="980px"
-      :modal-append-to-body="false"
+      :modal-append-to-body="false" :close-on-click-modal="false" :close-on-press-escape="false"
       v-on="$listeners"
       @open="onOpen"
       @close="onClose"
diff --git a/ruoyi-ui/src/views/tool/build/ResourceDialog.vue b/ruoyi-ui/src/views/tool/build/ResourceDialog.vue
index 58b728ab..6fcfb140 100644
--- a/ruoyi-ui/src/views/tool/build/ResourceDialog.vue
+++ b/ruoyi-ui/src/views/tool/build/ResourceDialog.vue
@@ -4,7 +4,7 @@
       v-bind="$attrs"
       title="外部资源引用"
       width="600px"
-      :close-on-click-modal="false"
+      :close-on-click-modal="false" :close-on-press-escape="false"
       v-on="$listeners"
       @open="onOpen"
       @close="onClose"
diff --git a/ruoyi-ui/src/views/tool/build/TreeNodeDialog.vue b/ruoyi-ui/src/views/tool/build/TreeNodeDialog.vue
index 62d8c88f..0556912e 100644
--- a/ruoyi-ui/src/views/tool/build/TreeNodeDialog.vue
+++ b/ruoyi-ui/src/views/tool/build/TreeNodeDialog.vue
@@ -2,7 +2,7 @@
   <div>
     <el-dialog
       v-bind="$attrs"
-      :close-on-click-modal="false"
+      :close-on-click-modal="false" :close-on-press-escape="false"
       :modal-append-to-body="false"
       v-on="$listeners"
       @open="onOpen"
diff --git a/ruoyi-ui/src/views/tool/build/index.vue b/ruoyi-ui/src/views/tool/build/index.vue
index f9b9f98a..f5189857 100644
--- a/ruoyi-ui/src/views/tool/build/index.vue
+++ b/ruoyi-ui/src/views/tool/build/index.vue
@@ -118,7 +118,7 @@
     />
     <input id="copyNode" type="hidden">
     <!--表单配置详情-->
-    <el-dialog :title="formTitle" :visible.sync="formOpen" width="500px" append-to-body>
+    <el-dialog :title="formTitle" :visible.sync="formOpen" width="500px" append-to-body :close-on-click-modal="false" :close-on-press-escape="false">
       <el-form ref="form" :model="form" :rules="rules" label-width="80px">
         <el-form-item label="表单名称" prop="formName">
           <el-input v-model="form.formName" placeholder="请输入表单名称" />
diff --git a/ruoyi-ui/src/views/tool/gen/importTable.vue b/ruoyi-ui/src/views/tool/gen/importTable.vue
index a3315b21..809b367b 100644
--- a/ruoyi-ui/src/views/tool/gen/importTable.vue
+++ b/ruoyi-ui/src/views/tool/gen/importTable.vue
@@ -1,6 +1,6 @@
 <template>
   <!-- 导入表 -->
-  <el-dialog title="导入表" :visible.sync="visible" width="800px" top="5vh" append-to-body>
+  <el-dialog title="导入表" :visible.sync="visible" width="800px" top="5vh" append-to-body :close-on-click-modal="false" :close-on-press-escape="false">
     <el-form :model="queryParams" ref="queryForm" size="small" :inline="true">
       <el-form-item label="表名称" prop="tableName">
         <el-input
diff --git a/ruoyi-ui/src/views/tool/gen/index.vue b/ruoyi-ui/src/views/tool/gen/index.vue
index 6e7167de..187b9abf 100644
--- a/ruoyi-ui/src/views/tool/gen/index.vue
+++ b/ruoyi-ui/src/views/tool/gen/index.vue
@@ -158,7 +158,7 @@
       @pagination="getList"
     />
     <!-- 预览界面 -->
-    <el-dialog :title="preview.title" :visible.sync="preview.open" width="80%" top="5vh" append-to-body class="scrollbar">
+    <el-dialog :title="preview.title" :visible.sync="preview.open" width="80%" top="5vh" append-to-body class="scrollbar" :close-on-click-modal="false" :close-on-press-escape="false">
       <el-tabs v-model="preview.activeName">
         <el-tab-pane
           v-for="(value, key) in preview.data"
diff --git a/ruoyi-ui/src/views/trouble/pshMarks/index.vue b/ruoyi-ui/src/views/trouble/pshMarks/index.vue
index 7f0440d8..5c7bfe72 100644
--- a/ruoyi-ui/src/views/trouble/pshMarks/index.vue
+++ b/ruoyi-ui/src/views/trouble/pshMarks/index.vue
@@ -164,7 +164,7 @@
     />
 
     <!-- 添加或修改安全留痕对话框 -->
-    <el-dialog :title="title" :visible.sync="open" width="500px" append-to-body>
+    <el-dialog :title="title" :visible.sync="open" width="500px" append-to-body :close-on-click-modal="false" :close-on-press-escape="false">
       <el-form ref="form" :model="form" :rules="rules" label-width="80px">
         <el-form-item label="id" prop="id">
           <el-input v-model="form.id" placeholder="请输入id" />
@@ -271,7 +271,7 @@
     </el-dialog>
 
     <el-image-viewer v-if="showViewer" :on-close="closeViewer" :url-list="srcList" />
-    <el-dialog title="视频播放" :visible.sync="openVideo" width="980px" :before-close="cancelVideo" append-to-body>
+    <el-dialog title="视频播放" :visible.sync="openVideo" width="980px" :before-close="cancelVideo" append-to-body :close-on-click-modal="false" :close-on-press-escape="false">
       <video ref="video" :src="videoSrc" controls="controls" autoplay="autoplay" poster="../../../assets/images/video_loading.gif" style="max-height: 550px;"/>
       <div slot="footer" class="dialog-footer">
         <el-button @click="cancelVideo">关 闭</el-button>
diff --git a/ruoyi-ui/src/views/trouble/pshProblemmodify/index.vue b/ruoyi-ui/src/views/trouble/pshProblemmodify/index.vue
index 1dbb1eab..a6e005ff 100644
--- a/ruoyi-ui/src/views/trouble/pshProblemmodify/index.vue
+++ b/ruoyi-ui/src/views/trouble/pshProblemmodify/index.vue
@@ -294,7 +294,7 @@
     </el-tabs>
 
     <!-- 添加或修改安全整改对话框 -->
-    <el-dialog :title="title" :visible.sync="open" width="500px" append-to-body>
+    <el-dialog :title="title" :visible.sync="open" width="500px" append-to-body :close-on-click-modal="false" :close-on-press-escape="false">
       <el-form ref="form" :model="form" :rules="rules" label-width="80px">
         <el-form-item label="项目id" prop="projectId">
           <el-input v-model="form.projectId" placeholder="请输入项目id" />
@@ -378,7 +378,7 @@
       :visible.sync="openVideo"
       width="980px"
       :before-close="cancelVideo"
-      append-to-body
+      append-to-body :close-on-click-modal="false" :close-on-press-escape="false"
     >
       <video
         ref="video"
diff --git a/ruoyi-ui/src/views/trouble/sspMarks/index.vue b/ruoyi-ui/src/views/trouble/sspMarks/index.vue
index d685f7cd..d280d2b5 100644
--- a/ruoyi-ui/src/views/trouble/sspMarks/index.vue
+++ b/ruoyi-ui/src/views/trouble/sspMarks/index.vue
@@ -164,7 +164,7 @@
     />
 
     <!-- 添加或修改质量留痕对话框 -->
-    <el-dialog :title="title" :visible.sync="open" width="500px" append-to-body>
+    <el-dialog :title="title" :visible.sync="open" width="500px" append-to-body :close-on-click-modal="false" :close-on-press-escape="false">
       <el-form ref="form" :model="form" :rules="rules" label-width="80px">
         <el-form-item label="id" prop="id">
           <el-input v-model="form.id" placeholder="请输入id" />
@@ -271,7 +271,7 @@
     </el-dialog>
 
     <el-image-viewer v-if="showViewer" :on-close="closeViewer" :url-list="srcList" />
-    <el-dialog title="视频播放" :visible.sync="openVideo" width="980px" :before-close="cancelVideo" append-to-body>
+    <el-dialog title="视频播放" :visible.sync="openVideo" width="980px" :before-close="cancelVideo" append-to-body :close-on-click-modal="false" :close-on-press-escape="false">
       <video ref="video" :src="videoSrc" controls="controls" autoplay="autoplay" poster="../../../assets/images/video_loading.gif" style="max-height: 550px;"/>
       <div slot="footer" class="dialog-footer">
         <el-button @click="cancelVideo">关 闭</el-button>
diff --git a/ruoyi-ui/src/views/trouble/sspProblemmodify/index.vue b/ruoyi-ui/src/views/trouble/sspProblemmodify/index.vue
index 1e7c5cca..c94c2682 100644
--- a/ruoyi-ui/src/views/trouble/sspProblemmodify/index.vue
+++ b/ruoyi-ui/src/views/trouble/sspProblemmodify/index.vue
@@ -288,7 +288,7 @@
     </el-tabs>
 
     <!-- 添加或修改质量整改对话框 -->
-    <el-dialog :title="title" :visible.sync="open" width="500px" append-to-body>
+    <el-dialog :title="title" :visible.sync="open" width="500px" append-to-body :close-on-click-modal="false" :close-on-press-escape="false">
       <el-form ref="form" :model="form" :rules="rules" label-width="80px">
         <el-form-item label="项目id" prop="projectId">
           <el-input v-model="form.projectId" placeholder="请输入项目id" />
@@ -371,7 +371,7 @@
       title="视频播放"
       :visible.sync="openVideo"
       width="980px"
-      :before-close="cancelVideo"
+      :before-close="cancelVideo" :close-on-click-modal="false" :close-on-press-escape="false"
       append-to-body
     >
       <video
diff --git a/ruoyi-ui/src/views/video/aiBoxProjectConfig/aiBoxVideoConfigDrawer.vue b/ruoyi-ui/src/views/video/aiBoxProjectConfig/aiBoxVideoConfigDrawer.vue
index 938d147f..029a45ae 100644
--- a/ruoyi-ui/src/views/video/aiBoxProjectConfig/aiBoxVideoConfigDrawer.vue
+++ b/ruoyi-ui/src/views/video/aiBoxProjectConfig/aiBoxVideoConfigDrawer.vue
@@ -99,7 +99,7 @@
     />
 
     <!-- 添加或修改AI视频配置对话框 -->
-    <el-dialog :title="title" :visible.sync="open" width="720px" append-to-body>
+    <el-dialog :title="title" :visible.sync="open" width="720px" append-to-body :close-on-click-modal="false" :close-on-press-escape="false">
       <el-form ref="form" :model="form" :rules="rules" label-width="100px">
         <el-form-item label="项目名称" prop="projectName">
           <el-input v-model="form.projectName" placeholder="请输入项目名称" :disabled="true"/>
diff --git a/ruoyi-ui/src/views/video/aiBoxProjectConfig/index.vue b/ruoyi-ui/src/views/video/aiBoxProjectConfig/index.vue
index 599a92b0..69b5f54f 100644
--- a/ruoyi-ui/src/views/video/aiBoxProjectConfig/index.vue
+++ b/ruoyi-ui/src/views/video/aiBoxProjectConfig/index.vue
@@ -140,7 +140,7 @@
     />
 
     <!-- 添加或修改AI视频配置对话框 -->
-    <el-dialog :title="title" :visible.sync="open" width="720px" append-to-body>
+    <el-dialog :title="title" :visible.sync="open" width="720px" append-to-body :close-on-click-modal="false" :close-on-press-escape="false">
       <el-form ref="form" :model="form" :rules="rules" label-width="100px">
         <el-form-item label="项目名称" prop="projectId">
           <el-select
diff --git a/ruoyi-ui/src/views/video/videoConfig/index.vue b/ruoyi-ui/src/views/video/videoConfig/index.vue
index a83c27fe..f160d698 100644
--- a/ruoyi-ui/src/views/video/videoConfig/index.vue
+++ b/ruoyi-ui/src/views/video/videoConfig/index.vue
@@ -229,7 +229,7 @@
     />
 
     <!-- 添加或修改视频配置对话框 -->
-    <el-dialog :title="title" :visible.sync="open" width="680px" append-to-body>
+    <el-dialog :title="title" :visible.sync="open" width="680px" append-to-body :close-on-click-modal="false" :close-on-press-escape="false">
       <el-form ref="form" :model="form" :rules="rules" label-width="80px">
         <el-form-item label="项目名称" prop="projectId">
           <el-select
diff --git a/ruoyi-ui/src/views/video/videoConfig/videoConfigDrawer.vue b/ruoyi-ui/src/views/video/videoConfig/videoConfigDrawer.vue
index 4e815310..73677239 100644
--- a/ruoyi-ui/src/views/video/videoConfig/videoConfigDrawer.vue
+++ b/ruoyi-ui/src/views/video/videoConfig/videoConfigDrawer.vue
@@ -162,7 +162,7 @@
       />
 
       <!-- 添加或修改视频配置对话框 -->
-      <el-dialog :title="title" :visible.sync="open" width="680px" append-to-body>
+      <el-dialog :title="title" :visible.sync="open" width="680px" append-to-body :close-on-click-modal="false" :close-on-press-escape="false">
         <el-form ref="form" :model="form" :rules="rules" label-width="80px">
           <el-form-item label="项目名称" prop="projectName">
             <el-input
diff --git a/ruoyi-ui/src/views/work/emergencyDrill/index.vue b/ruoyi-ui/src/views/work/emergencyDrill/index.vue
index 67801067..663b30c2 100644
--- a/ruoyi-ui/src/views/work/emergencyDrill/index.vue
+++ b/ruoyi-ui/src/views/work/emergencyDrill/index.vue
@@ -230,7 +230,7 @@
     />
 
     <!-- 添加或修改演练演练对话框 -->
-    <el-dialog :title="title" :visible.sync="open" width="680px" append-to-body>
+    <el-dialog :title="title" :visible.sync="open" width="680px" append-to-body :close-on-click-modal="false" :close-on-press-escape="false">
       <el-form ref="form" :model="form" :rules="rules" label-width="80px">
         <el-form-item label="项目名称">
           <el-input
diff --git a/ruoyi-ui/src/views/work/workFile/index.vue b/ruoyi-ui/src/views/work/workFile/index.vue
index 5311634f..c957196f 100644
--- a/ruoyi-ui/src/views/work/workFile/index.vue
+++ b/ruoyi-ui/src/views/work/workFile/index.vue
@@ -164,7 +164,7 @@
     />
 
     <!-- 添加或修改文件传达对话框 -->
-    <el-dialog :title="title" v-if="open" :visible.sync="open" width="680px" append-to-body>
+    <el-dialog :title="title" v-if="open" :visible.sync="open" width="680px" append-to-body :close-on-click-modal="false" :close-on-press-escape="false">
       <el-form ref="form" :model="form" :rules="rules" label-width="80px">
         <el-form-item label="文件归属" prop="fileBelong">
           <el-select v-model="form.fileBelong" placeholder="请选择文件归属" style="width: 100%;">
diff --git a/ruoyi-ui/src/views/work/workJournalism/index.vue b/ruoyi-ui/src/views/work/workJournalism/index.vue
index c1f38406..8978568c 100644
--- a/ruoyi-ui/src/views/work/workJournalism/index.vue
+++ b/ruoyi-ui/src/views/work/workJournalism/index.vue
@@ -228,7 +228,7 @@
       />
     </el-tabs>
     <!-- 添加或修改集团新闻对话框 -->
-    <el-dialog :title="title" :visible.sync="open" width="800px" append-to-body>
+    <el-dialog :title="title" :visible.sync="open" width="800px" append-to-body :close-on-click-modal="false" :close-on-press-escape="false">
       <el-form ref="form" :model="form" :rules="rules" label-width="120px">
         <el-form-item label="新闻标题" prop="title">
           <el-input v-model="form.title" placeholder="请输入新闻标题" />
diff --git a/ruoyi-ui/src/views/work/workTrain/index.vue b/ruoyi-ui/src/views/work/workTrain/index.vue
index 44984742..cdc940de 100644
--- a/ruoyi-ui/src/views/work/workTrain/index.vue
+++ b/ruoyi-ui/src/views/work/workTrain/index.vue
@@ -230,7 +230,7 @@
     />
 
     <!-- 添加或修改演练培训对话框 -->
-    <el-dialog :title="title" :visible.sync="open" width="680px" append-to-body>
+    <el-dialog :title="title" :visible.sync="open" width="680px" append-to-body :close-on-click-modal="false" :close-on-press-escape="false">
       <el-form ref="form" :model="form" :rules="rules" label-width="80px">
         <el-form-item label="培训主图" prop="mainImage">
           <image-upload v-model="form.mainImage" :limit="1" />
diff --git a/ruoyi-ui/src/views/wxsetting/wxMenConfig/index.vue b/ruoyi-ui/src/views/wxsetting/wxMenConfig/index.vue
index b3f2ad2f..f543d0e5 100644
--- a/ruoyi-ui/src/views/wxsetting/wxMenConfig/index.vue
+++ b/ruoyi-ui/src/views/wxsetting/wxMenConfig/index.vue
@@ -133,7 +133,7 @@
     />
 
     <!-- 添加或修改菜单配置对话框 -->
-    <el-dialog :title="title" :visible.sync="open" width="500px" append-to-body>
+    <el-dialog :title="title" :visible.sync="open" width="500px" append-to-body :close-on-click-modal="false" :close-on-press-escape="false">
       <el-form ref="form" :model="form" :rules="rules" label-width="80px">
         <el-form-item label="菜单图标" prop="menuImg">
           <image-upload v-model="form.menuImg" :limit="1"/>
diff --git a/ruoyi-ui/vue.config.js b/ruoyi-ui/vue.config.js
index b6e02c50..945f0299 100644
--- a/ruoyi-ui/vue.config.js
+++ b/ruoyi-ui/vue.config.js
@@ -41,8 +41,8 @@ module.exports = {
       //   }
       // },   
       '/jhapi':{
-        //target: `http://62.234.3.186/jhapi/`,
-        target: `http://127.0.0.1:8090/jhapi/`,
+        target: `http://62.234.3.186/jhapi/`,
+        //target: `http://127.0.0.1:8090/jhapi/`,
         changeOrigin: true,
         pathRewrite: {
           '^/jhapi':'/'
diff --git a/yanzhu-bigscreen/src/main/java/com/yanzhu/jh/bigscreen/web/controller/BgWorkTrainController.java b/yanzhu-bigscreen/src/main/java/com/yanzhu/jh/bigscreen/web/controller/BgWorkTrainController.java
index d894841a..7bbfc137 100644
--- a/yanzhu-bigscreen/src/main/java/com/yanzhu/jh/bigscreen/web/controller/BgWorkTrainController.java
+++ b/yanzhu-bigscreen/src/main/java/com/yanzhu/jh/bigscreen/web/controller/BgWorkTrainController.java
@@ -6,12 +6,13 @@ import com.ruoyi.common.core.page.TableDataInfo;
 import com.ruoyi.common.core.text.Convert;
 import com.ruoyi.common.utils.SecurityUtils;
 import com.ruoyi.common.utils.StringUtils;
+import com.yanzhu.jh.project.domain.SurProjectDeptWroks;
 import com.yanzhu.jh.work.domain.WorkTrain;
 import com.yanzhu.jh.work.service.IWorkTrainService;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.List;
 
 /**
  * 培训演训Conller
@@ -45,4 +46,39 @@ public class BgWorkTrainController extends BaseController {
         return getDataTable(workTrainService.selectBgscreenWorkTrainListv2(workTrain));
     }
 
+    /**
+     * 大屏教训培训，应急演练图标数据查询
+     * @return
+     */
+    @GetMapping("/getGroupByDataType")
+    public AjaxResult getGroupByDataType(String deptId, String projectId){
+        WorkTrain workTrain = new WorkTrain();
+        if(deptId!=null && !"0".equals(deptId)){
+            workTrain.setNowDept(deptId);
+        }else{
+            if (SecurityUtils.isUserB()) {
+                workTrain.setPrjIds(getProjectIds());
+            }
+        }
+        if(projectId!=null && !"0".equals(projectId)){
+            workTrain.setProjectId(Convert.toLong(projectId));
+        }
+        return AjaxResult.success(workTrainService.getGroupByDataType(workTrain));
+    }
+
+    @PostMapping("/queryWorkTrainList")
+    public TableDataInfo queryWorkTrainList(@RequestBody WorkTrain where){
+        Long deptId= where.getDeptId();
+        if(deptId!=null && deptId>0){
+            where.setNowDept(""+deptId);
+        }else{
+            if (SecurityUtils.isUserB()) {
+                where.setPrjIds(getProjectIds());
+            }
+        }
+        startPage();
+        List<WorkTrain> list=workTrainService.queryWorkTrainList(where);
+        return getDataTable(list);
+    }
+
 }
diff --git a/yanzhu-bigscreen/src/main/java/com/yanzhu/jh/bigscreen/web/controller/ProjectCheckingController.java b/yanzhu-bigscreen/src/main/java/com/yanzhu/jh/bigscreen/web/controller/ProjectCheckingController.java
index ecf39f1f..8c650f8c 100644
--- a/yanzhu-bigscreen/src/main/java/com/yanzhu/jh/bigscreen/web/controller/ProjectCheckingController.java
+++ b/yanzhu-bigscreen/src/main/java/com/yanzhu/jh/bigscreen/web/controller/ProjectCheckingController.java
@@ -8,9 +8,7 @@ import com.ruoyi.common.utils.SecurityUtils;
 import com.yanzhu.jh.project.domain.SurProjectChecking;
 import com.yanzhu.jh.project.service.ISurProjectCheckingService;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.bind.annotation.*;
 
 /**
  * 项目验收Conller
@@ -65,4 +63,69 @@ public class ProjectCheckingController extends BaseController {
         }
         return success(surProjectCheckingService.selectBgscreenProjectCheckingView(surProjectChecking));
     }
+
+    /**
+     * 根据验收类型2级分组查询，用于大屏质量管理-举牌验收图表
+     * @param deptId
+     * @param projectId
+     * @return
+     */
+    @GetMapping("/getProjectCheckingGroupFoChart")
+    public AjaxResult getProjectCheckingGroupFoChart(String deptId, String projectId){
+        SurProjectChecking surProjectChecking = new SurProjectChecking();
+        if(deptId!=null && !"0".equals(deptId)){
+            surProjectChecking.setProjectDeptId(deptId);
+        }else{
+            if (SecurityUtils.isUserB()) {
+                surProjectChecking.setPrjIds(getProjectIds());
+            }
+        }
+        if(projectId!=null && !"0".equals(projectId)){
+            surProjectChecking.setProjectId(Convert.toLong(projectId));
+        }
+        return success(surProjectCheckingService.getProjectCheckingGroupFoChart(surProjectChecking));
+    }
+
+    /**
+     * 根据验收类型2级分组查询，用于大屏质量管理-举牌验收分组查询
+     * @param deptId
+     * @param projectId
+     * @return
+     */
+    @GetMapping("/groupCheckingByProjectId")
+    public AjaxResult groupCheckingByProjectId(String lvl,String deptId, String projectId){
+        SurProjectChecking surProjectChecking = new SurProjectChecking();
+        surProjectChecking.setDataTypeLvl2(lvl);
+        if(deptId!=null && !"0".equals(deptId)){
+            surProjectChecking.setProjectDeptId(deptId);
+        }else{
+            if (SecurityUtils.isUserB()) {
+                surProjectChecking.setPrjIds(getProjectIds());
+            }
+        }
+        if(projectId!=null && !"0".equals(projectId)){
+            surProjectChecking.setProjectId(Convert.toLong(projectId));
+        }
+        return success(surProjectCheckingService.groupCheckingByProjectId(surProjectChecking));
+    }
+
+
+    @PostMapping("/queryProjectCheckingList")
+    public TableDataInfo queryProjectCheckingList(@RequestBody SurProjectChecking where){
+        Long deptId=where.getDeptId();
+        Long projectId=where.getProjectId();
+        if(deptId!=null && deptId.equals(0)){
+            where.setProjectDeptId(""+deptId);
+            where.setDeptId(null);
+        }else{
+            if (SecurityUtils.isUserB()) {
+                where.setPrjIds(getProjectIds());
+            }
+        }
+        if(projectId!=null && projectId.equals(0)){
+            where.setProjectId(Convert.toLong(projectId));
+        }
+        startPage();
+        return getDataTable(surProjectCheckingService.selectBgscreenProjectCheckingListByPage(where));
+    }
 }
diff --git a/yanzhu-jh/src/main/java/com/yanzhu/jh/project/domain/SurProjectChecking.java b/yanzhu-jh/src/main/java/com/yanzhu/jh/project/domain/SurProjectChecking.java
index 717bd58e..6963da14 100644
--- a/yanzhu-jh/src/main/java/com/yanzhu/jh/project/domain/SurProjectChecking.java
+++ b/yanzhu-jh/src/main/java/com/yanzhu/jh/project/domain/SurProjectChecking.java
@@ -105,6 +105,30 @@ public class SurProjectChecking extends BaseEntity
     @Excel(name = "审核状态")
     private String approveStatus;
 
+
+    @Excel(name = "验收类型")
+    private String dataTypeLvl1;
+
+    public String getDataTypeLvl1() {
+        return dataTypeLvl1;
+    }
+
+    public void setDataTypeLvl1(String dataTypeLvl1) {
+        this.dataTypeLvl1 = dataTypeLvl1;
+    }
+
+    public String getDataTypeLvl2() {
+        return dataTypeLvl2;
+    }
+
+    public void setDataTypeLvl2(String dataTypeLvl2) {
+        this.dataTypeLvl2 = dataTypeLvl2;
+    }
+
+    @Excel(name = "子验收类型")
+    private String dataTypeLvl2;
+
+
     private String projectName;
     private String deptName;
 
diff --git a/yanzhu-jh/src/main/java/com/yanzhu/jh/project/mapper/SurProjectCheckingMapper.java b/yanzhu-jh/src/main/java/com/yanzhu/jh/project/mapper/SurProjectCheckingMapper.java
index 2e2c723c..6949b317 100644
--- a/yanzhu-jh/src/main/java/com/yanzhu/jh/project/mapper/SurProjectCheckingMapper.java
+++ b/yanzhu-jh/src/main/java/com/yanzhu/jh/project/mapper/SurProjectCheckingMapper.java
@@ -32,11 +32,15 @@ public interface SurProjectCheckingMapper
     /**
      * 查询项目验收列表
      *
-     * @param surProjectChecking 项目验收
      * @return 项目验收集合
      */
     public List<SurProjectChecking> selectBgscreenProjectCheckingList(SurProjectChecking surProjectChecking);
-
+    /**
+     * 查询项目验收列表(分页)
+     *
+     * @return 项目验收集合
+     */
+    public List<SurProjectChecking> selectBgscreenProjectCheckingListByPage(SurProjectChecking where);
     /**
      * 查询项目验收统计
      *
@@ -84,4 +88,10 @@ public interface SurProjectCheckingMapper
      * @return 结果
      */
     public List<Map<String,Object>> findStatisticsByProjectId(Long projectId);
+
+    public List<SurProjectChecking> playVideo(SurProjectChecking where);
+
+    List<SurProjectChecking> selectProjectCheckingGroupFoChart(SurProjectChecking surProjectChecking);
+
+    List<SurProjectChecking> groupCheckingByProjectId(SurProjectChecking where);
 }
diff --git a/yanzhu-jh/src/main/java/com/yanzhu/jh/project/service/ISurProjectCheckingService.java b/yanzhu-jh/src/main/java/com/yanzhu/jh/project/service/ISurProjectCheckingService.java
index 761dac81..4eb6e01a 100644
--- a/yanzhu-jh/src/main/java/com/yanzhu/jh/project/service/ISurProjectCheckingService.java
+++ b/yanzhu-jh/src/main/java/com/yanzhu/jh/project/service/ISurProjectCheckingService.java
@@ -92,4 +92,20 @@ public interface ISurProjectCheckingService
      * @return 结果
      */
     public List<Map<String,Object>> findStatisticsByProjectId(Long projectId);
+
+    /**
+     * 根据验收类型2级分组查询，用于大屏质量管理-举牌验收图表
+     * @param surProjectChecking
+     * @return
+     */
+    public List<SurProjectChecking>  getProjectCheckingGroupFoChart(SurProjectChecking surProjectChecking);
+
+    /**
+     * 根据验收类型2级分组查询，用于大屏质量管理-举牌验收分组查询
+     * @param surProjectChecking
+     * @return
+     */
+    public List<SurProjectChecking> groupCheckingByProjectId(SurProjectChecking surProjectChecking);
+
+    public List<SurProjectChecking> selectBgscreenProjectCheckingListByPage(SurProjectChecking where);
 }
diff --git a/yanzhu-jh/src/main/java/com/yanzhu/jh/project/service/impl/SurProjectCheckingServiceImpl.java b/yanzhu-jh/src/main/java/com/yanzhu/jh/project/service/impl/SurProjectCheckingServiceImpl.java
index ac489614..a3181a65 100644
--- a/yanzhu-jh/src/main/java/com/yanzhu/jh/project/service/impl/SurProjectCheckingServiceImpl.java
+++ b/yanzhu-jh/src/main/java/com/yanzhu/jh/project/service/impl/SurProjectCheckingServiceImpl.java
@@ -229,4 +229,19 @@ public class SurProjectCheckingServiceImpl implements ISurProjectCheckingService
     public List<Map<String,Object>> findStatisticsByProjectId(Long projectId) {
         return surProjectCheckingMapper.findStatisticsByProjectId(projectId);
     }
+
+    @Override
+    public List<SurProjectChecking> getProjectCheckingGroupFoChart(SurProjectChecking surProjectChecking) {
+        return surProjectCheckingMapper.selectProjectCheckingGroupFoChart(surProjectChecking);
+    }
+
+    @Override
+    public List<SurProjectChecking> groupCheckingByProjectId(SurProjectChecking where) {
+        return surProjectCheckingMapper.groupCheckingByProjectId(where);
+    }
+
+    @Override
+    public List<SurProjectChecking> selectBgscreenProjectCheckingListByPage(SurProjectChecking where) {
+        return surProjectCheckingMapper.selectBgscreenProjectCheckingListByPage(where);
+    }
 }
diff --git a/yanzhu-jh/src/main/java/com/yanzhu/jh/work/domain/WorkTrain.java b/yanzhu-jh/src/main/java/com/yanzhu/jh/work/domain/WorkTrain.java
index 2cee3405..b440ae20 100644
--- a/yanzhu-jh/src/main/java/com/yanzhu/jh/work/domain/WorkTrain.java
+++ b/yanzhu-jh/src/main/java/com/yanzhu/jh/work/domain/WorkTrain.java
@@ -70,6 +70,17 @@ public class WorkTrain extends BaseEntity
     @Excel(name = "演训内容")
     private String trainFile;
 
+    /** 数据类型 */
+    private Integer dataType;
+
+    public Integer getDataType() {
+        return dataType;
+    }
+
+    public void setDataType(Integer dataType) {
+        this.dataType = dataType;
+    }
+
     /** 演练培训协同部门信息 */
     private List<WorkTrainDept> workTrainDeptList;
 
diff --git a/yanzhu-jh/src/main/java/com/yanzhu/jh/work/mapper/WorkTrainMapper.java b/yanzhu-jh/src/main/java/com/yanzhu/jh/work/mapper/WorkTrainMapper.java
index 0109a139..6378cf1c 100644
--- a/yanzhu-jh/src/main/java/com/yanzhu/jh/work/mapper/WorkTrainMapper.java
+++ b/yanzhu-jh/src/main/java/com/yanzhu/jh/work/mapper/WorkTrainMapper.java
@@ -118,4 +118,8 @@ public interface WorkTrainMapper
      * @return 结果
      */
     public List<Map<String,Object>> findGroupCountByProjectId(Long projectId);
+
+    public List<WorkTrain> getGroupByDataType(WorkTrain workTrain);
+
+    public List<WorkTrain> queryWorkTrainList(WorkTrain where);
 }
diff --git a/yanzhu-jh/src/main/java/com/yanzhu/jh/work/service/IWorkTrainService.java b/yanzhu-jh/src/main/java/com/yanzhu/jh/work/service/IWorkTrainService.java
index e1f15c28..5f9f712c 100644
--- a/yanzhu-jh/src/main/java/com/yanzhu/jh/work/service/IWorkTrainService.java
+++ b/yanzhu-jh/src/main/java/com/yanzhu/jh/work/service/IWorkTrainService.java
@@ -92,4 +92,8 @@ public interface IWorkTrainService
      * @return 结果
      */
     public List<Map<String,Object>> findGroupCountByProjectId(Long projectId);
+
+    public List<WorkTrain> getGroupByDataType(WorkTrain workTrain);
+
+    public List<WorkTrain> queryWorkTrainList(WorkTrain where);
 }
diff --git a/yanzhu-jh/src/main/java/com/yanzhu/jh/work/service/impl/WorkTrainServiceImpl.java b/yanzhu-jh/src/main/java/com/yanzhu/jh/work/service/impl/WorkTrainServiceImpl.java
index e5121153..77bb0401 100644
--- a/yanzhu-jh/src/main/java/com/yanzhu/jh/work/service/impl/WorkTrainServiceImpl.java
+++ b/yanzhu-jh/src/main/java/com/yanzhu/jh/work/service/impl/WorkTrainServiceImpl.java
@@ -220,4 +220,14 @@ public class WorkTrainServiceImpl implements IWorkTrainService
     public List<Map<String,Object>> findGroupCountByProjectId(Long projectId) {
         return workTrainMapper.findGroupCountByProjectId(projectId);
     }
+
+    @Override
+    public List<WorkTrain> getGroupByDataType(WorkTrain workTrain) {
+        return workTrainMapper.getGroupByDataType(workTrain);
+    }
+
+    @Override
+    public List<WorkTrain> queryWorkTrainList(WorkTrain where) {
+        return workTrainMapper.queryWorkTrainList(where);
+    }
 }
diff --git a/yanzhu-jh/src/main/resources/mapper/project/SurProjectCheckingMapper.xml b/yanzhu-jh/src/main/resources/mapper/project/SurProjectCheckingMapper.xml
index 3568a2ac..3ab45a8f 100644
--- a/yanzhu-jh/src/main/resources/mapper/project/SurProjectCheckingMapper.xml
+++ b/yanzhu-jh/src/main/resources/mapper/project/SurProjectCheckingMapper.xml
@@ -34,6 +34,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="projectName"    column="projectName"    />
         <result property="deptName"    column="dept_name"    />
         <result property="approveStatus"    column="approve_status"    />
+        <result property="dataTypeLvl1"    column="data_type_lvl1"    />
+        <result property="dataTypeLvl2"    column="data_type_lvl2"    />
     </resultMap>
 
     <sql id="selectSurProjectCheckingVo">
@@ -87,7 +89,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </select>
 
     <select id="selectBgscreenProjectCheckingList" parameterType="SurProjectChecking" resultMap="SurProjectCheckingResult">
-        select spc.id, spc.project_id, spc.dept_id, spc.group_dept_id, spc.check_type, spc.main_image, spc.image_urls, spc.working_position_type, spc.check_working_position, spc.checking_num, spc.check_result, spc.intro, spc.quality_user, spc.quality_user_name, spc.supervise_user, spc.supervise_user_name, spc.group_dept_user, spc.group_dept_user_name, spc.checking_date, spc.checking_files, spc.is_del, spc.create_by, spc.create_time, spc.update_by, spc.update_time, spc.remark, spc.approve_status, sp.projectName, sd.dept_name from sur_project_checking spc
+        select spc.id, spc.project_id, spc.dept_id, spc.group_dept_id, spc.check_type, spc.main_image, spc.image_urls, spc.working_position_type, spc.check_working_position, spc.checking_num, spc.check_result, spc.intro, spc.quality_user, spc.quality_user_name, spc.supervise_user, spc.supervise_user_name, spc.group_dept_user, spc.group_dept_user_name, spc.checking_date, spc.checking_files, spc.is_del, spc.create_by, spc.create_time, spc.update_by, spc.update_time, spc.remark, spc.approve_status, sp.projectName, sd.dept_name
+        from sur_project_checking spc
         left join sur_project sp on spc.project_id = sp.id
         left join sys_dept sd on sd.dept_id = spc.dept_id
         <!--监理单位/总包公司/分包单位-->
@@ -101,6 +104,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
                     #{item}
                 </foreach>
             </if>
+            <if test="dataTypeLvl2 != null "> and spc.data_type_lvl2 = #{dataTypeLvl2}</if>
             <if test="projectName != null and projectName != ''"> and sp.projectName like concat('%', #{projectName}, '%')</if>
             <if test="deptId != null "> and spc.dept_id = #{deptId}</if>
             <if test="deptName != null and deptName != ''"> and sd.dept_name like concat('%', #{deptName}, '%')</if>
@@ -130,6 +134,53 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         limit 0,10
     </select>
 
+
+
+    <select id="selectBgscreenProjectCheckingListByPage" parameterType="SurProjectChecking" resultMap="SurProjectCheckingResult">
+        select spc.id, spc.project_id, spc.dept_id, spc.group_dept_id, spc.check_type, spc.main_image, spc.image_urls, spc.working_position_type, spc.check_working_position, spc.checking_num, spc.check_result, spc.intro, spc.quality_user, spc.quality_user_name, spc.supervise_user, spc.supervise_user_name, spc.group_dept_user, spc.group_dept_user_name, spc.checking_date, spc.checking_files, spc.is_del, spc.create_by, spc.create_time, spc.update_by, spc.update_time, spc.remark, spc.approve_status, sp.projectName, sd.dept_name
+        from sur_project_checking spc
+        left join sur_project sp on spc.project_id = sp.id
+        left join sys_dept sd on sd.dept_id = spc.dept_id
+        <!--监理单位/总包公司/分包单位-->
+        <if test='nowRole == "5" or nowRole == "6" or nowRole == "7"'> left join sur_project_unit_info spui on spui.projectId = sp.id</if>
+        <where>
+            and spc.is_del=0
+            <if test="projectId != null "> and spc.project_id = #{projectId}</if>
+            <if test="prjIds !=null and prjIds.size()>0">
+                and spc.project_id in
+                <foreach collection="prjIds"  item="item" index="index" open="(" close=")" separator=",">
+                    #{item}
+                </foreach>
+            </if>
+            <if test="dataTypeLvl2 != null "> and spc.data_type_lvl2 = #{dataTypeLvl2}</if>
+            <if test="projectName != null and projectName != ''"> and sp.projectName like concat('%', #{projectName}, '%')</if>
+            <if test="deptId != null "> and spc.dept_id = #{deptId}</if>
+            <if test="deptName != null and deptName != ''"> and sd.dept_name like concat('%', #{deptName}, '%')</if>
+            <if test="groupDeptId != null "> and spc.group_dept_id = #{groupDeptId}</if>
+            <if test="checkType != null  and checkType != ''"> and spc.check_type = #{checkType}</if>
+            <if test="workingPositionType != null  and workingPositionType != ''"> and spc.working_position_type = #{workingPositionType}</if>
+            <if test="checkWorkingPosition != null  and checkWorkingPosition != ''"> and spc.check_working_position like concat('%', #{checkWorkingPosition}, '%')</if>
+            <if test="checkResult != null  and checkResult != ''"> and spc.check_result = #{checkResult}</if>
+            <if test="qualityUser != null  and qualityUser != ''"> and (spc.quality_user like concat('%', #{qualityUser}, '%') or spc.quality_user_name like concat('%', #{qualityUser}, '%'))</if>
+            <if test="qualityUserName != null  and qualityUserName != ''"> and spc.quality_user_name like concat('%', #{qualityUserName}, '%')</if>
+            <if test="superviseUser != null  and superviseUser != ''"> and (spc.supervise_user like concat('%', #{superviseUser}, '%') or spc.supervise_user_name like concat('%', #{superviseUser}, '%'))</if>
+            <if test="superviseUserName != null  and superviseUserName != ''"> and spc.supervise_user_name like concat('%', #{superviseUserName}, '%')</if>
+            <if test="groupDeptUser != null  and groupDeptUser != ''"> and spc.group_dept_user like concat('%', #{groupDeptUser}, '%')</if>
+            <if test="groupDeptUserName != null  and groupDeptUserName != ''"> and spc.group_dept_user_name like concat('%', #{groupDeptUserName}, '%')</if>
+            <if test="params.beginCheckingDate != null and params.beginCheckingDate != '' and params.endCheckingDate != null and params.endCheckingDate != ''"> and spc.checking_date between #{params.beginCheckingDate} and #{params.endCheckingDate}</if>
+            <if test="isDel != null "> and spc.is_del = #{isDel}</if>
+            <!-- 查询条件-项目部门 -->
+            <if test="projectDeptId != null "> and sp.deptId = #{projectDeptId}</if>
+            <!--子部门数据-->
+            <if test='nowRole == "4"'> and sp.deptId = #{nowDept}</if>
+            <!--监理单位/总包公司/分包单位查询当前关联数据-->
+            <if test='nowRole == "5" or nowRole == "6" or nowRole == "7"'> and spui.unitId = #{nowDept}</if>
+            <!--普通用户查询项目人员-->
+            <if test='nowRole == "15" or nowRole == "16" or nowRole == "17" or nowRole == "99"'> and spc.create_by = #{nowUserName}</if>
+        </where>
+        order by checking_date desc
+    </select>
+
     <select id="selectBgscreenProjectCheckingView" parameterType="SurProjectChecking" resultType="map">
         select spc.check_result, count(spc.id) as total from sur_project_checking spc
         left join sur_project sp on spc.project_id = sp.id
@@ -180,7 +231,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         GROUP BY
             spc.project_id
     </select>
-        
+
+
     <insert id="insertSurProjectChecking" parameterType="SurProjectChecking" useGeneratedKeys="true" keyProperty="id">
         insert into sur_project_checking
         <trim prefix="(" suffix=")" suffixOverrides=",">
@@ -208,6 +260,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="createTime != null">create_time,</if>
             <if test="updateBy != null">update_by,</if>
             <if test="updateTime != null">update_time,</if>
+            <if test="dataTypeLvl1 != null">data_type_lvl1,</if>
+            <if test="dataTypeLvl2 != null">data_type_lvl2,</if>
             <if test="remark != null">remark,</if>
             <if test="approveStatus != null">approve_status,</if>
          </trim>
@@ -236,6 +290,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="createTime != null">#{createTime},</if>
             <if test="updateBy != null">#{updateBy},</if>
             <if test="updateTime != null">#{updateTime},</if>
+            <if test="dataTypeLvl1 != null">#{dataTypeLvl1},</if>
+            <if test="dataTypeLvl2 != null">#{dataTypeLvl2},</if>
             <if test="remark != null">#{remark},</if>
             <if test="approveStatus != null">#{approveStatus},</if>
          </trim>
@@ -268,6 +324,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="createTime != null">create_time = #{createTime},</if>
             <if test="updateBy != null">update_by = #{updateBy},</if>
             <if test="updateTime != null">update_time = #{updateTime},</if>
+            <if test="dataTypeLvl1 != null">data_type_lvl1 = #{dataTypeLvl1},</if>
+            <if test="dataTypeLvl2 != null">data_type_lvl2 = #{dataTypeLvl2},</if>
             <if test="remark != null">remark = #{remark},</if>
             <if test="approveStatus != null">approve_status = #{approveStatus},</if>
         </trim>
@@ -284,4 +342,41 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             #{id}
         </foreach>
     </delete>
+    <select id="selectProjectCheckingGroupFoChart" parameterType="SurProjectChecking" resultMap="SurProjectCheckingResult">
+        select a.dict_value data_type_lvl2,dict_label main_image,a.css_class check_type,b.cnt id from
+        (
+        SELECT *
+        FROM sys_dict_data WHERE dict_type='project_checking_data_type_lvl2'
+        ) a
+        left join
+        (
+        SELECT data_type_lvl2,count(1) cnt
+        FROM sur_project_checking a,sur_project b WHERE a.project_id=b.id
+            and a.is_del=0
+            <if test="projectId != null "> and a.project_id = #{projectId}</if>
+            <if test="projectDeptId != null "> and b.deptId = #{projectDeptId}</if>
+            <if test="prjIds !=null and prjIds.size()>0">
+                and a.project_id in
+                <foreach collection="prjIds"  item="item" index="index" open="(" close=")" separator=",">
+                    #{item}
+                </foreach>
+            </if>
+        group by data_type_lvl2
+        ) b
+        on a.dict_value=b.data_type_lvl2
+    </select>
+    <select id="groupCheckingByProjectId" parameterType="SurProjectChecking" resultMap="SurProjectCheckingResult">
+        SELECT a.project_id,COUNT(1) id,b.projectName
+        FROM sur_project_checking a,sur_project b WHERE a.project_id=b.id  AND a.data_type_lvl2=#{dataTypeLvl2}
+        and a.is_del=0
+        <if test="projectId != null "> and a.project_id = #{projectId}</if>
+        <if test="projectDeptId != null "> and b.deptId = #{projectDeptId}</if>
+        <if test="prjIds !=null and prjIds.size()>0">
+            and a.project_id in
+            <foreach collection="prjIds"  item="item" index="index" open="(" close=")" separator=",">
+                #{item}
+            </foreach>
+        </if>
+        GROUP BY a.project_id
+    </select>
 </mapper>
\ No newline at end of file
diff --git a/yanzhu-jh/src/main/resources/mapper/work/WorkTrainMapper.xml b/yanzhu-jh/src/main/resources/mapper/work/WorkTrainMapper.xml
index 3e4c6e43..a9bdde08 100644
--- a/yanzhu-jh/src/main/resources/mapper/work/WorkTrainMapper.xml
+++ b/yanzhu-jh/src/main/resources/mapper/work/WorkTrainMapper.xml
@@ -25,6 +25,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="remark"    column="remark"    />
         <result property="vDel"    column="v_del"    />
         <result property="trainNatureName"    column="train_nature_name"    />
+        <result property="dataType"    column="data_type"    />
     </resultMap>
 
     <resultMap id="WorkTrainWorkTrainDeptResult" type="WorkTrain" extends="WorkTrainResult">
@@ -174,6 +175,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="updateBy != null">update_by,</if>
             <if test="updateTime != null">update_time,</if>
             <if test="remark != null">remark,</if>
+            <if test="dataType != null">data_type,</if>
          </trim>
         <trim prefix="values (" suffix=")" suffixOverrides=",">
             <if test="projectId != null">#{projectId},</if>
@@ -193,9 +195,11 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="updateBy != null">#{updateBy},</if>
             <if test="updateTime != null">#{updateTime},</if>
             <if test="remark != null">#{remark},</if>
+            <if test="dataType != null">#{dataType},</if>
          </trim>
     </insert>
 
+
     <update id="updateWorkTrain" parameterType="WorkTrain">
         update work_train
         <trim prefix="SET" suffixOverrides=",">
@@ -215,6 +219,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="createTime != null">create_time = #{createTime},</if>
             <if test="updateBy != null">update_by = #{updateBy},</if>
             <if test="updateTime != null">update_time = #{updateTime},</if>
+            <if test="dataType != null">data_type = #{dataType},</if>
             <if test="remark != null">remark = #{remark},</if>
         </trim>
         where id = #{id}
@@ -248,4 +253,50 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             ( #{item.trainId}, #{item.deptId}, #{item.isMain})
         </foreach>
     </insert>
+    <select id="getGroupByDataType" parameterType="WorkTrain" resultMap="WorkTrainResult">
+        SELECT a.dict_value data_type,dict_label train_title,css_class train_type,b.cnt id
+        FROM (
+                 SELECT *
+                 FROM sys_dict_data WHERE dict_type='work_train_data_type' ) a
+                 LEFT JOIN
+             (
+                 SELECT COUNT(1) cnt,data_type
+                 FROM work_train
+                 <where>
+                <if test="nowDept != null and nowDept != ''"> and sp.deptId = #{nowDept}</if>
+                <if test="projectId != null"> and project_id = #{projectId}</if>
+                <if test="prjIds !=null and prjIds.size()>0">
+                    and project_id in
+                    <foreach collection="prjIds"  item="item" index="index" open="(" close=")" separator=",">
+                        #{item}
+                    </foreach>
+                </if>
+                 </where>
+                 GROUP BY data_type
+             ) b ON a.dict_value=b.data_type
+    </select>
+    <select id="queryWorkTrainList"  parameterType="WorkTrain" resultMap="WorkTrainResult">
+        select wt.id, wt.project_id, wt.project_name, wt.main_image, wt.train_type, wt.train_title, wt.train_nature, sdd.dict_label as train_nature_name, wt.train_participants, wt.begin_date, wt.end_date, wt.train_content, wt.train_file, wt.is_del, wt.create_by, wt.create_time, wt.update_by, wt.update_time, wt.remark, group_concat(sd.dept_id) as trainDeptIds, group_concat(sd.dept_name) as trainDeptNames
+        from work_train wt
+        left join work_train_dept wtd on wtd.train_id = wt.id
+        left join sys_dept sd on sd.dept_id = wtd.dept_id
+        left join sur_project sp on sp.id = wt.project_id
+        <if test='trainType != null  and trainType == "0"'> left join sys_dict_data sdd on sdd.dict_type = 'train_nature_zxpx' and wt.train_nature = sdd.dict_value</if>
+        <if test='trainType != null  and trainType == "1"'> left join sys_dict_data sdd on sdd.dict_type = 'train_nature_yjyl' and wt.train_nature = sdd.dict_value</if>
+        <where>
+            and wt.is_del=0
+            <if test="dataType != null and dataType != 0 "> and wt.data_type = #{dataType}</if>
+            <if test="nowDept != null and nowDept != ''"> and sp.deptId = #{nowDept}</if>
+            <if test="trainType != null  and trainType != ''"> and wt.train_type = #{trainType}</if>
+            <if test="projectId != null and projectId!=0"> and wt.project_id = #{projectId}</if>
+            <if test="prjIds !=null and prjIds.size()>0">
+                and wt.project_id in
+                <foreach collection="prjIds"  item="item" index="index" open="(" close=")" separator=",">
+                    #{item}
+                </foreach>
+            </if>
+        </where>
+        group by wt.id
+        order by wt.create_time desc
+    </select>
 </mapper>
\ No newline at end of file