Accueil Explorer Aide
Connexion
CocoRoboLabs
/
pbl-teacher-table
3
0
Fork 0
Fichiers Tickets 0 Pull Requests 0 Wiki
Parcourir la source

Merge branch 'beta' of https://git.cocorobo.cn/CocoRoboLabs/pbl-teacher-table into beta

lsc il y a 1 semaine
Parent
bcf9f41555 f3c4a902ad
commit
4cc15a0e10
20 fichiers modifiés avec 113 ajouts et 10 suppressions
Vue séparée Afficher les stats Diff
  1. 1 1
      dist/index.html
  2. 0 0
      dist/static/css/app.2422c67699f24808585e6722a6d2c812.css
  3. 0 0
      dist/static/css/app.2422c67699f24808585e6722a6d2c812.css.map
  4. 0 0
      dist/static/js/0.4f3b05586c3acc102a54.js
  5. 0 0
      dist/static/js/0.4f3b05586c3acc102a54.js.map
  6. 0 0
      dist/static/js/0.eb6bdee5e7207bfd76b0.js
  7. 0 0
      dist/static/js/0.eb6bdee5e7207bfd76b0.js.map
  8. 0 0
      dist/static/js/app.d4a83db17bb1eeb0af16.js
  9. 0 0
      dist/static/js/app.d4a83db17bb1eeb0af16.js.map
  10. 2 2
      dist/static/js/manifest.23ea04dc469b57e2b4f8.js
  11. 0 0
      dist/static/js/manifest.23ea04dc469b57e2b4f8.js.map
  12. 0 0
      dist/static/js/workPage-manifest.2ece51fa34be51c8610a.js.map
  13. 1 1
      src/components/pages/components/appDialog.vue
  14. 2 1
      src/components/pages/liyuan/CourseCon.vue
  15. 4 0
      src/components/pages/liyuan/components/card.vue
  16. 82 0
      src/components/pages/liyuan/topTalent.vue
  17. 3 1
      src/components/pages/studentManage/student.vue
  18. 1 1
      src/components/pages/test/check/docxTemplateDialog.vue
  19. 7 3
      src/components/pages/test/databoard.vue
  20. 10 0
      src/router/index.js

+ 1 - 1
dist/index.html
Voir le fichier 

@@ -32,7 +32,7 @@
 
       width: 100%;
 
       background: #e6eaf0;
 
       font-family: '黑体';
 
-    }</style><link href=./static/css/app.163b360d1c21d950210452f1f73600c3.css rel=stylesheet></head><body><div id=app></div><script type=text/javascript src=./static/js/manifest.922a8e02a3800fb34d90.js></script><script type=text/javascript src=./static/js/vendor.062f14352151ff2301df.js></script><script type=text/javascript src=./static/js/app.d69745f5285696892ffd.js></script></body></html><script>function stopSafari() {
 
+    }</style><link href=./static/css/app.2422c67699f24808585e6722a6d2c812.css rel=stylesheet></head><body><div id=app></div><script type=text/javascript src=./static/js/manifest.23ea04dc469b57e2b4f8.js></script><script type=text/javascript src=./static/js/vendor.062f14352151ff2301df.js></script><script type=text/javascript src=./static/js/app.d4a83db17bb1eeb0af16.js></script></body></html><script>function stopSafari() {
 
     //阻止safari浏览器双击放大功能
 
     let lastTouchEnd = 0  //更新手指弹起的时间
 
     document.documentElement.addEventListener("touchstart", function (event) {

Fichier diff supprimé car celui-ci est trop grand
+ 0 - 0
dist/static/css/app.2422c67699f24808585e6722a6d2c812.css


Fichier diff supprimé car celui-ci est trop grand
+ 0 - 0
dist/static/css/app.2422c67699f24808585e6722a6d2c812.css.map


Fichier diff supprimé car celui-ci est trop grand
+ 0 - 0
dist/static/js/0.4f3b05586c3acc102a54.js


Fichier diff supprimé car celui-ci est trop grand
+ 0 - 0
dist/static/js/0.4f3b05586c3acc102a54.js.map


Fichier diff supprimé car celui-ci est trop grand
+ 0 - 0
dist/static/js/0.eb6bdee5e7207bfd76b0.js


Fichier diff supprimé car celui-ci est trop grand
+ 0 - 0
dist/static/js/0.eb6bdee5e7207bfd76b0.js.map


Fichier diff supprimé car celui-ci est trop grand
+ 0 - 0
dist/static/js/app.d4a83db17bb1eeb0af16.js


Fichier diff supprimé car celui-ci est trop grand
+ 0 - 0
dist/static/js/app.d4a83db17bb1eeb0af16.js.map


+ 2 - 2
dist/static/js/manifest.922a8e02a3800fb34d90.js → dist/static/js/manifest.23ea04dc469b57e2b4f8.js
Voir le fichier 

@@ -1,2 +1,2 @@
 
-!function(e){var n=window.webpackJsonp;window.webpackJsonp=function(r,c,a){for(var i,u,f,s=0,l=[];s<r.length;s++)u=r[s],t[u]&&l.push(t[u][0]),t[u]=0;for(i in c)Object.prototype.hasOwnProperty.call(c,i)&&(e[i]=c[i]);for(n&&n(r,c,a);l.length;)l.shift()();if(a)for(s=0;s<a.length;s++)f=o(o.s=a[s]);return f};var r={},t={8:0};function o(n){if(r[n])return r[n].exports;var t=r[n]={i:n,l:!1,exports:{}};return e[n].call(t.exports,t,t.exports,o),t.l=!0,t.exports}o.e=function(e){var n=t[e];if(0===n)return new Promise(function(e){e()});if(n)return n[2];var r=new Promise(function(r,o){n=t[e]=[r,o]});n[2]=r;var c=document.getElementsByTagName("head")[0],a=document.createElement("script");a.type="text/javascript",a.charset="utf-8",a.async=!0,a.timeout=12e4,o.nc&&a.setAttribute("nonce",o.nc),a.src=o.p+"static/js/"+e+"."+{0:"4f3b05586c3acc102a54",1:"14e8e8c7e44fc858e4a6",2:"94e1427bfc7ef0b4c685",3:"3a9f53a78da16650e6b8"}[e]+".js";var i=setTimeout(u,12e4);function u(){a.onerror=a.onload=null,clearTimeout(i);var n=t[e];0!==n&&(n&&n[1](new Error("Loading chunk "+e+" failed.")),t[e]=void 0)}return a.onerror=a.onload=u,c.appendChild(a),r},o.m=e,o.c=r,o.d=function(e,n,r){o.o(e,n)||Object.defineProperty(e,n,{configurable:!1,enumerable:!0,get:r})},o.n=function(e){var n=e&&e.__esModule?function(){return e.default}:function(){return e};return o.d(n,"a",n),n},o.o=function(e,n){return Object.prototype.hasOwnProperty.call(e,n)},o.p="./",o.oe=function(e){throw console.error(e),e}}([]);
 
-//# sourceMappingURL=manifest.922a8e02a3800fb34d90.js.map
 
+!function(e){var n=window.webpackJsonp;window.webpackJsonp=function(r,c,a){for(var i,u,f,s=0,l=[];s<r.length;s++)u=r[s],t[u]&&l.push(t[u][0]),t[u]=0;for(i in c)Object.prototype.hasOwnProperty.call(c,i)&&(e[i]=c[i]);for(n&&n(r,c,a);l.length;)l.shift()();if(a)for(s=0;s<a.length;s++)f=o(o.s=a[s]);return f};var r={},t={8:0};function o(n){if(r[n])return r[n].exports;var t=r[n]={i:n,l:!1,exports:{}};return e[n].call(t.exports,t,t.exports,o),t.l=!0,t.exports}o.e=function(e){var n=t[e];if(0===n)return new Promise(function(e){e()});if(n)return n[2];var r=new Promise(function(r,o){n=t[e]=[r,o]});n[2]=r;var c=document.getElementsByTagName("head")[0],a=document.createElement("script");a.type="text/javascript",a.charset="utf-8",a.async=!0,a.timeout=12e4,o.nc&&a.setAttribute("nonce",o.nc),a.src=o.p+"static/js/"+e+"."+{0:"eb6bdee5e7207bfd76b0",1:"14e8e8c7e44fc858e4a6",2:"94e1427bfc7ef0b4c685",3:"3a9f53a78da16650e6b8"}[e]+".js";var i=setTimeout(u,12e4);function u(){a.onerror=a.onload=null,clearTimeout(i);var n=t[e];0!==n&&(n&&n[1](new Error("Loading chunk "+e+" failed.")),t[e]=void 0)}return a.onerror=a.onload=u,c.appendChild(a),r},o.m=e,o.c=r,o.d=function(e,n,r){o.o(e,n)||Object.defineProperty(e,n,{configurable:!1,enumerable:!0,get:r})},o.n=function(e){var n=e&&e.__esModule?function(){return e.default}:function(){return e};return o.d(n,"a",n),n},o.o=function(e,n){return Object.prototype.hasOwnProperty.call(e,n)},o.p="./",o.oe=function(e){throw console.error(e),e}}([]);
 
+//# sourceMappingURL=manifest.23ea04dc469b57e2b4f8.js.map

Fichier diff supprimé car celui-ci est trop grand
+ 0 - 0
dist/static/js/manifest.23ea04dc469b57e2b4f8.js.map


Fichier diff supprimé car celui-ci est trop grand
+ 0 - 0
dist/static/js/workPage-manifest.2ece51fa34be51c8610a.js.map


+ 1 - 1
src/components/pages/components/appDialog.vue
Voir le fichier 

@@ -436,7 +436,7 @@ export default {
 
       selectLabel: "",
 
       typeList: [],
 
       selectList: [
 
-        { index: 3, label: "所有组织" },
 
+        { index: 3, label: "官方&精选" },
 
         { index: 2, label: "组织内" },
 
         { index: 1, label: "我的" }
 
         // { index: 98,label:"已发布"},

+ 2 - 1
src/components/pages/liyuan/CourseCon.vue
Voir le fichier 

@@ -112,9 +112,10 @@ export default {
 
         { title: '课程管理', icon: require('../../../assets/icon/liyuan/niandukaohe.svg'), type: 1, to: "/course" },
 
         { title: '课程中心', icon: require('../../../assets/icon/liyuan/gerendangan.svg'), type: 4, to: `/pbl-student-table/dist/#/index?userid=${this.$route.query.userid}&oid=${this.$route.query.oid}&org=${this.$route.query.org}&tType=${this.$route.query.tType}&cid=&screenType=3&gotype=1` },
 
         { title: 'AI应用', icon: require('../../../assets/icon/liyuan/jiaoshihuaxiang.svg'), type: 3, to: `?userid=${this.$route.query.userid}&oid=${this.$route.query.oid}&org=${this.$route.query.org}&role=${this.$route.query.role}&tab=0&gotype=1` },
 
-        { title: '工作空间', icon: require('../../../assets/icon/liyuan/ketangguancha.svg'), type: 3, to:`?userid=${this.$route.query.userid}&oid=${this.$route.query.oid}&org=${this.$route.query.org}&role=${this.$route.query.role}&tab=1&gotype=1` },
 
+        // { title: '工作空间', icon: require('../../../assets/icon/liyuan/ketangguancha.svg'), type: 3, to:`?userid=${this.$route.query.userid}&oid=${this.$route.query.oid}&org=${this.$route.query.org}&role=${this.$route.query.role}&tab=1&gotype=1` },
 
         { title: '知识库', icon: require('../../../assets/icon/liyuan/zhinengbiaodan.svg'), type:3, to: `?userid=${this.$route.query.userid}&oid=${this.$route.query.oid}&org=${this.$route.query.org}&role=${this.$route.query.role}&tab=2&gotype=1`  },
 
         { title: '协同建构', icon: require('../../../assets/icon/liyuan/zhinengbiaodan.svg'), type: 1, to: "/synergyCourse" },
 
+        { title: 'AI通识课', icon: require('../../../assets/icon/liyuan/ketangguancha.svg'), type: 6, to: `/ai.html?userid=${this.$route.query.userid}&gotype=CourseCon` },
 
       ]
 
     }
 
   },

+ 4 - 0
src/components/pages/liyuan/components/card.vue
Voir le fichier 

@@ -90,6 +90,10 @@ export default {
 
                 // console.log( `${con}${this.to}`);
 
                 // 直接传的地址不用区分beta与正式
 
                 window.location.href = `${this.to}`;
 
+            } else if (this.type == 6) { 
+                let con = 'https://cloud.cocorobo.cn'
 
+                console.log( `${con}${this.to}`);
 
+                window.location.href = `${con}${this.to}`;
 
             }
 
         }
 
     },

+ 82 - 0
src/components/pages/liyuan/topTalent.vue
Voir le fichier 

@@ -0,0 +1,82 @@
 
+<template>
 
+  <div class="teacherDevelop">
 
+    <el-image
 
+        style="
 
+            width: 100%;
 
+            border-radius: 10px;
 
+            height: 320px;
 
+        "
 
+        class="imgCar"
 
+        src="https://img2.baidu.com/it/u=3227833308,1625526130&fm=253&fmt=auto&app=138&f=JPEG?w=800&h=328"
 
+    >
 
+    </el-image>
 
+    <topBar title="拔尖人才" detail="教师年度考核 · 教师成长画像 · AI课堂观察"></topBar>
 
+    <div class="cardBox">
 
+      <card v-for="item in cardData(cardArray)"
 
+      :key="item.title"
 
+      :title="item.title"
 
+      :icon="item.icon"
 
+      :to="item.to"
 
+      :type="item.type"
 
+      :sortId="item.sortId"
 
+      :cardData="item"
 
+      ></card>
 
+    </div>
 
+  </div>
 
+</template>
 
+
 
+<script>
 
+import topBar from './components/topBar'
 
+import card from './components/card.vue';
 
+export default {
 
+  components: {
 
+    topBar,
 
+    card
 
+  },
 
+  computed:{
 
+    // 进行权限判断一些只有管理员能看
 
+    cardData(){
 
+      return (val)=>{
 
+          let com = val.filter(e=> e.role==0 || (this.role == 1 && e.role == 1) )
 
+          return com
 
+      }
 
+    }
 
+  },
 
+  data() {
 
+    return {
 
+      role: this.$route.query.role,
 
+      cardArray: [
 
+        { title: '人才标准', icon: require('../../../assets/icon/liyuan/niandukaohe.svg'), type: 1, to: "/examineL",role:0 },
 
+        { title: '学生画像', icon: require('../../../assets/icon/liyuan/jiaoshihuaxiang.svg'), type: 1, to: `/testDataBoard?userid= +${this.$route.query.userid} +&oid= +${this.$route.query.oid} +&org= +${this.$route.query.org} +&role= +${this.$route.query.role} +&cid=`,role:0 },
 
+        { title: '人才数据库', icon: require('../../../assets/icon/liyuan/zhinengbiaodan.svg'), type: 1, to: "/sassPlatform",role:1,sassPlatFormTypeId:"eefb7195-8ee7-11f0-9c7b-005056924926" },
 
+        { title: '个人档案', icon: require('../../../assets/icon/liyuan/zlsj.svg'), type: 1, to: "/teadTest",role:0,sortId:'eefb7195-8ee7-11f0-9c7b-005056924926' },
 
+        { title: '人才评估', icon: require('../../../assets/icon/liyuan/workTest.svg'), type: 1, to: "/testReview",role:0 },
 
+      ]
 
+      
+    }
 
+  },
 
+}
 
+</script>
 
+
 
+<style scoped>
 
+.teacherDevelop{
 
+  width: 100%;
 
+  height: 100%;
 
+  padding: 40px 90px;
 
+  box-sizing: border-box;
 
+  background: #FAFAFA;
 
+}
 
+
 
+.cardBox{
 
+  display: grid;
 
+  grid-template-columns: repeat(5, 1fr);
 
+  gap: 20px;
 
+  width: 100%;
 
+  margin-top: 20px;
 
+}
 
+.imgCar >>> img{
 
+	/* height: 100%; */
 
+	width: 100%;
 
+	object-fit: cover;
 
+}
 
+</style>

+ 3 - 1
src/components/pages/studentManage/student.vue
Voir le fichier 

@@ -1052,7 +1052,9 @@ export default {
 
                   message: "新增成功",
 
                   type: "success",
 
                 });
 
-                _this.getStudent();
 
+                setTimeout(() => {
 
+                  _this.getStudent();
 
+                }, 5000);
 
               }
 
               loading.close();
 
             })

+ 1 - 1
src/components/pages/test/check/docxTemplateDialog.vue
Voir le fichier 

@@ -533,7 +533,7 @@ export default {
 
             );
 
           } else if (fieldList[i].type == "file") {
 
             let _text = ``;
 
-            if(!fieldList[i].value || !fileList[i].value.length<=0)continue;
 
+            if(!fieldList[i].value || !fieldList[i].value.length<=0)continue;
 
             // this.fieldList[i].value.forEach(async f => {
 
             for (let j = 0; j < fieldList[i].value.length; j++) {
 
               let f = fieldList[i].value[j];

+ 7 - 3
src/components/pages/test/databoard.vue
Voir le fichier 

@@ -1,9 +1,10 @@
 
 <template>
 
   <div
 
     class="pb_content"
 
-    style="height: auto; width: calc(100% - 40px); margin: 0 auto;background: unset;"
 
+    :style="{padding : gotype ? '0 40px' : ''}"
 
+    style="height: auto; width: calc(100% - 40px); margin: 0 auto;background: unset;box-sizing: border-box;"
 
   >
 
-    <div style="width:100%;padding:0;box-sizing: border-box;">
 
+    <div style="width:100%;padding:0;box-sizing: border-box;" v-if="!gotype">
 
       <div class="pb_head top">
 
         <div style="display: flex;align-items: center;">
 
           <span
 
@@ -61,6 +62,7 @@
 
         </div>
 
       </div>
 
     </div>
 
+    <backPage style="padding-left: 0;" v-else tit="学生管理"></backPage>
 
     <div class="bbox_serch">
 
       <el-select
 
         v-model="selectTime"
 
@@ -165,15 +167,17 @@ import radarZong from "./dataCom/radarZong.vue";
 
 import radarTeacher from "./dataCom/radarTeacher.vue";
 
 
 import Cascader from "./dataCom/cascader.vue";
 
+import backPage from "../liyuan/components/backPage.vue";
 
 
 export default {
 
   name: "testDataBoard",
 
-  components: { radarZong, radarTeacher, Cascader },
 
+  components: { radarZong, radarTeacher, Cascader,backPage },
 
   data() {
 
     return {
 
       userid: this.$route.query.userid, //用户id
 
       oid: this.$route.query.oid, //学校id
 
       org: this.$route.query.org, //组织id
 
+      gotype: (window.topU && window.topU.gotype) ?  window.topU.gotype : '',
 
       pType: 2,
 
       teacherName: "",
 
       tabLoading: false,

+ 10 - 0
src/router/index.js
Voir le fichier 

@@ -163,6 +163,7 @@ import workPageNew from '@/components/pages/workPage/index_new'
 
 import pptEasy from '@/components/pages/pptEasy/addCourse'
 
 import noticeCenter from '@/components/pages/noticeCenter/index'
 
 import PersonnelManagement from "@/components/pages/PersonnelManagement";
 
+import topTalent from "@/components/pages/liyuan/topTalent";
 
 
 // 全局修改默认配置，点击空白处不能关闭弹窗
 
 ElementUI.Dialog.props.closeOnClickModal.default = false
 
@@ -310,6 +311,15 @@ export default new Router({
 
       requireAuth: '' // 是否需要判断是否登录,这里是需要判断
 
     }
 
   },
 
+    {
 
+      path: "/topTalent",
 
+      name: "topTalent",
 
+      component: topTalent,
 
+      meta: {
 
+        keepAlive: true,
 
+        requireAuth: "" // 是否需要判断是否登录,这里是需要判断
 
+      }
 
+    },
 
   {
 
     path: '/course/addCourseE',
 
     component: addCourseE,

Certains fichiers n'ont pas été affichés car il y a eu trop de fichiers modifiés dans ce diff