Merge pull request WeBankBlockchain#189 from huangfei1994/feature-mil…

…estone2

wedpr-web界面优化

wedpr-web/src/components/modelCard.vue

@@ -15,6 +15,9 @@
         <li class="ell">
           标签字段： <span>{{ modelInfo.label_column }}</span>
         </li>
+        <li class="ell">
+          模型ID： <span>{{ modelInfo.id }}</span>
+        </li>
         <li class="ell">
           发起人： <span>{{ modelInfo.owner }}</span>
         </li>

wedpr-web/src/views/jobDetail/result/xgbResult.vue

@@ -229,7 +229,6 @@
 import { toDynamicTableData } from 'Utils/index.js'
 import { downloadLargeFile } from 'Mixin/downloadLargeFile.js'
 import { jobEnum } from 'Utils/constant.js'
-import { jobManageServer } from 'Api'
 export default {
   name: 'AiResultNew',
   mixins: [downloadLargeFile],
@@ -245,6 +244,14 @@ export default {
       default: () => {
         return ''
       }
+    },
+    modelResultDetail: {
+      type: Object,
+      default: () => {}
+    },
+    jobStatusInfo: {
+      type: Object,
+      default: () => {}
     }
   },
   data() {
@@ -270,34 +277,18 @@ export default {
       FEPreviewData: null,
       PRPreviewTableData: null,
       resultLink: {},
-      jobEnum,
-      jobStatusInfo: {},
-      loading: false
+      jobEnum
     }
   },
   watch: {
-    jobID() {
-      this.getJobResult()
+    modelResultDetail() {
+      this.handleResult()
     }
   },
   created() {
-    this.getJobResult()
+    this.handleResult()
   },
   methods: {
-    async getJobResult() {
-      const { jobID } = this
-      this.loading = true
-      const res = await jobManageServer.queryJobDetail({ jobID, fetchJobResult: true, fetchJobDetail: false })
-      if (res.code === 0 && res.data) {
-        const { modelResultDetail = {}, resultFileInfo, job = {} } = res.data
-        const { jobStatusInfo = {} } = job
-        this.modelResultDetail = modelResultDetail
-        this.resultFileInfo = resultFileInfo
-        this.jobStatusInfo = jobStatusInfo
-        this.handleResult()
-      }
-      this.loading = false
-    },
     downloadResult(path, fileName) {
       path && this.downloadLargeFile({ filePath: path }, fileName)
     },

wedpr-web/src/views/leadMode/dataSelect/index.vue

@@ -86,14 +86,16 @@ export default {
       searchForm: {
         datasetTitle: '',
         ownerUserName: '',
-        tag: '',
-        createTime: ''
+        dataSourceType: '',
+        createTime: '',
+        datasetId: ''
       },
       searchQuery: {
         datasetTitle: '',
         ownerUserName: '',
-        tag: '',
-        createTime: ''
+        dataSourceType: '',
+        createTime: '',
+        datasetId: ''
       },
       formLabelWidth: '112px',
       loadingFlag: false,
@@ -220,3 +222,8 @@ export default {
   }
 }
 </style>
+<style lang="less">
+.el-select-dropdown {
+  z-index: 2100 !important;
+}
+</style>

wedpr-web/src/views/leadMode/modelSelect/index.vue

@@ -2,10 +2,10 @@
   <div class="record">
     <div class="form-search">
       <el-form :inline="true" @submit="queryHandle" :model="searchForm" ref="searchForm" size="small">
-        <el-form-item prop="serviceName" label="模型名称：">
+        <el-form-item prop="name" label="模型名称：">
           <el-input clearable style="width: 180px" v-model="searchForm.name" placeholder="请输入"> </el-input>
         </el-form-item>
-        <el-form-item prop="serviceId" label="模型ID：">
+        <el-form-item prop="id" label="模型ID：">
           <el-input style="width: 180px" v-model="searchForm.id" placeholder="请输入" clearable> </el-input>
         </el-form-item>
         <el-form-item>
@@ -18,7 +18,7 @@
         </el-form-item>
       </el-form>
     </div>
-    <div class="card-container" v-if="modelTableData.length">
+    <div class="card-container" v-if="modelTableData.length" v-loading="queryFlag">
       <modelCard
         v-for="item in modelTableData"
         :selected="selectedId === item.id"
@@ -77,7 +77,7 @@ export default {
   },
   data() {
     return {
-      loadingFlag: false,
+      queryFlag: false,
       pageData: { page_offset: 1, page_size: 8 },
       modelTableData: [],
       searchForm: {
@@ -104,6 +104,9 @@ export default {
     ...mapGetters(['userId', 'agencyId'])
   },
   methods: {
+    reset() {
+      this.$refs.searchForm.resetFields()
+    },
     hanleSelectedModel(selected, item) {
       this.selectedId = selected ? item.id : ''
       if (selected) {
@@ -125,7 +128,7 @@ export default {
       const { id = '', name = '' } = this.searchQuery
       const searchParams = handleParamsValid({ id, name })
       const params = { pageNum: page_offset, pageSize: page_size }
-      this.loadingFlag = true
+      this.queryFlag = true
       const condition = {
         id: '',
         name: '',
@@ -143,7 +146,7 @@ export default {
         ...params,
         condition
       })
-      this.loadingFlag = false
+      this.queryFlag = false
       console.log(res)
       if (res.code === 0 && res.data) {
         const { dataList, total } = res.data

wedpr-web/src/views/modelServerCreate/index.vue

@@ -14,6 +14,13 @@
           <modelSelect :queriedTypes="['XGB_MODEL_SETTING', 'LR_MODEL_SETTING']" v-model="serverForm.serviceConfig" />
         </el-form-item>
       </formCard>
+      <formCard title="设置访问凭证">
+        <el-form-item label-width="108px" label="访问凭证：" prop="grantedAccessKeyList">
+          <el-select style="width: 480px" multiple v-model="serverForm.grantedAccessKeyList" placeholder="请选择" clearable>
+            <el-option :title="item.value" :label="item.label" :value="item.value" :key="item" v-for="item in accessKeyList"></el-option>
+          </el-select>
+        </el-form-item>
+      </formCard>
     </el-form>
     <div>
       <el-button size="medium" type="primary" @click="checkService" v-if="type === 'edit'"> 编辑服务 </el-button>
@@ -23,7 +30,7 @@
 </template>
 <script>
 import { tableHeightHandle } from 'Mixin/tableHeightHandle.js'
-import { serviceManageServer } from 'Api'
+import { serviceManageServer, accessKeyManageServer } from 'Api'
 import { mapGetters } from 'vuex'
 import modelSelect from '../leadMode/modelSelect/index.vue'
 import { serviceTypeEnum } from 'Utils/constant.js'
@@ -38,7 +45,8 @@ export default {
       serverForm: {
         serviceName: '',
         serviceDesc: '',
-        serviceConfig: ''
+        serviceConfig: '',
+        grantedAccessKeyList: []
       },
       pageData: {
         page_offset: 1,
@@ -51,13 +59,15 @@ export default {
       type: '',
       dataList: [],
       selectedData: {},
-      serviceId: ''
+      serviceId: '',
+      accessKeyList: []
     }
   },
 
   created() {
     const { type, serviceId } = this.$route.query
     this.type = type
+    this.queryAccessKeyList()
     if (this.type === 'edit') {
       this.serviceId = serviceId
       this.queryService()
@@ -81,6 +91,13 @@ export default {
             trigger: 'blur'
           }
         ],
+        grantedAccessKeyList: [
+          {
+            required: true,
+            message: '请选择访问凭证',
+            trigger: 'blur'
+          }
+        ],
         serviceConfig: [
           {
             required: true,
@@ -92,6 +109,21 @@ export default {
     }
   },
   methods: {
+    // 获取ak列表
+    async queryAccessKeyList() {
+      const params = { condition: { status: 'Enable', id: '' }, pageNum: -1, pageSize: 1 }
+      const res = await accessKeyManageServer.queryAccessKeyList(params)
+      console.log(res)
+      if (res.code === 0 && res.data) {
+        const { credentials = [] } = res.data
+        this.accessKeyList = credentials.map((v) => {
+          return {
+            label: v.desc + '-' + v.accessKeyID,
+            value: v.accessKeyID
+          }
+        })
+      }
+    },
     // 获取服务详情回显
     async queryService() {
       this.loadingFlag = true
@@ -127,19 +159,19 @@ export default {
     checkService() {
       this.$refs.serverForm.validate((valid) => {
         if (valid) {
-          const { serviceName, serviceDesc, serviceConfig } = this.serverForm
+          const { serviceName, serviceDesc, serviceConfig, grantedAccessKeyList } = this.serverForm
           let setting = ''
           if (this.type === 'edit') {
             setting = serviceConfig
           } else {
             setting = serviceConfig.setting
           }
           const { model_type } = JSON.parse(setting)
-          const serviceType = model_type === 'xgb_model' ? serviceTypeEnum.XGB : serviceTypeEnum.LR
+          const serviceType = model_type === 'lr_model' ? serviceTypeEnum.LR : serviceTypeEnum.XGB
           if (this.type === 'edit') {
-            this.updateService({ serviceName, serviceDesc, serviceId: this.serviceId, serviceConfig: setting, serviceType })
+            this.updateService({ serviceName, serviceDesc, serviceId: this.serviceId, serviceConfig: setting, serviceType, grantedAccessKeyList })
           } else {
-            this.createService({ serviceName, serviceDesc, serviceType, serviceConfig: setting })
+            this.createService({ serviceName, serviceDesc, serviceType, serviceConfig: setting, grantedAccessKeyList })
           }
         } else {
           return false