冲突解决

assets/css/custom.less

 //定义变量
 // @import './themes/deepBlank.less';
-// @import './themes/green.less';
- @import './themes/default.less';
+@import './themes/green.less';
+//  @import './themes/default.less';

assets/css/themes/deepBlank.less

@@ -142,7 +142,7 @@
 @table-bottom-border:#ffffff;
 @action-buttons_col:#106FFE;
 @add_col:#ffffff;
-@buttons_bg:rgba(47, 47, 87, 0.6);
+@buttons_bg:rgba(47, 47, 87, 1);
 @add_border-right:rgba(255, 255, 255, 0.06);
 //工单列表等背景色
 @part_body_backcolor:#2F2F57;

assets/css/themes/default.less

@@ -141,7 +141,7 @@
 @table-bottom_line:#dcdee2;
 @table-bottom-border:#ffffff;
 @action-buttons_col:#515a6e;
-@buttons_bg:rgba(186, 232, 238, 0.06);
+@buttons_bg:#ebf7ff;
 @add_border-right:rgba(98, 97, 102, 0.06);
 @add_col:#5f6470;
 //工单列表等背景色

assets/css/themes/green.less

@@ -138,7 +138,7 @@
 @part_top_border:1px solid #ffffff;
 @table_border-bg:transparent;
 @table_line: #ffffff;
-@buttons_bg:rgba(255, 255, 255, 0.6);
+@buttons_bg:rgba(255, 255, 255, 1);
 @table-bottom_line:transparent;
 @table-bottom-border:#ffffff;
 @action-buttons_col:#04BB8C;

pages/theme/index.vue

@@ -7,8 +7,7 @@
             placeholder="请输入工艺名称/工艺编号"
             v-width="280"
             v-model="formInline.value"
-            clearable
-          />
+            clearable/>
           <Button type="primary" class="search_icon" icon="ios-search"></Button>
           <Button type="text" class="search_text">高级搜索</Button>
         </Form>
@@ -46,7 +45,7 @@
         <Table :border="false" stripe :columns="columns1" :data="data1">
           <template
             slot="action"
-            slot-scope="{ row, index }"
+            slot-scope="{ row , index }"
             style="width: 100%; height: 100%"
           >
             <a href="" class="action-buttons"
@@ -62,10 +61,6 @@
                   <Icon type="icon iconfont iconshanchu" />
                   删除</a
                 >
-                 <!-- <a  class="add mr20">
-                  <Icon type="icon iconfont iconshanchu" />
-                  分解</a
-                > -->
               </div>
             </a>
           </template>
@@ -78,8 +73,7 @@
         type="flex"
         justify="center"
         align="end"
-        class="page_index"
-      >
+        class="page_index">
         <Page :total="100" show-elevator />
       </Col>
     </Row>
@@ -343,7 +337,6 @@ export default {
         font-size: 22px;
       }
     .ivu-select-dropdown {
-      
       background-color: #222341 !important;
       .ivu-dropdown-item {
         color: #ffffff !important;
@@ -402,7 +395,7 @@ export default {
               position: absolute;
               display: none;
               right: -58px;
-              top: -22px;
+              top: -21px;
               width: -webkit-max-content; // 兼容
               width: -moz-max-content; // 兼容
               width: max-content;