123

ruoyi-ui/src/lang/zh/dataModel.js

@@ -152,7 +152,7 @@ export default {
   grasslandUsage: {
     queryKeyword: "草场名称",
     queryKeywordPh: "请输入草场名称关键字",
-    queryReserveDate: "预约日期",
+    queryReserveDate: "使用日期",
     colGrasslandName: "草场名称",
     colUsageAreaMu: "使用面积",
     colPastureName: "养殖主体",

ruoyi-ui/src/layout/components/Navbar.vue

@@ -38,9 +38,9 @@
           <size-select id="size-select" class="right-menu-item hover-effect" />
         </el-tooltip>
 
-        <el-tooltip content="消息通知" effect="dark" placement="bottom">
+        <!-- <el-tooltip content="消息通知" effect="dark" placement="bottom">
           <header-notice id="header-notice" class="right-menu-item hover-effect" />
-        </el-tooltip>
+        </el-tooltip> -->
 
       </template>
 

ruoyi-ui/src/views/diseaseTreatment/medicalResource/index.vue

@@ -64,7 +64,7 @@
             <span>{{ orgLevelLabel(scope.row.orgLevel) }}</span>
           </template>
         </el-table-column>
-        <el-table-column v-if="activeTab === 'equipment'" :label="dtT('colEquipmentModel')" prop="equipmentModel" align="center" width="100" :show-overflow-tooltip="true" />
+        <el-table-column v-if="activeTab === 'equipment'" :label="dtT('colEquipmentModel')" prop="equipmentModel" align="center" min-width="150" :show-overflow-tooltip="true" />
         <el-table-column v-if="showColAccount" :label="dtT('colAccount')" align="center" min-width="100">
           <template slot-scope="scope">
             <span v-if="scope.row.accountAssigned === 1">

ruoyi-ui/src/views/techService/onlineTrainingCourse/index.vue

@@ -11,7 +11,7 @@
             filterable
             style="width: 200px"
           >
-            <el-option v-for="item in courseTopicOptions" :key="item" :label="item" :value="item" />
+            <el-option v-for="item in courseTopicOptions" :key="item.code" :label="item.name" :value="item.code" />
           </el-select>
         </el-form-item>
         <el-form-item prop="courseTitle">
@@ -41,7 +41,11 @@
             <span>{{ introSummary(scope.row.courseIntro) }}</span>
           </template>
         </el-table-column>
-        <el-table-column :label="tsT('colCourseTopic')" prop="courseTopic" align="center" width="120" :show-overflow-tooltip="true" />
+        <el-table-column :label="tsT('colCourseTopic')" align="center" width="120" :show-overflow-tooltip="true">
+          <template slot-scope="scope">
+            <span>{{ courseTopicLabel(scope.row.courseTopic) }}</span>
+          </template>
+        </el-table-column>
         <el-table-column :label="tsT('colVideoFile')" align="center" min-width="140" :show-overflow-tooltip="true">
           <template slot-scope="scope">
             <span>{{ videoFileLabel(scope.row) }}</span>
@@ -71,7 +75,7 @@
     <el-dialog :title="tsCommon('viewTitle')" :visible.sync="viewOpen" width="720px" append-to-body @close="onViewClose">
       <el-descriptions v-if="viewRow.id" :column="1" border size="small">
         <el-descriptions-item :label="tsT('viewCourseTitle')">{{ viewRow.courseTitle || dash }}</el-descriptions-item>
-        <el-descriptions-item :label="tsT('viewCourseTopic')">{{ viewRow.courseTopic || dash }}</el-descriptions-item>
+        <el-descriptions-item :label="tsT('viewCourseTopic')">{{ courseTopicLabel(viewRow.courseTopic) }}</el-descriptions-item>
         <el-descriptions-item :label="tsT('viewCourseIntro')">
           <span class="view-text-pre">{{ viewRow.courseIntro || dash }}</span>
         </el-descriptions-item>
@@ -112,13 +116,12 @@
 
 <script>
 import techServiceLocaleMixin from "@/mixins/techServiceLocaleMixin"
-import {
-  listOnlineTrainingCourse,
-  getOnlineTrainingCourse,
-  listOnlineTrainingCourseTopics
-} from "@/api/techService/onlineTrainingCourse"
+import { listOnlineTrainingCourse, getOnlineTrainingCourse } from "@/api/techService/onlineTrainingCourse"
+import { listInformationCategoryChildren } from "@/api/category/informationCategory"
 
 const INTRO_SUMMARY_LEN = 50
+const COURSE_TOPIC_PARENT_CODE = "005"
+const COURSE_TOPIC_CATEGORY_TYPE = "8"
 
 export default {
   name: "OnlineTrainingCourse",
@@ -163,7 +166,7 @@ export default {
   },
   methods: {
     loadCourseTopics() {
-      listOnlineTrainingCourseTopics()
+      listInformationCategoryChildren(COURSE_TOPIC_PARENT_CODE, COURSE_TOPIC_CATEGORY_TYPE)
         .then((res) => {
           this.courseTopicOptions = Array.isArray(res.data) ? res.data : []
         })
@@ -171,6 +174,17 @@ export default {
           this.courseTopicOptions = []
         })
     },
+    courseTopicLabel(val) {
+      if (val == null || val === "") {
+        return this.dash
+      }
+      const key = String(val).trim()
+      const item = this.courseTopicOptions.find((o) => String(o.code) === key)
+      if (item && item.name) {
+        return item.name
+      }
+      return key
+    },
     introSummary(text) {
       if (text == null || text === "") {
         return this.dash