修改

src/views/core/send/index.vue

@@ -52,7 +52,7 @@
       <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
         <template slot-scope="scope">
           <el-button size="mini" type="text" v-if="scope.row.sendStatus == 2" icon="el-icon-edit-outline"
-            @click="handleUpdate(scope.row)" v-hasPermi="['core:send:edit']">修改</el-button>
+            @click="handleUpdate(scope.row)" v-hasPermi="['core:send:edit']">编辑</el-button>
 
           <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>
@@ -100,7 +100,7 @@
         </el-form-item>
         <el-form-item prop="sendTime" v-if="form.sendTimeType == 2" label="指定时间">
           <el-date-picker style="width: 100%;" v-model="form.sendTime" @change="startDateChanged"
-            :picker-options="startDatepickerOptions" align="right" type="date" placeholder="选择指定时间">
+            :picker-options="startDatepickerOptions" align="right" type="datetime" placeholder="选择指定时间">
           </el-date-picker>
         </el-form-item>
       </el-form>
@@ -117,9 +117,9 @@
           <el-input readonly v-model="form.title" maxlength="50" placeholder="请输入标题" />
         </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="请选择类型" :disabled="true">
             <el-option v-for="dict in dict.type.message_type" :key="dict.value" :label="dict.label"
-              :value="`${dict.value}`" :disabled="true"></el-option>
+              :value="`${dict.value}`" ></el-option>
           </el-select>
         </el-form-item>
         <el-form-item label="内容" prop="content">
@@ -127,12 +127,12 @@
         </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" placeholder="按用户选择" :disabled="true">
             <el-option v-for="item in userOptions" :key="item.id" :label="item.name" :value="item.id"
               :disabled="true"></el-option>
           </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" placeholder="按角色选择" :disabled="true">
             <el-option v-for="item in roleOptions" :key="item.id" :label="item.roleName" :value="item.id"
               :disabled="true"></el-option>
           </el-select>
@@ -144,9 +144,9 @@
             </el-radio>
           </el-radio-group>
         </el-form-item>
-        <el-form-item prop="sendTime" v-if="form.sendTimeType == 2" label="指定时间">
+        <el-form-item prop="sendTime" v-if="form.sendTimeType == 2" label="指定时间" :disabled="true">
           <el-date-picker readonly style="width: 100%;" v-model="form.sendTime" @change="startDateChanged"
-            :picker-options="startDatepickerOptions" align="right" type="date" placeholder="选择指定时间">
+            :picker-options="startDatepickerOptions" align="right" type="datetime" placeholder="选择指定时间">
           </el-date-picker>
         </el-form-item>
       </el-form>
@@ -316,7 +316,7 @@ export default {
     handleAdd() {
       this.reset();
       this.open = true;
-      this.title = "添加";
+      this.title = "新增消息";
     },
     /** 修改按钮操作 */
     handleUpdate(row) {
@@ -325,7 +325,7 @@ export default {
       getSend(id).then(response => {
         this.form = response.data;
         this.open = true;
-        this.title = "修改";
+        this.title = "编辑消息";
       });
     },
     /**

src/views/system/device/index.vue

@@ -10,12 +10,12 @@
           <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch"
             label-width="68px">
             <el-form-item label="设备名称" prop="deviceName">
-              <el-input v-model="queryParams.deviceName" placeholder="请输入设备名称" clearable
+              <el-input v-model="queryParams.deviceName" placeholder="请输入设备名称" 
                 @keyup.enter.native="handleQuery" />
             </el-form-item>
             <el-form-item label="资产类别" prop="assetType">
 
-              <el-select style="width: 100%;" clearable v-model="queryParams.assetType" placeholder="请选择"
+              <el-select style="width: 100%;"  v-model="queryParams.assetType" placeholder="请选择"
                 @change="changeSelectDevice">
                 <el-option v-for="dict in dict.type.sys_asset_type" :key="dict.value" :label="dict.label"
                   :value="`${dict.value}`"></el-option>
@@ -24,7 +24,7 @@
 
             <el-form-item label="设备分类" prop="deviceType">
 
-              <el-select style="width: 100%;" clearable v-model="queryParams.deviceType" placeholder="请选择">
+              <el-select style="width: 100%;"  v-model="queryParams.deviceType" placeholder="请选择">
                 <el-option v-for="item in devices" :key="item.dictValue" :label="item.dictLabel"
                   :value="item.dictValue"></el-option>
               </el-select>
@@ -472,7 +472,7 @@ export default {
       this.reset();
     },
     closeHandler() {
-      // alert(11111)
+      this.reset();
     },
     // 表单重置
     reset() {
@@ -521,6 +521,7 @@ export default {
       this.form.orgId = this.selectOrgId;
       this.dept.id=this.selectOrgId;
       this.changeSelect(this.dept);
+      this.devices=null;
     },
     changeSelectDevice(val) {
       if (val) {