Merge remote-tracking branch 'origin/V0.0.5' 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/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/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/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/safetycheck/plan/dialog.edit.vue

@@ -111,9 +111,8 @@
                   :disabled="cannotEdit()"
                   @change="cleanExecOrgList"
                   prop="execOrgType"
-                  label="机构类型"
                   v-model="formData.execOrgType"
-                  placeholder="请选择机构类型"
+                  placeholder="请选择检查主体类型"
                   clearable
                 >
                   <el-option
@@ -132,9 +131,8 @@
               <el-form-item prop="roleIds" label="检查人员:">
                 <el-select
                   :disabled="cannotEdit()"
-                  label="检查人员"
                   v-model="formData.roleIds"
-                  placeholder="请选择用户角色"
+                  placeholder="请选择检查人员"
                   multiple
                   filterable
                   @change="handleRolesChange"
@@ -157,7 +155,7 @@
                   prop="checkOrgTypes"
                   label="受检机构类型"
                   v-model="formData.checkOrgTypes"
-                  placeholder="请选择机构类型"
+                  placeholder="请选择受检机构类型"
                   clearable
                   multiple
                 >
@@ -182,9 +180,7 @@
                   :max="9"
                 ></el-input-number>
               </el-form-item>
-            </el-col>
-          </el-row>
-          <el-row>
+            </el-col>          
             <el-col :span="6">
               <el-form-item :span="6" prop="execOrgIds" label="检查主体">
                 <org-tree-select
@@ -412,7 +408,7 @@ export default {
           //周期
           this.formData.planCycle = "5";
           //机构类型
-          this.formData.execOrgType = "1";
+          this.formData.execOrgType = 1;
           this.getRolesByOrg();
           //角色
           this.formData.roleIds = ["116"];
@@ -427,7 +423,7 @@ export default {
           //周期
           this.formData.planCycle = "5";
           //机构类型
-          this.formData.execOrgType = "2";
+          this.formData.execOrgType = 2;
           this.getRolesByOrg();
           //角色
           this.formData.roleIds = ["118"];
@@ -442,7 +438,7 @@ export default {
           //周期
           this.formData.planCycle = "2";
           //机构类型
-          this.formData.execOrgType = "4";
+          this.formData.execOrgType = 4;
           this.getRolesByOrg();
           //角色
           this.formData.roleIds = ["121"];
@@ -458,7 +454,7 @@ export default {
           //周期
           this.formData.planCycle = "5";
           //机构类型
-          this.formData.execOrgType = "3";
+          this.formData.execOrgType = 3;
           this.getRolesByOrg();
           //角色
           this.formData.roleIds = ["120"];
@@ -682,7 +678,7 @@ export default {
           this.defbuildTaskNow = res.data.buildTaskNow;
           this.parentCount = res.data.parentCount;
           this.formData = res.data;
-          this.formData.buildTaskNow;
+          this.formData.planCycle=this.formData.planCycle+'';
           this.tableData = res.data.rulePointList;
           if (this.formData.execOrgType) {
             this.formData.roleIds = this.formData.roleList.map(

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

@@ -406,6 +406,18 @@
               </el-radio-group>
             </el-form-item>
           </el-col>
+
+          <el-col :span="24">
+            <el-form-item v-if="isEdit" label="机构缩略词" prop="breviary" label-width="240">
+              <el-input
+                :maxlength="5"
+                style="width: 270px;" 
+                v-model="form.breviary"
+                placeholder="请输入机构缩略词"
+              
+              />
+            </el-form-item>
+          </el-col>
         </el-row>
       </el-form>
       <div slot="footer" class="dialog-footer">
@@ -479,6 +491,7 @@ export default {
         children: "children",
         label: "shortName",
       },
+      isEdit:null,
       // 查询参数
       queryParams: {
         pageNum: 1,
@@ -492,9 +505,12 @@ export default {
         isLock:null,
       },
       // 表单参数
-      form: {},
+      form: {breviary:null},
       // 表单校验
       rules: {
+        breviary:[
+        { required: true, message: "机构缩略词不能为空", trigger: "blur" },
+        ],
         parentId: [
           { required: true, message: "上级机构不能为空", trigger: "blur" },
         ],
@@ -629,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>