Browse Source

Merge remote-tracking branch 'origin/gzb' into wzl

gzb
wangzhonglu 8 months ago
parent
commit
972b414aa5

+ 18
- 1
src/assets/less/common.less View File

63
 .ivu-table {
63
 .ivu-table {
64
   color: #798cb5;
64
   color: #798cb5;
65
   background-color: #ffffff66;
65
   background-color: #ffffff66;
66
+  .ivu-table-header {
67
+    background-color: #e9f0ff;
68
+  }
66
   .ivu-table-header,
69
   .ivu-table-header,
67
   .ivu-table-fixed-header {
70
   .ivu-table-fixed-header {
68
     thead tr {
71
     thead tr {
136
   }
139
   }
137
   .ivu-table-cell {
140
   .ivu-table-cell {
138
     line-height: 1.6;
141
     line-height: 1.6;
142
+    padding: 0 8px;
139
   }
143
   }
140
   // .ivu-table-overflowX {
144
   // .ivu-table-overflowX {
141
   //   overflow: visible;
145
   //   overflow: visible;
168
       color: #339cff;
172
       color: #339cff;
169
     }
173
     }
170
   }
174
   }
175
+  .ivu-page-options-sizer {
176
+    margin-right: 0;
177
+  }
171
 }
178
 }
172
 //按钮圆角
179
 //按钮圆角
173
 .ivu-btn,
180
 .ivu-btn,
202
   background-color: #f3f4fc;
209
   background-color: #f3f4fc;
203
   user-select: none;
210
   user-select: none;
204
 }
211
 }
212
+//下拉组件全局样式
213
+.ivu-select-dropdown-list {
214
+  padding: 0 5px;
215
+  .ivu-select-item-selected{
216
+    border-radius: 6px;
217
+  }
218
+  .ivu-select-item:hover {
219
+    color: #2d8cf0;
220
+    border-radius: 6px;
221
+  }
222
+}
205
 // 二级路由页面全局样式
223
 // 二级路由页面全局样式
206
 .page_root {
224
 .page_root {
207
   width: 100%;
225
   width: 100%;
388
     align-items: center;
406
     align-items: center;
389
     color: #339dff;
407
     color: #339dff;
390
     > div {
408
     > div {
391
-      margin: 0 4px;
392
       padding: 0 4px;
409
       padding: 0 4px;
393
       cursor: pointer;
410
       cursor: pointer;
394
       &.action_del {
411
       &.action_del {

+ 2
- 1
src/views/schoolSection/applicationStrategy/appStrategyManage.vue View File

44
           >
44
           >
45
             修改
45
             修改
46
           </div>
46
           </div>
47
-          <div v-if="searchForm.hasst" @click="toResetAppStrategy()">重置</div>
47
+          <div   style="font-size: 13px" v-if="searchForm.hasst" @click="toResetAppStrategy()">重置</div>
48
           <div @click="toSelectAppStrategy()">引用</div>
48
           <div @click="toSelectAppStrategy()">引用</div>
49
         </div>
49
         </div>
50
       </div>
50
       </div>
439
         display: flex;
439
         display: flex;
440
         justify-content: flex-start;
440
         justify-content: flex-start;
441
         align-items: center;
441
         align-items: center;
442
+        font-size: 14px;
442
         > div {
443
         > div {
443
           margin-left: 16px;
444
           margin-left: 16px;
444
           cursor: pointer;
445
           cursor: pointer;

+ 4
- 1
src/views/schoolSection/strategy/publicStrategy.vue View File

2
   <div class="index1">
2
   <div class="index1">
3
     <div class="operation">
3
     <div class="operation">
4
       <span @click="curState = 2">修改</span>
4
       <span @click="curState = 2">修改</span>
5
-      <span v-if="curClass.type === strategyInfo.sttype" @click="Reset"
5
+      <span
6
+        style="font-size: 13px"
7
+        v-if="curClass.type === strategyInfo.sttype"
8
+        @click="Reset"
6
         >重置</span
9
         >重置</span
7
       >
10
       >
8
       <span @click="getstPad_list">引用</span>
11
       <span @click="getstPad_list">引用</span>

Loading…
Cancel
Save