Selaa lähdekoodia

修改签名的字体

余思翰 1 vuosi sitten
vanhempi
commit
305d1cf16e

BIN
oa-ui/src/assets/font/kaishu/xdks.ttf Näytä tiedosto


+ 5
- 1
oa-ui/src/assets/styles/index.scss Näytä tiedosto

194
   font-family: 'CMCTitle'; // 根据自己用的去重命名字体名 
194
   font-family: 'CMCTitle'; // 根据自己用的去重命名字体名 
195
   src: url('~@/assets/font/cmctitle/cmctitle.woff');
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
 .vertical-text{
201
 .vertical-text{
198
   writing-mode: vertical-rl;
202
   writing-mode: vertical-rl;
199
   transform: rotate(360deg);
203
   transform: rotate(360deg);
201
 }
205
 }
202
 
206
 
203
 .auditor {
207
 .auditor {
204
-  font-family: '华文行楷';
208
+  font-family: 'xdks';
205
   font-size: 20px;
209
   font-size: 20px;
206
 }
210
 }

+ 0
- 4
oa-ui/src/views/flowable/form/access/cwTable.vue Näytä tiedosto

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

+ 0
- 4
oa-ui/src/views/flowable/form/access/jsTable.vue Näytä tiedosto

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

+ 0
- 4
oa-ui/src/views/flowable/form/access/jyTable.vue Näytä tiedosto

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

+ 0
- 4
oa-ui/src/views/flowable/form/access/scTable.vue Näytä tiedosto

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

+ 0
- 5
oa-ui/src/views/flowable/form/access/xmTable.vue Näytä tiedosto

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

+ 0
- 5
oa-ui/src/views/flowable/form/access/zhTable.vue Näytä tiedosto

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

+ 0
- 5
oa-ui/src/views/flowable/form/finance/borrowForm.vue Näytä tiedosto

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

+ 0
- 4
oa-ui/src/views/flowable/form/oa/carForm.vue Näytä tiedosto

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

+ 0
- 4
oa-ui/src/views/flowable/form/projectProcess/addproject.vue Näytä tiedosto

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

+ 0
- 4
oa-ui/src/views/flowable/form/projectProcess/businessReview.vue Näytä tiedosto

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

+ 0
- 5
oa-ui/src/views/flowable/form/projectProcess/inProgress.vue Näytä tiedosto

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

+ 0
- 4
oa-ui/src/views/flowable/form/projectProcess/manageReview.vue Näytä tiedosto

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

+ 2
- 2
oa-ui/src/views/flowable/form/projectProcess/scConfirm.vue Näytä tiedosto

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

+ 0
- 4
oa-ui/src/views/flowable/form/safeForm.vue Näytä tiedosto

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

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


+ 0
- 5
oa-ui/src/views/flowable/form/technicalForm.vue Näytä tiedosto

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

+ 3
- 3
oa-ui/src/views/flowable/task/myProcess/index.vue Näytä tiedosto

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

+ 18
- 15
oa-ui/src/views/flowable/task/myProcess/progressTree.vue Näytä tiedosto

1
 <!--
1
 <!--
2
  * @Author: ysh
2
  * @Author: ysh
3
  * @Date: 2024-04-18 15:14:45
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
 <template>
7
 <template>
8
   <div>
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
       <el-button type="primary" @click="confirm">确定</el-button>
24
       <el-button type="primary" @click="confirm">确定</el-button>
22
       <el-button @click="$emit('close')">取消</el-button>
25
       <el-button @click="$emit('close')">取消</el-button>
23
     </div>
26
     </div>
77
           this.treeData[0].children.push(i);
80
           this.treeData[0].children.push(i);
78
         }
81
         }
79
         else if (i.category == "project") {
82
         else if (i.category == "project") {
80
-          if (i.name != "项目预算" && i.name != "安全交底" && i.name != "技术交底") 
83
+          if (i.name != "项目预算" && i.name != "安全交底" && i.name != "技术交底")
81
             this.treeData[1].children.push(i);
84
             this.treeData[1].children.push(i);
82
         } else if (i.category == "finance") {
85
         } else if (i.category == "finance") {
83
           this.treeData[2].children.push(i);
86
           this.treeData[2].children.push(i);

Loading…
Peruuta
Tallenna