From 87ed3ecc23cb3cb7d0e96af26d776d7a8ec67457 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=A7=9C=E7=8E=89=E7=90=A6?=
 <7507756+jiang_yuqi@user.noreply.gitee.com>
Date: Tue, 15 Aug 2023 14:02:08 +0800
Subject: [PATCH] =?UTF-8?q?=E6=8F=90=E4=BA=A4=E4=B8=80=E4=B8=8B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../views/project/surProjectSpecial/index.vue | 57 +++++++++---
 .../surProjectSpecialDrawer.vue               | 90 ++++++++++++++-----
 .../projectUserInfoDrawer.vue                 |  4 +-
 .../emergencyDrill/emergencyDrillDrawer.vue   | 22 ++---
 .../src/views/work/emergencyDrill/index.vue   | 12 +--
 ruoyi-ui/src/views/work/workTrain/index.vue   |  6 +-
 .../views/work/workTrain/workTrainDrawer.vue  | 16 ++--
 7 files changed, 143 insertions(+), 64 deletions(-)

diff --git a/ruoyi-ui/src/views/project/surProjectSpecial/index.vue b/ruoyi-ui/src/views/project/surProjectSpecial/index.vue
index 16e61390..c4d59cd7 100644
--- a/ruoyi-ui/src/views/project/surProjectSpecial/index.vue
+++ b/ruoyi-ui/src/views/project/surProjectSpecial/index.vue
@@ -17,7 +17,7 @@
           @keyup.enter.native="handleQuery"
         />
       </el-form-item>
-      <el-form-item label="是否有证" prop="isCredential">
+      <el-form-item label="是否有证" prop="isCredential" v-if="false">
         <el-select v-model="queryParams.isCredential" placeholder="请选择是否有证书" clearable>
           <el-option
             v-for="dict in dict.type.sys_yes_no"
@@ -27,6 +27,14 @@
           />
         </el-select>
       </el-form-item>
+      <el-form-item label="证书编号" prop="credentialNumber">
+        <el-input
+          v-model="queryParams.credentialNumber"
+          placeholder="请输入证书编号"
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
       <el-form-item label="责任主体" prop="projectDeptId" v-hasPermi="['project:project:zgs']">
         <el-select v-model="queryParams.projectDeptId" placeholder="请选择责任主体" clearable>
             <el-option
@@ -111,14 +119,22 @@
           <span>{{ parseTime(scope.row.credentialExpirationTime, '{y}-{m}-{d}') }}</span>
         </template>
       </el-table-column>
-      <el-table-column label="培训主图" align="center" prop="mainImage" width="200">
+      <el-table-column label="证书预览" align="center" prop="credentialFile" width="200">
         <template slot-scope="scope">
-          <image-preview :src="scope.row.mainImage" :width="50" :height="50"/>
+          <svg v-if="scope.row.credentialType=='PDF'" style="vertical-align: middle;fill: currentColor;overflow: hidden;" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="1379" width="50" height="50"><path d="M905.185809 178.844158C898.576738 172.685485 891.19337 165.824412 883.21687 158.436127 860.422682 137.322863 837.434925 116.207791 815.697647 96.487895 813.243072 94.261877 813.243072 94.261877 810.786411 92.037081 781.783552 65.781062 757.590948 44.376502 739.713617 29.293612 729.254178 20.469111 721.020606 13.860686 714.970549 9.501727 710.955023 6.608611 707.690543 4.524745 704.47155 2.998714 700.417679 1.07689 696.638044-0.094029 691.307277 0.005928 677.045677 0.273349 665.6 11.769337 665.6 26.182727L665.6 77.352844 665.6 128.522961 665.6 230.863194 665.6 256.448252 691.2 256.448252 896 256.448252 870.4 230.863194 870.4 998.414942 896 972.829884 230.381436 972.829884C187.90385 972.829884 153.6 938.623723 153.6 896.20663L153.6 26.182727 128 51.767786 588.8 51.767786C602.93849 51.767786 614.4 40.312965 614.4 26.182727 614.4 12.05249 602.93849 0.597669 588.8 0.597669L128 0.597669 102.4 0.597669 102.4 26.182727 102.4 896.20663C102.4 966.91021 159.652833 1024 230.381436 1024L896 1024 921.6 1024 921.6 998.414942 921.6 230.863194 921.6 205.278135 896 205.278135 691.2 205.278135 716.8 230.863194 716.8 128.522961 716.8 77.352844 716.8 26.182727C716.8 39.813762 705.748075 50.91427 692.267725 51.167041 687.705707 51.252584 685.069822 50.435995 682.52845 49.231204 682.259458 49.103682 683.344977 49.796618 685.029451 51.010252 689.779394 54.432502 697.145822 60.34494 706.686383 68.394196 724.009052 83.009121 747.816448 104.072869 776.413589 129.961594 778.850014 132.168064 778.850014 132.168064 781.285216 134.376514 802.876774 153.964212 825.739479 174.96442 848.413564 195.966437 856.350957 203.3185 863.697005 210.144893 870.269888 216.269843 874.209847 219.941299 877.019309 222.565641 878.499674 223.951409 888.81866 233.610931 905.019017 233.081212 914.684179 222.768247 924.349344 212.455283 923.819315 196.264383 913.500326 186.604861 911.981323 185.182945 909.155025 182.542876 905.185809 178.844158ZM102.4 461.128719 0 461.128719 0 896.074709 512 896.074709 1024 896.074709 1024 461.128719 153.6 461.128719 153.6 460.531049 102.4 460.531049 102.4 461.128719ZM208.2 711 208.2 819.2 157.6 819.2 157.6 528 269 528C301.533495 528 327.366571 536.466581 346.5 553.4 365.633429 570.333419 375.2 592.733195 375.2 620.6 375.2 649.133476 365.833427 671.333254 347.1 687.2 328.366573 703.066746 302.133502 711 268.4 711L208.2 711ZM208.2 670.4 269 670.4C287.00009 670.4 300.733286 666.166709 310.2 657.7 319.666714 649.233291 324.4 637.000079 324.4 621 324.4 605.266588 319.600047 592.700047 310 583.3 300.399951 573.899953 287.200083 569.066669 270.4 568.8L208.2 568.8 208.2 670.4ZM419.4 819.2 419.4 528 505.4 528C531.133461 528 553.966566 533.733276 573.9 545.2 593.833434 556.666724 609.266611 572.933229 620.2 594 631.133389 615.066771 636.6 639.199863 636.6 666.4L636.6 681C636.6 708.600139 631.100055 732.866562 620.1 753.8 609.099945 774.733438 593.433436 790.866609 573.1 802.2 552.766564 813.533391 529.466799 819.2 503.2 819.2L419.4 819.2ZM470 568.8 470 778.8 503 778.8C529.533466 778.8 549.89993 770.500083 564.1 753.9 578.30007 737.299917 585.533331 713.466822 585.8 682.4L585.8 666.2C585.8 634.599842 578.933402 610.46675 565.2 593.8 551.466598 577.13325 531.533463 568.8 505.4 568.8L470 568.8ZM854.8 695.8 737.6 695.8 737.6 819.2 687 819.2 687 528 872 528 872 568.8 737.6 568.8 737.6 655.4 854.8 655.4 854.8 695.8Z" fill="#01A9FF" p-id="1380"></path></svg>
+          <image-preview v-if="scope.row.credentialType=='JPG' || scope.row.credentialType=='PNG' || scope.row.credentialType=='JPEG'" :src="scope.row.credentialFile" :width="50" :height="50"/>
         </template>
       </el-table-column>
       <el-table-column label="备注" align="center" prop="remark" />
       <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
         <template slot-scope="scope">
+          <el-button
+            size="mini"
+            type="text"
+            icon="el-icon-edit"
+            @click="handledownload(scope.row)"
+            v-hasPermi="['project:surProjectSpecial:list']"
+          >下载证书</el-button>
           <el-button
             size="mini"
             type="text"
@@ -164,6 +180,9 @@
             ></el-option>
           </el-select>
         </el-form-item>
+        <el-form-item label="联系方式" prop="phoneNumber">
+          <el-input v-model="form.phoneNumber" placeholder="请输入联系方式" />
+        </el-form-item>
         <el-form-item label="是否有证书" prop="isCredential">
           <el-select v-model="form.isCredential" placeholder="请选择是否有证书" style="width: 100%;" @change="credentialChange">
             <el-option
@@ -185,8 +204,8 @@
             placeholder="请选择证书过期时间">
           </el-date-picker>
         </el-form-item>
-        <el-form-item label="备注" prop="remark">
-          <el-input v-model="form.remark" placeholder="请输入备注" />
+        <el-form-item label="证书附件" prop="credentialFile">
+          <FileUpload @input="fileInput" :limit="1" :fileType="['pdf','png','jpg','jpeg']"/>
         </el-form-item>
       </el-form>
       <div slot="footer" class="dialog-footer">
@@ -233,6 +252,7 @@ export default {
         deptId: null,
         name: null,
         isCredential: null,
+        credentialNumber: null,
         credentialExpirationTime: null,
         isDel: null,
         projectDeptId: null
@@ -251,10 +271,23 @@ export default {
                 { required: true, message: "请选择人员性别", trigger: "blur" }
             ],
             isCredential: [
-                { required: true, message: "请选择是否有证书", trigger: "blur" }
+                { required: false, message: "请选择是否有证书", trigger: "blur" }
+            ],
+            phoneNumber: [
+                { required: true, message: "请输入联系方式", trigger: "blur" },
+                {
+                  validator: function(rule, value, callback) {
+                    if (/^1[34578]\d{9}$/.test(value) == false) {
+                      callback(new Error("联系手机格式错误"));
+                    } else {
+                      callback();
+                    }
+                  },
+                  trigger: "blur"
+                }
             ],
             credentialNumber: [
-                { required: false, message: "请输入证书编号", trigger: "blur" },
+                { required: true, message: "请输入证书编号", trigger: "blur" },
                 { maxlength: 50,  message: "证书编号最多50字符", trigger: "blur" }
             ],
             credentialExpirationTime: [
@@ -275,9 +308,13 @@ export default {
   },
   methods: {
     // 是否有证书
-    credentialChange(ev){
-      debugger
-      console.log(ev.value);
+    credentialChange(ev){},
+    fileInput(files){
+      if(files.length>0){
+          this.form.credentialFile = files[0].url;
+      }else{
+          this.form.credentialFile = null;
+      }
     },
     /** 查询项目特种人员列表 */
     getList() {
diff --git a/ruoyi-ui/src/views/project/surProjectSpecial/surProjectSpecialDrawer.vue b/ruoyi-ui/src/views/project/surProjectSpecial/surProjectSpecialDrawer.vue
index b77131b5..ee830465 100644
--- a/ruoyi-ui/src/views/project/surProjectSpecial/surProjectSpecialDrawer.vue
+++ b/ruoyi-ui/src/views/project/surProjectSpecial/surProjectSpecialDrawer.vue
@@ -1,7 +1,7 @@
 <template>
     <div class="app-container">
       <el-drawer v-bind="$attrs" v-if="onOpen" v-on="$listeners" @opened="onOpen" @close="onClose" style="padding-left: 20px;">
-        <el-row :gutter="10" class="mb8" style="margin-left: 25px; margin-top:10px;">
+        <el-row :gutter="10" class="mb8" style="margin-left: 25px; margin-top:10px;margin-right:0px;">
             <el-col :span="1.5">
                 <el-button
                 type="primary"
@@ -36,29 +36,36 @@
         </el-col>
       <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
     </el-row>
-        <el-table v-loading="loading" :data="surProjectSpecialList" style="margin-left: 20px;margin-right: 20px;" @selection-change="handleSelectionChange">
+        <el-table v-loading="loading" :data="surProjectSpecialList"  @selection-change="handleSelectionChange">
         <el-table-column type="selection" width="55" align="center" />
-        <el-table-column label="提交单位" align="center" prop="deptName" width="150" show-overflow-tooltip/>
         <el-table-column label="人员姓名" align="center" prop="name" width="80" show-overflow-tooltip/>
         <el-table-column label="性别" align="center" prop="sex" width="60">
             <template slot-scope="scope">
             <dict-tag :options="dict.type.sys_user_sex" :value="scope.row.sex"/>
             </template>
         </el-table-column>
-        <el-table-column label="是否有证书" align="center" prop="isCredential" width="90">
-            <template slot-scope="scope">
-            <dict-tag :options="dict.type.sys_yes_no" :value="scope.row.isCredential"/>
-            </template>
-        </el-table-column>
+        <el-table-column label="联系方式" align="center" prop="phoneNumber" width="130" show-overflow-tooltip/>
         <el-table-column label="证书编号" align="center" prop="credentialNumber" show-overflow-tooltip/>
         <el-table-column label="证书过期时间" align="center" prop="credentialExpirationTime" width="100">
             <template slot-scope="scope">
             <span>{{ parseTime(scope.row.credentialExpirationTime, '{y}-{m}-{d}') }}</span>
             </template>
         </el-table-column>
-        <el-table-column label="备注" align="center" prop="remark" width="150" show-overflow-tooltip/>
-        <el-table-column label="操作" align="center" width="120" class-name="small-padding fixed-width">
+        <el-table-column label="证书预览" align="center" prop="credentialFile" width="75">
+          <template slot-scope="scope">
+            <svg v-if="scope.row.credentialType=='PDF'" style="vertical-align: middle;fill: currentColor;overflow: hidden;" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="1379" width="50" height="50"><path d="M905.185809 178.844158C898.576738 172.685485 891.19337 165.824412 883.21687 158.436127 860.422682 137.322863 837.434925 116.207791 815.697647 96.487895 813.243072 94.261877 813.243072 94.261877 810.786411 92.037081 781.783552 65.781062 757.590948 44.376502 739.713617 29.293612 729.254178 20.469111 721.020606 13.860686 714.970549 9.501727 710.955023 6.608611 707.690543 4.524745 704.47155 2.998714 700.417679 1.07689 696.638044-0.094029 691.307277 0.005928 677.045677 0.273349 665.6 11.769337 665.6 26.182727L665.6 77.352844 665.6 128.522961 665.6 230.863194 665.6 256.448252 691.2 256.448252 896 256.448252 870.4 230.863194 870.4 998.414942 896 972.829884 230.381436 972.829884C187.90385 972.829884 153.6 938.623723 153.6 896.20663L153.6 26.182727 128 51.767786 588.8 51.767786C602.93849 51.767786 614.4 40.312965 614.4 26.182727 614.4 12.05249 602.93849 0.597669 588.8 0.597669L128 0.597669 102.4 0.597669 102.4 26.182727 102.4 896.20663C102.4 966.91021 159.652833 1024 230.381436 1024L896 1024 921.6 1024 921.6 998.414942 921.6 230.863194 921.6 205.278135 896 205.278135 691.2 205.278135 716.8 230.863194 716.8 128.522961 716.8 77.352844 716.8 26.182727C716.8 39.813762 705.748075 50.91427 692.267725 51.167041 687.705707 51.252584 685.069822 50.435995 682.52845 49.231204 682.259458 49.103682 683.344977 49.796618 685.029451 51.010252 689.779394 54.432502 697.145822 60.34494 706.686383 68.394196 724.009052 83.009121 747.816448 104.072869 776.413589 129.961594 778.850014 132.168064 778.850014 132.168064 781.285216 134.376514 802.876774 153.964212 825.739479 174.96442 848.413564 195.966437 856.350957 203.3185 863.697005 210.144893 870.269888 216.269843 874.209847 219.941299 877.019309 222.565641 878.499674 223.951409 888.81866 233.610931 905.019017 233.081212 914.684179 222.768247 924.349344 212.455283 923.819315 196.264383 913.500326 186.604861 911.981323 185.182945 909.155025 182.542876 905.185809 178.844158ZM102.4 461.128719 0 461.128719 0 896.074709 512 896.074709 1024 896.074709 1024 461.128719 153.6 461.128719 153.6 460.531049 102.4 460.531049 102.4 461.128719ZM208.2 711 208.2 819.2 157.6 819.2 157.6 528 269 528C301.533495 528 327.366571 536.466581 346.5 553.4 365.633429 570.333419 375.2 592.733195 375.2 620.6 375.2 649.133476 365.833427 671.333254 347.1 687.2 328.366573 703.066746 302.133502 711 268.4 711L208.2 711ZM208.2 670.4 269 670.4C287.00009 670.4 300.733286 666.166709 310.2 657.7 319.666714 649.233291 324.4 637.000079 324.4 621 324.4 605.266588 319.600047 592.700047 310 583.3 300.399951 573.899953 287.200083 569.066669 270.4 568.8L208.2 568.8 208.2 670.4ZM419.4 819.2 419.4 528 505.4 528C531.133461 528 553.966566 533.733276 573.9 545.2 593.833434 556.666724 609.266611 572.933229 620.2 594 631.133389 615.066771 636.6 639.199863 636.6 666.4L636.6 681C636.6 708.600139 631.100055 732.866562 620.1 753.8 609.099945 774.733438 593.433436 790.866609 573.1 802.2 552.766564 813.533391 529.466799 819.2 503.2 819.2L419.4 819.2ZM470 568.8 470 778.8 503 778.8C529.533466 778.8 549.89993 770.500083 564.1 753.9 578.30007 737.299917 585.533331 713.466822 585.8 682.4L585.8 666.2C585.8 634.599842 578.933402 610.46675 565.2 593.8 551.466598 577.13325 531.533463 568.8 505.4 568.8L470 568.8ZM854.8 695.8 737.6 695.8 737.6 819.2 687 819.2 687 528 872 528 872 568.8 737.6 568.8 737.6 655.4 854.8 655.4 854.8 695.8Z" fill="#01A9FF" p-id="1380"></path></svg>
+            <image-preview v-if="scope.row.credentialType=='JPG' || scope.row.credentialType=='PNG' || scope.row.credentialType=='JPEG'" :src="scope.row.credentialFile" :width="50" :height="50"/>
+          </template>
+        </el-table-column>
+        <el-table-column label="操作" align="center" width="180" class-name="small-padding fixed-width">
         <template slot-scope="scope">
+          <el-button
+            size="mini"
+            type="text"
+            icon="el-icon-edit"
+            @click="handledownload(scope.row)"
+            v-hasPermi="['project:surProjectSpecial:list']"
+          >下载证书</el-button>
           <el-button
             size="mini"
             type="text"
@@ -101,8 +108,11 @@
                     ></el-option>
                 </el-select>
             </el-form-item>
-            <el-form-item label="是否有证书" prop="isCredential">
-                <el-select v-model="form.isCredential" placeholder="请选择是否有证书" style="width: 100%;" @change="credentialChange">
+            <el-form-item label="联系方式" prop="phoneNumber">
+              <el-input v-model="form.phoneNumber" placeholder="请输入联系方式" />
+            </el-form-item>
+            <el-form-item label="是否有证书" prop="isCredential" v-if="false">
+                <el-select v-model="form.isCredential" placeholder="请选择是否有证书" style="width: 100%;">
                     <el-option
                     v-for="dict in dict.type.sys_yes_no"
                     :key="dict.value"
@@ -111,10 +121,12 @@
                     ></el-option>
                 </el-select>
             </el-form-item>
-            <el-form-item label="证书编号" prop="credentialNumber" v-show="credential">
+            <!-- v-show="credential" -->
+            <el-form-item label="证书编号" prop="credentialNumber">
                 <el-input v-model="form.credentialNumber" placeholder="请输入证书编号" />
             </el-form-item>
-            <el-form-item label="证书过期时间" prop="credentialExpirationTime" v-show="credential">
+            <!-- v-show="credential" -->
+            <el-form-item label="证书过期时间" prop="credentialExpirationTime">
                 <el-date-picker clearable
                     v-model="form.credentialExpirationTime"
                     type="date"
@@ -122,6 +134,9 @@
                     placeholder="请选择证书过期时间" style="width: 100%;">
                 </el-date-picker>
             </el-form-item>
+            <el-form-item label="证书附件" prop="remark">
+              <FileUpload @input="fileInput" :limit="1" :fileType="['pdf','png','jpg','jpeg']" v-model="files"/>
+            </el-form-item>
             <el-form-item label="备注" prop="remark">
                 <el-input v-model="form.remark" placeholder="请输入备注" />
             </el-form-item>
@@ -175,6 +190,7 @@
         },
         // 表单参数
         form: {},
+        files: [],
         // 表单校验
         rules: {
             name: [
@@ -184,15 +200,28 @@
             sex: [
                 { required: true, message: "请选择人员性别", trigger: "blur" }
             ],
+            phoneNumber: [
+                { required: true, message: "请输入联系方式", trigger: "blur" },
+                {
+                  validator: function(rule, value, callback) {
+                    if (/^1[34578]\d{9}$/.test(value) == false) {
+                      callback(new Error("联系手机格式错误"));
+                    } else {
+                      callback();
+                    }
+                  },
+                  trigger: "blur"
+                }
+            ],
             isCredential: [
-                { required: true, message: "请选择是否有证书", trigger: "blur" }
+                { required: false, message: "请选择是否有证书", trigger: "blur" }
             ],
             credentialNumber: [
-                { required: false, message: "请输入证书编号", trigger: "blur" },
+                { required: true, message: "请输入证书编号", trigger: "blur" },
                 { maxlength: 50,  message: "证书编号最多50字符", trigger: "blur" }
             ],
             credentialExpirationTime: [
-                { required: false, message: "请选择证书过期时间", trigger: "blur" }
+                { required: true, message: "请选择证书过期时间", trigger: "blur" }
             ],
             remark: [
                 { required: false, message: "请输入备注", trigger: "blur" },
@@ -220,6 +249,13 @@
 
     },
     methods: {
+      fileInput(files){
+        if(files.length>0){
+          this.form.credentialFile = files[0].url;
+        }else{
+          this.form.credentialFile = null;
+        }
+      },
       // 是否有证书
       credentialChange(val){
         if(val=="Y"){
@@ -233,7 +269,6 @@
             this.rules.credentialNumber[0].required = false;
             this.rules.credentialExpirationTime[0].required = false;
         }
-        console.log("12312312");
       },
       onOpen() {
         this.getList();
@@ -266,10 +301,12 @@
         name: null,
         sex: null,
         age: null,
+        phoneNumber: null,
         idNumber: null,
         isCredential: null,
         credentialNumber: null,
         credentialExpirationTime: null,
+        credentialFile: null,
         isDel: null,
         createBy: null,
         createTime: null,
@@ -299,11 +336,7 @@
       const id = row.id || this.ids
       getSurProjectSpecial(id).then(response => {
         this.form = response.data;
-        if(this.form.isCredential=="Y"){
-          this.credential = true;
-        }else{
-          this.credential = false;
-        }
+        this.files = this.form.credentialFile;
         this.open = true;
         this.title = "修改项目特种人员";
       });
@@ -312,6 +345,9 @@
     submitForm() {
       this.$refs["form"].validate(valid => {
         if (valid) {
+          if(!this.form.credentialFile){
+            this.$modal.msgWarning("请上传证书附件");
+          }
           if (this.form.id != null) {
             updateSurProjectSpecial(this.form).then(response => {
               this.$modal.msgSuccess("修改成功");
@@ -319,6 +355,8 @@
               this.getList();
             });
           } else {
+            this.form.isCredential="Y";
+            this.form.isDel=0;
             addSurProjectSpecial(this.form).then(response => {
               this.$modal.msgSuccess("添加成功");
               this.open = false;
@@ -328,7 +366,7 @@
         }
       });
     },
-     /** 删除按钮操作 */
+    /** 删除按钮操作 */
     handleDelete(row) {
       const ids = row.id || this.ids;
       this.$modal.confirm('是否确认删除特种人员编号为"' + ids + '"的数据项？').then(function() {
@@ -338,6 +376,10 @@
         this.$modal.msgSuccess("删除成功");
       }).catch(() => {});
     },
+    /** 下载证书 */
+    handledownload(row){
+      window.open(row.credentialFile);
+    }
     }
   }
   </script>
diff --git a/ruoyi-ui/src/views/project/surProjectUserInfo/projectUserInfoDrawer.vue b/ruoyi-ui/src/views/project/surProjectUserInfo/projectUserInfoDrawer.vue
index f96044e6..166057ba 100644
--- a/ruoyi-ui/src/views/project/surProjectUserInfo/projectUserInfoDrawer.vue
+++ b/ruoyi-ui/src/views/project/surProjectUserInfo/projectUserInfoDrawer.vue
@@ -1,7 +1,7 @@
 <template>
     <div class="app-container">
       <el-drawer v-bind="$attrs" v-if="onOpen" v-on="$listeners" @opened="onOpen" @close="onClose" style="padding-left: 20px;">
-        <el-row :gutter="10" class="mb8" style="margin-left: 25px; margin-top:10px;">
+        <el-row :gutter="10" class="mb8" style="margin-left: 25px; margin-top:10px;margin-right:0px;">
             <el-col :span="1.5">
                 <el-button
                 type="primary"
@@ -25,7 +25,7 @@
         </el-col>
       <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
     </el-row>
-        <el-table v-loading="loading" :data="surProjectUserInfoList" style="margin-left: 20px;margin-right: 20px;" @selection-change="handleSelectionChange">
+        <el-table v-loading="loading" :data="surProjectUserInfoList" @selection-change="handleSelectionChange">
         <el-table-column type="selection" width="55" align="center" />
         <el-table-column label="单位名称"  prop="deptName"  align="left" show-overflow-tooltip/>
         <el-table-column label="单位类型" align="center" prop="deptType">
diff --git a/ruoyi-ui/src/views/work/emergencyDrill/emergencyDrillDrawer.vue b/ruoyi-ui/src/views/work/emergencyDrill/emergencyDrillDrawer.vue
index 4c4f5bde..8ddb6410 100644
--- a/ruoyi-ui/src/views/work/emergencyDrill/emergencyDrillDrawer.vue
+++ b/ruoyi-ui/src/views/work/emergencyDrill/emergencyDrillDrawer.vue
@@ -1,7 +1,7 @@
 <template>
     <div class="app-container">
       <el-drawer v-bind="$attrs" v-if="onOpen" v-on="$listeners" @opened="onOpen" @close="onClose" style="padding-left: 20px;">
-        <el-row :gutter="10" class="mb8" style="margin-left: 25px; margin-top:10px;">
+        <el-row :gutter="10" class="mb8" style="margin-left: 25px; margin-top:10px;margin-right:0px;">
             <el-col :span="1.5">
                 <el-button
                 type="primary"
@@ -15,8 +15,8 @@
         <right-toolbar :showSearch.sync="showSearch" @queryTable="getworkTrainList"></right-toolbar>
         </el-row>
 
-        <el-table v-loading="loading" :data="workTrainList" style="margin-left: 20px;margin-right: 20px;" @selection-change="handleSelectionChange">
-        <el-table-column label="演练主图" align="center" prop="mainImage" width="80">
+        <el-table v-loading="loading" :data="workTrainList"  @selection-change="handleSelectionChange">
+        <el-table-column label="演练主图" align="center" prop="mainImage" width="75">
             <template slot-scope="scope">
             <image-preview :src="scope.row.mainImage" :width="50" :height="50"/>
             </template>
@@ -26,7 +26,7 @@
             <dict-tag :options="dict.type.train_nature_yjyl" :value="scope.row.trainNature"/>
             </template>
         </el-table-column>
-        <el-table-column label="培训标题" align="center" prop="trainTitle" width="120" show-overflow-tooltip/>
+        <el-table-column label="演练标题" align="center" prop="trainTitle" width="160" show-overflow-tooltip/>
         <el-table-column label="参与人数" align="center" prop="trainParticipants" width="90"/>
         <el-table-column label="开始时间" align="center" prop="beginDate" width="100">
             <template slot-scope="scope">
@@ -34,7 +34,7 @@
                 <div>{{ parseTime(scope.row.endDate, '{y}-{m}-{d}') }}</div>
             </template>
         </el-table-column>
-        <el-table-column label="演练内容" align="center" prop="trainContent" width="150" show-overflow-tooltip />
+        <el-table-column label="演练内容" align="center" prop="trainContent" width="170" show-overflow-tooltip />
         <el-table-column label="协同部门" align="center" prop="trainDeptNames" width="220" show-overflow-tooltip >
             <template slot-scope="scope">
                 <div class='div_tag' v-for="dept in getTrainDeptNames(scope.row.trainDeptNames)"><el-tag>{{ dept }}</el-tag></div>
@@ -74,7 +74,7 @@
           <el-form-item label="演练主图" prop="mainImage">
             <image-upload v-model="form.mainImage" :limit="1"/>
           </el-form-item>
-            <el-form-item label="演练类型" prop="trainNature">
+            <el-form-item label="演练类型" prop="trainNature" v-if="false">
             <el-select v-model="form.trainNature" placeholder="请选择演练类型" style="width: 100%;">
                 <el-option
                 v-for="dict in dict.type.train_nature_yjyl"
@@ -84,11 +84,11 @@
                 ></el-option>
             </el-select>
             </el-form-item>
-            <el-form-item label="培训标题" prop="trainTitle">
-              <el-input v-model="form.trainTitle" placeholder="请输入培训标题" />
+            <el-form-item label="演练标题" prop="trainTitle">
+              <el-input v-model="form.trainTitle" placeholder="请输入演练标题" />
             </el-form-item>
             <el-form-item label="参与人数" prop="trainParticipants">
-            <el-input type="number" v-model="form.trainParticipants" placeholder="请输入参与人数" />
+              <el-input-number v-model="form.trainParticipants" placeholder="请输入工作参与者" controls-position="right" style="width: 100%;" :min="1"/>
             </el-form-item>
             <el-form-item label="演练日期" prop="daterangeMarksTime">
             <el-date-picker
@@ -177,14 +177,14 @@
             ],
             trainTitle: [
             { required: true, message: "请输入培训标题", trigger: "blur" },
-            { maxlength: 20,  message: '培训标题最多20个字符',trigger: 'blur' }
+            { max: 20,  message: '培训标题最多20个字符',trigger: 'blur' }
             ],
             trainParticipants: [
             { required: true, message: "请输入参与人数", trigger: "blur" }
             ],
             trainContent: [
             { required: true, message: "请输入演练内容", trigger: "blur" },
-            { maxlength: 1000,  message: '演练内容长度在最多1000个字符',trigger: 'blur' }
+            { max: 1000,  message: '演练内容长度在最多1000个字符',trigger: 'blur' }
             ]
         }
       }
diff --git a/ruoyi-ui/src/views/work/emergencyDrill/index.vue b/ruoyi-ui/src/views/work/emergencyDrill/index.vue
index da43f6af..10167c27 100644
--- a/ruoyi-ui/src/views/work/emergencyDrill/index.vue
+++ b/ruoyi-ui/src/views/work/emergencyDrill/index.vue
@@ -108,12 +108,12 @@
           <image-preview :src="scope.row.mainImage" :width="50" :height="50"/>
         </template>
       </el-table-column>
-      <el-table-column label="演练类型" align="center" prop="trainNature">
+      <el-table-column label="演练类型" align="center" prop="trainNature" v-if="false">
         <template slot-scope="scope">
           <dict-tag :options="dict.type.train_nature_yjyl" :value="scope.row.trainNature"/>
         </template>
       </el-table-column>
-      <el-table-column label="培训标题" align="center" prop="trainTitle" width="150" show-overflow-tooltip />
+      <el-table-column label="演练标题" align="center" prop="trainTitle" width="150" show-overflow-tooltip />
       <el-table-column label="参与人数" align="center" prop="trainParticipants" />
       <el-table-column label="开始时间" align="center" prop="beginDate" width="120">
         <template slot-scope="scope">
@@ -173,7 +173,7 @@
         <el-form-item label="演练主图" prop="mainImage">
           <image-upload v-model="form.mainImage" :limit="1"/>
         </el-form-item>
-        <el-form-item label="演练类型" prop="trainNature">
+        <el-form-item label="演练类型" prop="trainNature" v-if="false">
           <el-select v-model="form.trainNature" filterable placeholder="请选择演练类型" style="width: 100%;">
             <el-option
               v-for="dict in dict.type.train_nature_yjyl"
@@ -187,7 +187,7 @@
             <el-input placeholder="请输入培训标题" v-model="form.trainTitle"></el-input>
           </el-form-item>
         <el-form-item label="参与人数" prop="trainParticipants">
-          <el-input type="number" v-model="form.trainParticipants" placeholder="请输入工作参与者" />
+          <el-input-number v-model="form.trainParticipants" placeholder="请输入工作参与者" controls-position="right" style="width: 100%;" :min="1"/>
         </el-form-item>
         <el-form-item label="演练日期" prop="daterangeMarksTime">
           <el-date-picker
@@ -279,14 +279,14 @@ export default {
             ],
             trainTitle: [
             { required: true, message: "请输入培训标题", trigger: "blur" },
-            { maxlength: 20,  message: '培训标题最多20个字符',trigger: 'blur' }
+            { max: 20,  message: '培训标题最多20个字符',trigger: 'blur' }
             ],
             trainParticipants: [
             { required: true, message: "请输入参与人数", trigger: "blur" }
             ],
             trainContent: [
             { required: true, message: "请输入演练内容", trigger: "blur" },
-            { maxlength: 1000,  message: '演练内容长度在最多1000个字符',trigger: 'blur' }
+            { max: 1000,  message: '演练内容长度在最多1000个字符',trigger: 'blur' }
             ]
         }
     };
diff --git a/ruoyi-ui/src/views/work/workTrain/index.vue b/ruoyi-ui/src/views/work/workTrain/index.vue
index c2921b66..a77db3c9 100644
--- a/ruoyi-ui/src/views/work/workTrain/index.vue
+++ b/ruoyi-ui/src/views/work/workTrain/index.vue
@@ -187,7 +187,7 @@
             <el-input placeholder="请输入培训标题" v-model="form.trainTitle"></el-input>
           </el-form-item>
         <el-form-item label="参与人数" prop="trainParticipants">
-          <el-input type="number" v-model="form.trainParticipants" placeholder="请输入工作参与者" />
+          <el-input-number v-model="form.trainParticipants" placeholder="请输入工作参与者" controls-position="right" style="width: 100%;" :min="1"/>
         </el-form-item>
         <el-form-item label="培训日期" prop="daterangeMarksTime">
           <el-date-picker
@@ -279,14 +279,14 @@ export default {
             ],
             trainTitle: [
             { required: true, message: "请输入培训标题", trigger: "blur" },
-            { maxlength: 20,  message: '培训标题最多20个字符',trigger: 'blur' }
+            { max: 20,  message: '培训标题最多20个字符',trigger: 'blur' }
             ],
             trainParticipants: [
             { required: true, message: "请输入参与人数", trigger: "blur" }
             ],
             trainContent: [
             { required: true, message: "请输入培训内容", trigger: "blur" },
-            { maxlength: 1000,  message: '培训内容长度在最多1000个字符',trigger: 'blur' }
+            { max: 1000,  message: '培训内容长度在最多1000个字符',trigger: 'blur' }
           ]
       }
     };
diff --git a/ruoyi-ui/src/views/work/workTrain/workTrainDrawer.vue b/ruoyi-ui/src/views/work/workTrain/workTrainDrawer.vue
index 5b3d2895..a5d75df8 100644
--- a/ruoyi-ui/src/views/work/workTrain/workTrainDrawer.vue
+++ b/ruoyi-ui/src/views/work/workTrain/workTrainDrawer.vue
@@ -1,7 +1,7 @@
 <template>
     <div class="app-container">
       <el-drawer v-bind="$attrs" v-if="onOpen" v-on="$listeners" @opened="onOpen" @close="onClose" style="padding-left: 20px;">
-        <el-row :gutter="10" class="mb8" style="margin-left: 25px; margin-top:10px;">
+        <el-row :gutter="10" class="mb8" style="margin-left: 25px; margin-top:10px;margin-right:0px;">
             <el-col :span="1.5">
                 <el-button
                 type="primary"
@@ -15,8 +15,8 @@
         <right-toolbar :showSearch.sync="showSearch" @queryTable="getworkTrainList"></right-toolbar>
         </el-row>
 
-        <el-table v-loading="loading" :data="workTrainList" style="margin-left: 20px;margin-right: 20px;" @selection-change="handleSelectionChange">
-        <el-table-column label="培训主图" align="center" prop="mainImage" width="80">
+        <el-table v-loading="loading" :data="workTrainList"  @selection-change="handleSelectionChange">
+        <el-table-column label="培训主图" align="center" prop="mainImage" width="75">
             <template slot-scope="scope">
             <image-preview :src="scope.row.mainImage" :width="50" :height="50"/>
             </template>
@@ -26,7 +26,7 @@
             <dict-tag :options="dict.type.train_nature_zxpx" :value="scope.row.trainNature"/>
             </template>
         </el-table-column>
-        <el-table-column label="培训标题" align="center" prop="trainTitle" width="120" show-overflow-tooltip/>
+        <el-table-column label="培训标题" align="center" prop="trainTitle" width="160" show-overflow-tooltip/>
         <el-table-column label="参与人数" align="center" prop="trainParticipants" width="90"/>
         <el-table-column label="开始时间" align="center" prop="beginDate" width="100">
             <template slot-scope="scope">
@@ -34,7 +34,7 @@
                 <div>{{ parseTime(scope.row.endDate, '{y}-{m}-{d}') }}</div>
             </template>
         </el-table-column>
-        <el-table-column label="培训内容" align="center" prop="trainContent" width="150" show-overflow-tooltip />
+        <el-table-column label="培训内容" align="center" prop="trainContent" width="170" show-overflow-tooltip />
         <el-table-column label="协同部门" align="center" prop="trainDeptNames" width="220" show-overflow-tooltip >
             <template slot-scope="scope">
                 <div class='div_tag' v-for="dept in getTrainDeptNames(scope.row.trainDeptNames)"><el-tag>{{ dept }}</el-tag></div>
@@ -88,7 +88,7 @@
               <el-input v-model="form.trainTitle" placeholder="请输入培训标题" />
             </el-form-item>
             <el-form-item label="参与人数" prop="trainParticipants">
-              <el-input type="number" v-model="form.trainParticipants" placeholder="请输入参与人数" />
+              <el-input-number v-model="form.trainParticipants" placeholder="请输入工作参与者" controls-position="right" style="width: 100%;" :min="1"/>
             </el-form-item>
             <el-form-item label="培训日期" prop="daterangeMarksTime">
             <el-date-picker
@@ -177,14 +177,14 @@
             ],
             trainTitle: [
             { required: true, message: "请输入培训标题", trigger: "blur" },
-            { maxlength: 20,  message: '培训标题最多20个字符',trigger: 'blur' }
+            { max: 20,  message: '培训标题最多20个字符',trigger: 'blur' }
             ],
             trainParticipants: [
             { required: true, message: "请输入参与人数", trigger: "blur" }
             ],
             trainContent: [
             { required: true, message: "请输入培训内容", trigger: "blur" },
-            { maxlength: 1000,  message: '培训内容长度在最多1000个字符',trigger: 'blur' }
+            { max: 1000,  message: '培训内容长度在最多1000个字符',trigger: 'blur' }
             ]
         }
       }