Browse Source

修改签名的字体

余思翰 1 year ago
parent
commit
305d1cf16e

BIN
oa-ui/src/assets/font/kaishu/xdks.ttf View File


+ 5
- 1
oa-ui/src/assets/styles/index.scss View File

@@ -194,6 +194,10 @@ aside {
194 194
   font-family: 'CMCTitle'; // 根据自己用的去重命名字体名 
195 195
   src: url('~@/assets/font/cmctitle/cmctitle.woff');
196 196
 }
197
+@font-face {
198
+  font-family: 'xdks'; // 根据自己用的去重命名字体名 
199
+  src: url('~@/assets/font/kaishu/xdks.ttf');
200
+}
197 201
 .vertical-text{
198 202
   writing-mode: vertical-rl;
199 203
   transform: rotate(360deg);
@@ -201,6 +205,6 @@ aside {
201 205
 }
202 206
 
203 207
 .auditor {
204
-  font-family: '华文行楷';
208
+  font-family: 'xdks';
205 209
   font-size: 20px;
206 210
 }

+ 0
- 4
oa-ui/src/views/flowable/form/access/cwTable.vue View File

@@ -800,8 +800,4 @@ td {
800 800
   border-radius: 0px;
801 801
   background: none;
802 802
 }
803
-.auditor {
804
-  font-family: '华文行楷';
805
-  font-size: 20px;
806
-}
807 803
 </style>

+ 0
- 4
oa-ui/src/views/flowable/form/access/jsTable.vue View File

@@ -881,8 +881,4 @@ td {
881 881
   border-radius: 0px;
882 882
   background: none;
883 883
 }
884
-.auditor {
885
-  font-family: '华文行楷';
886
-  font-size: 20px;
887
-}
888 884
 </style>

+ 0
- 4
oa-ui/src/views/flowable/form/access/jyTable.vue View File

@@ -586,8 +586,4 @@ td {
586 586
   border-radius: 0px;
587 587
   background: none;
588 588
 }
589
-.auditor {
590
-  font-family: '华文行楷';
591
-  font-size: 20px;
592
-}
593 589
 </style>

+ 0
- 4
oa-ui/src/views/flowable/form/access/scTable.vue View File

@@ -1930,8 +1930,4 @@ td {
1930 1930
   border-radius: 0px;
1931 1931
   background: none;
1932 1932
 }
1933
-.auditor {
1934
-  font-family: '华文行楷';
1935
-  font-size: 20px;
1936
-}
1937 1933
 </style>

+ 0
- 5
oa-ui/src/views/flowable/form/access/xmTable.vue View File

@@ -615,9 +615,4 @@ td {
615 615
   border-radius: 0px;
616 616
   background: none;
617 617
 }
618
-
619
-.auditor {
620
-  font-family: '华文行楷';
621
-  font-size: 20px;
622
-}
623 618
 </style>

+ 0
- 5
oa-ui/src/views/flowable/form/access/zhTable.vue View File

@@ -1034,9 +1034,4 @@ td {
1034 1034
   border-radius: 0px;
1035 1035
   background: none;
1036 1036
 }
1037
-
1038
-.auditor {
1039
-  font-family: '华文行楷';
1040
-  font-size: 20px;
1041
-}
1042 1037
 </style>

+ 0
- 5
oa-ui/src/views/flowable/form/finance/borrowForm.vue View File

@@ -691,11 +691,6 @@ export default {
691 691
 <style lang="scss" scoped>
692 692
 @import "@/assets/styles/element-reset.scss";
693 693
 
694
-.auditor {
695
-  font-family: '华文行楷';
696
-  font-size: 20px;
697
-}
698
-
699 694
 table {
700 695
   text-align: center;
701 696
   border-collapse: collapse;

+ 0
- 4
oa-ui/src/views/flowable/form/oa/carForm.vue View File

@@ -669,10 +669,6 @@ export default {
669 669
 </style>
670 670
 
671 671
 <style>
672
-.auditor {
673
-  font-family: '华文行楷';
674
-  font-size: 20px;
675
-}
676 672
 
677 673
 .my-label {
678 674
   width: 100px;

+ 0
- 4
oa-ui/src/views/flowable/form/projectProcess/addproject.vue View File

@@ -424,8 +424,4 @@ table {
424 424
   border-color: var(--current-color);
425 425
 }
426 426
 
427
-.auditor {
428
-  font-family: '华文行楷';
429
-  font-size: 20px;
430
-}
431 427
 </style>

+ 0
- 4
oa-ui/src/views/flowable/form/projectProcess/businessReview.vue View File

@@ -128,10 +128,6 @@ export default {
128 128
 </script>
129 129
 
130 130
 <style lang="scss" scoped>
131
-.auditor {
132
-  font-family: '华文行楷';
133
-  font-size: 20px;
134
-}
135 131
 ::v-deep .el-textarea.is-disabled .el-textarea__inner {
136 132
   color: #121212 !important;
137 133
 }

+ 0
- 5
oa-ui/src/views/flowable/form/projectProcess/inProgress.vue View File

@@ -399,11 +399,6 @@ export default {
399 399
 <style lang="scss" scoped>
400 400
 @import "@/assets/styles/element-reset.scss";
401 401
 
402
-.auditor {
403
-  font-family: "华文行楷";
404
-  font-size: 20px;
405
-}
406
-
407 402
 table {
408 403
   /*边框*/
409 404
   /* border: 1px solid black; */

+ 0
- 4
oa-ui/src/views/flowable/form/projectProcess/manageReview.vue View File

@@ -130,10 +130,6 @@ export default {
130 130
 </script>
131 131
 
132 132
 <style lang="scss" scoped>
133
-.auditor {
134
-  font-family: '华文行楷';
135
-  font-size: 20px;
136
-}
137 133
 ::v-deep .el-textarea.is-disabled .el-textarea__inner {
138 134
   color: #121212 !important;
139 135
 }

+ 2
- 2
oa-ui/src/views/flowable/form/projectProcess/scConfirm.vue View File

@@ -2,7 +2,7 @@
2 2
  * @Author: ysh
3 3
  * @Date: 2024-04-08 13:56:14
4 4
  * @LastEditors: Please set LastEditors
5
- * @LastEditTime: 2024-04-30 11:30:34
5
+ * @LastEditTime: 2024-06-03 16:10:57
6 6
 -->
7 7
 <template>
8 8
   <div class="app-container">
@@ -182,7 +182,7 @@ export default {
182 182
 
183 183
 <style lang="scss" scoped>
184 184
 .auditor {
185
-  font-family: '华文行楷';
185
+  font-family: 'xdks';
186 186
   font-size: 20px;
187 187
   margin-right: 20px;
188 188
 }

+ 0
- 4
oa-ui/src/views/flowable/form/safeForm.vue View File

@@ -319,8 +319,4 @@ export default {
319 319
 
320 320
 <style lang="scss" scoped>
321 321
 @import "@/assets/styles/element-reset.scss";
322
-.auditor {
323
-  font-family: '华文行楷';
324
-  font-size: 20px;
325
-}
326 322
 </style>

+ 576
- 247
oa-ui/src/views/flowable/form/settleForm.vue
File diff suppressed because it is too large
View File


+ 0
- 5
oa-ui/src/views/flowable/form/technicalForm.vue View File

@@ -502,11 +502,6 @@ export default {
502 502
 </script>
503 503
 
504 504
 <style lang="scss" scoped>
505
-.auditor {
506
-  font-family: '华文行楷';
507
-  font-size: 20px;
508
-}
509
-
510 505
 ::v-deep .el-input.is-disabled .el-input__inner {
511 506
   color: #686a6e;
512 507
 }

+ 3
- 3
oa-ui/src/views/flowable/task/myProcess/index.vue View File

@@ -2,7 +2,7 @@
2 2
  * @Author: ysh
3 3
  * @Date: 2024-01-03 09:23:11
4 4
  * @LastEditors: Please set LastEditors
5
- * @LastEditTime: 2024-05-27 14:08:00
5
+ * @LastEditTime: 2024-06-03 15:23:55
6 6
 -->
7 7
 <template>
8 8
   <div class="app-container">
@@ -22,10 +22,10 @@
22 22
         <el-button type="primary" plain icon="el-icon-plus" size="mini" @click="handleAdd"
23 23
           v-hasPermi="['system:deployment:add']">发起流程</el-button>
24 24
       </el-col>
25
-      <el-col :span="1.5">
25
+      <!-- <el-col :span="1.5">
26 26
         <el-button type="danger" plain icon="el-icon-delete" size="mini" :disabled="multiple" @click="handleDelete"
27 27
           v-hasPermi="['system:deployment:remove']">删除</el-button>
28
-      </el-col>
28
+      </el-col> -->
29 29
       <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
30 30
     </el-row>
31 31
 

+ 18
- 15
oa-ui/src/views/flowable/task/myProcess/progressTree.vue View File

@@ -1,23 +1,26 @@
1 1
 <!--
2 2
  * @Author: ysh
3 3
  * @Date: 2024-04-18 15:14:45
4
- * @LastEditors: wrh
5
- * @LastEditTime: 2024-05-09 10:46:19
4
+ * @LastEditors: Please set LastEditors
5
+ * @LastEditTime: 2024-06-03 14:49:25
6 6
 -->
7 7
 <template>
8 8
   <div>
9
-    <el-tree class="filter-tree" icon-class="el-icon-caret-right" :data="treeData" :props="defaultProps"
10
-      @node-click="handleNodeClick" default-expand-all highlight-current ref="tree">
11
-      <span class="custom-tree-node" slot-scope="{ node, data }">
12
-        <!-- <svg-icon icon-class="folder" class="svgIcon" style="margin-right:5px;" /> -->
13
-        <svg-icon v-if="!data.children" icon-class="file" class="svgIcon" />
14
-        <svg-icon v-else-if="node.expanded" icon-class="folder" class="svgIcon" />
15
-        <svg-icon v-else icon-class="folder_close" class="svgIcon" />
16
-        <span class="fontSize14" :title="node.label || '-'">{{ node.label }}</span>
17
-      </span>
18
-    </el-tree>
19
-    <el-divider></el-divider>
20
-    <div class="text-center">
9
+    <el-scrollbar style="height:400px">
10
+      <el-tree class="filter-tree" icon-class="el-icon-caret-right" :data="treeData" :props="defaultProps"
11
+        @node-click="handleNodeClick" default-expand-all highlight-current ref="tree">
12
+        <span class="custom-tree-node" slot-scope="{ node, data }">
13
+          <!-- <svg-icon icon-class="folder" class="svgIcon" style="margin-right:5px;" /> -->
14
+          <svg-icon v-if="!data.children" icon-class="file" class="svgIcon" />
15
+          <svg-icon v-else-if="node.expanded" icon-class="folder" class="svgIcon" />
16
+          <svg-icon v-else icon-class="folder_close" class="svgIcon" />
17
+          <span class="fontSize14" :title="node.label || '-'">{{ node.label }}</span>
18
+        </span>
19
+      </el-tree>
20
+      <el-divider></el-divider>
21
+
22
+    </el-scrollbar>
23
+    <div class="text-center mt20">
21 24
       <el-button type="primary" @click="confirm">确定</el-button>
22 25
       <el-button @click="$emit('close')">取消</el-button>
23 26
     </div>
@@ -77,7 +80,7 @@ export default {
77 80
           this.treeData[0].children.push(i);
78 81
         }
79 82
         else if (i.category == "project") {
80
-          if (i.name != "项目预算" && i.name != "安全交底" && i.name != "技术交底") 
83
+          if (i.name != "项目预算" && i.name != "安全交底" && i.name != "技术交底")
81 84
             this.treeData[1].children.push(i);
82 85
         } else if (i.category == "finance") {
83 86
           this.treeData[2].children.push(i);

Loading…
Cancel
Save