dedsudiyu 11 月之前
父節點
當前提交
4802cd00c7

+ 0 - 1
src/views/emergencyManagement/plan/index.vue

@@ -180,7 +180,6 @@ export default {
   },
   mounted(){
     this.iotAttributeGetByTypeKey();
-
     this.getList();
     this.laboratoryMusicFindByType();
   },

+ 3 - 3
src/views/integratedManagement/messageNotice/warningNotice/forewarningConfig.vue

@@ -35,7 +35,7 @@
               <!--</el-form-item>-->
               <!--</div>-->
               <div>
-                <el-form-item label="过期短信:" prop="expireMessage">
+                <el-form-item label="报警时间:" prop="expireMessage">
                   <el-time-select v-model="chemicalsForm.expireMessage" placeholder="请选择" style="width:130px;"
                                   :picker-options="{
                       start: '00:00',
@@ -43,7 +43,7 @@
                       end: '23:45'
                     }">
                   </el-time-select>
-                  <span style="margin-left:20px;">化学品过期报警短信通知定时推送时间</span>
+                  <span style="margin-left:20px;">化学品临期/过期报警通知定时推送时间</span>
                 </el-form-item>
               </div>
               <!--<div>-->
@@ -71,7 +71,7 @@
                 </el-form-item>
               </div>
               <div>
-                <el-form-item label="临期预警:化学品过期 " prop="adventWarnDay" label-width="210px">
+                <el-form-item label="临期报警天数:化学品过期 " prop="adventWarnDay" label-width="210px">
                   <el-input-number v-model="chemicalsForm.adventWarnDay" style="width:100px;"
                                    :controls="false" :min="1" :max="360">
                   </el-input-number>

+ 1 - 1
src/views/integratedManagement/personnelManage/post/index.vue

@@ -213,7 +213,7 @@ export default {
     },
     //角色下拉列表
     systemRoleDropList(){
-      systemRoleDropList({}).then(response => {
+      systemRoleDropList({pageSize:100}).then(response => {
           this.$set(this,'optionselectList',response.data);
         }
       );

+ 1 - 1
src/views/systemManagement/systemUser/index.vue

@@ -417,7 +417,7 @@ export default {
     },
     //角色下拉列表
     systemRoleDropList(){
-      systemRoleDropList({roleName :'',pageSize:10}).then(response => {
+      systemRoleDropList({roleName :'',pageSize:100}).then(response => {
           this.roleOptions = response.data;
         }
       );