Merge branch 'V0.0.5' of http://10.87.21.221:8000/jzyd_yyds/soc_web into V0.0.5

.env.development

@@ -6,19 +6,11 @@ ENV = 'development'
 
 # 开发环境
 #测试地址
-<<<<<<< HEAD
-#VUE_APP_BASE_API = 'http://47.92.229.224:8080'
+VUE_APP_BASE_API = 'http://47.92.229.224:8080'
 #罗俊
 #VUE_APP_BASE_API = 'http://10.87.21.60:8080'
 #罗伟
-  VUE_APP_BASE_API = 'http://10.87.23.62:8080'
-=======
-# VUE_APP_BASE_API = 'http://47.92.229.224:8080'
-#罗俊
-#VUE_APP_BASE_API = 'http://10.87.21.60:8080'
-#罗伟
- VUE_APP_BASE_API = 'http://10.87.23.62:8080'
->>>>>>> d909b77fe3593021b73d72d6276f6df848c73f8a
+  # VUE_APP_BASE_API = 'http://10.87.23.62:8080'
 #高雄
 #VUE_APP_BASE_API = 'http://10.87.11.94:8080'
 #景远超

src/components/elDialog/dialog.vue

@@ -1,6 +1,6 @@
 <template>
   <div>
-    <el-dialog  v-dialogDrag v-bind="$attrs" v-on="$listeners" @close="handleClose" :close-on-click-modal="false" class="centerDialog">
+    <el-dialog center v-dialogDrag v-bind="$attrs" v-on="$listeners" @close="handleClose" :close-on-click-modal="false" class="centerDialog">
       <slot></slot>
       <slot name="footer" class="dialog-footer"></slot>
     </el-dialog>
@@ -27,6 +27,9 @@ export default {
 .dialog-footer {
   text-align: right;
 }
+.el-dialog{
+  margin:  0 auto;
+}
 </style>
 <style lang="scss" scoped>
   //.centerDialog{

src/views/core/drill/plan/index.vue

@@ -838,9 +838,9 @@ export default {
             let msg = "";
             if (this.form.planStatus == 1) {
               if (this.form.done == 1) {
-                msg = "因存在已完成任务，本次修改内容将下周期生效，是否确认提交?";
+                msg = "因存在已完成任务，本次修改内容将从下周期生效";
               } else {
-                msg = "因不存在已完成任务，本次修改内容将立即生效，是否确认提交?";
+                msg = "因不存在已完成任务，本次修改内容将立即生效";
               }
             } else {
               msg = "是否确认修改?";
@@ -874,13 +874,17 @@ export default {
       let msg = "";
       if (row.planStatus == 0) {
         msg = '是否确认删除名称为"' + row.planName + '"的任务？';
-      } else {
-        if (row.done == 1) {
-          msg =
-            "本次操作将对下周期及以后任务生效，对当前及历史任务不造成影响，是否确认提交?";
+      } else if (row.planStatus == 1) {
+        if (row.planCycle == 1) {
+          msg = "本次删除将强制删除今日所有任务?";
         } else {
-          msg =
-            "本次操作将对当前轮次及以后任务生效，并删除所有历史未完成任务，是否确认提交?";
+          msg = "本次删除将强制删除当前任务时间及以后所有任务";
+        }
+      } else if (row.planStatus == 2) {
+        if (row.planCycle == 1) {
+          msg = "本次删除将强制删除今日所有任务";
+        } else {
+          msg = "本次删除将强制删除当前任务时间及以后所有任务";
         }
       }
       const ids = row.id || this.ids;
@@ -913,7 +917,7 @@ export default {
           });
       } else {
         if (row.planStatus == 0) {
-          msg = "请选择从当前轮次或下周期开始生成任务?";
+          msg = "请选择下发后立即生成或下周期生成任务?";
           this.$refs["DialogThreeState"].show(
             msg,
             (state) => {
@@ -925,16 +929,16 @@ export default {
               }
             },
             {
-              yesText: "当前轮次",//1
+              yesText: "立即生成",//1
               noText: "下周期",//0
               cancelText: "取消下发",
             }
           );
         } else if (row.planStatus == 2) {
           this.$modal
-            .confirm("因存在已完成任务，本次任务下发仅支持下周期生成任务", {
-              confirmButtonText: "下周期",
-              canelButtonText: "取消下发",
+            .confirm("因存在已完成任务，是否确定从下周期生成任务", {
+              confirmButtonText: "确定",
+              canelButtonText: "取消",
             })
             .then(() => {
               publishPlan(row.id, 0);
@@ -952,10 +956,10 @@ export default {
         let msg = "";
         if (row.done == 1) {
           msg =
-            "本次操作将对下周期及以后任务生效，对当前及历史任务不造成影响，是否确认提交?";
+            "因存在已完成任务,撤回后下周期起将不再生成任务";
         } else {
           msg =
-            "本次操作将对当前轮次及以后任务生效，并删除所有历史未完成任务，是否确认提交?";
+            "因存在不已完成任务,撤回后将删除所有生成任务";
         }
         this.$modal
           .confirm(msg)

src/views/core/edu/plan/index.vue

@@ -915,9 +915,9 @@ export default {
             let msg = "";
             if (this.form.planStatus == 1) {
               if (this.form.done == 1) {
-                msg = "因存在已完成任务，本次修改内容将下周期生效，是否确认提交?";
+                msg = "因存在已完成任务，本次修改内容将从下周期生效";
               } else {
-                msg = "因不存在已完成任务，本次修改内容将立即生效，是否确认提交?";
+                msg = "因不存在已完成任务，本次修改内容将立即生效";
               }
             } else {
               msg = "是否确认修改?";
@@ -951,13 +951,17 @@ export default {
       let msg = "";
       if (row.planStatus == 0) {
         msg = '是否确认删除名称为"' + row.planName + '"的任务？';
-      } else {
-        if (row.done == 1) {
-          msg =
-            "本次操作将对下周期及以后任务生效，对当前及历史任务不造成影响，是否确认提交?";
+      } else if (row.planStatus == 1) {
+        if (row.planCycle == 1) {
+          msg = "本次删除将强制删除今日所有任务?";
+        } else {
+          msg = "本次删除将强制删除当前任务时间及以后所有任务";
+        }
+      } else if (row.planStatus == 2) {
+        if (row.planCycle == 1) {
+          msg = "本次删除将强制删除今日所有任务";
         } else {
-          msg =
-            "本次操作将对当前轮次及以后任务生效，并删除所有历史未完成任务，是否确认提交?";
+          msg = "本次删除将强制删除当前任务时间及以后所有任务";
         }
       }
       const ids = row.id || this.ids;
@@ -990,7 +994,7 @@ export default {
           });
       } else {
         if (row.planStatus == 0) {
-          msg = "请选择从当前轮次或下周期开始生成任务?";
+          msg = "请选择下发后立即生成或下周期生成任务?";
           this.$refs["DialogThreeState"].show(
             msg,
             (state) => {
@@ -1002,15 +1006,15 @@ export default {
               }
             },
             {
-              yesText: "当前轮次",//1
+              yesText: "立即生成",//1
               noText: "下周期",//0
               cancelText: "取消下发",
             }
           );
         } else if (row.planStatus == 2) {
           this.$modal
-            .confirm("因存在已完成任务，本次任务下发仅支持下周期生成任务", {
-              confirmButtonText: "下周期",
+            .confirm("因存在已完成任务，是否确定从下周期生成任务", {
+              confirmButtonText: "确定",
               canelButtonText: "取消下发",
             })
             .then(() => {
@@ -1034,10 +1038,10 @@ export default {
       let msg = "";
       if (row.done == 1) {
         msg =
-          "本次操作将对下周期及以后任务生效，对当前及历史任务不造成影响，是否确认提交?";
+          "因存在已完成任务,撤回后下周期起将不再生成任务";
       } else {
         msg =
-          "本次操作将对当前轮次及以后任务生效，并删除所有历史未完成任务，是否确认提交?";
+          "因存在不已完成任务,撤回后将删除所有生成任务";
       }
       this.$modal
         .confirm(msg, "提示")

src/views/core/materials/index.vue

@@ -130,6 +130,7 @@
               align="left"
               header-align="center"
               prop="orgName"
+              width="200px"
             />
             <el-table-column
               label="资料名称"
@@ -139,7 +140,7 @@
               :show-overflow-tooltip="true"
             />
 
-            <el-table-column label="资料类型" align="center" prop="knowledgeId">
+            <el-table-column label="资料类型" align="center" prop="knowledgeId" width="130px">
               <template slot-scope="scope">
                 <dict-tag
                   :options="dict.type.edu_materials_type"
@@ -156,6 +157,7 @@
               align="center"
               header-align="center"
               prop="isOpen"
+              width="100px"
             >
               <template slot-scope="scope">
                 <dict-tag
@@ -165,17 +167,14 @@
               </template>
             </el-table-column>
 
-            <el-table-column label="创建人" align="center" prop="createBy" />
-            <el-table-column
-              label="创建时间"
-              align="center"
-              prop="createTime"
+            <el-table-column label="创建人" align="center" prop="createBy"  width="110px"/>
+            <el-table-column label="创建时间" align="center" prop="createTime" width="200px"
             />
             <!--          <el-table-column width="250" scoped-slot="remark" align="center" prop="remark" label="备注"></el-table-column>-->
 
             <el-table-column
               label="操作"
-              width="200"
+              width="250px"
               header-align="center"
               class-name="small-padding fixed-width"
             >

src/views/core/message/index.vue

@@ -204,7 +204,7 @@
                   size="mini"
                   type="text"
                   @click="lookThisOne(scope.row)"
-                  icon="el-icon-info"
+                  icon="el-icon-view"
                   v-hasPermi="['core:notification:query']"
                 >详情
                 </el-button

src/views/core/send/index.vue

@@ -65,7 +65,7 @@
           <el-button size="mini" type="text" v-if="scope.row.sendStatus == 2" icon="el-icon-delete"
             @click="handleDelete(scope.row)" v-hasPermi="['core:send:remove']">删除</el-button>
 
-          <el-button size="mini" type="text" v-if="scope.row.sendStatus == 1" icon="el-icon-info"
+          <el-button size="mini" type="text" v-if="scope.row.sendStatus == 1" icon="el-icon-view"
             @click="handleSelect(scope.row)" v-hasPermi="['core:send:query']">详情</el-button>
         </template>
       </el-table-column>

src/views/resumptionEvaluate/evaluate/index.vue

@@ -168,7 +168,7 @@
             </el-table-column>
             <el-table-column
               label="操作"
-              width="200"
+              width="260"
               class-name="small-padding fixed-width"
             >
               <template slot-scope="{ row }">

src/views/resumptionEvaluate/evaluatePlan/index.vue

@@ -149,7 +149,7 @@
                   size="mini"
                   @click="editHandler(row)"
                   type="text"
-                  class="el-icon-info"
+                  class="el-icon-view"
                   >详情</el-button
                 >
               </template>

src/views/safetyBook/aqbwbndjh/dialog.des.vue

@@ -4,7 +4,7 @@
       :title="id ? '安全保卫部年度工作计划详情' : '新增安全保卫部年度工作计划'"
       :visible.sync="isShow"
       @close="onHide"
-      width="900px"
+      width="50%"
     >
       <div class="page-body">
         <el-form

src/views/safetyBook/aqbwbndjh/index.vue

@@ -123,7 +123,7 @@
         </el-table-column>
 
         <el-table-column
-          align="center"
+          align="left"
           class-name="small-padding fixed-width"
           fixed="right"
           label="操作"
@@ -131,7 +131,7 @@
           <template slot-scope="scope">
             <el-button
               v-hasPermi="['core:aqbwbndjh:query']"
-              icon="el-icon-info"
+              icon="el-icon-view"
               size="mini"
               type="text"
               @click="handleInfo(scope.row.id)"

src/views/safetyBook/dialog.des.vue

@@ -4,7 +4,7 @@
       :title="id ? '安全责任书存档记录详情' : '新增安全责任书存档记录'"
       :visible.sync="isShow"
       @close="onHide"
-      width="1200px"
+      width="50%"
     >
       <div class="page-body">
         <el-form

src/views/safetyBook/hsggbsdj/dialog.des.vue

@@ -4,7 +4,7 @@
       :title="id ? '高管工作部署会议记录详情' : '新增高管工作部署会议记录'"
       :visible.sync="isShow"
       @close="onHide"
-      width="700px"
+      width="50%"
     >
       <div class="page-body">
         <el-form
@@ -109,8 +109,8 @@
                 :fileSize="2"
               ></imgs-upload> -->
               <W-file-upload
-              :isRem="false"
-              :isShowTip="false"
+                :isRem="false"
+                :isShowTip="false"
                 ref="upload"
                 :defaultValue="formFileListDefualtValue"
                 v-model="formData.images"
@@ -160,7 +160,7 @@ import Editor from "@/components/Editor";
 import dayjs from "dayjs";
 import WFileUpload from "@/components/W-FileUpload/index.vue";
 export default {
-  components: { UserSelector, ImgsUpload, Editor,WFileUpload },
+  components: { UserSelector, ImgsUpload, Editor, WFileUpload },
   dicts: ["hsggbsdj_role"],
   data() {
     return {
@@ -176,7 +176,7 @@ export default {
         "min-width": "300px",
         "word-break": "break-all",
       },
-      formFileListDefualtValue:[],
+      formFileListDefualtValue: [],
       id: null,
       isShow: false,
       formData: this.reset(),
@@ -255,7 +255,7 @@ export default {
         await gethsggbsdj(id).then((res) => {
           // this.formData.names = res.data.userNames.split(",");
           this.formData = res.data;
-          this.formFileListDefualtValue=res.data.images;
+          this.formFileListDefualtValue = res.data.images;
         });
       }
     },

src/views/safetyBook/hsggbsdj/index.vue

@@ -130,7 +130,7 @@
         </el-table-column>
 
         <el-table-column
-          align="center"
+          align="left"
           class-name="small-padding fixed-width"
           fixed="right"
           label="操作"
@@ -147,7 +147,7 @@
             </el-button> -->
             <el-button
               v-hasPermi="['core:hsggbsdj:query']"
-              icon="el-icon-info"
+              icon="el-icon-view"
               size="mini"
               type="text"
               @click="handleInfo(scope.row.id)"

src/views/safetyBook/index.vue

@@ -144,14 +144,14 @@
         <el-table-column
           label="操作"
           width="250"
-          align="center"
+          align="left"
           class-name="small-padding fixed-width"
         >
           <template slot-scope="scope">
             <el-button
               size="mini"
               type="text"
-              icon="el-icon-info"
+              icon="el-icon-view"
               @click="handleInfo(scope.row.id)"
               v-hasPermi="['core:book:query']"
               >详情

src/views/safetyBook/newBook/dialog.des.vue

@@ -4,7 +4,7 @@
       :title="id ? '安全责任书存档记录详情' : '新增安全责任书存档记录'"
       :visible.sync="isShow"
       @close="onHide"
-      width="1200px"
+      width="50%"
     >
       <div class="page-body">
         <el-form

src/views/safetyBook/newBook/index.vue

@@ -158,14 +158,14 @@
         <el-table-column
           label="操作"
           width="250"
-          align="center"
+          align="left"
           class-name="small-padding fixed-width"
         >
           <template slot-scope="scope">
             <el-button
               size="mini"
               type="text"
-              icon="el-icon-info"
+              icon="el-icon-view"
               @click="handleInfo(scope.row.id)"
               v-hasPermi="['core:safetyBooknew:query']"
               >详情

src/views/system/dept/extend.vue

@@ -297,7 +297,7 @@
                 v-model="constructionTime"
                 type="date"
                 value-format="yyyy-MM-dd HH:mm:ss"
-                placeholder="请选择建设时间"
+                placeholder="请选择最近一次改造时间"
               >
               </el-date-picker>
             </el-descriptions-item>
@@ -548,7 +548,7 @@
         //表单验证
         rules: {
           type: [{required: true, message: "请选择机构类型", trigger: "change"}],
-          standard: [{required: true, message: "请输入标准", trigger: "change"}],
+          standard: [{required: true, message: "请选择标准", trigger: "change"}],
         },
         remoteCountoptions: [
           {label: "0", value: 0},

src/views/system/dept/index.vue

@@ -408,13 +408,13 @@
           </el-col>
 
           <el-col :span="24">
-            <el-form-item label="机构缩略词" prop="breviary" label-width="240">
+            <el-form-item v-if="isEdit" label="机构缩略词" prop="breviary" label-width="240">
               <el-input
-                :maxlength="50"
+                :maxlength="5"
                 style="width: 270px;" 
                 v-model="form.breviary"
                 placeholder="请输入机构缩略词"
-                :disabled="form.source == 1"
+              
               />
             </el-form-item>
           </el-col>
@@ -491,6 +491,7 @@ export default {
         children: "children",
         label: "shortName",
       },
+      isEdit:null,
       // 查询参数
       queryParams: {
         pageNum: 1,
@@ -644,9 +645,9 @@ export default {
     getList() {
       this.loading = true;
       listDept(this.queryParams).then((response) => {
-        this.deptList = response.rows;
-        this.total = response.total;
-
+        this.deptList = response.data.rows;
+        this.total = response.data.total;
+this.isEdit=response.isEdit;
         this.loading = false;
        
       });

src/views/system/device/index.vue

@@ -327,7 +327,7 @@
                 clearable
                 v-model="form.checkTime"
                 type="date"
-                value-format="yyyy-MM-dd HH:mm:ss"
+                value-format="yyyy-MM-dd"
                 placeholder="请选择到期时间"
               >
               </el-date-picker>