修改

src/api/system/user.js

@@ -14,6 +14,7 @@ export function listAllUser(query) {
     url: '/system/user/selectAllUser',
     method: 'get',
     params: query
+
   })
 }
 

src/views/core/accessPlan/index.vue

@@ -96,7 +96,7 @@
           <el-table-column label="备注" align="center" prop="description"/>
           <el-table-column label="操作" fixed="right" width="120" align="center" class-name="small-padding fixed-width">
             <template slot-scope="scope">
-              <el-button size="mini" type="text" icon="el-icon-edit-outline" @click="handleUpdate(scope.row)" v-if="(scope.row.parentOrgId==isEdit||scope.row.orgId==isEdit)&&check==true"
+              <el-button size="mini" type="text" icon="el-icon-edit-outline" @click="handleUpdate(scope.row)" v-if="scope.row.parentId==null&&(scope.row.parentOrgId==isEdit||scope.row.orgId==isEdit)&&check==true"
                          v-hasPermi="['core:accessPlan:edit','core:accessPlan:query']">编辑
               </el-button>
               <el-button size="mini" type="text" v-if="scope.row.parentId==null&& scope.row.orgId==isEdit&&scope.row.isDistribute == 0 && (scope.row.planStatus==0||scope.row.planStatus==2)" icon="el-icon-arrow-down"
@@ -105,7 +105,8 @@
               <el-button size="mini" type="text" v-if="scope.row.orgId==isEdit&&scope.row.isDistribute == 1 && scope.row.planStatus==1&&scope.row.parentId==null" icon="el-icon-arrow-down"
                          @click="handWithdraw(scope.row)" >撤回
               </el-button>
-              <el-button size="mini" type="text" icon="el-icon-delete" @click="handleDelete(scope.row)" v-if="(scope.row.parentOrgId==isEdit)&&scope.row.parentId==null && check==true"
+
+              <el-button size="mini" type="text" v-if="scope.row.parentOrgId==isEdit&&scope.row.parentId==null && check==true" icon="el-icon-delete" @click="handleDelete(scope.row)" 
                          v-hasPermi="['core:accessPlan:remove']">删除
               </el-button>
             </template>
@@ -138,6 +139,16 @@
                        :value="`${dict.value}`" :disabled="form.isEdit||form.isComplete"></el-option>
           </el-select>
         </el-form-item>
+        <el-form-item label="立即生效" prop="immediately" v-if="form.planCycle!=0">
+              <el-checkbox v-model="form.immediately">
+                默认从下个周期生成任务，
+                <br/>
+                勾选后从当前周期立即生成任务
+                <!-- <el-popover placement="top-start" title="" width="200" trigger="hover"
+                            content="" :disabled="form.isEdit">
+                </el-popover> -->
+              </el-checkbox>
+            </el-form-item> 
         <el-form-item prop="startTime" v-if="form.planCycle == 0" label="开始日期">
           <el-date-picker style="width: 100%;" v-model="form.startTime" @change="startDateChanged" :picker-options="startDatepickerOptions"
                           align="right" type="date" placeholder="选择开始日期" :disabled="form.isEdit||form.isComplete">
@@ -169,16 +180,7 @@
             </el-radio>
           </el-radio-group>
         </el-form-item> -->
-            <el-form-item label="立即生效" prop="immediately" v-if="form.planCycle!=0">
-              <el-checkbox v-model="form.immediately">
-                默认从下个周期生成任务，
-                <br/>
-                勾选后从当前周期立即生成任务
-                <!-- <el-popover placement="top-start" title="" width="200" trigger="hover"
-                            content="" :disabled="form.isEdit">
-                </el-popover> -->
-              </el-checkbox>
-            </el-form-item> 
+      
 
        
         <el-form-item label="备注" prop="description">
@@ -463,7 +465,7 @@
       handleDelete(row) {
         const ids = row.id || this.ids;
         const names = row.planName || this.names;
-        this.$modal.confirm('是否确认删除监控调阅计划"' + names + '"的数据项？').then(function () {
+        this.$modal.confirm('删除计划会清除本周期所有任务,确定执行？').then(function () {
           return delPlan(ids);
         }).then(() => {
           this.getList();
@@ -472,7 +474,7 @@
         });
       },
       handDistribute(row) {
-        this.$modal.confirm('是否确认下发监控调阅计划"' + row.planName + '"的数据项？').then(function () {
+        this.$modal.confirm('下发计划会生成本周期所有任务,确定执行？').then(function () {
           return distribute(row.id);
         }).then(() => {
           this.getList();
@@ -482,7 +484,7 @@
 
       },
       handWithdraw(row){
-        this.$modal.confirm('撤回计划会清除本周期所有任务？').then(function () {
+        this.$modal.confirm('撤回计划会清除本周期所有任务,确定执行？').then(function () {
           return withdraw(row.id);
         }).then(() => {
           this.getList();

src/views/core/configuration/index.vue

@@ -339,7 +339,7 @@ export default {
         coreResumptionConfiguration: [this.day, this.week, this.month, this.season, this.halfYear, this.year]
       };
       insertConfiguration(data).then(response => {
-        this.$modal.msgSuccess("新增成功");
+        this.$modal.msgSuccess("保存成功");
         this.open = false;
       this.  selectInfo();
       })

src/views/core/send/index.vue

@@ -70,24 +70,24 @@
     <DialogCom :title="title" :visible.sync="open" width="500px" append-to-body>
       <el-form ref="form" :model="form" :rules="rules" label-width="80px">
         <el-form-item label="标题" prop="title">
-          <el-input v-model="form.title" maxlength="50" placeholder="请输入标题" />
+          <el-input v-model="form.title" maxlength="50" placeholder="请输入标题" clearable/>
         </el-form-item>
         <el-form-item label="类型" prop="type">
-          <el-select v-model="form.type" style="width: 100%" placeholder="请选择类型">
+          <el-select v-model="form.type" style="width: 100%" placeholder="请选择类型" clearable>
             <el-option v-for="dict in dict.type.message_type" :key="dict.value" :label="dict.label"
               :value="`${dict.value}`"></el-option>
           </el-select>
         </el-form-item>
         <el-form-item label="内容" prop="content">
-          <el-input v-model="form.content" type="textarea" :rows="10" maxlength="2000" placeholder="输入内容" />
+          <el-input v-model="form.content" type="textarea" :rows="10" maxlength="2000" placeholder="输入内容" clearable/>
         </el-form-item>
 
         <el-form-item label="发送目标" prop="sendUser">
-          <el-select mode="multiple" style="width: 100%;" v-model="form.sendUser" placeholder="按用户选择">
+          <el-select mode="multiple" style="width: 100%;" v-model="form.sendUser" filterable placeholder="按用户选择" clearable>
             <el-option v-for="item in userOptions" :key="item.id" :label="item.name" :value="item.id"></el-option>
-          </el-select>
+          </el-select> 
 
-          <el-select mode="multiple" style="width: 100%;" v-model="form.sendRole" placeholder="按角色选择">
+          <el-select mode="multiple" style="width: 100%;" v-model="form.sendRole" filterable placeholder="按角色选择" clearable>
             <el-option v-for="item in roleOptions" :key="item.id" :label="item.roleName" :value="item.id"></el-option>
           </el-select>
         </el-form-item>
@@ -240,7 +240,7 @@ export default {
   },
   created() {
     this.getList();
-    this.getAllUser();
+    this.getAllUser("");
     this.getAllRole();
   },
   methods: {
@@ -253,8 +253,8 @@ export default {
         this.loading = false;
       });
     },
-    getAllUser() {
-      listAllUser().then(response => {
+    getAllUser(val) {
+      listAllUser(val).then(response => {
         this.userOptions = response.data;
         this.form.sendRole = null;
       })

src/views/system/device/index.vue

@@ -245,7 +245,7 @@ export default {
         assetType: [
           { required: true, message: '请选择资产类别', trigger: 'change' },
         ],
-        hostId: [{ required: true, message: '请选择主机', trigger: 'blur' }],
+        hostId: [{ required: true, message: '请选择主机', trigger: 'change' }],
         channel: [{ required: true, message: '请输入通道号', trigger: 'change' }],
         deviceType: [
           { required: true, message: '请选择设备分类', trigger: 'change' },

src/views/system/user/extend.vue

@@ -25,9 +25,9 @@
           </el-col>
           <el-col :xs="24" :sm="12" :md="8" :lg="6">
 
-            <el-form-item label="持证上岗未通过原因" v-if="formData.certificateWork == 0" label-width="180"
+            <el-form-item label="持证上岗未通过原因" v-if="formData.certificateWork == 0" label-width="180" 
               prop="certificateFailReason">
-              <el-select style="width: 190px;" v-model="formData.certificateFailReason" placeholder="请选择持证上岗未通过原因">
+              <el-select style="width: 240px;" v-model="formData.certificateFailReason" placeholder="请选择持证上岗未通过原因">
                 <el-option v-for="dict in dict.type.post_no_pass" :key="dict.value" :label="dict.label"
                   :value="dict.value" />
               </el-select>
@@ -84,7 +84,7 @@
 
           <el-col :xs="24" :sm="12" :md="8" :lg="8">
             <el-form-item label="初级以上相关专业技术职业资格" label-width="240" prop="professionalQualifications">
-              <el-input style="width: 240px;" maxlength="50" v-model="formData.professionalQualifications"
+              <el-input style="width: 280px;" maxlength="50" v-model="formData.professionalQualifications"
                 placeholder="请输入初级以上相关专业技术职业资格">
               </el-input>
             </el-form-item>
@@ -110,16 +110,16 @@
           </el-col>
           <el-col :xs="24" :sm="12" :md="8" :lg="6">
             <el-form-item label="参加工作时间" prop="workTime">
-              <el-date-picker style="width: 217px;" v-model="formData.workTime" :picker-options="endDatepickerOptions"
+              <el-date-picker style="width: 217px;" v-model="formData.workTime" 
                 align="right" type="date" placeholder="请选择参加工作时间">
               </el-date-picker>
             </el-form-item>
           </el-col>
 
-
+          <!-- :picker-options="endDatepickerOptions" -->
           <el-col :xs="24" :sm="12" :md="8" :lg="6">
             <el-form-item prop="entryTime" label="现任职时间">
-              <el-date-picker v-model="formData.entryTime" :picker-options="endDatepickerOptions" align="right"
+              <el-date-picker v-model="formData.entryTime"  align="right"
                 type="date" placeholder="选择现任职时间">
               </el-date-picker>
             </el-form-item>
@@ -145,7 +145,7 @@
         </el-row>
         <el-row>
           <el-col :xs="24" :sm="24" :md="24" :lg="24">
-            <el-form-item label="上传相关证书">
+            <el-form-item v-if="formData.certificateWork == 0" label="上传相关证书">
               <imgs-upload :limit="5" v-model="formData.qualificationCertificateUrl" :fileSize="2"></imgs-upload>
             </el-form-item>
           </el-col>

src/views/system/user/index.vue

@@ -47,9 +47,9 @@
             <!-- @visible-change="selectAllRoles" -->
             <el-select
               style="width: 200px"
-              clearable
               v-model="queryParams.roleId"
               placeholder="请选择用户角色"
+              clearable
             >
               <el-option
                 v-for="item in role_options"