Merge branch 'wsm' of http://139.196.39.194:9021/chenc/cd-work-flow-web into wsm

public/index.html

@@ -283,7 +283,12 @@
     // window._CONFIG['domianURL'] = 'http://127.0.0.1:8090/jeecg-boot'; // 本地测试
     // window._CONFIG['domianURL'] = 'http://106.15.206.14:8087/jeecg-boot';// 测试服务器
     // window._CONFIG['domianURL'] = 'http://www.myfitt.cn:18087/jeecg-boot';// 森语外网
-    window._CONFIG['domianURL'] = 'http://172.18.91.36:8081/jeecg-boot';// 博物馆oa
+    // window._CONFIG['domianURL'] = 'https://172.18.91.36:8083/jeecg-boot';// 博物馆oa
+    window._CONFIG['domianURL'] = 'https://oa.worldskillsmuseum.cn/jeecg-boot';// 博物馆oa域名
+
+    // window._CONFIG['ssoURL'] = 'http://127.0.0.1:8090/jeecg-boot';// 本地测试
+    // window._CONFIG['ssoURL'] = 'http://172.18.91.12:8888/sso';// 博物馆oa
+    window._CONFIG['ssoURL'] = 'https://sso.worldskillsmuseum.cn/sso';// 博物馆oa域名
     window._CONFIG['casPrefixUrl'] = 'http://www.myfitt.cn:18005/cas';
     window._CONFIG['onlinePreviewDomainURL'] = 'http://fileview.jeecg.com/onlinePreview'
     window._CONFIG['staticDomainURL'] = window._CONFIG['domianURL'] + '/sys/common/static';

src/components/tools/UserMenu.vue

@@ -181,10 +181,10 @@
           content: '真的要注销登录吗 ?',
           onOk() {
             return that.Logout({}).then(() => {
-              window.location.href="/";
+              // window.location.href="/";
               //window.location.reload()
                 //博物馆单点登录注销
-                // window.location.href="http://172.18.91.12:8888/sso";
+                window.location.href=window._CONFIG['ssoURL'];
             }).catch(err => {
               that.$message.error({
                 title: '错误',

src/config/router.config.js

@@ -299,7 +299,7 @@ export const constantRouterMap = [
     component: UserLayout,
     redirect: '/user/login',
     // 博物馆单点登录
-    // component: () => import('@/views/Index'),
+    component: () => import('@/views/Index'),
     hidden: true,
     children: [
       {

src/store/modules/user.js

@@ -234,11 +234,12 @@ const user = {
         Vue.ls.remove(USER_NAME)
        
         logout(logoutToken).then(() => {
-            let sevice = 'http://' + window.location.host + '/'
+            // let sevice = 'http://' + window.location.host + '/'
             let serviceUrl = encodeURIComponent(sevice)
-            window.location.href = window._CONFIG['casPrefixUrl']+"/logout?service="+serviceUrl;
+            // window.location.href = window._CONFIG['casPrefixUrl']+"/logout?service="+serviceUrl;
+            // window.location.href="/";
               //博物馆单点登录注销
-//             window.location.href="http://172.18.91.12:8888/sso";
+            window.location.href=window._CONFIG['ssoURL'];
             // resolve()
         }).catch(() => {
           console.log("111111111111111")

src/views/Index.vue

@@ -27,9 +27,6 @@
     created(){
       this.getUUID();
     },
-    // created(){
-    //   window.location.href = 'http://172.18.91.12:8888/sso/oauth/authorize?client_id=OAManager&response_type=code&redirect_url=http://172.18.91.36:8083/#/redirect/login'
-    // },
     methods: {
       ...mapActions(['uuidLogin']),
       getUUID(){
@@ -37,7 +34,7 @@
         // var dz_url = url.split('#')[0];                //获取#/之前的字符串
         var cs = url.split('?')[1];                //获取?之后的参数字符串
         if(cs==undefined){
-          window.location.href = 'http://172.18.91.12:8888/sso/oauth/authorize?client_id=OAManager&response_type=code&redirect_url=http://172.18.91.36:8083/#/redirect/login'
+          window.location.href = window._CONFIG['ssoURL']+'/oauth/authorize?client_id=OAManager&response_type=code&redirect_url=https://oa.worldskillsmuseum.cn/#/redirect/login'
         }
         var cs_arr = cs.split('&');                    //参数字符串分割为数组
         var cs={};
@@ -79,7 +76,7 @@
             })
           })
         }else{
-          window.location.href = 'http://172.18.91.12:8888/sso/oauth/authorize?client_id=OAManager&response_type=code&redirect_url=http://172.18.91.36:8083/#/redirect/login'
+          window.location.href = window._CONFIG['ssoURL']+'/oauth/authorize?client_id=OAManager&response_type=code&redirect_url=https://oa.worldskillsmuseum.cn/#/redirect/login'
         }
       },
     }

src/views/Redirect.vue

@@ -97,7 +97,7 @@
           } else {
               this.requestFailed(res)
               setTimeout(()=>{
-                window.location.href="http://172.18.91.12:8888/sso"
+                window.location.href=window._CONFIG['ssoURL']
               },3000)
           }
       },

src/views/oa/AssetInDetailList.vue

@@ -458,7 +458,7 @@
         })
       },
       print(record){
-        var printMouldUrl = 'http://172.18.91.36:8081/jeecg-boot/jmreport/shareView/834580385717637120'+'?id='+record.cdAssetInId
+        var printMouldUrl = window._CONFIG['domianURL']+'/jmreport/shareView/834580385717637120'+'?id='+record.cdAssetInId
         window.open(printMouldUrl)
       }
     }

src/views/oa/BudgetCostList.vue

@@ -330,7 +330,7 @@
         }
       },
       print(row){
-        var printMouldUrl = 'http://172.18.91.36:8081/jeecg-boot/jmreport/shareView/834329134622920704'+'?id='+row.id
+        var printMouldUrl = window._CONFIG['domianURL']+'/jmreport/shareView/834329134622920704'+'?id='+row.id
         window.open(printMouldUrl)
        },
       // 得到年份选择器的值

src/views/oa/BudgetReplyList.vue

@@ -234,7 +234,7 @@
         this.queryParam.budgetYear = value;
       },
       print(record){
-        this.printMouldUrl = 'http://172.18.91.36:8081/jeecg-boot/jmreport/shareView/834332600510533632'+'?id='+record.id
+        this.printMouldUrl = window._CONFIG['domianURL']+'/jmreport/shareView/834332600510533632'+'?id='+record.id
       },
       loadData(arg) {
         if(!this.url.list){

src/views/oa/CarList.vue

@@ -251,7 +251,7 @@
       initDictConfig(){
       },
       print(record){
-        this.printMouldUrl = 'http://172.18.91.36:8081/jeecg-boot/jmreport/shareView/834586790692474880'+'?id='+record.id
+        this.printMouldUrl = window._CONFIG['domianURL']+'/jmreport/shareView/834586790692474880'+'?id='+record.id
       }
     }
   }

src/views/oa/CarfareDetailList.vue

@@ -292,7 +292,7 @@
       initDictConfig(){
       },
       print(record){
-        var printMouldUrl = 'http://172.18.91.36:8081/jeecg-boot/jmreport/shareView/834582982537072640'+'?id='+record.cdCarfareId
+        var printMouldUrl = window._CONFIG['domianURL']+'/jmreport/shareView/834582982537072640'+'?id='+record.cdCarfareId
         window.open(printMouldUrl)
       },
       handleMultiAdd: function () {

src/views/oa/ConferenceApplyList.vue

@@ -277,7 +277,7 @@
         this.$refs.modalForm.disableSubmit = false;
       },
       print(record){
-        this.printMouldUrl = 'http://172.18.91.36:8081/jeecg-boot/jmreport/shareView/834590233121345536'+'?id='+record.id
+        this.printMouldUrl = window._CONFIG['domianURL']+'/jmreport/shareView/834590233121345536'+'?id='+record.id
       }
     }
   }

src/views/oa/ConferenceMinutesList.vue

@@ -216,7 +216,7 @@
       initDictConfig(){
       },
       print(record){
-        this.printMouldUrl = 'http://172.18.91.36:8081/jeecg-boot/jmreport/shareView/834602447416938496'+'?id='+record.id
+        this.printMouldUrl = window._CONFIG['domianURL']+'/jmreport/shareView/834602447416938496'+'?id='+record.id
       }
     }
   }

src/views/oa/DepartList.vue

@@ -516,7 +516,7 @@
       print(){
         // var formData1 = this.form.getFieldsValue()
         // debugger
-        this.printMouldUrl = 'http://172.18.91.36:8081/jeecg-boot/jmreport/shareView/835862164483166208'+'?id='+this.id
+        this.printMouldUrl = window._CONFIG['domianURL']+'/jmreport/shareView/835862164483166208'+'?id='+this.id
       },
       getAllKeys(node) {
         // console.log('node',node);

src/views/oa/MaterialInDetailList.vue

@@ -294,7 +294,7 @@
         this.$refs.multiAddModalForm.disableSubmit = false;
       },
       print(row){
-        var printMouldUrl = 'http://172.18.91.36:8081/jeecg-boot/jmreport/shareView/834588108278550528'+'?id='+row.cdMaterialInId
+        var printMouldUrl = window._CONFIG['domianURL']+'/jmreport/shareView/834588108278550528'+'?id='+row.cdMaterialInId
         window.open(printMouldUrl)
        },
       loadData(arg) {

src/views/oa/MuseumDutyList.vue

@@ -233,7 +233,7 @@
         this.queryParam.dutyMonth = value;
       },
       print(record){
-        this.printMouldUrl = 'http://172.18.91.36:8081/jeecg-boot/jmreport/shareView/834337917675851776'+'?id='+record.id
+        this.printMouldUrl = window._CONFIG['domianURL']+'/jmreport/shareView/834337917675851776'+'?id='+record.id
       },
       loadData(arg) {
         if(!this.url.list){

src/views/oa/ReceivedMainList.vue

@@ -227,7 +227,7 @@
       initDictConfig(){
       },
       print(record){
-        this.printMouldUrl = 'http://172.18.91.36:8081/jeecg-boot/jmreport/shareView/834346213321297920'+'?id='+record.id
+        this.printMouldUrl = window._CONFIG['domianURL']+'/jmreport/shareView/834346213321297920'+'?id='+record.id
       }
 
     }

src/views/oa/SealDestroyList.vue

@@ -226,7 +226,7 @@
         this.$refs.modalForm.disableSubmit = false;
       },
       print(record){
-        this.printMouldUrl = 'http://172.18.91.36:8081/jeecg-boot/jmreport/shareView/834347959238086656'+'?id='+record.id
+        this.printMouldUrl = window._CONFIG['domianURL']+'/jmreport/shareView/834347959238086656'+'?id='+record.id
       }
     }
   }

src/views/oa/SealTurnList.vue

@@ -263,7 +263,7 @@
         this.$refs.modalForm.disableSubmit = false;
       },
       print(record){
-        this.printMouldUrl = 'http://172.18.91.36:8081/jeecg-boot/jmreport/shareView/834346918941642752'+'?id='+record.id
+        this.printMouldUrl = window._CONFIG['domianURL']+'/jmreport/shareView/834346918941642752'+'?id='+record.id
       }
     }
   }

src/views/oa/modules/EnrollmentModal.vue

@@ -549,7 +549,7 @@
         }
       },
       print(){
-        this.printMouldUrl = 'http://172.18.91.36:8081/jeecg-boot/jmreport/shareView/835754802514579456'+'?id='+this.id
+        this.printMouldUrl = window._CONFIG['domianURL']+'/jmreport/shareView/835754802514579456'+'?id='+this.id
       },
       validateError(msg){
         this.$message.error(msg)

src/views/system/NewUserList.vue

@@ -272,7 +272,7 @@
       initDictConfig(){
       },
       print(record){
-        this.printMouldUrl = 'http://172.18.91.36:8081/jeecg-boot/jmreport/shareView/836112226480115712'+'?id='+record.id
+        this.printMouldUrl = window._CONFIG['domianURL']+'/jmreport/shareView/836112226480115712'+'?id='+record.id
       }
        
     }

url.config.js

@@ -1,9 +1,9 @@
 export function getEditorJumpUrl () {
-    let url = 'http://localhost:8080'
+    // let url = 'http://localhost:8080'
     //let url ="http://106.15.206.14:8089";//测试服务器
     // let url ="http://192.168.1.158:8089";//森宇服务器
     // let url = "http://220.191.168.86:18089" // 森语外网
-    // let url = 'http://172.18.91.36:8082' // 博物馆OA
+    let url = 'https://172.18.91.36:8082' // 博物馆OA
     return url
   }