bug修复

src/assets/styles/ruoyi.scss

@@ -372,3 +372,7 @@
    }
  }
 
+ .vue-treeselect--has-value .vue-treeselect__input {
+   line-height: 100%!important;
+   vertical-align: middle!important;
+ }

src/views/check/index.vue

@@ -2,7 +2,10 @@
   <div class="app-container">
     <el-row :gutter="10">
       <!--机构数据-->
-      <el-col :span="4" :xs="24">
+      <el-col :span="4" :xs="24"
+
+
+      >
         <org-tree
           v-model="queryParams.orgId"
           @defaultKey="getDefaultKey"
@@ -174,7 +177,7 @@
                   >新增任务</el-button
                 >
               </el-col>
-             
+
               <right-toolbar
                 :showSearch.sync="showSearch"
                 @queryTable="getList"
@@ -703,5 +706,6 @@ export default {
 
 <style lang="scss" scoped>
 .brand {
+
 }
 </style>

src/views/system/device/index.vue

@@ -194,7 +194,7 @@
     >
       <el-form ref="form" :model="form" :rules="rules" label-width="120px">
         <el-row>
-          <el-col :span="22">
+          <el-col :span="24">
             <el-form-item label="所属机构" prop="orgId">
               <tree-select
                 v-model="form.orgId"
@@ -202,7 +202,7 @@
                 :show-count="true"
                 :normalizer="tenantIdnormalizer"
                 :props="{ checkStrictly: true, label: 'name' }"
-                placeholder="请选择归属机构"
+                placeholder="请选择所属机构"
                 @select="changeSelect"
                 clearValueText="清除"
                 :noChildrenText="''"
@@ -218,6 +218,7 @@
               <el-select
                 style="width: 100%"
                 v-model="form.assetType"
+                :popper-append-to-body="false"
                 placeholder="请选择设备类别"
                 @change="changeSelectDevice"
               >
@@ -234,6 +235,7 @@
             <el-form-item label="设备分类" prop="deviceType">
               <el-select
                 style="width: 100%"
+                :popper-append-to-body="false"
                 v-model="form.deviceType"
                 placeholder="请选择设备分类"
               >
@@ -365,8 +367,6 @@ 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 "@riophae/vue-treeselect/dist/vue-treeselect.css";
 import { deptTreeSelect } from "@/api/system/public";
 import { getDeviceType } from "@/api/system/dict/data";
 import {
@@ -383,7 +383,7 @@ export default {
   mixins: [tableList],
   dicts: ["sys_asset_type", "sys_device_type"],
   name: "Device",
-  components: { OrgTree, treeselect, orgDropDown },
+  components: { OrgTree, orgDropDown },
   data() {
     return {
       checkList: [],
@@ -767,3 +767,9 @@ export default {
   },
 };
 </script>
+<style lang="scss">
+//.vue-treeselect--has-value .vue-treeselect__input {
+//   line-height: 100%;
+//   vertical-align: middle;
+//}
+</style>

src/views/system/user/index.vue

@@ -389,6 +389,7 @@
                 :props="{ checkStrictly: true, label: 'name' }"
                 placeholder="请选择所属机构"
                 :disabled="form.source == 1"
+                clearValueText="清除"
                 :noChildrenText="''"
                 noOptionsText="没有数据"
                 noResultsText="没有搜索结果"

src/views/system/workTimeSet/dialog.add.vue

@@ -248,22 +248,22 @@ export default {
     //检查每一项
     check(other) {
       if(!other.ymdDate){
-        this.$message.error(`日期不能为空`);
+        this.$message.warning(`日期不能为空`);
         return;
       }
       const ds = this.formatTime(other.ymdDate,"YYYY-MM-DD");
       console.log(other,'ds')
       if ( !other.isEnable === null && !other.disabled ) {
-        this.$message.error(`${ds}：未进行配置`);
+        this.$message.warning(`${ds}：未进行配置`);
         return;
       }
       if(other.isEnable){
         if(!other.openTime || !other.closeTime){
-          this.$message.error(`${ds}：未配置时间`);
+          this.$message.warning(`${ds}：未配置时间`);
           return;
         }
         if(!timeCheck([other.openTime,other.closeTime])){
-          this.$message.error(`${ds}：营业开始时间应在营业结束之前`);
+          this.$message.warning(`${ds}：营业开始时间应在营业结束之前`);
           return false;
         }
       }

src/views/system/workTimeSet/dialog.edit.vue

@@ -131,8 +131,8 @@ export default {
         workOffTime: [{ required: true, message: "请输入下班时间" }],
         // noonbreakStart: [{ required: true, message: "请输入午休开始时间" }],
         // noonbreakEnd: [{ required: true, message: "请输入午休结束时间" }],
-        openTime: [{ required: true, message: "请输入营业时间" }],
-        closeTime: [{ required: true, message: "请输入营业终了时间" }],
+        openTime: [{ required: true, message: "请输入营业开始时间" }],
+        closeTime: [{ required: true, message: "请输入营业结束时间" }],
       },
 
     };

src/views/system/workTimeSet/dialog.template.vue

@@ -244,15 +244,15 @@ export default {
     },
     onSubmit() {
       if (this.formData.orgIds.length < 1) {
-        this.$message.error("机构不能为空");
+        this.$message.warning("机构不能为空");
         return;
       }
       if (!this.formData.effectiveDate ) {
-        this.$message.error("生效日期不能为空");
+        this.$message.warning("生效日期不能为空");
         return;
       }
       if (this.formData.dayOfWeeks.filter(w => w.isWorkday == 1 || w.isWorkday).length === 0) {
-        this.$message.error("工作日不能为空");
+        this.$message.warning("工作日不能为空");
         return;
       }
       // 校验
@@ -271,7 +271,7 @@ export default {
       //是否启用
       if(dayOfWeek.isWorkday == '0') return true;
       if (!( dayOfWeek.openTime && dayOfWeek.closeTime)) {
-        this.$message.error(`${dayOfWeek.dayOfWeekText}的营业时间未完整配置`);
+        this.$message.warning(`${dayOfWeek.dayOfWeekText}的营业时间未完整配置`);
         return;
       }
       // if (!dayOfWeek.noonbreakStart ^ !dayOfWeek.noonbreakEnd) {
@@ -280,7 +280,7 @@ export default {
       // }
       let arr = [dayOfWeek.openTime,dayOfWeek.closeTime];
       if (!timeCheck(arr)) {
-        this.$message.error(`${dayOfWeek.dayOfWeekText}的营业开始时间应在营业结束之前`);
+        this.$message.warning(`${dayOfWeek.dayOfWeekText}的营业开始时间应在营业结束之前`);
         return false;
       }
       return true;