chenxiaochao 9 時間 前
コミット
ebf5183008

+ 10 - 3
apps/web-ele/src/views/knowledge/detail/index.vue

1424
   margin-bottom: 30px;
1424
   margin-bottom: 30px;
1425
   font-size: 14px;
1425
   font-size: 14px;
1426
 }
1426
 }
1427
-:global(.content-text ul) {
1427
+:deep(.content-text ul) {
1428
   list-style-type: disc !important;
1428
   list-style-type: disc !important;
1429
   padding-left: 24px !important;
1429
   padding-left: 24px !important;
1430
 }
1430
 }
1431
-
1432
-:global(.content-text ol) {
1431
+:deep(.content-text ol) {
1433
   list-style-type: decimal !important;
1432
   list-style-type: decimal !important;
1434
   padding-left: 24px !important;
1433
   padding-left: 24px !important;
1435
 }
1434
 }
1435
+/* 表格样式 */
1436
+:deep(.content-text table) {
1437
+  border-collapse: collapse;
1438
+}
1439
+:deep(.content-text th),
1440
+:deep(.content-text td) {
1441
+  border: 1px solid #d9d9d9;
1442
+}
1436
 .content-attachments {
1443
 .content-attachments {
1437
   padding-top: 20px;
1444
   padding-top: 20px;
1438
   border-top: 1px solid #e8e8e8;
1445
   border-top: 1px solid #e8e8e8;

+ 2 - 2
apps/web-ele/src/views/knowledge/edit/index.vue

66
       .join(','),
66
       .join(','),
67
   })
67
   })
68
     .then(() => {
68
     .then(() => {
69
-      handleChapterClick({ id: ChapterId });
69
+      handleChapterClick({ id: selectedChapter.value?.id });
70
     })
70
     })
71
     .finally(() => {
71
     .finally(() => {
72
       centerloading.value = false;
72
       centerloading.value = false;
90
       .join(','),
90
       .join(','),
91
   })
91
   })
92
     .then(() => {
92
     .then(() => {
93
-      handleChapterClick({ id: ChapterId });
93
+      handleChapterClick({ id: selectedChapter.value?.id  });
94
     })
94
     })
95
     .finally(() => {
95
     .finally(() => {
96
       centerloading.value = false;
96
       centerloading.value = false;

+ 6 - 3
apps/web-ele/src/views/system/taskDesign/taskTemplate/index.vue

108
         isLicensable: String(res.isLicensable),
108
         isLicensable: String(res.isLicensable),
109
         isRating: String(res.isRating),
109
         isRating: String(res.isRating),
110
         isMust: String(res.isMust),
110
         isMust: String(res.isMust),
111
-        executionMethod: String(res.executionMethod),
111
+        // executionMethod: String(res.executionMethod),
112
         status: String(res.status),
112
         status: String(res.status),
113
         isTiming: String(res.isTiming),
113
         isTiming: String(res.isTiming),
114
         level: String(res.level),
114
         level: String(res.level),
137
         isLicensable: String(res.isLicensable),
137
         isLicensable: String(res.isLicensable),
138
         isRating: String(res.isRating),
138
         isRating: String(res.isRating),
139
         isMust: String(res.isMust),
139
         isMust: String(res.isMust),
140
-        executionMethod: String(res.executionMethod),
140
+        // executionMethod: String(res.executionMethod),
141
         status: String(res.status),
141
         status: String(res.status),
142
         isTiming: String(res.isTiming),
142
         isTiming: String(res.isTiming),
143
         level: String(res.level),
143
         level: String(res.level),
144
-        repel: Number(res.repel),
144
+        repel: res?.repel?.split(',').map(Number),
145
         isCycleEnd: res?.isCycleEnd === 1 ? [true] : [],
145
         isCycleEnd: res?.isCycleEnd === 1 ? [true] : [],
146
         standardGuidelineName: `${res?.knowledgeCategoryDetails?.name || ''}${res?.knowledgeContentDetails?.title ? '/' : ''}${res?.knowledgeContentDetails?.title || ''}`,
146
         standardGuidelineName: `${res?.knowledgeCategoryDetails?.name || ''}${res?.knowledgeContentDetails?.title ? '/' : ''}${res?.knowledgeContentDetails?.title || ''}`,
147
       })
147
       })
214
     data.endTimeDay = Number(data?.endTimeYearDay);
214
     data.endTimeDay = Number(data?.endTimeYearDay);
215
     delete data.endTimeYearDay;
215
     delete data.endTimeYearDay;
216
     }
216
     }
217
+    if(data.repel.length>0){
218
+      data.repel = data.repel.join(',');
219
+    }
217
     // 根据是否包含 id 来决定调用新增接口还是编辑接口
220
     // 根据是否包含 id 来决定调用新增接口还是编辑接口
218
     if (data.id) {
221
     if (data.id) {
219
       // 编辑操作
222
       // 编辑操作

+ 12 - 11
apps/web-ele/src/views/system/taskDesign/taskTemplate/taskTemplate-data.tsx

573
       triggerFields: ['executePositions'],
573
       triggerFields: ['executePositions'],
574
     },
574
     },
575
   },
575
   },
576
-  {
577
-    component: 'RadioGroup',
578
-    fieldName: 'executionMethod',
579
-    label: '执行方式',
580
-    defaultValue: '1',
581
-    componentProps: createRadioConfig([
582
-      { label: '人工', value: '1' },
583
-      { label: '自动', value: '0' },
584
-    ]),
585
-    formItemClass: 'col-span-2 items-baseline',
586
-  },
576
+  // {
577
+  //   component: 'RadioGroup',
578
+  //   fieldName: 'executionMethod',
579
+  //   label: '执行方式',
580
+  //   defaultValue: '1',
581
+  //   componentProps: createRadioConfig([
582
+  //     { label: '人工', value: '1' },
583
+  //     { label: '自动', value: '0' },
584
+  //   ]),
585
+  //   formItemClass: 'col-span-2 items-baseline',
586
+  // },
587
   {
587
   {
588
     component: 'Select',
588
     component: 'Select',
589
     fieldName: 'taskFrequency',
589
     fieldName: 'taskFrequency',
1160
       labelField: 'label',
1160
       labelField: 'label',
1161
       valueField: 'value',
1161
       valueField: 'value',
1162
       clearable: true,
1162
       clearable: true,
1163
+      multiple: true,
1163
     },
1164
     },
1164
     formItemClass: 'col-span-2 items-baseline',
1165
     formItemClass: 'col-span-2 items-baseline',
1165
   },
1166
   },