Merge branch 'master' of http://gitlab.91isoft.com:90/zhangbotao/intelligent_station_web

src/api/resLabelInfo.js

@@ -20,6 +20,14 @@ export function listResLabelInfo(query) {
   })
 }
 
+export function listResLabelInfoAll(query) {
+  return request({
+    url: '/reslabelinfo/listAll',
+    method: 'get',
+    params: query
+  })
+}
+
 // 2. 查询标签信息详细信息
 export function getResLabelInfo(businessId) {
   return request({

src/views/resDatasetInfo/index.vue

@@ -167,51 +167,23 @@
         <!-- <el-form-item label="数据集分类" prop="dataType">
           <el-input v-model.trim="form.dataType" show-word-limit :maxlength="255" placeholder="请输入数据集分类" />
         </el-form-item> -->
-
-        <!-- <el-form-item label="标签名称" >
-        <el-select v-model="form.labellist.businessId" placeholder="请选择标签名称" clearable size="small">
-          <el-option
-                  v-for="dict in labellist"
-                  :key="dict.businessId"
-                  :label="dict.labelName"
-                  :value="dict.businessId"
-          />
-        </el-select>
-        </el-form-item> -->
-
-        <el-form-item label="父字典名称">
-          <el-select v-model="form.parentId" style="width: 100%" clearable placeholder="请选择父字典类型" @clear="setRules" @change="getOptions">
-            <el-option
-              v-for="item in options"
-              :key="item.businessId"
-              :label="item.dictName"
-              :value="item.businessId"
-            />
-          </el-select>
-
-        </el-form-item>
-        <el-form-item v-show="form.parentId" prop="dataId">
-          <el-select v-model="form.dataId" style="width: 100%" clearable placeholder="请选择父字典数据" @visible-change="clearSelected">
-            <el-option
-              v-for="item in optionsDict"
-              :key="item.businessId"
-              :label="item.dictLabel"
-              :disabled="item.status == 1"
-              :value="item.businessId"
-            >
-              <span style="float: left">{{ item.dictLabel }}</span>
-              <span v-if="item.status === '1'" style="float: right; color: #8492a6; font-size: 12px;padding-left: 10px">{{ '已停用' }}</span>
-            </el-option>
-          </el-select>
-        </el-form-item>
-
         <el-form-item label="数据集分类" prop="dataType">
-            <el-radio-group v-model="form.dataType" >
+            <el-radio-group v-model="form.dataType" @change="dataTypeChange" >
               <el-radio label="1">语言</el-radio>
               <el-radio label="2">视觉</el-radio>
               <el-radio label="3">多模态</el-radio>
             </el-radio-group>
           </el-form-item>
+          <el-form-item label="标签选择" >
+            <el-select name="lableSelect" id="lableSelect" v-model="form.labelId" clearable placeholder="请选择">
+              <el-option
+              v-for="labelInfo in statusArr"
+              :key="labelInfo.businessId"
+              :label="labelInfo.labelName"
+              :value="labelInfo.businessId"
+              />
+            </el-select>
+          </el-form-item>
           <el-form-item label="状态">
             <el-radio-group v-model="form.flag">
               <el-radio label="1">启用</el-radio>
@@ -238,7 +210,7 @@ import {
   addResDatasetInfo,
   updateResDatasetInfo,
   exportResDatasetInfo } from '@/api/resDatasetInfo'
-  import listResLabelInfo from '@/api/resLabelInfo'
+  import {listResLabelInfo} from '@/api/resLabelInfo'
 import commonField from '@/utils/commonField'
 import { getDataCache, setDataCache } from '@/assets/js/filterData'
 export default {
@@ -251,6 +223,8 @@ export default {
       total: 0,
       // 数据集信息表格数据
       resDatasetInfoList: [],
+       // 数据集信息表格数据
+       resLanelInfoList: [],
       // 弹出层标题
       title: '',
       // 是否显示弹出层
@@ -281,34 +255,29 @@ export default {
           dictValue: '3'
         }
       ],
-      statusOptionsLabel: [
-        {
-          dictLabel: '测试1',
-          dictValue: 1
-        },
-        {
-          dictLabel: '测试2',
-          dictValue: 2
-        },
-        {
-          dictLabel: '测试三',
-          dictValue: 3
-        }
-      ],
-      labellist:[],
+      //传入label信息
+      statusArr:[],
       // 查询参数
       queryParams: {
         page: 1,
         rows: 10,
-        // businessId: undefined,
         dataName: undefined,
         dataCode: undefined,
         dataOssPath: undefined,
         dataType: undefined,
+        flag: '',
+        labelId: 0,
+      },
+      queryParamsLabels: {
+        labelName: undefined,
+        labelType: undefined,
+        weight: undefined,
         flag: ''
       },
       // 表单参数
-      form: {},
+      form: {
+        labelId: 0
+      },
       // 表单校验
       rules: {
         dataName:[{type: 'string',required: true,message: "数据集名称必填", trigger: 'blur'}],
@@ -330,9 +299,22 @@ export default {
   },
   created() {
     this.queryParams = JSON.parse(getDataCache(this.$route.path)) // 获取存储的筛选项
+    this.getSelectLabel()//标签查询
     this.getList() // 列表查询
   },
   methods: {
+    /** 查询标签列表 */
+    getSelectLabel() {
+      this.loading = true
+      listResLabelInfo(this.queryParamsLabels).then(
+        response => {
+          this.statusArr=response.rows
+          this.resLanelInfoList = response.rows
+          this.total = response.total
+          this.loading = false
+        }
+      )
+    },
     /** 查询数据集信息列表 */
     getList() {
       this.loading = true
@@ -341,13 +323,8 @@ export default {
                 this.resDatasetInfoList = response.rows
                 this.total = response.total
                 this.loading = false
-              },
-              listResLabelInfo(this.labellist).then(
-              response => {
-                this.labellist = response.rows
               }
       )
-      )
     },
     // 取消按钮
     cancel() {
@@ -363,12 +340,8 @@ export default {
         dataCode: undefined,
         dataOssPath: undefined,
         dataType: '1',
-        flag: '1',
-        labellist: {
-          labelName: undefined,
-          businessId: undefined,
-          labelType: 3,
-        }
+        labelId: undefined,
+        flag: '1'
       }
       this.resetForm('form')
     },
@@ -395,7 +368,6 @@ export default {
       this.reset()
       this.open = true
       this.title = '添加数据集信息'
-      
     },
     /** 修改按钮操作 */
     handleUpdate(row) {
@@ -483,6 +455,12 @@ export default {
           window.URL.revokeObjectURL(href)// 释放掉blob对象
         })
       })
+    },
+    dataTypeChange(){
+      if(this.form.dataType){
+        this.queryParamsLabels.labelType=this.form.dataType
+        this.getSelectLabel()
+      }
     }
   }
 }