重构镜像仓库qa-test

src/api/docker.js

@@ -2,19 +2,19 @@ import request from '@/utils/request'
 
 export function getAllRepos() {
   return request({
-    url: '/repo/getAll'
+    url: '/repoNew/getAll'
   })
 }
 
 export function getBaseRepos() {
   return request({
-    url: '/repo/getBase'
+    url: '/repoNew/getBase'
   })
 }
 
 export function getAppRepos() {
   return request({
-    url: '/repo/getApp'
+    url: '/repoNew/getApp'
   })
 }
 
@@ -105,7 +105,8 @@ export function deleteClusterService(data) {
 
 export function fetchUserrepository(data) {
   return request({
-    url: '/k8s/repository',
+    url: '/repoNew/getSingleTypeApp',
+    // url: '/k8s/repository',
     method: 'post',
     data
   })

src/views/docker/envDetail.vue

@@ -294,8 +294,8 @@
             <el-option
               v-for="(item,index) in options"
               :key="index"
-              :label="item.reponame.split('/')[1]"
-              :value="item.reponame"/>
+              :label="item.appname.split(':')[0]"
+              :value="item.tag.split(':')[0]"/>
           </el-select>
         </el-col>
       </el-row>
@@ -450,6 +450,7 @@ export default {
   directives: { permission },
   data() {
     return {
+      QATEST: 'qa-test',
       debugOptions: [
         { key: '"1"', display_name: '是' },
         { key: '"0"', display_name: '否' }
@@ -565,9 +566,9 @@ export default {
       this.debug = { key: '"0"', display_name: '否' }
       this.wechat = { key: '"0"', display_name: '否' }
       this.mock = { key: '"0"', display_name: '否' }
-      fetchUserrepository({ 'namespace': 'qa-' + label }).then(res => {
-        this.options = res.data.repoInfo
-        this.server = res.data.server
+      const repoName = label === 'base' ? 'base' : 'test'
+      fetchUserrepository({ 'namespace': 'qa-' + repoName, type: label }).then(res => {
+        this.options = res.data
       })
       this.dialogVisible = true
     },
@@ -631,7 +632,6 @@ export default {
       // })
     },
     openConsole(data) {
-      console.log(1, data)
       let port
       if (data.serviceName === 'rabbitmq') {
         port = data.portMappings.filter(item => item.port === 15672)[0].nodePort
@@ -642,7 +642,6 @@ export default {
       window.open(`http://${data.lanIp}:${port}/`, '_blank')
     },
     getServiceDetails(value) {
-      console.log(value)
       fetchServiceDetails({ serviceName: value.serviceName, namespace: this.namespace, type: value.labels.type }).then(res => {
         this.centerDialogVisible = true
         this.value = res.data
@@ -700,7 +699,7 @@ export default {
       this.serviceName = value.serviceName
       this.type = value.labels.type
       this.tagOptions = []
-      fetchTaglist({ reponame: 'qa-' + value.labels.type + '/' + this.serviceName }).then(res => {
+      fetchTaglist({ reponame: this.QATEST + '/' + this.serviceName }).then(res => {
         if (res.data.tagCount) {
           this.tagOptions = res.data.tagInfo
           this.reponame = res.data.reponame

src/views/resources/cpuDetails.vue

@@ -71,8 +71,8 @@ export default {
   directives: { waves },
   data() {
     return {
-      startTime: moment(new Date()).add(-1, 'days').format(),
-      endTime: moment(new Date()).format(),
+      startTime: moment(new Date()).add(-1, 'days').format('YYYY-MM-DD'),
+      endTime: moment(new Date()).format('YYYY-MM-DD'),
       name: undefined,
       cpuResources: null
     }
@@ -119,8 +119,8 @@ export default {
         name: 'cpuInfo',
         query: {
           name: row.name,
-          startTime: moment(this.startTime).format(),
-          endTime: moment(this.endTime).format()
+          startTime: moment(this.startTime).format('YYYY-MM-DD'),
+          endTime: moment(this.endTime).format('YYYY-MM-DD')
         }
       })
     }