admin-portal/.env.development

@@ -4,3 +4,4 @@ ENV = 'development'
 # base api
 VUE_APP_BASE_API = '/adminserver'
 VUE_APP_BASE_API2 = ''
+VUE_APP_BASE_DOMAIN=''

admin-portal/README.md

@@ -88,3 +88,8 @@ Modern browsers and Internet Explorer 10+.
 [MIT](https://github.com/PanJiaChen/vue-admin-template/blob/master/LICENSE) license.
 
 Copyright (c) 2017-present PanJiaChen
+
+## notice
+
+本地调试执行npm run dev需要在env.development文件中配置环境变量VUE_APP_BASE_DOMAIN中的地址
+

admin-portal/src/api/globalVariable.js

@@ -1,10 +1,13 @@
 
 let DOMAIN
 if (process.env.NODE_ENV === 'development') {
-  DOMAIN = 'http://192.168.202.73'
+  // eslint-disable-next-line no-undef
+  DOMAIN = process.env.VUE_APP_BASE_DOMAIN || 'http://192.168.202.73'
 } else {
-  if (!window.location.port || window.location.port == '') { DOMAIN = window.location.protocol + '//' + document.domain } else { DOMAIN = window.location.protocol + '//' + document.domain + ':' + window.location.port }
+  if (!window.location.port || window.location.port == '') { DOMAIN = window.location.protocol + '//' + document.domain }
+  else { DOMAIN = window.location.protocol + '//' + document.domain + ':' + window.location.port }
 }
 export default {
   DOMAIN
-}
+}
+// 本地调试执行npm run dev指令需要修改DOMAIN地址，将http://192.168.202.73替换成服务器地址

admin-portal/src/views/modelManager/components/reupload.vue

@@ -0,0 +1,84 @@
+<template>
+    <div>
+        <el-dialog title="重新上传" :visible.sync="dialogFormVisible" width="650px" :before-close="handleDialogClose"
+            :close-on-click-modal="false" :show-close="close">
+            <el-form ref="ruleForm" :model="ruleForm" label-width="100px" class="demo-ruleForm">
+                <el-form-item label="模型版本" :label-width="formLabelWidth" prop="modelDescript">
+                    <el-input v-model="ruleForm.version" autocomplete="off" :disabled="true" />
+                </el-form-item>
+                <el-form-item label="模型描述" :label-width="formLabelWidth" prop="modelDescript">
+                    <el-input v-model="ruleForm.descript" autocomplete="off" :disabled="true" />
+                </el-form-item>
+                <el-form-item v-if="showUpload" label="模型上传" :label-width="formLabelWidth">
+                    <upload :upload-data="uploadData" @confirm="confirm" @cancel="cancel" @upload="isCloseX" />
+                </el-form-item>
+            </el-form>
+
+        </el-dialog>
+    </div>
+</template>
+
+<script>
+    import upload from '@/components/upload/index.vue'
+    import { getErrorMsg } from '@/error/index'
+    export default {
+        name: "CreateDialog",
+        components: {
+            upload
+        },
+
+        props: {
+            isList: {
+                type: Boolean
+            },
+            row: { type: Object, default: () => { } }
+        },
+        data() {
+            return {
+                ruleForm: {},
+                dialogFormVisible: true,
+                formLabelWidth: '120px',
+                showUpload: true,
+                uploadData: {type:'',data:{}},
+                id: undefined,
+                close: undefined
+
+            }
+        },
+        created() {
+            this.ruleForm.version = this.row.version
+            this.ruleForm.descript = this.row.descript
+            this.id = this.row.modelId
+            this.uploadData.type = "modelManager"
+            this.uploadData.data.modelId=this.row.modelId
+            this.uploadData.data.version=this.row.version
+            
+
+        },
+        beforeDestroy() {
+
+        },
+        methods: {
+            // 错误码
+            getErrorMsg(code) {
+                return getErrorMsg(code)
+            },
+            confirm(val) { this.$emit('confirm', val) },
+            cancel(val) { this.$emit('cancel', val) },
+            handleDialogClose() {
+                this.$emit('close', false)
+            },
+            confirm(val) { this.$emit('confirm', val) },
+            cancel(val) { this.$emit('cancel', val) },
+            isCloseX(val) {
+                this.close = val
+            }
+
+        }
+    }
+</script>
+<style lang="scss" scoped>
+    .el-dialog--center .el-dialog__body {
+        text-align: center;
+    }
+</style>

admin-portal/src/views/modelManager/components/versionList.vue

@@ -30,10 +30,14 @@
                 </el-table-column>
                 <el-table-column label="操作">
                     <template slot-scope="scope">
+                        <el-button v-if="scope.row.fileStatus==0||scope.row.fileStatus==3&&modelType==3" type="text"
+                            @click="handleEdit(scope.row)" :disabled="scope.row.progress&&scope.row.progress!=0">重新上传
+                        </el-button>
                         <el-button type="text" :disabled="scope.row.fileStatus!==2" @click="handlePreview(scope.row)">
                             预览
                         </el-button>
-                        <el-button v-if="modelType===3" type="text" @click="open(scope.row)" :disabled="scope.row.progress&&scope.row.progress!=0">删除</el-button>
+                        <el-button v-if="modelType===3" type="text" @click="open(scope.row)"
+                            :disabled="scope.row.progress&&scope.row.progress!=0">删除</el-button>
                         <el-button type="text" :disabled="scope.row.fileStatus!==2" @click="handledDownload(scope.row)">
                             下载
                         </el-button>
@@ -50,6 +54,9 @@
         </el-dialog>
         <!-- 预览对话框 -->
         <previewDialog v-if="preVisible" :row="data" @close="closeShareDialog" />
+        <!-- 创建对话框 -->
+        <reupload v-if="CreateVisible" :row="row" :is-list="isList" @close="close" @cancel="cancel"
+            @confirm="confirm" />
     </div>
 </template>
 
@@ -59,10 +66,12 @@
     import { getModelList, downloadModel, deletePreModelVersion } from '@/api/modelManager.js'
     import { parseTime } from '@/utils/index'
     import { getErrorMsg } from '@/error/index'
+    import reupload from './reupload.vue'
+    import store from '@/store'
     export default {
         name: "VersionList",
         components: {
-
+            reupload,
             previewDialog
         },
         props: {
@@ -81,7 +90,9 @@
                 tableData: [],
                 row: { flag: undefined, data: undefined },
                 data: { modelId: undefined, version: undefined },
-                timer: null
+                timer: null,
+                CreateVisible: false,
+                isList: true
 
             }
         },
@@ -238,7 +249,26 @@
                     default:
                         return '上传失败'
                 }
-            }
+            },
+            // 重新上传
+            handleEdit(val) {
+                this.isList = true
+                this.CreateVisible = true
+                this.row = val
+                store.commit('user/SET_PROGRESSID', val.modelId)
+            },
+            cancel(val) {
+                this.CreateVisible=val         
+                this.getList()
+            },
+            confirm(val) {
+                this.CreateVisible=val           
+                this.getList()
+            },
+            close(val) {
+                this.CreateVisible=val
+                this.getList()
+            },
         }
 
     }

openai-portal/.env.development

@@ -4,3 +4,4 @@ ENV = 'development'
 # base api
 VUE_APP_BASE_API = '/openaiserver'
 VUE_APP_BASE_API2 = ''
+VUE_APP_BASE_DOMAIN=''

openai-portal/src/api/globalVariable.js

@@ -1,11 +1,12 @@
 
 let DOMAIN
 if (process.env.NODE_ENV === 'development') {
-  DOMAIN = 'http://192.168.202.72'
+  DOMAIN = process.env.VUE_APP_BASE_DOMAIN || 'http://192.168.202.73'
 } else {
   // eslint-disable-next-line eqeqeq
   if (!window.location.port || window.location.port == '') { DOMAIN = window.location.protocol + '//' + document.domain } else { DOMAIN = window.location.protocol + '//' + document.domain + ':' + window.location.port }
 }
 export default {
   DOMAIN
-}
+}
+// 本地调试执行npm run dev指令需要修改DOMAIN地址，将http://192.168.202.73替换成服务器地址