Merge branch 'master' of http://60.23.29.213:3060/HB/yudao-web

src/views/task/index.vue

@@ -104,7 +104,7 @@
       </el-table-column> -->
       <el-table-column label="任务类型" align="center" prop="taskType">
         <template #default="scope">
-          <dict-tag :type="DICT_TYPE.TASK_TYPE" :value="scope.row.taskType" />
+        <el-tag>{{ scope.row.taskTypeName }}</el-tag>
         </template>
       </el-table-column>
       <!-- <el-table-column label="任务优先级" align="center" prop="priority">
@@ -225,6 +225,7 @@ const { push } = useRouter()
 const loading = ref(true) // 列表的加载中
 const list = ref<TaskInfoVO[]>([]) // 列表的数据
 const total = ref(0) // 列表的总页数
+const taskTypeMap=ref()
 const queryParams = reactive({
   pageNo: 1,
   pageSize: 10,
@@ -259,6 +260,7 @@ const getList = async () => {
   }
 }
 
+
 //选择任务中企业范围
 const selectEnterprise = async (id: number) => {}