chao 1 неделя назад
Родитель
Сommit
a8055a37de

+ 1 - 1
dist/assets/Details-fdnfLjPy.js → dist/assets/Details-poa3poNW.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-s02F6gaJ.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-Zx76qvzR.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-iQfWzrp7.js


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


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


+ 2 - 2
dist/index.html

@@ -8,8 +8,8 @@
     <script>
       document.domain = "cocorobo.cn"
     </script>
-    <script type="module" crossorigin src="./assets/index-s02F6gaJ.js"></script>
-    <link rel="stylesheet" crossorigin href="./assets/index-RlFoAsrD.css">
+    <script type="module" crossorigin src="./assets/index-Zx76qvzR.js"></script>
+    <link rel="stylesheet" crossorigin href="./assets/index-RV7f1RYS.css">
   </head>
   <body>
     <div id="app"></div>

+ 3 - 2
src/App.vue

@@ -18,6 +18,7 @@ onMounted(() => {
   // 通过 grant_code 获取登录信息
   let isGrantCode = getUrlParam(window.parent.location.href, 'grant_code')
   axios.defaults.headers = { 'content-type': 'application/json;charset=utf-8' }
+ 
   if (isGrantCode) {
     let params = {
       grantCode: isGrantCode,
@@ -70,7 +71,7 @@ const userInfo = (data) => {
   let userIdentity = 1
   if (data.currentRole == "edupersonnel" || data.currentRole == "areaAdministrator" || data.currentRole == "userAdministrator" || data.currentRole == "securityAuditor" || data.currentRole == "schoolAdministrator" || data.currentRole == "schoolSecurityAuditor" || data.currentRole == "teacher") {
     isShow.value = true
-    CurrentRole.currentRole == data.currentRole
+    CurrentRole.setUserCurrentRole(data.currentRole)
     userIdentity = 1
     let userGrand = ""
     if (data.childList && data.childList.length > 0) {
@@ -124,7 +125,7 @@ const settimeoutUserinfo = () => {
   setTimeout(() => {
     isShow.value = false
     console.log("top.US.userInfo", top.US.userInfo)
-    store.user = top.US.userInfo
+    store.setUserInfo(top.US.userInfo) 
   }, 1000)
 }
 

+ 2 - 2
src/components/header/headerRight.vue

@@ -53,8 +53,8 @@ const adminClick = () => {
     console.log('admin')
     // U.MD.D.I.openInApplication('dataBoardSZCity') //市级数据看板
     // U.MD.D.I.openInApplication('dataBoardSZArea') //区级数据看板
-    console.log(CurrentRole.currentRole)
-    if (CurrentRole.currentRole === 'userAdministrator') {
+    console.log(CurrentRole.CurrentRole)
+    if (CurrentRole.currentRole === 'userAdministrator' || user.user.role === 0) {
         top.U.MD.D.I.openInApplication('dataBoardSZCity')
     } else if (CurrentRole.currentRole === 'securityAuditor') {
         top.U.MD.D.I.openInApplication('dataBoardSZArea')

+ 13 - 10
src/components/main/courseSelect.vue

@@ -78,7 +78,7 @@
           <div class="grid-content ep-bg-purple">
             <img :src="getImageUrl(item.url)" alt="">
             <div class="course_content">
-              <div class="div_title">
+              <div class="div_title" style="">
                 <span>下册</span>
                 {{ item.title }}
                 <!-- v-if="isupdateCourse" -->
@@ -832,15 +832,15 @@ const DownloadProcessing = async () => {
   let urls = []
   if (volumes.value) {
     await data.shang.map(x => {
-    // console.log(x)
-    x.dataList.length > 0 && x.dataList.map(m => {
-      if (m.checked) {
-        urls.push(m)
-      }
-      return m
+      // console.log(x)
+      x.dataList.length > 0 && x.dataList.map(m => {
+        if (m.checked) {
+          urls.push(m)
+        }
+        return m
+      })
+      return x
     })
-    return x
-  })
   } else {
     await data.xia.map(x => {
       // console.log(x)
@@ -885,7 +885,7 @@ const DownloadProcessing = async () => {
 
 watchEffect(() => {
   if (JSON.stringify(user.user) != "{}") {
-    if (CurrentRole.currentRole == "edupersonnel" || CurrentRole.currentRole == "areaAdministrator" || CurrentRole.currentRole == "userAdministrator" || CurrentRole.currentRole == "securityAuditor" || CurrentRole.currentRole == "schoolAdministrator" || CurrentRole.currentRole == "schoolSecurityAuditor" || CurrentRole.currentRole == "teacher" || user.user.type != 2) {
+    if (CurrentRole.currentRole == "edupersonnel" || CurrentRole.currentRole == "areaAdministrator" || CurrentRole.currentRole == "userAdministrator" || CurrentRole.currentRole == "securityAuditor" || CurrentRole.currentRole == "schoolAdministrator" || CurrentRole.currentRole == "schoolSecurityAuditor" || CurrentRole.currentRole == "teacher" || user.type != 2) {
       isupdateCourse.value = true
     }
   }
@@ -910,6 +910,9 @@ watchEffect(() => {
     .course_content {
       .div_title {
         margin-top: 10px;
+        white-space: nowrap;
+        text-overflow: ellipsis;
+        overflow: hidden;
 
         span {
           // display: inline-block;

+ 22 - 14
src/stores/counter.js

@@ -1,22 +1,30 @@
 import { ref, computed } from 'vue'
 import { defineStore } from 'pinia'
 
-export const userInfoStore = defineStore('counter', () => {
-  const user = ref({})
-  const doubleCount = computed(() => user)
-  function increment() {
-    user
+export const userInfoStore = defineStore({
+  id: 'user',
+  state: () => {
+    return {
+      user: {}
+    }
+  },
+  actions: {
+    setUserInfo(user) {
+      this.user = user
+    }
   }
-
-  return { user, doubleCount, increment }
 })
 
-export const userCurrentRole = defineStore('currentRole', () => {
-  const currentRole = ref("")
-  const doubleCount = computed(() => currentRole)
-  function increment() {
-    currentRole
+export const userCurrentRole = defineStore({
+  id: 'userCurrentRole',
+  state: () => {
+    return {
+      CurrentRole: ""
+    }
+  },
+  actions: {
+    setUserCurrentRole(CurrentRole) {
+      this.CurrentRole = CurrentRole
+    }
   }
-
-  return { currentRole, doubleCount, increment }
 })

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