Przeglądaj źródła

添加单点登录新地址

zhangyu 5 lat temu
rodzic
commit
49c2231bd5

+ 2 - 1
config/dev.env.js

@@ -5,7 +5,8 @@ const prodEnv = require('./prod.env')
 module.exports = merge(prodEnv, {
     NODE_ENV: '"development"',
     BASE_URL: '"http://192.168.20.236"', //测试iframe地址
-    SSO_SERVER: '"http://192.168.20.102:8080"', //(新)测试环境
+    SSO_SERVER: '"http://192.168.20.102:8080"', //测试环境
+    // SSO_SERVER: '"http://192.168.20.236:8086"', //(新)测试环境
     MQTT_SERVICE: '"ws://192.168.20.225:61614/stomp/"' //MQ测试环境地址
     // SSO_SERVER: '"http://sso.sagacloud.cn"',  //正式环境
     // BASE_URL: '"http://mbi.sagacloud.cn"', //线上iframe地址

+ 2 - 1
config/prod.env.js

@@ -2,7 +2,8 @@
 module.exports = {
     NODE_ENV: '"production"',
     BASE_URL: '"http://192.168.20.236"', //测试iframe地址
-    SSO_SERVER: '"http://192.168.20.102:8080"', //(新)测试环境
+    SSO_SERVER: '"http://192.168.20.102:8080"', //测试环境
+    // SSO_SERVER: '"http://192.168.20.236:8086"', //(新)测试环境
     MQTT_SERVICE: '"ws://192.168.20.225:61614/stomp/"' //MQ测试环境地址
     // BASE_URL: '"http://mbi.sagacloud.cn"', //线上iframe地址
     // SSO_SERVER: '"http://sso.sagacloud.cn"',  //正式环境

+ 9 - 1
src/components/globaluploader/index.vue

@@ -2,7 +2,7 @@
  * @Author: zhangyu
  * @Date: 2019-11-28 10:05:28
  * @Info: 
- * @LastEditTime : 2019-12-25 17:48:31
+ * @LastEditTime : 2020-01-03 15:31:04
  -->
 <template>
   <div id="global-uploader">
@@ -11,6 +11,7 @@
     <uploader
         ref="uploader"
         :options="options"
+        :fileStatusText="fileStatusText"
         :autoStart="false"
         @file-added="onFileAdded"
         @file-success="onFileSuccess"
@@ -69,6 +70,13 @@ import { mapGetters, mapMutations } from 'vuex'
 export default {
   data() {
     return {
+      fileStatusText: {
+        success: '成功',
+        error: '失败',
+        uploading: '上传中',
+        paused: '暂停',
+        waiting: '等待'
+      },
       options: {
         target: '/image-service/common/multipart_upload',
         chunkSize: 1*1024*1024,

+ 2 - 1
src/components/model/file/addFolder.vue

@@ -5,12 +5,13 @@
         <el-form
           :model="ruleForm"
           :rules="rules"
+          @submit.native.prevent
           ref="addFolderModel"
           label-width="100px"
           class="demo-ruleForm"
         >
           <el-form-item label="文件夹名称" prop="name">
-            <el-input v-model="ruleForm.name" focus></el-input>
+            <el-input v-model="ruleForm.name"  @keyup.enter.native="addFolder" focus></el-input>
           </el-form-item>
         </el-form>
       </div>

+ 1 - 1
src/components/model/file/floorTable.vue

@@ -36,7 +36,7 @@
                 :color="scope.row.Status?'#909399':'#67C23A'"></el-progress>
             </div>
             <div class="progress-right">
-              <span v-if="!scope.row.Status">上传中</span>
+              <span v-if="!scope.row.Status">上传中...</span>
               <span v-show="scope.row.Status == 1">等待检查...</span>
               <span v-show="scope.row.Status == 10">模型检查中...</span>
               <span v-show="scope.row.Status == 11">未通过检查</span>