提交

src/components/message/messageex.js

@@ -0,0 +1,22 @@
+/**
+ * 对消息提示进行扩展
+ */
+import Vue from 'vue'
+var messageContainer = {
+  info: {},
+};
+let vue=new Vue();
+export default {
+  info: (message) => {
+    if (messageContainer.info[message]) {
+      messageContainer.info[message].close();
+    }
+    
+    messageContainer.info[message] = vue.$message.info({
+      message,
+      onClose: (msgObj) => {
+        delete messageContainer.info[message];
+      },
+    });
+  },
+};

src/views/check/dialog.edit.vue

@@ -91,7 +91,7 @@
                   :disabled="isChildren()"
                   v-model="formData.startDate"
                   style="width: 240px"
-                  value-format="yyyy-MM-dd hh:mm:ss"
+                  value-format="yyyy-MM-dd 00:00:00"
                   placeholder="请选择开始时间"
                   type="date"
                   :clearable="false"
@@ -109,7 +109,7 @@
                   :disabled="isChildren()"
                   v-model="formData.endDate"
                   style="width: 240px"
-                  value-format="yyyy-MM-dd hh:mm:ss"
+                  value-format="yyyy-MM-dd 23:59:59"
                   placeholder="请选择结束时间"
                   type="date"
                   :clearable="false"
@@ -256,8 +256,14 @@
           </el-form-item>
         </el-form>
         <el-button @click="openSelect">新增检查内容</el-button>
-
-        <el-table :data="tableData" style="width: 100%" height="400px">
+        <el-button @click="deleteSelected">批量删除</el-button>
+        <el-table
+          :data="tableData"
+          style="width: 100%"
+          height="400px"
+          @selection-change="handleSelectionChange"
+        >
+          <el-table-column type="selection"></el-table-column>
           <el-table-column label="是否扫描">
             <template v-slot="{ row }">
               <el-switch
@@ -364,6 +370,7 @@ export default {
       planExec: null,
       count: 0,
       description: null,
+      selectedRows: [],
       propItem: "",
       row: "",
       tableData: [],
@@ -398,6 +405,21 @@ export default {
     ...mapGetters(["orgId", "orgName"]),
   },
   methods: {
+    // 监听行选中事件，将选中的行数据存入 selectedRows 数组中
+    handleSelectionChange(selection) {
+      // console.log(selection, "selection");
+      this.selectedRows = selection;
+    },
+    deleteSelected() {
+      // 在这里执行批量删除操作，使用 this.selectedRows 数组中的数据
+      // console.log("删除选中的数据:", this.selectedRows);
+      // 从数据数组中移除选中的行数据
+      this.tableData = this.tableData.filter(
+        (row) => !this.selectedRows.includes(row)
+      );
+      // 清空选中的行数据
+      this.selectedRows = [];
+    },
     //省联社内容不能删除
     getshenglianshe(row) {
       if (row.ofOrgId == this.orgId) {

src/views/check/index.vue

@@ -150,6 +150,9 @@
         </el-row>
 
         <el-table
+          border
+          height="600"
+          size="small"
           v-loading="loading"
           :data="pageData"
           @selection-change="handleSelectionChange"

src/views/check/task/index.vue

@@ -235,7 +235,7 @@
           </el-table-column>
 
           <el-table-column
-            prop="submitName"
+            prop="submitBy"
             label="检查人"
             min-width="100"
             v-if="columns[7].visible"

src/views/core/drill/task/dialog.info.vue

@@ -7,7 +7,7 @@
           <el-row>
 
             <el-col :span="12">
-              <el-form-item prop="type" label="演练主题">{{
+              <el-form-item prop="type" label="主题">{{
                   formData.title
                 }}
               </el-form-item>
@@ -21,7 +21,7 @@
             </el-col>
 
             <el-col :span="12">
-              <el-form-item label="演练类型">{{
+              <el-form-item label="演练项目">{{
                   formData.typeText
                 }}
               </el-form-item>
@@ -85,7 +85,7 @@
             </el-col>
             <!-- 图片 -->
             <el-col :span="12">
-              <el-form-item prop="imageList" label="签名图片">
+              <el-form-item prop="imageList" label="参与人员签名图片">
                 <ImageListPreview v-model="formData.signImageList"></ImageListPreview>
               </el-form-item>
             </el-col>

src/views/core/drill/task/dialog.newtask.vue

@@ -5,19 +5,19 @@
         <el-form :model="formData" :rules="formDataRules" size="small" ref="form" label-position="right"
                  label-width="120px" label-prefix=":">
           <el-row>
-            <!-- 培训主题 -->
+            <!-- 演练主题 -->
             <el-col :span="12">
-              <el-form-item prop="title" label="培训主题">
+              <el-form-item prop="title" label="主题">
                 <el-input
                   v-model="formData.title"
                   :maxlength="32"
-                  placeholder="请输入培训主题"
+                  placeholder="请输入主题"
                   clearable
                 />
               </el-form-item>
             </el-col>
             <el-col :span="12">
-              <el-form-item prop="content" label="演练地点">
+              <el-form-item prop="drillSite" label="演练地点">
                 <el-input v-model="formData.drillSite" placeholder="请输入演练地点" :length="50"/>
               </el-form-item>
             </el-col>

src/views/core/drill/task/dialog.perform.vue

@@ -7,7 +7,7 @@
           <el-row>
             <!-- 培训主题 -->
             <el-col :span="12">
-              <el-form-item prop="title" label="演练主题">
+              <el-form-item prop="title" label=>
                 {{ formData.title }}
               </el-form-item>
             </el-col>
@@ -32,13 +32,13 @@
             </el-col>
 
             <el-col :span="12">
-              <el-form-item prop="content" label="演练地点">
+              <el-form-item prop="drillSite" label="演练地点">
                 <el-input v-model="formData.drillSite" placeholder="请输入演练地点" :length="50"/>
               </el-form-item>
             </el-col>
             <el-col :span="24">
-              <el-form-item label="演练类型" prop="type">
-                <el-select v-model="formData.type" placeholder="请选择演练类型">
+              <el-form-item label="演练项目" prop="type">
+                <el-select v-model="formData.type" placeholder="请选择演练项目">
                   <el-option v-for="dict in dict.type.core_drill_type" :key="dict.value" :label="dict.label"
                              :value="parseInt(dict.value)">
                   </el-option>
@@ -112,9 +112,9 @@ export default {
         drillStartTime: [{required: true, message: "请选择演练开始时间"}],
         drillEndTime: [{required: true, message: "请选择演练结束时间"}],
         drillSite: [{required: true, message: "请输入演练地点"}],
-        type: [{required: true, message: "请选择演练类型"}],
+        type: [{required: true, message: "请选择演练项目"}],
         presetCase: [{required: true, message: "请输入预设案由"}],
-        drillSituation: [{required: true, message: "请输入预设案由"}],
+        drillSituation: [{required: true, message: "请输入演练情况"}],
         imageList: [{required: true, message: "请上传图片"}],
         absenceList: [{required: true, type: "array", message: "请选择参与人员", trigger: ['blur', 'change']}],
       },

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

@@ -10,8 +10,8 @@
                  label-width="100px">
 
 
-          <el-form-item label="演练类型" prop="type">
-            <el-select v-model="queryParams.type" placeholder="请选择演练类型" clearable>
+          <el-form-item label="演练项目" prop="type">
+            <el-select v-model="queryParams.type" placeholder="请选择演练项目" clearable>
               <el-option
                 v-for="dict in dict.type.core_drill_type"
                 :key="dict.value"
@@ -21,14 +21,7 @@
             </el-select>
           </el-form-item>
 
-          <el-form-item label="任务时间" prop="rangen">
-            <el-date-picker
-              v-model="queryParams.range"
-              type="daterange"
-              value-format="yyyy-MM-dd"
-              placeholder="请选择开始日期">
-            </el-date-picker>
-          </el-form-item>
+
           <el-form-item label="演练状态" prop="status">
             <el-select v-model="queryParams.status" placeholder="请选择演练状态" clearable>
               <el-option
@@ -39,6 +32,14 @@
               />
             </el-select>
           </el-form-item>
+          <el-form-item label="任务时间" prop="rangen">
+            <el-date-picker
+              v-model="queryParams.range"
+              type="daterange"
+              value-format="yyyy-MM-dd"
+              placeholder="请选择开始日期">
+            </el-date-picker>
+          </el-form-item>
           <el-form-item>
             <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
             <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
@@ -54,7 +55,7 @@
         </el-row>
 
         <el-table border height="550px" v-loading="loading" :data="eduTaskList" @selection-change="handleSelectionChange">
-          <el-table-column label="演练主题" width="200" align="left" header-align="center" prop="title"/>
+          <el-table-column label="主题" width="200" align="left" header-align="center" prop="title"/>
           <el-table-column label="演练机构" width="200" align="left" header-align="center" prop="orgName"/>
           <!--          <el-table-column label="演练角色" align="center">
                       <template slot-scope="scope">
@@ -67,7 +68,7 @@
                         </template>
                       </template>
                     </el-table-column>-->
-          <el-table-column label="演练类型" align="left" header-align="center" prop="type">
+          <el-table-column label="演练项目" align="left" header-align="center" prop="type">
             <template slot-scope="scope">
               <dict-tag :options="dict.type.core_drill_type" :value="scope.row.type"/>
             </template>
@@ -248,9 +249,14 @@ export default {
     },
     /** 重置按钮操作 */
     resetQuery() {
-      this.resetForm("queryForm");
+      this.clearQueryForm();
       this.handleQuery();
     },
+    clearQueryForm(){
+      this.queryParams.type=null;
+      this.queryParams.status=null;
+      this.queryParams.range=[];
+    },
     //单选框状态改变
     checkChange(state) {
       this.queryParams.checkSub = state;

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

@@ -443,10 +443,10 @@ export default {
       }
       return time.getTime() < new Date(startDate).getTime()
     },
-    //草稿状态显示按钮“下发、编辑、删除”，使用中显示按钮“撤回、编辑、删除”，停用状态显示按钮“下发、编辑、删除”；
-    //已完成下发的计划不显示下发按钮
+
     checkCanPublish(row) {
-      if (row.issue == 0 && row.standard == 1 && (row.planStatus == 0 || row.planStatus == 2)) {
+      //是标准计划且未下发，状态为草稿或停用，且所属机构为当前用户登录机构时才显示 “下发”按钮
+      if (row.issue == 0 && row.standard == 1 && (row.planStatus == 0 || row.planStatus == 2)&& row.belongOrgId == this.$store.getters.orgId) {
         return true
       }
       return false;

src/views/core/edu/task/dialog.info.vue

@@ -107,7 +107,7 @@
                         </el-col>
                         <!-- 图片 -->
                         <el-col :span="24">
-                            <el-form-item prop="imageList" label="签名图片">
+                            <el-form-item prop="imageList" label="参与人员签名图片">
                                 <ImageListPreview v-model="formData.signImageList"></ImageListPreview>
                                 <!-- <k-multi-upload :disabled="!!id" v-model="formData.imageList" limit="4" byModule
                                     moduleName="edu-training" v-if="isShow" /> -->

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

@@ -269,10 +269,17 @@ export default {
       this.getList();
     },
     /** 重置按钮操作 */
+    /** 重置按钮操作 */
     resetQuery() {
-      this.resetForm("queryForm");
+      this.clearQueryForm();
       this.handleQuery();
     },
+    clearQueryForm(){
+      this.queryParams.title=null;
+      this.queryParams.status=null;
+      this.queryParams.range=[];
+    },
+
     //单选框状态改变
     checkChange(state) {
       this.queryParams.checkSub = state;

src/views/core/materials/index.vue

@@ -28,11 +28,10 @@
             </el-select>
           </el-form-item>
 
-
           <el-form-item label="资料状态" prop="isOpen">
-            <el-select v-model="queryParams.isOpen" placeholder="请选择资料状态" clearable>
-              <el-option v-for="item in openOption" :key="item.value" :label="item.label"
-                         :value="item.value"></el-option>
+            <el-select v-model="queryParams.isOpen" placeholder="请选择资料状态" style="width: 100%;" clearable>
+              <el-option v-for="dict in dict.type.materials_status" :key="dict.value" :label="dict.label"
+                         :value="parseInt(dict.value)"></el-option>
             </el-select>
           </el-form-item>
 
@@ -53,41 +52,7 @@
             >新增
             </el-button>
           </el-col>
-<!--          <el-col :span="1.5">
-            <el-button
-              type="success"
-              plain
-              icon="el-icon-edit-outline"
-              size="mini"
-              :disabled="single"
-              @click="handleUpdate"
-              v-hasPermi="['core:materials:edit']"
-            >修改
-            </el-button>
-          </el-col>
-          <el-col :span="1.5">
-            <el-button
-              type="danger"
-              plain
-              icon="el-icon-delete"
-              size="mini"
-              :disabled="multiple"
-              @click="handleDelete"
-              v-hasPermi="['core:materials:remove']"
-            >删除
-            </el-button>
-          </el-col>
-          <el-col :span="1.5">
-            <el-button
-              type="warning"
-              plain
-              icon="el-icon-download"
-              size="mini"
-              @click="handleExport"
-              v-hasPermi="['core:materials:export']"
-            >导出
-            </el-button>
-          </el-col>-->
+
           <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
         </el-row>
         <!-- 表格数据 -->
@@ -96,19 +61,25 @@
           height="600"
           size="small"
           v-loading="loading" :data="materialsList" @selection-change="handleSelectionChange">
-          <el-table-column  label="序号"  type="index" align="center" width="60"/>
-          <el-table-column label="创建机构"  align="left" width="200" prop="orgName"/>
-          <el-table-column label="资料名称"   align="left" width="160" prop="title"/>
+          <el-table-column label="序号" type="index" align="center" width="60"/>
+          <el-table-column label="创建机构" align="left" width="200" prop="orgName"/>
+          <el-table-column label="资料名称" align="left" width="160" prop="title"/>
 
           <el-table-column label="资料类型" align="center" width="180" prop="knowledgeId">
             <template slot-scope="scope">
-              <dict-tag :options="dict.type.edu_materials_type" :value="scope.row.knowledgeId"/>
+              <dict-tag :options="dict.type.edu_materials_type" :value="parseInt(scope.row.knowledgeId)"/>
             </template>
           </el-table-column>
           <!-- <el-table-column label="资料附件"  width="200" align="left" prop="fileNames"/> -->
-          <el-table-column label="资料状态" align="center" prop="isOpen">
-            <template slot-scope="r">{{ r.row.isOpen == 0 ? '待发布' : '已发布' }}</template>
+          <!--          <el-table-column label="资料状态" align="center" prop="isOpen">
+                      <template slot-scope="r">{{ r.row.isOpen == 0 ? '待发布' : '已发布' }}</template>
+                    </el-table-column>-->
+          <el-table-column label="资料状态" align="center" header-align="center" prop="isOpen">
+            <template slot-scope="scope">
+              <dict-tag :options="dict.type.materials_status" :value="scope.row.isOpen"/>
+            </template>
           </el-table-column>
+
           <el-table-column label="创建人" align="center" prop="createBy"/>
           <el-table-column label="创建时间" align="center" prop="createTime"/>
           <el-table-column width="250" scoped-slot="remark" align="center" prop="remark" label="备注"></el-table-column>
@@ -117,7 +88,7 @@
             <template slot-scope="scope">
               <!-- 公开 按钮显示逻辑: 仅当前用户上传的学习资料且处于未公开状态-->
               <el-button
-                v-if="checkCanEditOpen(scope.row)&&scope.row.isOpen==0"
+                v-if="checkCanEditOpen(scope.row)&&(scope.row.isOpen==0||scope.row.isOpen==2)"
                 size="mini"
                 type="text"
                 icon="el-icon-folder-opened"
@@ -127,7 +98,7 @@
               </el-button>
               <!-- 取消公开 按钮显示逻辑: 仅当前用户上传的学习资料且处于公开状态-->
               <el-button
-                v-if="checkCanEditOpen(scope.row)&&scope.row.isOpen===1"
+                v-if="checkCanEditOpen(scope.row)&&scope.row.isOpen==1"
                 size="mini"
                 type="text"
                 icon="el-icon-folder"
@@ -184,24 +155,20 @@
         </el-form-item>
 
         <el-form-item label="资料类型" prop="knowledgeId">
-<!--          <el-select style="width: 100%" v-model="form.knowledgeId" placeholder="请选择资料类型">
-            <el-option v-for="item in knowledgeList" :key="item.id" :label="item.name" :value="item.id"></el-option>
-          </el-select>-->
-
-          <el-select  style="width: 100%"  v-model="form.knowledgeId" placeholder="请选择资料类型">
+          <el-select style="width: 100%" v-model="form.knowledgeId" placeholder="请选择资料类型">
             <el-option v-for="dict in dict.type.edu_materials_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" placeholder="请输入资料内容" maxlength="200" show-word-limit/>
-        </el-form-item>-->
+        <!--        <el-form-item label="资料内容" prop="content">
+                  <el-input v-model="form.content" placeholder="请输入资料内容" maxlength="200" show-word-limit/>
+                </el-form-item>-->
 
         <el-form-item label="资料附件" prop="fileList">
-          <K-file-upload  ref="upload" :isShowUploadBtn="title!='知识库详情'"
-          :defaultValue="formFileListDefualtValue"
-          v-model="form.fileList"/>
+          <K-file-upload ref="upload" :isShowUploadBtn="title!='知识库详情'"
+                         :defaultValue="formFileListDefualtValue"
+                         v-model="form.fileList"/>
         </el-form-item>
 
         <el-form-item prop="remark" label="备注">
@@ -237,9 +204,9 @@ import KTextarea from "@/components/common/textarea.vue";
 
 export default {
   name: "Materials",
-  components: {OrgTree, kOrgTree, KFileUpload,KTextarea},
+  components: {OrgTree, kOrgTree, KFileUpload, KTextarea},
   mixins: [tableList],
-  dicts: ["edu_materials_type"],
+  dicts: ["edu_materials_type", 'materials_status'],
   data() {
     return {
       // 遮罩层
@@ -270,10 +237,10 @@ export default {
         children: "children",
         label: "name"
       },
-      formFileListDefualtValue:[],
+      formFileListDefualtValue: [],
       // 查询参数
       queryParams: {
-        checkSub:true,
+        checkSub: true,
         pageNum: 1,
         pageSize: 10,
         title: null,
@@ -296,7 +263,7 @@ export default {
         content: [
           {required: true, message: "资料内容不能为空", trigger: "blur"}
         ],
-        fileList:[
+        fileList: [
           {required: true, message: "资料附件不能为空", trigger: "blur"}
         ],
       },
@@ -377,7 +344,7 @@ export default {
         orgId: this.$store.getters.orgId,
         isOpen: null,
         remark: null,
-        fileNames:null,
+        fileNames: null,
         fileList: [],
       };
       // this.formFileListDefualtValue=[];
@@ -472,7 +439,7 @@ export default {
       const id = row.id || this.ids
       getMaterials(id).then(response => {
         this.form = response.data;
-        this.formFileListDefualtValue=this.form.fileList;
+        this.formFileListDefualtValue = this.form.fileList;
         this.open = true;
         this.title = "修改知识库";
       });
@@ -483,7 +450,7 @@ export default {
       const id = row.id || this.ids
       getMaterials(id).then(response => {
         this.form = response.data;
-        this.formFileListDefualtValue=this.form.fileList;
+        this.formFileListDefualtValue = this.form.fileList;
         this.open = true;
         this.title = "知识库详情";
       });
@@ -532,7 +499,8 @@ export default {
   overflow: hidden;
   text-overflow: ellipsis;
 }
-.endItem .el-input__inner{
+
+.endItem .el-input__inner {
   padding-right: 50px;
 }
 </style>

src/views/resumption/plan/dialog.edit.vue

@@ -198,8 +198,15 @@
           </el-form-item>
         </el-form>
         <el-button @click="openSelect">新增履职内容</el-button>
+        <el-button @click="deleteSelected">批量删除</el-button>
+        <el-table
+          :data="tableData"
+          style="width: 100%"
+          height="400px"
+          @selection-change="handleSelectionChange"
+        >
+          <el-table-column type="selection"></el-table-column>
 
-        <el-table :data="tableData" style="width: 100%" height="400px">
           <el-table-column label="是否扫描">
             <template v-slot="{ row }">
               <el-switch
@@ -337,6 +344,7 @@ export default {
       row: "",
       tableData: [],
       id: null,
+      selectedRows: [],
       isShow: false,
       formData: {},
       formDataRules: {
@@ -367,6 +375,21 @@ export default {
     ...mapGetters(["orgId", "orgName"]),
   },
   methods: {
+    // 监听行选中事件，将选中的行数据存入 selectedRows 数组中
+    handleSelectionChange(selection) {
+      // console.log(selection, "selection");
+      this.selectedRows = selection;
+    },
+    deleteSelected() {
+      // 在这里执行批量删除操作，使用 this.selectedRows 数组中的数据
+      console.log("删除选中的数据:", this.selectedRows);
+      // 从数据数组中移除选中的行数据
+      this.tableData = this.tableData.filter(
+        (row) => !this.selectedRows.includes(row)
+      );
+      // 清空选中的行数据
+      this.selectedRows = [];
+    },
     changeBuildTime() {
       // console.log(this.formData.planCycle, "this.formData.planCycle");
       const dateObj = new Date(); // 获取当前时间对象
@@ -400,7 +423,7 @@ export default {
         case "5":
           const year2 = dateObj.getFullYear(); // 获取年份
           const month2 = String(dateObj.getMonth() + 1).padStart(2, "0"); // 获取月份，并补齐两位数
-          const day2 = String(dateObj.getDate()).padStart(2, "0"); // 获取日期，并补齐两位数
+          const day2 = "01"; // 获取日期，并补齐两位数
           var month3 = month2;
           month3++;
           for (var i = 0; i < 12; i++) {
@@ -668,6 +691,7 @@ export default {
           this.tableData = res.data.itemList;
         });
       }
+      this.changeBuildTime();
       this.isShow = true;
     },
     removeRow(row) {

src/views/resumption/ruleManager/dialog.editItem.vue

@@ -87,7 +87,7 @@
 import { mapState, mapMutations } from "vuex";
 import EditPoint from "./dialog.editPoint.vue";
 import { get, update } from "@/api/resumption/ruleManager.js";
-
+import MessageEx from "@/components/message/messageex.js";
 export default {
   data() {
     return {
@@ -138,7 +138,7 @@ export default {
           !this.formData.pointDtoList ||
           this.formData.pointDtoList.length == 0
         ) {
-          this.$message.warning("履职内容不能为空!");
+          MessageEx.info("履职内容不能为空!");
           return;
         }
         update(this.formData).then((v) => {

src/views/resumption/ruleManager/dialog.editPoint.vue

@@ -58,6 +58,7 @@
 import { mapState, mapMutations } from "vuex";
 import { allAreaByOrgtype } from "@/api/system/area";
 import { allCheckByOrgType } from "@/api/system/check";
+import MessageEx from "@/components/message/messageex.js";
 export default {
   data() {
     return {
@@ -130,7 +131,7 @@ export default {
       this.$refs.form.validate((isValidate) => {
         if (!isValidate) return;
         if(!this.formData.checkId && !this.formData.areaId){
-          this.$message.warning("履职区域、履职点位至少选择一个");
+          MessageEx.info("履职区域、履职点位至少选择一个");
           return;
         }
         let obj = {};

src/views/resumption/ruleManager/index.vue

@@ -8,7 +8,7 @@
         </org-tree>
       </el-col>
       <el-col :span="20" :xs="24">
-        <el-form :model="queryParams" ref="search" size="small" :inline="true" v-show="showSearch" label-width="100px">
+        <el-form :model="queryParams" ref="search" size="small" :inline="true" v-show="showSearch && rule" label-width="100px">
           <el-form-item prop="itemName" label="履职项" class="search_itemname">
             <el-input v-model="queryParams.itemName" placeholder="请输入履职项" maxlength="50" clearable></el-input>
           </el-form-item>

src/views/safetycheck/ruleManager/dialog.editItem.vue

@@ -76,7 +76,7 @@
 import { mapState, mapMutations } from "vuex";
 import EditPoint from "./dialog.editPoint.vue";
 import { get, update } from "@/api/safetycheck/ruleManager.js";
-
+import MessageEx from "@/components/message/messageex.js";
 export default {
   data() {
     return {
@@ -123,7 +123,7 @@ export default {
           return;
         }
         if(!this.formData.pointDtoList || this.formData.pointDtoList.length==0){
-          this.$message.warning("检查内容不能为空!");
+          MessageEx.info("检查内容不能为空!");
           return;
         }
         update(this.formData).then((v) => {
@@ -156,10 +156,8 @@ export default {
 </script>
 
 <style lang="scss">
-.brand_info {
-  .el-form {
-    width: 600px;
-    padding-top: 40px;
-  }
+
+.box {
+  margin-bottom: 20px;
 }
 </style>

src/views/safetycheck/ruleManager/index.vue

@@ -24,7 +24,7 @@
           ref="search"
           size="small"
           :inline="true"
-          v-show="showSearch"
+          v-show="showSearch && rule"
           label-width="100px"
         >
           <el-form-item prop="itemName" label="检查项">

src/views/system/dept/index.vue

@@ -217,8 +217,8 @@
             <el-table-column
               label="操作"
               align="center"
-              fixed="right"
-              width="160"
+            width="300"
+            fixed="right"
               class-name="small-padding fixed-width"
             >
               <template slot-scope="scope">
@@ -240,7 +240,7 @@
                     >补充信息</el-button
                   >
                 <!-- </router-link> -->
-
+                <el-divider direction="vertical"></el-divider>
                 <el-button
                   size="mini"
                   type="text"
@@ -248,7 +248,7 @@
                   @click="handleUpdate(scope.row)"
                   v-hasPermi="['system:dept:edit']"
                   >编辑</el-button
-                >
+                ><el-divider direction="vertical"></el-divider>
                 <el-button
                   v-if="!scope.row.source"
                   size="mini"
@@ -723,14 +723,14 @@ export default {
     /** 提交按钮 */
     changeSubmitForm() {
       this.addIndex = 2;
-      debugger;
       this.$refs["form"].validate((valid) => {
         if (valid) {
+          console.log(this.queryParams,'queryParams')
           updateDept(this.form).then((response) => {
             this.$modal.msgSuccess("处理成功");
             this.open = false;
             this.getList();
-            this.getDeptTree();
+            // this.getDeptTree();
           });
         }
       });

src/views/system/device/index.vue

@@ -3,8 +3,13 @@
     <el-row :gutter="20">
       <!--机构数据-->
       <el-col :span="4" :xs="24">
-                  <org-tree v-model="queryParams.orgId" @defaultKey="getDefaultKey" @defaultOrg="getDefaultOrg" @checkChange="checkChange"
-                    @click="clickTreeNode"></org-tree>
+        <org-tree
+          v-model="queryParams.orgId"
+          @defaultKey="getDefaultKey"
+          @defaultOrg="getDefaultOrg"
+          @checkChange="checkChange"
+          @click="clickTreeNode"
+        ></org-tree>
       </el-col>
         <el-col :span="20" :xs="24">
           <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch"
@@ -22,79 +27,175 @@
               </el-select>
             </el-form-item>
 
-            <el-form-item label="设备分类" prop="deviceType">
-
+          <el-form-item label="设备分类" prop="deviceType">
+            <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>
+          </el-form-item>
+
+<<<<<<< HEAD
               <el-select style="width: 100%;"  v-model="queryParams.deviceType" placeholder="请选择">
                 <el-option v-for="item in searchDevices" :key="item.dictValue" :label="item.dictLabel"
                   :value="item.dictValue"></el-option>
               </el-select>
             </el-form-item>
-
-            <el-form-item>
-              <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
-              <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
-            </el-form-item>
-          </el-form>
-
-          <el-row :gutter="10" class="mb8">
-           <!-- <el-col :span="1.5">
+=======
+          <el-form-item>
+            <el-button
+              type="primary"
+              icon="el-icon-search"
+              size="mini"
+              @click="handleQuery"
+              >搜索</el-button
+            >
+            <el-button icon="el-icon-refresh" size="mini" @click="resetQuery"
+              >重置</el-button
+            >
+          </el-form-item>
+        </el-form>
+>>>>>>> c6e1db440ea56e6ba0fc50bceaefd540b16737ca
+
+        <el-row :gutter="10" class="mb8">
+          <!-- <el-col :span="1.5">
               <el-button type="info" plain icon="el-icon-upload2" size="mini" @click="handleImport"
                 v-hasPermi="['system:device:import']">导入</el-button>
             </el-col>  -->
-        <el-col :span="1.5">
-                <el-button type="primary" icon="el-icon-plus" size="mini" @click="handleImport" v-hasPermi="['system:device:importData']">导入</el-button>
-            </el-col> 
-
-            <el-col :span="1.5">
-                <el-button type="primary" icon="el-icon-plus" size="mini" @click="handleAdd" v-hasPermi="['system:device:add']">新增</el-button>
-            </el-col>
-
-            <el-col :span="1.5">
-<el-button type="primary" icon="el-icon-plus" size="mini" @click="handleOut" v-hasPermi="['system:user:export']">导出模版</el-button>
-</el-col>
-            <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
-          </el-row>
-
-          <el-table border height="600" size="small" v-loading="loading" :data="deviceList"
-            @selection-change="handleSelectionChange">
-            <!--<el-table-column type="selection" width="55" align="center" />-->
-            <el-table-column label="序号" align="center" min-width="50">
-              <template v-slot:default="scope">
-                <span v-text="getPageIndex(scope.$index)"> </span>
-              </template>
-            </el-table-column>
-            <el-table-column label="所属机构" align="left" prop="orgName" />
-
-            <el-table-column label="资产类别" align="center" key="assetType" prop="assetType" width="80">
-              <template slot-scope="scope">
-                <dict-tag :options="dict.type.sys_asset_type" :value="scope.row.assetType" />
-              </template>
-            </el-table-column>
+          <el-col :span="1.5">
+            <el-button
+              type="primary"
+              icon="el-icon-plus"
+              size="mini"
+              @click="handleImport"
+              v-hasPermi="['system:device:importData']"
+              >导入</el-button
+            >
+          </el-col>
 
-            <el-table-column label="设备分类" align="center" key="deviceType" prop="deviceType" width="80">
-              <template slot-scope="scope">
-                <dict-tag :options="dict.type.sys_device_type" :value="scope.row.deviceType" />
-              </template>
-            </el-table-column>
-            <el-table-column label="设备名称" align="center" prop="deviceName" />
-            <el-table-column label="设备品牌" align="center" prop="deviceBrand" />
-            <el-table-column label="有效期至" align="center" prop="checkTime" width="160">
-            </el-table-column>
-            <!--    <el-table-column label="保修期限" align="center" prop="maintenanceTerm" /> -->
-            <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-outline" @click="handleUpdate(scope.row)"
-                  v-hasPermi="['system:device:edit']">编辑</el-button>
-                <el-button size="mini" type="text" icon="el-icon-delete" @click="handleDelete(scope.row)"
-                  v-hasPermi="['system:device:remove']">删除</el-button>
-              </template>
-            </el-table-column>
-          </el-table>
+          <el-col :span="1.5">
+            <el-button
+              type="primary"
+              icon="el-icon-plus"
+              size="mini"
+              @click="handleAdd"
+              v-hasPermi="['system:device:add']"
+              >新增</el-button
+            >
+          </el-col>
 
-          <pagination v-show="total > 0" :total="total" :page.sync="queryParams.pageNum"
-            :limit.sync="queryParams.pageSize" @pagination="getList" />
-        </el-col>
+          <el-col :span="1.5">
+            <el-button
+              type="primary"
+              icon="el-icon-plus"
+              size="mini"
+              @click="handleOut"
+              v-hasPermi="['system:user:export']"
+              >导出模版</el-button
+            >
+          </el-col>
+          <right-toolbar
+            :showSearch.sync="showSearch"
+            @queryTable="getList"
+          ></right-toolbar>
+        </el-row>
 
+        <el-table
+          border
+          height="600"
+          size="small"
+          v-loading="loading"
+          :data="deviceList"
+          @selection-change="handleSelectionChange"
+        >
+          <!--<el-table-column type="selection" width="55" align="center" />-->
+          <el-table-column label="序号" align="center" min-width="50">
+            <template v-slot:default="scope">
+              <span v-text="getPageIndex(scope.$index)"> </span>
+            </template>
+          </el-table-column>
+          <el-table-column label="所属机构" align="left" prop="orgName" />
+
+          <el-table-column
+            label="资产类别"
+            align="center"
+            key="assetType"
+            prop="assetType"
+            width="80"
+          >
+            <template slot-scope="scope">
+              <dict-tag
+                :options="dict.type.sys_asset_type"
+                :value="scope.row.assetType"
+              />
+            </template>
+          </el-table-column>
+
+          <el-table-column
+            label="设备分类"
+            align="center"
+            key="deviceType"
+            prop="deviceType"
+            width="80"
+          >
+            <template slot-scope="scope">
+              <dict-tag
+                :options="dict.type.sys_device_type"
+                :value="scope.row.deviceType"
+              />
+            </template>
+          </el-table-column>
+          <el-table-column label="设备名称" align="center" prop="deviceName" />
+          <el-table-column label="设备品牌" align="center" prop="deviceBrand" />
+          <el-table-column
+            label="有效期至"
+            align="center"
+            prop="checkTime"
+            width="160"
+          >
+          </el-table-column>
+          <!--    <el-table-column label="保修期限" align="center" prop="maintenanceTerm" /> -->
+          <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-outline"
+                @click="handleUpdate(scope.row)"
+                v-hasPermi="['system:device:edit']"
+                >编辑</el-button
+              >
+              <el-button
+                size="mini"
+                type="text"
+                icon="el-icon-delete"
+                @click="handleDelete(scope.row)"
+                v-hasPermi="['system:device:remove']"
+                >删除</el-button
+              >
+            </template>
+          </el-table-column>
+        </el-table>
+
+        <pagination
+          v-show="total > 0"
+          :total="total"
+          :page.sync="queryParams.pageNum"
+          :limit.sync="queryParams.pageSize"
+          @pagination="getList"
+        />
+      </el-col>
     </el-row>
 
     <!-- 添加或修改【请填写功能名称】对话框 -->
@@ -105,7 +206,7 @@
       @close="closeHandler"
       append-to-body
     >
-    <el-form ref="form" :model="form" :rules="rules" label-width="80px">
+      <el-form ref="form" :model="form" :rules="rules" label-width="80px">
         <el-row>
           <el-col :span="20">
             <el-form-item label="所属机构" prop="orgId">
@@ -117,7 +218,10 @@
                 :props="{ checkStrictly: true, label: 'name' }"
                 placeholder="请选择归属机构"
                 @select="changeSelect"
-                 clearValueText="清除"
+                clearValueText="清除"
+                :noChildrenText="''"
+                noOptionsText="没有数据"
+                noResultsText="没有搜索结果"
               />
             </el-form-item>
           </el-col>
@@ -125,17 +229,34 @@
         <el-row>
           <el-col :span="12">
             <el-form-item label="资产类别" prop="assetType">
-              <el-select style="width: 100%;" v-model="form.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>
+              <el-select
+                style="width: 100%"
+                v-model="form.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>
               </el-select>
             </el-form-item>
           </el-col>
           <el-col :span="12">
             <el-form-item label="设备分类" prop="deviceType">
-              <el-select style="width: 100%" v-model="form.deviceType" placeholder="请选择">
-                <el-option v-for="item in devices" :key="item.dictValue" :label="item.dictLabel"
-                  :value="item.dictValue"></el-option>
+              <el-select
+                style="width: 100%"
+                v-model="form.deviceType"
+                placeholder="请选择"
+              >
+                <el-option
+                  v-for="item in devices"
+                  :key="item.dictValue"
+                  :label="item.dictLabel"
+                  :value="item.dictValue"
+                ></el-option>
               </el-select>
             </el-form-item>
           </el-col>
@@ -143,7 +264,11 @@
         <el-row>
           <el-col :span="12">
             <el-form-item label="设备名称" prop="deviceName">
-              <el-input v-model="form.deviceName" placeholder="请输入" maxlength="50"/>
+              <el-input
+                v-model="form.deviceName"
+                placeholder="请输入"
+                maxlength="50"
+              />
             </el-form-item>
           </el-col>
           <el-col :span="12">
@@ -154,57 +279,98 @@
         </el-row>
         <el-row>
           <el-col :span="12">
-            <el-form-item v-if="form.deviceType == 2" label="主机" prop="hostId">
-              <el-select style="width: 100%" v-model="form.hostId" placeholder="请选择">
-                <el-option v-for="item in hostList" :key="item.id" :label="item.deviceName" :value="item.id"></el-option>
+            <el-form-item
+              v-if="form.deviceType == 2"
+              label="主机"
+              prop="hostId"
+            >
+              <el-select
+                style="width: 100%"
+                v-model="form.hostId"
+                placeholder="请选择"
+              >
+                <el-option
+                  v-for="item in hostList"
+                  :key="item.id"
+                  :label="item.deviceName"
+                  :value="item.id"
+                ></el-option>
               </el-select>
             </el-form-item>
           </el-col>
 
           <el-col :span="12">
-            <el-form-item v-if="form.deviceType == 2" label="通道号" prop="channel">
-              <el-input type="number" max="64" min="0"
-                oninput="if(value<=0)value=null;if(value>=64)value=64;value=parseInt(value)" v-model="form.channel"
-                placeholder="请输入" />
+            <el-form-item
+              v-if="form.deviceType == 2"
+              label="通道号"
+              prop="channel"
+            >
+              <el-input
+                type="number"
+                max="64"
+                min="0"
+                oninput="if(value<=0)value=null;if(value>=64)value=64;value=parseInt(value)"
+                v-model="form.channel"
+                placeholder="请输入"
+              />
             </el-form-item>
           </el-col>
-
         </el-row>
 
-
         <el-row>
           <el-col :span="12">
-            <el-form-item v-if="form.assetType == 0" label="有效期至" prop="checkTime">
-              <el-date-picker style="width: 100%" clearable v-model="form.checkTime" type="date"
-                value-format="yyyy-MM-dd HH:mm:ss" placeholder="请选择时间">
+            <el-form-item
+              v-if="form.assetType == 0"
+              label="有效期至"
+              prop="checkTime"
+            >
+              <el-date-picker
+                style="width: 100%"
+                clearable
+                v-model="form.checkTime"
+                type="date"
+                value-format="yyyy-MM-dd HH:mm:ss"
+                placeholder="请选择时间"
+              >
               </el-date-picker>
             </el-form-item>
           </el-col>
         </el-row>
-        <el-row>
-        </el-row>
+        <el-row> </el-row>
       </el-form>
       <div slot="footer" class="dialog-footer">
         <el-button type="primary" @click="submitForm">确 定</el-button>
         <el-button @click="cancel">取 消</el-button>
       </div>
-  </DialogCom>
+    </DialogCom>
 
-        <!-- 设备导入对话框 -->
-        <DialogCom :title="upload.title" :visible.sync="upload.open" width="400px" append-to-body>
-      <el-upload ref="upload" :limit="1" accept=".xlsx, .xls" :headers="upload.headers"
-        :action="upload.url " :disabled="upload.isUploading"
-        :on-progress="handleFileUploadProgress" :on-success="handleFileSuccess" :auto-upload="false" drag>
+    <!-- 设备导入对话框 -->
+    <DialogCom
+      :title="upload.title"
+      :visible.sync="upload.open"
+      width="400px"
+      append-to-body
+    >
+      <el-upload
+        ref="upload"
+        :limit="1"
+        accept=".xlsx, .xls"
+        :headers="upload.headers"
+        :action="upload.url"
+        :disabled="upload.isUploading"
+        :on-progress="handleFileUploadProgress"
+        :on-success="handleFileSuccess"
+        :auto-upload="false"
+        drag
+      >
         <i class="el-icon-upload"></i>
         <div class="el-upload__text">将文件拖到此处，或<em>点击上传</em></div>
-
       </el-upload>
       <div slot="footer" class="dialog-footer">
         <el-button type="primary" @click="submitFileForm">确 定</el-button>
         <el-button @click="upload.open = false">取 消</el-button>
       </div>
     </DialogCom>
-   
   </div>
 </template>
 
@@ -212,18 +378,26 @@
 import { getToken } from "@/utils/auth";
 import orgDropDown from "../../../components/orgTree/orgDropDown.vue";
 import OrgTree from "@/components/orgTree";
-import tableList from '@/mixins/tableList'
-import treeselect from '@riophae/vue-treeselect'
+import tableList from "@/mixins/tableList";
+import treeselect from "@riophae/vue-treeselect";
 import "@riophae/vue-treeselect/dist/vue-treeselect.css";
 import { deptTreeSelect } from "@/api/system/public";
 import { getDeviceType } from "@/api/system/dict/data";
-import { listDevice, getDevice, delDevice, addDevice, updateDevice, getHostByOrgId ,downInCharge} from "@/api/system/device";
+import {
+  listDevice,
+  getDevice,
+  delDevice,
+  addDevice,
+  updateDevice,
+  getHostByOrgId,
+  downInCharge,
+} from "@/api/system/device";
 export default {
   /** 引入基础minxins*/
   mixins: [tableList],
-  dicts: ['sys_asset_type', 'sys_device_type'],
+  dicts: ["sys_asset_type", "sys_device_type"],
   name: "Device",
-  components: { OrgTree, treeselect,orgDropDown },
+  components: { OrgTree, treeselect, orgDropDown },
   data() {
     return {
       checkList: [],
@@ -233,29 +407,24 @@ export default {
       checked: false,
       defaultProps: {
         children: "children",
-        label: "name"
+        label: "name",
       },
       rules: {
         deviceName: [
-          { required: true, message: '请输入设备名称', trigger: 'change' },
-        ],
-        orgId: [
-          { required: true, message: '请选择所属机构', trigger: 'blur' },
+          { required: true, message: "请输入设备名称", trigger: "change" },
         ],
+        orgId: [{ required: true, message: "请选择所属机构", trigger: "blur" }],
         assetType: [
           { required: true, message: '请选择资产类别', trigger: 'change' },
         ],
         hostId: [{ required: true, message: '请选择主机', trigger: 'change' }],
         channel: [{ required: true, message: '请输入通道号', trigger: 'change' }],
         deviceType: [
-          { required: true, message: '请选择设备分类', trigger: 'change' },
-
+          { required: true, message: "请选择设备分类", trigger: "change" },
         ],
         checkTime: [
-          { required: true, message: '请选择有效期', trigger: 'blur' },
-        ]
-
-
+          { required: true, message: "请选择有效期", trigger: "blur" },
+        ],
       },
       // 遮罩层
       loading: true,
@@ -285,8 +454,8 @@ export default {
       // 是否显示弹出层
       open: false,
       // 查询参数
-      dept:{
-        id:null
+      dept: {
+        id: null,
       },
       queryParams: {
         pageNum: 1,
@@ -301,11 +470,16 @@ export default {
         maintenanceTerm: null,
         hostId: null,
         channel: null,
-        checkSub: true
+        checkSub: true,
       },
+<<<<<<< HEAD
 
         // 设备导入参数
         upload: {
+=======
+      // 设备导入参数
+      upload: {
+>>>>>>> c6e1db440ea56e6ba0fc50bceaefd540b16737ca
         // 是否显示弹出层（用户导入）
         open: false,
         // 弹出层标题（用户导入）
@@ -316,7 +490,10 @@ export default {
         // 设置上传的请求头部
         headers: { Authorization: "Bearer " + getToken() },
         // 上传的地址
-        url:  process.env.NODE_ENV === "development"?process.env.VUE_APP_BASE_API + "/system/device/importData":window.origin+"/system/device/importData",
+        url:
+          process.env.NODE_ENV === "development"
+            ? process.env.VUE_APP_BASE_API + "/system/device/importData"
+            : window.origin + "/system/device/importData",
       },
       // 表单参数
       form: {
@@ -328,7 +505,7 @@ export default {
         checkTime: null,
         maintenanceTerm: null,
         hostId: null,
-        channel: null
+        channel: null,
       },
       // 表单校验
 
@@ -340,25 +517,23 @@ export default {
   created() {
     this.getDeptTree();
     //this.getList();
-
   },
 
   watch: {
     // 根据名称筛选部门树
     deptName(val) {
-
       this.$refs.tree.filter(val);
-    }
+    },
   },
 
   methods: {
     onOrgSelect(node) {
       this.form.orgPath = node.path;
-      debugger
+      debugger;
       this.form.orgName = node.name;
     },
-        // 文件上传中处理
-        handleFileUploadProgress(event, file, fileList) {
+    // 文件上传中处理
+    handleFileUploadProgress(event, file, fileList) {
       this.upload.isUploading = true;
     },
     handleImport() {
@@ -366,21 +541,21 @@ export default {
       this.upload.open = true;
     },
 
-      // 文件上传成功处理
-      handleFileSuccess(response, file, fileList) {
+    // 文件上传成功处理
+    handleFileSuccess(response, file, fileList) {
       this.upload.open = false;
       this.upload.isUploading = false;
       this.$refs.upload.clearFiles();
       this.$alert(
         "<div style='overflow: auto;overflow-x: hidden;max-height: 70vh;padding: 10px 20px 0;'>" +
-        response.msg +
-        "</div>",
+          response.msg +
+          "</div>",
         "导入结果",
         { dangerouslyUseHTMLString: true }
       );
       this.getList();
     },
-    getDefaultOrg(org){
+    getDefaultOrg(org) {
       this.orgName = org.name;
     },
     getDefaultKey(key) {
@@ -410,31 +585,35 @@ export default {
     },
     /** 查询机构树数据 */
 
-
-
     // 节点单击事件
     handleNodeClick(data) {
       this.queryParams.orgId = data.id;
       this.selectOrgId = data.id;
-   this.changeSelect(data);
+      this.changeSelect(data);
       this.handleQuery();
     },
     changeSelect(val) {
-      getHostByOrgId(val).then(response => {
+      getHostByOrgId(val).then((response) => {
         this.form.hostId = null;
         this.hostList = response.data;
-      })
+      });
     },
-    
-    handleOut(){
-      this.download('system/device/downInChargeOfTemplate', {
-        ...this.queryParams
-      }, `${this.orgName+'-设备导入-'+this.formatTime(new Date(),'YYYYMMhh')}.xlsx`)
+
+    handleOut() {
+      this.download(
+        "system/device/downInChargeOfTemplate",
+        {
+          ...this.queryParams,
+        },
+        `${
+          this.orgName + "-设备导入-" + this.formatTime(new Date(), "YYYYMMhh")
+        }.xlsx`
+      );
     },
     /** 查询【请填写功能名称】列表 */
     getList() {
       this.loading = true;
-      listDevice(this.queryParams).then(response => {
+      listDevice(this.queryParams).then((response) => {
         this.deviceList = response.rows;
         this.total = response.total;
         this.loading = false;
@@ -443,7 +622,7 @@ export default {
 
     /** 查询部门下拉树结构 */
     getDeptTree() {
-      deptTreeSelect().then(response => {
+      deptTreeSelect().then((response) => {
         this.deptOptions = response.data;
         this.defaultKeys.push(response.data[0].id);
         this.queryParams.orgId = response.data[0].id;
@@ -494,7 +673,7 @@ export default {
         updateBy: null,
         delFlag: null,
         hostId: null,
-        channel: null
+        channel: null,
       };
       this.resetForm("form");
     },
@@ -505,33 +684,33 @@ export default {
     },
     /** 重置按钮操作 */
     resetQuery() {
-     this.devices=null;
+      this.devices = null;
       this.resetForm("queryForm");
       this.handleQuery();
     },
     // 多选框选中数据
     handleSelectionChange(selection) {
-      this.ids = selection.map(item => item.id)
-      this.names = selection.map(item => item.deviceName)
-      this.single = selection.length !== 1
-      this.multiple = !selection.length
+      this.ids = selection.map((item) => item.id);
+      this.names = selection.map((item) => item.deviceName);
+      this.single = selection.length !== 1;
+      this.multiple = !selection.length;
     },
     /** 新增按钮操作 */
     handleAdd(val) {
       this.open = true;
       this.title = "新增";
       this.form.orgId = this.selectOrgId;
-      this.dept.id=this.selectOrgId;
+      this.dept.id = this.selectOrgId;
       this.changeSelect(this.dept);
-      this.devices=null;
+      this.devices = null;
     },
     changeSelectDevice(val) {
       if (val) {
-        getDeviceType(val).then(response => {
+        getDeviceType(val).then((response) => {
           this.devices = response.data;
           this.form.deviceType = null;
           this.queryParams.deviceType = null;
-        })
+        });
       }
     },
     searchChangeSelectDevice(val) {
@@ -546,28 +725,27 @@ export default {
     /** 修改按钮操作 */
     handleUpdate(row) {
       this.reset();
-      const id = row.id || this.ids
-      getDevice(id).then(response => {
+      const id = row.id || this.ids;
+      getDevice(id).then((response) => {
         this.form = response.data;
-     this.devices=response.devices;
-     this.hostList=response.hostList;
+        this.devices = response.devices;
+        this.hostList = response.hostList;
         this.open = true;
         this.title = "编辑";
       });
-
     },
     /** 提交按钮 */
     submitForm() {
-      this.$refs["form"].validate(valid => {
+      this.$refs["form"].validate((valid) => {
         if (valid) {
           if (this.form.id != null) {
-            updateDevice(this.form).then(response => {
+            updateDevice(this.form).then((response) => {
               this.$modal.msgSuccess("处理成功");
               this.open = false;
               this.getList();
             });
           } else {
-            addDevice(this.form).then(response => {
+            addDevice(this.form).then((response) => {
               this.$modal.msgSuccess("处理成功");
               this.open = false;
               this.getList();
@@ -580,23 +758,31 @@ export default {
     handleDelete(row) {
       const ids = row.id || this.ids;
       const names = row.deviceName || this.names;
-      this.$modal.confirm('是否确认删除名称为"' + names + '"的数据项？').then(function () {
-        return delDevice(ids);
-      }).then(() => {
-        this.getList();
-        this.$modal.msgSuccess("删除成功");
-      }).catch(() => { });
-    },
-        // 提交上传文件
-        submitFileForm() {
+      this.$modal
+        .confirm('是否确认删除名称为"' + names + '"的数据项？')
+        .then(function () {
+          return delDevice(ids);
+        })
+        .then(() => {
+          this.getList();
+          this.$modal.msgSuccess("删除成功");
+        })
+        .catch(() => {});
+    },
+    // 提交上传文件
+    submitFileForm() {
       this.$refs.upload.submit();
     },
     /** 导出按钮操作 */
     handleExport() {
-      this.download('system/device/export', {
-        ...this.queryParams
-      }, `device_${new Date().getTime()}.xlsx`)
-    }
-  }
+      this.download(
+        "system/device/export",
+        {
+          ...this.queryParams,
+        },
+        `device_${new Date().getTime()}.xlsx`
+      );
+    },
+  },
 };
 </script>

src/views/system/user/index.vue

@@ -379,6 +379,9 @@
                 :props="{ checkStrictly: true, label: 'name' }"
                 placeholder="请选择所属机构"
                 :disabled="form.source == 1"
+                :noChildrenText="''"
+                noOptionsText="没有数据"
+                noResultsText="没有搜索结果"
               />
             </el-form-item>
           </el-col>
@@ -794,6 +797,7 @@ export default {
     },
     /** 重置按钮操作 */
     resetQuery() {
+      this.queryParams.roleId=null;
       this.resetForm("queryForm");
       this.queryParams.onlyManager = false;
       this.handleQuery();