wyh hace 2 meses
padre
commit
1bbb942e4c

+ 4 - 20
src/assets/less/interLock.css

@@ -340,29 +340,13 @@
 }
 .iotmenu-content-container .normal-tag,
 .iotmenu-modal-box .normal-tag {
-  display: inline-block;
-  height: 24px;
-  line-height: 24px;
-  text-align: center;
-  font-size: 15px;
-  padding: 0 8px;
-  border-radius: 16px;
-  background: linear-gradient(0deg, rgba(182, 240, 211, 0.5), rgba(182, 240, 211, 0.5)), #ffffff;
-  border: 1px solid #b6f0d3;
-  color: #00cc66;
+  color: #52c41a;
+  font-weight: 600;
 }
 .iotmenu-content-container .abnormal-tag,
 .iotmenu-modal-box .abnormal-tag {
-  display: inline-block;
-  height: 24px;
-  line-height: 24px;
-  text-align: center;
-  font-size: 15px;
-  padding: 0 8px;
-  border-radius: 16px;
-  background: linear-gradient(0deg, rgba(195, 65, 21, 0.5), rgba(197, 56, 7, 0.5)), #ffffff;
-  border: 1px solid #D65F37;
-  color: #fff;
+  color: red;
+  font-weight: 600;
 }
 .iotmenu-modal-box .ant-modal .ant-modal-title {
   font-size: 18px;

+ 26 - 23
src/assets/less/interLock.less

@@ -309,44 +309,47 @@
   }
   /** tag不同样式 */
   .normal-tag{
-    // color: #52c41a;
+    color: #52c41a;
+    font-weight: 600;
 
     // color: #52c41a;
     // background: #f6ffed;
     // border-color: #b7eb8f;
 
-    display: inline-block;
-    height: 24px;
-    line-height: 24px;
-    text-align: center;
-    font-size: 15px;
-    padding: 0 8px;
-    border-radius: 16px;
+    // display: inline-block;
+    // height: 24px;
+    // line-height: 24px;
+    // text-align: center;
+    // font-size: 15px;
+    // padding: 0 8px;
+    // border-radius: 16px;
 
-    background: linear-gradient(0deg, rgba(182, 240, 211, 0.5), rgba(182, 240, 211, 0.5)), rgb(255, 255, 255);
-    border: 1px solid rgb(182, 240, 211);
-    color: rgb(0, 204, 102);
+    // background: linear-gradient(0deg, rgba(182, 240, 211, 0.5), rgba(182, 240, 211, 0.5)), rgb(255, 255, 255);
+    // border: 1px solid rgb(182, 240, 211);
+    // color: rgb(0, 204, 102);
   }
   .abnormal-tag{
     // color: #fb6666;
+    color: red;
+    font-weight: 600;
 
     // color: #fa8c16;
     // background: #fff7e6;
     // border-color: #ffd591;
 
-    display: inline-block;
-    height: 24px;
-    line-height: 24px;
-    text-align: center;
-    font-size: 15px;
-    padding: 0 8px;
-    border-radius: 16px;
+    // display: inline-block;
+    // height: 24px;
+    // line-height: 24px;
+    // text-align: center;
+    // font-size: 15px;
+    // padding: 0 8px;
+    // border-radius: 16px;
 
-    // background: linear-gradient(0deg, rgba(203, 54, 4, 0.5), rgba(205, 80, 36, 0.5)), #ffffff;
-    background: linear-gradient(0deg, rgba(195, 65, 21, 0.5), rgba(197, 56, 7, 0.5)), #ffffff;
-    border: 1px solid #D65F37;
-    // border: 1px solid #D45930;
-    color: #fff;
+    // // background: linear-gradient(0deg, rgba(203, 54, 4, 0.5), rgba(205, 80, 36, 0.5)), #ffffff;
+    // background: linear-gradient(0deg, rgba(195, 65, 21, 0.5), rgba(197, 56, 7, 0.5)), #ffffff;
+    // border: 1px solid #D65F37;
+    // // border: 1px solid #D45930;
+    // color: #fff;
   }
 }
 .iotmenu-modal-box{

+ 4 - 4
src/views/module_interLock/InterlockSummary/InterlockSummaryList.vue

@@ -264,17 +264,17 @@
             customRender:(text,record,index)=> {
               var children
               if(text === 'A'){
-                children = (<span style="color: #52c41a">{text}</span>)
+                children = (<span style="color: #52c41a;font-weight: 600;">{text}</span>)
                 // children = (<a-tag style="color: red">{text}</a-tag>)
               }
               if(text === 'B'){
-                children = (<span style="color: #eddf19">{text}</span>)
+                children = (<span style="color: #FFE31F;font-weight: 600;">{text}</span>)
               }
               if(text === 'C'){
-                children = (<span style="color: #fa8c16">{text}</span>)
+                children = (<span style="color: #FFA300;font-weight: 600;">{text}</span>)
               }
               if(text === 'D'){
-                children = (<span style="color: #f56c6c">{text}</span>)
+                children = (<span style="color: #FF0000;font-weight: 600;">{text}</span>)
               }
               return {children: children, attrs: {rowSpan:record.rowSpan3}};
             },