Merge remote-tracking branch 'origin/master'

ui/src/views/sems/specCc/index.vue

@@ -37,11 +37,11 @@
       :value="item.value">
       <div>
         <span v-if="item.value==1" style="width:45px;height:30px; float: left;background-color:#ffff00"> </span>
- <span v-if="item.value==1" style=" float: right; color: #121010 ; font-size: 18px">{{item.text }}</span>
+ <span v-if="item.value==1" style=" float: right; color: #121010 ; font-size: 16px">{{item.text }}</span>
         <span v-if="item.value==2" style="width:45px;height:30px; float: left;background-color:#ff9900 "></span>
- <span v-if="item.value==2" style=" float: right; color: #121010 ; font-size: 18px">{{item.text}}</span>
+ <span v-if="item.value==2" style=" float: right; color: #121010 ; font-size: 16px">{{item.text}}</span>
         <span v-if="item.value==3" style="width:45px;height:30px; float: left;background-color:#FF4500;"> </span>
- <span v-if="item.value==3" style=" float: right; color: #121010 ; font-size: 18px">{{item.text }}</span>
+ <span v-if="item.value==3" style=" float: right; color: #121010 ; font-size: 16px">{{item.text }}</span>
         </div>
     </el-option>
   </el-select>
@@ -644,13 +644,14 @@
       this.statusOptions = response.data;
     });
      //预警等级字典
-    this.getDicts("ALARM_LEVEL").then(response => {
+    this.getDicts("WARNING_SELE").then(response => {
 
          for (let i = 0; i < response.data.length; i++) {
           let items={
             text:'',
             value:''
           };
+          
       items.value = response.data[i].dictValue;
           items.text = response.data[i].dictLabel;
           this.filterList.push(items);

ui/src/views/sems/specDt/index.vue

@@ -46,11 +46,11 @@
       :value="item.value"  >
         <div>
         <span v-if="item.value==1" style="width:45px;height:30px; float: left;background-color:#ffff00"> </span>
- <span v-if="item.value==1" style=" float: right; color: #121010 ; font-size: 18px">{{item.text }}</span>
+ <span v-if="item.value==1" style=" float: right; color: #121010 ; font-size: 16px">{{item.text }}</span>
         <span v-if="item.value==2" style="width:45px;height:30px; float: left;background-color:#ff9900 "></span>
- <span v-if="item.value==2" style=" float: right; color: #121010 ; font-size: 18px">{{item.text}}</span>
+ <span v-if="item.value==2" style=" float: right; color: #121010 ; font-size: 16px">{{item.text}}</span>
         <span v-if="item.value==3" style="width:45px;height:30px; float: left;background-color:#FF4500;"> </span>
- <span v-if="item.value==3" style=" float: right; color: #121010 ; font-size: 18px">{{item.text }}</span>
+ <span v-if="item.value==3" style=" float: right; color: #121010 ; font-size: 16px">{{item.text }}</span>
         </div>
 
     </el-option>
@@ -596,7 +596,7 @@
       this.statusOptions = response.data;
     });
     //预警等级字典
-    this.getDicts("ALARM_LEVEL").then(response => {
+    this.getDicts("WARNING_SELE").then(response => {
          for (let i = 0; i < response.data.length; i++) {
           let items={
             text:'',

ui/src/views/sems/specDzsb/index.vue

@@ -46,11 +46,11 @@
       :value="item.value">
       <div>
         <span v-if="item.value==1" style="width:45px;height:30px; float: left;background-color:#ffff00"> </span>
- <span v-if="item.value==1" style=" float: right; color: #121010 ; font-size: 18px">{{item.text }}</span>
+ <span v-if="item.value==1" style=" float: right; color: #121010 ; font-size: 16px">{{item.text }}</span>
         <span v-if="item.value==2" style="width:45px;height:30px; float: left;background-color:#ff9900 "></span>
- <span v-if="item.value==2" style=" float: right; color: #121010 ; font-size: 18px">{{item.text}}</span>
+ <span v-if="item.value==2" style=" float: right; color: #121010 ; font-size: 16px">{{item.text}}</span>
         <span v-if="item.value==3" style="width:45px;height:30px; float: left;background-color:#FF4500;"> </span>
- <span v-if="item.value==3" style=" float: right; color: #121010 ; font-size: 18px">{{item.text }}</span>
+ <span v-if="item.value==3" style=" float: right; color: #121010 ; font-size: 16px">{{item.text }}</span>
         </div>
     </el-option>
   </el-select>
@@ -641,7 +641,7 @@
       this.statusOptions = response.data;
     });
     //预警等级字典
-    this.getDicts("ALARM_LEVEL").then(response => {
+    this.getDicts("WARNING_SELE").then(response => {
 
          for (let i = 0; i < response.data.length; i++) {
           let items={

ui/src/views/sems/specGl/index.vue

@@ -64,11 +64,11 @@
       :value="item.value">
       <div>  
         <span v-if="item.value==1" style="width:45px;height:30px; float: left;background-color:#ffff00"> </span> 
- <span v-if="item.value==1" style=" float: right; color: #121010 ; font-size: 18px">{{item.text }}</span>
+ <span v-if="item.value==1" style=" float: right; color: #121010 ; font-size: 16px">{{item.text }}</span>
         <span v-if="item.value==2" style="width:45px;height:30px; float: left;background-color:#ff9900 "></span> 
- <span v-if="item.value==2" style=" float: right; color: #121010 ; font-size: 18px">{{item.text}}</span>
+ <span v-if="item.value==2" style=" float: right; color: #121010 ; font-size: 16px">{{item.text}}</span>
         <span v-if="item.value==3" style="width:45px;height:30px; float: left;background-color:#FF4500;"> </span> 
- <span v-if="item.value==3" style=" float: right; color: #121010 ; font-size: 18px">{{item.text }}</span>
+ <span v-if="item.value==3" style=" float: right; color: #121010 ; font-size: 16px">{{item.text }}</span>
         </div>
     </el-option>
   </el-select>
@@ -714,7 +714,7 @@
       this.statusOptions = response.data;
     });
     //预警等级字典
-    this.getDicts("ALARM_LEVEL").then(response => {
+    this.getDicts("WARNING_SELE").then(response => {
 
          for (let i = 0; i < response.data.length; i++) {
           let items={

ui/src/views/sems/specYlgd/index.vue

@@ -118,11 +118,11 @@
       :value="item.value">
       <div>
         <span v-if="item.value==1" style="width:45px;height:30px; float: left;background-color:#ffff00"> </span>
- <span v-if="item.value==1" style=" float: right; color: #121010 ; font-size: 18px">{{item.text }}</span>
+ <span v-if="item.value==1" style=" float: right; color: #121010 ; font-size: 16px">{{item.text }}</span>
         <span v-if="item.value==2" style="width:45px;height:30px; float: left;background-color:#ff9900 "></span>
- <span v-if="item.value==2" style=" float: right; color: #121010 ; font-size: 18px">{{item.text}}</span>
+ <span v-if="item.value==2" style=" float: right; color: #121010 ; font-size: 16px">{{item.text}}</span>
         <span v-if="item.value==3" style="width:45px;height:30px; float: left;background-color:#FF4500;"> </span>
- <span v-if="item.value==3" style=" float: right; color: #121010 ; font-size: 18px">{{item.text }}</span>
+ <span v-if="item.value==3" style=" float: right; color: #121010 ; font-size: 16px">{{item.text }}</span>
         </div>
     </el-option>
   </el-select>
@@ -852,7 +852,7 @@ export default {
       this.statusOptions = response.data;
     });
      //预警等级字典
-    this.getDicts("ALARM_LEVEL").then(response => {
+    this.getDicts("WARNING_SELE").then(response => {
 
          for (let i = 0; i < response.data.length; i++) {
           let items={

ui/src/views/sems/specYlrq/index.vue

@@ -46,11 +46,11 @@
       :value="item.value">
       <div>
         <span v-if="item.value==1" style="width:45px;height:30px; float: left;background-color:#ffff00"> </span>
- <span v-if="item.value==1" style=" float: right; color: #121010 ; font-size: 18px">{{item.text }}</span>
+ <span v-if="item.value==1" style=" float: right; color: #121010 ; font-size: 16px">{{item.text }}</span>
         <span v-if="item.value==2" style="width:45px;height:30px; float: left;background-color:#ff9900 "></span>
- <span v-if="item.value==2" style=" float: right; color: #121010 ; font-size: 18px">{{item.text}}</span>
+ <span v-if="item.value==2" style=" float: right; color: #121010 ; font-size: 16px">{{item.text}}</span>
         <span v-if="item.value==3" style="width:45px;height:30px; float: left;background-color:#FF4500;"> </span>
- <span v-if="item.value==3" style=" float: right; color: #121010 ; font-size: 18px">{{item.text }}</span>
+ <span v-if="item.value==3" style=" float: right; color: #121010 ; font-size: 16px">{{item.text }}</span>
         </div>
     </el-option>
   </el-select>
@@ -756,7 +756,7 @@
       this.statusOptions = response.data;
     });
      //预警等级字典
-    this.getDicts("ALARM_LEVEL").then(response => {
+    this.getDicts("WARNING_SELE").then(response => {
 
          for (let i = 0; i < response.data.length; i++) {
           let items={