修改作息bug

.env.development

@@ -10,13 +10,14 @@ ENV = 'development'
 #罗俊
 # VUE_APP_BASE_API = 'http://10.87.10.49:8080'
 #罗伟
-VUE_APP_BASE_API = 'http://10.87.21.103:8080'
+# VUE_APP_BASE_API = 'http://10.87.10.47:8080'
 #高雄
 #VUE_APP_BASE_API = 'http://10.87.11.94:8080'
-# VUE_APP_BASE_API = 'http://localhost:8080'
+#景远超
+# VUE_APP_BASE_API = 'http://10.87.11.173:8080'
+#VUE_APP_BASE_API = 'http://localhost:8080'
 # 55环境
-#VUE_APP_BASE_API = 'http://10.87.10.55:8080'
-
+VUE_APP_BASE_API = 'http://10.87.21.103:8080'
 # 路由懒加载
 VUE_CLI_BABEL_TRANSPILE_MODULES = true
 

src/components/RightToolbar/index.vue

@@ -1,8 +1,8 @@
 <template>
   <div class="top-right-btn" :style="style">
     <el-row>
-      <el-tooltip class="item" effect="dark" :content="showSearch ? '隐藏搜索' : '显示搜索'" placement="top" v-if="search">
-        <el-button size="mini" circle icon="el-icon-view" @click="toggleSearch()" />
+      <el-tooltip class="item" effect="dark" :content="showSearch ? '折叠搜索' : '展开搜索'" placement="top" v-if="search">
+        <el-button size="mini" circle :icon="showSearch ? 'el-icon-top':'el-icon-bottom'" @click="toggleSearch()" />
       </el-tooltip>
       <el-tooltip class="item" effect="dark" content="刷新" placement="top">
         <el-button size="mini" circle icon="el-icon-refresh" @click="refresh()" />

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

@@ -319,8 +319,8 @@ export default {
       }
     },
     async onSubmit() {
-      if(this.orgIdList.length === 0)return  this.$message.warning('请选择机构！');
-      if(this.workTimeList.length === 0)return  this.$message.warning('请添加日期！');
+      if(this.orgIdList.length === 0)return  this.$message.warning('请选择机构');
+      if(this.workTimeList.length === 0)return  this.$message.warning('请添加日期');
       //判断是否有重复的日期
       let dateList = [];
       let workTimeList = JSON.parse(JSON.stringify(this.workTimeList))

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

@@ -244,11 +244,11 @@ export default {
     },
     onSubmit() {
       if (this.formData.orgIds.length < 1) {
-        this.$message.warning("机构不能为空");
+        this.$message.warning("请选择机构");
         return;
       }
       if (!this.formData.effectiveDate ) {
-        this.$message.warning("生效日期不能为空");
+        this.$message.warning("请选择生效日期");
         return;
       }
       if (this.formData.dayOfWeeks.filter(w => w.isWorkday == 1 || w.isWorkday).length === 0) {