Просмотр исходного кода

Merge remote-tracking branch 'origin/master'

wwh 1 месяц назад
Родитель
Сommit
2d8146df60

+ 2 - 2
ruoyi-ui/src/lang/bo/techService.js

@@ -50,8 +50,8 @@ export default {
50
     removeKb: "ཤེས་བྱིས་མཛོད་ནས་ཕྱིར་འདོན",
50
     removeKb: "ཤེས་བྱིས་མཛོད་ནས་ཕྱིར་འདོན",
51
     colKb: "མཛོད་དུ་བཞག་རྣམ་པ།",
51
     colKb: "མཛོད་དུ་བཞག་རྣམ་པ།",
52
     colContentFile: "ཤེས་བྱིས་ཡིག་ཆ།",
52
     colContentFile: "ཤེས་བྱིས་ཡིག་ཆ།",
53
-    tipBody: "pdf/doc/docx/xls/xlsx/ppt/pptx ≤30MB",
54
-    errBodyFmt: "pdf/doc/docx/xls/xlsx/ppt/pptx རྐྱང་།",
53
+    tipBody: "pdf/doc/docx/xls/xlsx/pptx ≤30MB",
54
+    errBodyFmt: "pdf/doc/docx/xls/xlsx/pptx རྐྱང་།",
55
     errBodyMb: "30MB ལས་མི་འགྲོ།",
55
     errBodyMb: "30MB ལས་མི་འགྲོ།",
56
     msgSyncOk: "མཉམ་སྒྲིག་ལེགས།",
56
     msgSyncOk: "མཉམ་སྒྲིག་ལེགས།",
57
     msgRemoveKbOk: "ཕྱིར་འདོན་ལེགས།"
57
     msgRemoveKbOk: "ཕྱིར་འདོན་ལེགས།"

+ 1 - 1
ruoyi-ui/src/lang/zh/breedingStd.js

@@ -39,7 +39,7 @@ export default {
39
     ruleLen3120: "标准名称长度在 3 到 20 个字符",
39
     ruleLen3120: "标准名称长度在 3 到 20 个字符",
40
     ruleLen120: "标准名称长度在 1 到 20 个字符",
40
     ruleLen120: "标准名称长度在 1 到 20 个字符",
41
     pickFile: "选取文件",
41
     pickFile: "选取文件",
42
-    tipBody: "支持 pdf、doc、docx、xls、xlsx、ppt、pptx;单文件不超过 30MB",
42
+    tipBody: "支持 pdf、doc、docx、xls、xlsx、pptx;单文件不超过 30MB",
43
     tipCover: "支持 jpg、jpeg、png;单张不超过 10MB(选填)",
43
     tipCover: "支持 jpg、jpeg、png;单张不超过 10MB(选填)",
44
     del: "删除",
44
     del: "删除",
45
     uploadingFile: "正在上传文件,请稍候...",
45
     uploadingFile: "正在上传文件,请稍候...",

+ 2 - 2
ruoyi-ui/src/lang/zh/techService.js

@@ -50,8 +50,8 @@ export default {
50
     removeKb: "移出知识库",
50
     removeKb: "移出知识库",
51
     colKb: "入库状态",
51
     colKb: "入库状态",
52
     colContentFile: "知识文件",
52
     colContentFile: "知识文件",
53
-    tipBody: "支持 pdf、doc、docx、xls、xlsx、ppt、pptx;单文件不超过 30MB",
54
-    errBodyFmt: "仅支持 pdf、doc、docx、xls、xlsx、ppt、pptx 格式",
53
+    tipBody: "支持 pdf、doc、docx、xls、xlsx、pptx;单文件不超过 30MB",
54
+    errBodyFmt: "仅支持 pdf、doc、docx、xls、xlsx、pptx 格式",
55
     errBodyMb: "文件大小不能超过 30 MB",
55
     errBodyMb: "文件大小不能超过 30 MB",
56
     msgSyncOk: "同步知识库成功",
56
     msgSyncOk: "同步知识库成功",
57
     msgRemoveKbOk: "移出知识库成功"
57
     msgRemoveKbOk: "移出知识库成功"

+ 1 - 1
ruoyi-ui/src/views/breedingStandards/breedingManage/index.vue

@@ -332,7 +332,7 @@ export default {
332
       },
332
       },
333
       form: {},
333
       form: {},
334
       standardTypeOptions: [],
334
       standardTypeOptions: [],
335
-      contentFileExts: ["pdf", "doc", "docx", "xls", "xlsx", "ppt", "pptx"],
335
+      contentFileExts: ["pdf", "doc", "docx", "xls", "xlsx", "pptx"],
336
       coverFileExts: ["jpg", "jpeg", "png"]
336
       coverFileExts: ["jpg", "jpeg", "png"]
337
     }
337
     }
338
   },
338
   },

+ 1 - 1
ruoyi-ui/src/views/breedingStandards/diseaseTreatment/epidemicTreatment/index.vue

@@ -327,7 +327,7 @@ export default {
327
       },
327
       },
328
       form: {},
328
       form: {},
329
       standardTypeOptions: [],
329
       standardTypeOptions: [],
330
-      contentFileExts: ["pdf", "doc", "docx", "xls", "xlsx", "ppt", "pptx"],
330
+      contentFileExts: ["pdf", "doc", "docx", "xls", "xlsx", "pptx"],
331
       coverFileExts: ["jpg", "jpeg", "png"]
331
       coverFileExts: ["jpg", "jpeg", "png"]
332
     }
332
     }
333
   },
333
   },

+ 1 - 1
ruoyi-ui/src/views/breedingStandards/equipmentOperation/index.vue

@@ -330,7 +330,7 @@ export default {
330
       },
330
       },
331
       form: {},
331
       form: {},
332
       standardTypeOptions: [],
332
       standardTypeOptions: [],
333
-      contentFileExts: ["pdf", "doc", "docx", "xls", "xlsx", "ppt", "pptx"],
333
+      contentFileExts: ["pdf", "doc", "docx", "xls", "xlsx", "pptx"],
334
       coverFileExts: ["jpg", "jpeg", "png"]
334
       coverFileExts: ["jpg", "jpeg", "png"]
335
     }
335
     }
336
   },
336
   },

+ 1 - 1
ruoyi-ui/src/views/breedingStandards/feeding/index.vue

@@ -328,7 +328,7 @@ export default {
328
       },
328
       },
329
       form: {},
329
       form: {},
330
       standardTypeOptions: [],
330
       standardTypeOptions: [],
331
-      contentFileExts: ["pdf", "doc", "docx", "xls", "xlsx", "ppt", "pptx"],
331
+      contentFileExts: ["pdf", "doc", "docx", "xls", "xlsx", "pptx"],
332
       coverFileExts: ["jpg", "jpeg", "png"]
332
       coverFileExts: ["jpg", "jpeg", "png"]
333
     }
333
     }
334
   },
334
   },

+ 1 - 1
ruoyi-ui/src/views/breedingStandards/growthOutbound/index.vue

@@ -328,7 +328,7 @@ export default {
328
       },
328
       },
329
       form: {},
329
       form: {},
330
       standardTypeOptions: [],
330
       standardTypeOptions: [],
331
-      contentFileExts: ["pdf", "doc", "docx", "xls", "xlsx", "ppt", "pptx"],
331
+      contentFileExts: ["pdf", "doc", "docx", "xls", "xlsx", "pptx"],
332
       coverFileExts: ["jpg", "jpeg", "png"]
332
       coverFileExts: ["jpg", "jpeg", "png"]
333
     }
333
     }
334
   },
334
   },

+ 1 - 1
ruoyi-ui/src/views/techService/knowledge/index.vue

@@ -248,7 +248,7 @@ export default {
248
         kbSyncStatus: undefined
248
         kbSyncStatus: undefined
249
       },
249
       },
250
       form: {},
250
       form: {},
251
-      contentFileExts: ["pdf", "doc", "docx", "xls", "xlsx", "ppt", "pptx"]
251
+      contentFileExts: ["pdf", "doc", "docx", "xls", "xlsx", "pptx"]
252
     }
252
     }
253
   },
253
   },
254
   computed: {
254
   computed: {