Merge branch 'main' into lyc-dev

Merge pull request 'zouyf_dev' (#202 ) from zouyf_dev into main
Reviewed-on: #202
2024-09-12 16:03:42 +08:00 · 2024-09-12 15:58:59 +08:00 · 2024-09-12 15:58:28 +08:00 · 2024-09-12 15:58:12 +08:00
1 changed files with 1 additions and 1 deletions
--- a/src/renderer/src/views/classTask/container/task-item.vue
+++ b/src/renderer/src/views/classTask/container/task-item.vue
@ -2,7 +2,7 @@
  <div class="class-reserv-item">
    <div class="class-reserv-item-body">
      <div class="class-reserv-item-title1">
-        <el-tag style="margin-left: 5px" :type="item.workclass"> {{ item.worktype }}</el-tag>
+        <el-tag style="margin-left: 5px" :type="item.workclass?item.workclass:'info'"> {{ item.worktype }}</el-tag>
        <label style="margin-left: 10px">{{ item.uniquekey }}</label>
      </div>
Author	SHA1	Message	Date
lyc	1da3ca0ee0	Merge branch 'main' into lyc-dev	2024-09-12 16:03:42 +08:00
zouyf	f57c67aab2	Merge pull request 'zouyf_dev' (#202 ) from zouyf_dev into main Reviewed-on: #202	2024-09-12 15:58:59 +08:00
“zouyf”	63ad74c77f	Merge branch 'main' into zouyf_dev	2024-09-12 15:58:28 +08:00
“zouyf”	d171117f03	tmp	2024-09-12 15:58:12 +08:00