chao 1 год назад
Родитель
Сommit
8b4243ce6d

+ 1 - 1
dist/assets/Details-TlJpzRQT.js → dist/assets/Details-oP4KTzQN.js

@@ -1 +1 @@
-import{u as m,r as i,o as p,a as l,b as a,c as b,d as t,w as s,F as f,H as h,e as n,t as k,f as v,g,h as r,i as y,C,j as x,P as B,k as N}from"./index-EEup708r.js";const V={class:"iframDiv"},P={__name:"Details",setup(D){const{query:u,params:o}=m();console.log(u,o);const e=i("");return p(()=>{e.value=o.title}),(w,F)=>{const c=l("el-breadcrumb-item"),_=l("el-breadcrumb"),d=l("el-page-header");return a(),b(f,null,[t(h),t(d,null,{breadcrumb:s(()=>[t(_,{separator:"/"},{default:s(()=>[t(c,{to:{path:"/"}},{default:s(()=>[n(" 首页 ")]),_:1}),t(c,null,{default:s(()=>[n(k(v(o).title),1)]),_:1})]),_:1})]),default:s(()=>[g("div",V,[e.value=="课程列表"?(a(),r(C,{key:0})):e.value=="资源中心"?(a(),r(x,{key:1})):e.value=="实践中心"?(a(),r(B,{key:2})):e.value=="其他课程资源"?(a(),r(N,{key:3})):y("",!0)])]),_:1})],64)}}};export{P as default};
+import{u as m,r as i,o as p,a as l,b as a,c as b,d as t,w as s,F as f,H as h,e as n,t as k,f as v,g,h as r,i as y,C,j as x,P as B,k as N}from"./index-qF0wv16P.js";const V={class:"iframDiv"},P={__name:"Details",setup(D){const{query:u,params:o}=m();console.log(u,o);const e=i("");return p(()=>{e.value=o.title}),(w,F)=>{const c=l("el-breadcrumb-item"),_=l("el-breadcrumb"),d=l("el-page-header");return a(),b(f,null,[t(h),t(d,null,{breadcrumb:s(()=>[t(_,{separator:"/"},{default:s(()=>[t(c,{to:{path:"/"}},{default:s(()=>[n(" 首页 ")]),_:1}),t(c,null,{default:s(()=>[n(k(v(o).title),1)]),_:1})]),_:1})]),default:s(()=>[g("div",V,[e.value=="课程列表"?(a(),r(C,{key:0})):e.value=="资源中心"?(a(),r(x,{key:1})):e.value=="实践中心"?(a(),r(B,{key:2})):e.value=="其他课程资源"?(a(),r(N,{key:3})):y("",!0)])]),_:1})],64)}}};export{P as default};

Разница между файлами не показана из-за своего большого размера
+ 0 - 0
dist/assets/admin-PpU2PT2o.js


Разница между файлами не показана из-за своего большого размера
+ 0 - 0
dist/assets/admin-UyyBpv7R.js


Разница между файлами не показана из-за своего большого размера
+ 0 - 0
dist/assets/index-3J7jiC6o.css


Разница между файлами не показана из-за своего большого размера
+ 0 - 0
dist/assets/index-qF0wv16P.js


+ 2 - 2
dist/index.html

@@ -8,8 +8,8 @@
     <script>
       document.domain = "cocorobo.cn"
     </script>
-    <script type="module" crossorigin src="./assets/index-EEup708r.js"></script>
-    <link rel="stylesheet" crossorigin href="./assets/index-El7xtwbz.css">
+    <script type="module" crossorigin src="./assets/index-qF0wv16P.js"></script>
+    <link rel="stylesheet" crossorigin href="./assets/index-3J7jiC6o.css">
   </head>
   <body>
     <div id="app"></div>

+ 22 - 4
src/App.vue

@@ -12,6 +12,8 @@ const store = userInfoStore()
 const CurrentRole = userCurrentRole()
 const name = ref('')
 const isShow = ref(true)
+const setTimeState = ref(null)
+
 onMounted(() => {
   // 通过 grant_code 获取登录信息
   let isGrantCode = getUrlParam(window.parent.location.href, 'grant_code')
@@ -80,14 +82,14 @@ const userInfo = (data) => {
     axios.post(`https://beta.api.cocorobo.cn/api/user`, qs.stringify(params)).then(res => {
       // console.log(res, '222222222222')
       if (res.data && res.data[0][0].active == 1) {
-        console.log(top)
-        store.user = top.US.userInfo
+        setStateUserinfo()
       } else {
         if (data.telephoneNumber) {
           top.U.A.Request("https://pbl.cocorobo.cn/api/pbl/batchRegistrationSzdjg", [data.userName, data.telephoneNumber + '@szdjg.com', '16ace517-b5c7-4168-a9bb-a9e0035df840', data.schoolName, data.telephoneNumber, userGrand, userIdentity, data.userId], function (r) {
             // console.log('rrrrr', r)
             axios.post(`https://beta.api.cocorobo.cn/api/user`, qs.stringify(params)).then(d => {
-              store.user = top.US.userInfo
+              // store.user = top.US.userInfo
+              setStateUserinfo()
             })
           }, [], { "type": "POST", "withCredentials": true });
         } else {
@@ -101,7 +103,10 @@ const userInfo = (data) => {
         top.U.A.Request("https://pbl.cocorobo.cn/api/pbl/batchRegistrationSzdjg", [data.userName, data.telephoneNumber + '@szdjg.com', '16ace517-b5c7-4168-a9bb-a9e0035df840', data.schoolName, data.telephoneNumber, userGrand, userIdentity, data.userId], function (r) {
           // console.log('rrrrr', r)
           axios.post(`https://beta.api.cocorobo.cn/api/user`, qs.stringify(params)).then(d => {
-            store.user = top.US.userInfo
+            // store.user = top.US.userInfo
+            if (d.data && d.data[0][0].active == 1) {
+              setStateUserinfo()
+            }
           })
         }, [], { "type": "POST", "withCredentials": true });
       } else {
@@ -122,6 +127,19 @@ const userInfo = (data) => {
 
 }
 
+const setStateUserinfo = () => {
+  // setTimeState
+  setTimeState.value = setInterval(() => {
+    if (JSON.stringify(top.US.userInfo) != '{}') {
+      store.user = top.US.userInfo
+    }else{
+      clearInterval(setTimeState.value)
+    }
+  }, 1000)
+
+
+}
+
 const getUrlParam = (urlStr, urlKey) => {
   const url = new URL(urlStr) // 字符串转换成url格式
   const paramsStr = url.search.slice(1) // 获取'?'后面的参数字符串

+ 10 - 1
src/components/header/headerRight.vue

@@ -37,7 +37,16 @@ const linkLogin = () => {
 
 const adminClick = () => {
     console.log('admin')
-    top.U.MD.D.I.openApplication('evaluate') 
+    // U.MD.D.I.openInApplication('dataBoardSZCity') //市级数据看板
+    // U.MD.D.I.openInApplication('dataBoardSZArea') //区级数据看板
+    console.log(CurrentRole.currentRole)
+    if(CurrentRole.currentRole === 'userAdministrator'){
+        top.U.MD.D.I.openInApplication('dataBoardSZCity')
+    }else if(CurrentRole.currentRole === 'securityAuditor'){
+        top.U.MD.D.I.openInApplication('dataBoardSZArea')
+    }else{
+        top.U.MD.D.I.openApplication('Grade') 
+    }
 }
 
 const goBack=()=>{

+ 0 - 8
src/views/admin.vue

@@ -14,14 +14,6 @@ const CurrentRole = userCurrentRole()
 //     console.log(e)
 // }
 onMounted(() => {
-    // U.MD.D.I.openInApplication('dataBoardSZCity') //市级数据看板
-    // U.MD.D.I.openInApplication('dataBoardSZArea') //区级数据看板
-    console.log(CurrentRole.currentRole)
-    if(CurrentRole.currentRole === 'userAdministrator'){
-        top.U.MD.D.I.openInApplication('dataBoardSZCity')
-    }else if(CurrentRole.currentRole === 'securityAuditor'){
-        top.U.MD.D.I.openInApplication('dataBoardSZArea')
-    }
 })
 </script>
 

Некоторые файлы не были показаны из-за большого количества измененных файлов