Merge branch 'master' of http://10.12.10.70:3000/zhangliang/simulation-front

src/views/algorithmsLibrary/algorithmsLibraryList.vue

@@ -168,7 +168,7 @@ export default {
                     type: "post",
                     // firstRequest: false,
                     data: this.$api.algorithmsLibrary.selectAlgorithmList,
-                    param: {},
+                    param: this.activeName === "2"?{uploadMode: "1"}:{uploadMode: "2"},
                 };
             } else {
                 // 公有

src/views/algorithmsLibrary/gitAlgorithms.vue

@@ -101,7 +101,7 @@ export default {
                 algorithmName: [{ required: true, message: "请输入", trigger: "blur" }],
                 description: [{ required: true, message: "请输入", trigger: "blur" }],
                 gitUrl: [{ required: true, message: "请输入", trigger: "blur" }],
-                gitUserName: [{ required: true, message: "请输入", trigger: "blur" }],
+                //gitUserName: [{ required: true, message: "请输入", trigger: "blur" }],
                 //gitPassword: [{ required: true, message: "请输入", trigger: "blur" }],
             },
         };
@@ -128,10 +128,10 @@ export default {
     methods: {
         testConnection(){
             let validateFieldList = []
-            this.$refs.form.validateField(['gitUserName','gitPassword','gitUrl'],async errorMsg=>{
+            this.$refs.form.validateField(['gitUrl'],async errorMsg=>{
                 if(!errorMsg){
                     validateFieldList.push(errorMsg)
-                    if(validateFieldList.length == 3 && validateFieldList.every(item=>item ==='')){
+                    if(validateFieldList.length == 1 && validateFieldList.every(item=>item ==='')){
                         this.$axios({
                             method: "POST",
                             url: this.$api.algorithmsLibrary.testConnection,

src/views/login.vue

@@ -69,8 +69,7 @@ export default {
                         data: this.form,
                     }).then((res) => {
                         if (res.code == 200 && res.info) {
-                            let Authorization =
-                                "Bearer " + res.info.access_token;
+                            let Authorization = res.info.token_type + ' ' + res.info.access_token;
                             let refreshToken = res.info.refresh_token;
                             let expiresTime = res.info.expires_time;
 
@@ -87,9 +86,8 @@ export default {
                                 new Date(expiresTime).getTime() -
                                 new Date().getTime();
 
-                            console.log("go1", toExpiresTime);
                             // 过期时间前60秒即可发送获取新的token
-                            if (toExpiresTime > 60 * 1000) {
+                            /*if (toExpiresTime > 60 * 1000) {
                                 tokenTimer = setTimeout(() => {
                                     this.getRefreshToken();
                                     clearTimeout(tokenTimer);
@@ -99,7 +97,7 @@ export default {
                                 this.getRefreshToken();
                             }
 
-                            this.$message.success("登录成功");
+                            this.$message.success("登录成功");*/
                             this.$router.push({ path: "/mainPage" });
                         } else {
                             this.$message.error(res.message || "登录失败");
@@ -117,7 +115,7 @@ export default {
                 },
             }).then((res) => {
                 if (res.code == 200 && res.info) {
-                    let Authorization = "Bearer " + res.info.access_token;
+                    let Authorization = res.info.token_type + ' ' + res.info.access_token;
                     let refreshToken = res.info.refresh_token;
                     let expiresTime = res.info.expires_time;
 
@@ -130,9 +128,7 @@ export default {
                     let toExpiresTime =
                         new Date(expiresTime).getTime() - new Date().getTime();
 
-                    // 过期时间前60秒即可发送获取新的token
-                    console.log("go", toExpiresTime);
-                    if (toExpiresTime > 60 * 1000) {
+                    /*if (toExpiresTime > 60 * 1000) {
                         tokenTimer = setTimeout(() => {
                             this.i++;
                             if (this.i >= 10) {
@@ -146,7 +142,7 @@ export default {
                         }, 15 * 1000);
                     } else {
                         this.getRefreshToken();
-                    }
+                    }*/
                 } else {
                     this.$message.error(res.message || "获取refresh_token失败");
                 }

src/views/page/pageMenu.vue

@@ -126,7 +126,7 @@
                             >手动运行项目</el-menu-item
                         >
                     </el-submenu>
-                    <el-submenu index="systemManagement">
+                    <!--<el-submenu index="systemManagement">
                         <template slot="title">
                             <i class="my-icon-menuF"></i>
                             <span>系统管理</span>
@@ -139,7 +139,7 @@
                         >    
                         <el-menu-item index="clusteringManagement"
                         >集群管理</el-menu-item>
-                    </el-submenu>
+                    </el-submenu>-->
                 </el-menu>
             </div>
         </div>
@@ -163,13 +163,34 @@ export default {
                 "workManagement",
             ],
             activeMenu: "mainPage", // 当前menu
+            expiresTime: '',
+            toExpiresTime: '',
+            tokenTimer: undefined   
         };
     },
-
     computed: {
         ...mapState(["themeColor"]),
     },
+    mounted() {
+        let menuKind = this.$route.meta.menuKind;
 
+        if (menuKind && menuKind !== "mainPage") {
+            this.$refs.menu.open(menuKind);
+        }
+
+        //设置一个定时器定时查看过期时间，如果距离过期时间小于5min，则发送refreshToken
+        /*
+        this.expiresTime = localStorage.getItem('expiresTime')
+        this.toExpiresTime = new Date(this.expiresTime).getTime() - new Date().getTime();
+        if(this.toExpiresTime < 5*60*1000){
+            this.refreshToken()
+        }else{
+            setInterval(function(){
+                let that = this;
+                that.checkExpiresTime()
+            }, 5*60*1000)
+        }*/
+    },
     methods: {
         menuFoldHandle(val) {
             if (val) {
@@ -190,13 +211,32 @@ export default {
                 });
             }
         },
-    },
-
-    mounted() {
-        let menuKind = this.$route.meta.menuKind;
-
-        if (menuKind && menuKind !== "mainPage") {
-            this.$refs.menu.open(menuKind);
+        checkExpiresTime(){
+            this.toExpiresTime = new Date(this.expiresTime).getTime() - new Date().getTime();
+            if(this.toExpiresTime < 5*60*1000){
+                this.refreshToken()
+            }
+        },
+        refreshToken(){
+            this.$axios({
+                method: "post",
+                url: this.$api.common.refreshToken,
+                data: {
+                    refreshToken: localStorage.getItem("refreshToken"),
+                },
+            }).then((res) => {
+                if (res.code == 200 && res.info) {
+                    let Authorization = res.info.token_type + ' ' + res.info.access_token;
+                    let refreshToken = res.info.refresh_token;
+                    let expiresTime = res.info.expires_time;
+                    localStorage.clear();
+                    localStorage.setItem("Authorization", Authorization);
+                    localStorage.setItem("refreshToken", refreshToken);
+                    localStorage.setItem("expiresTime", expiresTime);
+                    this.expiresTime = expiresTime
+                    this.toExpiresTime = new Date(this.expiresTime).getTime() - new Date().getTime();
+                }
+            })
         }
     },
 };

src/views/systemManagement/clusteringDetail.vue

@@ -17,10 +17,10 @@
                     >
                     </el-input>
                 </el-form-item>
-                <el-form-item label="独占类型:" prop="userType">
-                    <!--<el-select v-model="form.userType" disabled>
+                <el-form-item label="独占类型:" prop="useType">
+                    <!--<el-select v-model="form.useType" disabled>
                         <el-option
-                            v-for="item in userTypeList"
+                            v-for="item in useTypeList"
                             :label="item.caption"
                             :value="item.code"
                             :key="item.code"
@@ -29,7 +29,7 @@
                     <el-input
                         placeholder="请输入"
                         disabled
-                        v-model="form.userType"
+                        v-model="form.useType"
                     >
                     </el-input>
                 </el-form-item>
@@ -93,7 +93,7 @@ export default {
     components: {tableList},
     data() {
         return {
-            userTypeList: [],
+            useTypeList: [],
             getDataWay:{
                 dataType: "url",
                 type: "post",
@@ -137,6 +137,7 @@ export default {
             ],
             form: {
                 userName:"",
+                useType: "",
                 id: "",
                 userId: "",
                 numSimulationLicense: "",
@@ -166,7 +167,7 @@ export default {
             this.$refs.table.loadData()
         }
         await this.$dicsListsInit({
-            userTypeList: "useType"
+            useTypeList: "useType"
         });
     },
     computed: {},

src/views/systemManagement/clusteringManagement.vue

@@ -67,10 +67,10 @@
             :pagination="pagination"
             index
         >
-            <!--<el-table-column label="独占类型" slot="userType" align="center">
+            <!--<el-table-column label="独占类型" slot="useType" align="center">
                 <template v-slot="scope">
                     <span>
-                        {{(userTypeList.find(item=>item.code==scope.row.userType)||{}).caption||''}}
+                        {{(useTypeList.find(item=>item.code==scope.row.useType)||{}).caption||''}}
                     </span>
                 </template>
             </el-table-column>-->
@@ -108,7 +108,7 @@ export default {
             list: [],
             totalSimulation:0,
             totalDynamic:0,
-            userTypeList:[],
+            useTypeList:[],
             columns: [
                 //表格列
                 {
@@ -117,7 +117,7 @@ export default {
                 },
                 {
                     label: "独占类型",
-                    prop: "userType",
+                    prop: "useType",
                     //template:true
                 },
                 {
@@ -179,7 +179,7 @@ export default {
     },
     async mounted(){
         await this.$dicsListsInit({
-            userTypeList: "useType"
+            useTypeList: "useType"
         });
     },
     methods: {