首頁 探索 說明
登入
CocoRoboLabs
/
pbl-teacher-table
3
0
複刻 0
Files 問題管理 0 合併請求 0 Wiki
瀏覽代碼

gx

SanHQin 4 天之前
父節點
6aa8f866d6
當前提交
faa688bb90
共有 16 個文件被更改，包括 137 次插入 和 116 次删除
分割檢視 顯示文件統計
  1. 1 1
      dist/index.html
  2. 0 0
      dist/static/css/app.d182a4214829adce4b569fc71fa22b88.css
  3. 0 0
      dist/static/css/app.d182a4214829adce4b569fc71fa22b88.css.map
  4. 0 0
      dist/static/js/app.4318aaba24aef03bb034.js
  5. 0 0
      dist/static/js/app.4318aaba24aef03bb034.js.map
  6. 0 0
      dist/static/js/manifest.161e82026ac2ae03ab6f.js.map
  7. 9 8
      src/components/pages/liyuan/aiOffice.vue
  8. 26 6
      src/components/pages/liyuan/components/card.vue
  9. 3 3
      src/components/pages/liyuan/schoolSafe.vue
  10. 8 7
      src/components/pages/liyuan/teacherDevelop.vue
  11. 6 6
      src/components/pages/pptEasy/addCourse.vue
  12. 26 12
      src/components/pages/sassPlatform/index.vue
  13. 45 51
      src/components/pages/test/add/addTest.vue
  14. 1 0
      src/components/pages/test/add/setInfo/index.vue
  15. 11 10
      src/components/pages/test/check/index.vue
  16. 1 12
      src/components/pages/test/smarter.vue

+ 1 - 1
dist/index.html
查看文件 

@@ -32,7 +32,7 @@
 
       width: 100%;
 
       background: #e6eaf0;
 
       font-family: '黑体';
 
-    }</style><link href=./static/css/app.232268970ac1887edf3a8eb090707821.css rel=stylesheet></head><body><div id=app></div><script type=text/javascript src=./static/js/manifest.161e82026ac2ae03ab6f.js></script><script type=text/javascript src=./static/js/vendor.b7212920b6e58d14a873.js></script><script type=text/javascript src=./static/js/app.3199cfdd0c41aafdf765.js></script></body></html><script>function stopSafari() {
 
+    }</style><link href=./static/css/app.d182a4214829adce4b569fc71fa22b88.css rel=stylesheet></head><body><div id=app></div><script type=text/javascript src=./static/js/manifest.161e82026ac2ae03ab6f.js></script><script type=text/javascript src=./static/js/vendor.b7212920b6e58d14a873.js></script><script type=text/javascript src=./static/js/app.4318aaba24aef03bb034.js></script></body></html><script>function stopSafari() {
 
     //阻止safari浏览器双击放大功能
 
     let lastTouchEnd = 0  //更新手指弹起的时间
 
     document.documentElement.addEventListener("touchstart", function (event) {

File diff suppressed because it is too large
+ 0 - 0
dist/static/css/app.d182a4214829adce4b569fc71fa22b88.css


File diff suppressed because it is too large
+ 0 - 0
dist/static/css/app.d182a4214829adce4b569fc71fa22b88.css.map


File diff suppressed because it is too large
+ 0 - 0
dist/static/js/app.4318aaba24aef03bb034.js


File diff suppressed because it is too large
+ 0 - 0
dist/static/js/app.4318aaba24aef03bb034.js.map


File diff suppressed because it is too large
+ 0 - 0
dist/static/js/manifest.161e82026ac2ae03ab6f.js.map


+ 9 - 8
src/components/pages/liyuan/aiOffice.vue
查看文件 

@@ -2,13 +2,14 @@
 
   <div class="teacherDevelop">
 
     <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" 
+      <card v-for="item in cardData(cardArray)"
 
+      :key="item.title"
 
+      :title="item.title"
 
+      :icon="item.icon"
 
+      :to="item.to"
 
       :sortId="item.sortId"
 
-      :type="item.type"></card>
 
+      :type="item.type"
 
+      :cardData="item"></card>
 
     </div>
 
   </div>
 
 </template>
 
@@ -29,7 +30,7 @@ export default {
 
         { title: '会议妙记', icon: require('../../../assets/icon/liyuan/hymj.svg'), type: 2, to: `/aigpt/#/cocoFlowConferenceTrick?userid=${this.$route.query.userid}&oid=${this.$route.query.oid}&role=${this.$route.query.role}&tType=${this.$route.query.tType}&org=${this.$route.query.org}&gotype=1`,role:0 },
 
         { title: '教师管理', icon: require('../../../assets/icon/liyuan/teamange.svg'), type: 1, to: "/teacher",role:1 },
 
         { title: '学生管理', icon: require('../../../assets/icon/liyuan/stumange.svg'), type: 1, to: "/Listudent",role:0 },
 
-        { title: '办公表单', icon: require('../../../assets/icon/liyuan/workTest.svg'), type: 1, to: "/test",role:1 },
 
+        { title: '办公表单', icon: require('../../../assets/icon/liyuan/workTest.svg'), type: 1, to: "/sassPlatform",role:1,sassPlatFormTypeId:"cd006687-8a00-11f0-9c7b-005056924926"},
 
         { title: '教研室管理', icon: require('../../../assets/icon/liyuan/workTest.svg'), type: 1, to: "/teacherOffice",role:1 },
 
         { title: '数据看板', icon: require('../../../assets/icon/liyuan/workTest.svg'), type: 3, to: `https://liyuan.cocorobo.cn/#/dataBoardNew?userid=${this.$route.query.userid}&oid=${this.$route.query.oid}&org=${this.$route.query.org}`,role:1 },
 
       ]
 
@@ -63,4 +64,4 @@ export default {
 
   width: 100%;
 
   margin-top: 20px;
 
 }
 
-</style>
 
+</style>

+ 26 - 6
src/components/pages/liyuan/components/card.vue
查看文件 

@@ -25,6 +25,12 @@ export default {
 
         sortId: {
 
             type: String,
 
         },
 
+        cardData:{
 
+            type:Object,
 
+            default:()=>{
 
+                return {}
 
+            }
 
+        },
 
     },
 
     data() {
 
         return {
 
@@ -42,18 +48,32 @@ export default {
 
                 window.topU.gotype = this.$route.path
 
                 console.log('top',this.$route.path);
 
             } catch (error) {
 
-                console.log(err);
 
+                console.log(error);
 
             }
 
             // sessionStorage.setItem('gotype', this.$route.path);
 
             console.log('betaL',this.betaL);
 
-            
-            if (this.type == 1) {    
-                this.$router.push({ path: this.to, query: { userid: this.userid, oid: this.oid, org: this.org, role: this.role,tType: this.tType, gotype: 1,sortId:this.sortId } })
 
+
 
+            if (this.type == 1) {
 
+              let query = {
 
+                userid: this.userid,
 
+                oid: this.oid,
 
+                org: this.org,
 
+                role: this.role,
 
+                tType: this.tType,
 
+                gotype: 1,
 
+                sortId: this.sortId,
 
+              }
 
+              if(this.cardData && this.cardData.sassPlatFormTypeId){
 
+                query.sassPlatFormTypeId = this.cardData.sassPlatFormTypeId
 
+              }
 
+                console.log('query',query);
 
+                console.log('cardData',this.cardData);
 
+                this.$router.push({ path: this.to, query: query })
 
             }else if (this.type == 2) {
 
                 let con = this.betaL =='beta'? 'https://beta.cloud.cocorobo.cn' : 'https://cloud.cocorobo.cn'
 
                 console.log( `${con}${this.to}`);
 
                 window.location.href = `${con}${this.to}`;
 
-                
+
 
             }else if (this.type == 3) {
 
                 window.location.href = this.to;
 
             }else if (this.type == 4) {
 
@@ -104,4 +124,4 @@ export default {
 
     margin-bottom: -20px;
 
     margin-right: -20px;
 
 }
 
-</style>
 
+</style>

+ 3 - 3
src/components/pages/liyuan/schoolSafe.vue
查看文件 

@@ -2,7 +2,7 @@
 
   <div class="teacherDevelop">
 
     <topBar title="平安校园" detail="日常巡查记录 · AI辅助分析"></topBar>
 
     <div class="cardBox">
 
-      <card v-for="item in cardArray" :key="item.title" :title="item.title" :icon="item.icon" :to="item.to" :type="item.type"></card>
 
+      <card v-for="item in cardArray" :key="item.title" :title="item.title" :icon="item.icon" :to="item.to" :type="item.type" :cardData="item"></card>
 
     </div>
 
   </div>
 
 </template>
 
@@ -19,7 +19,7 @@ export default {
 
     return {
 
       cardArray: [
 
         { title: '安全巡查', icon: require('../../../assets/icon/liyuan/mbll.svg'), type: 1, to: "/safeTest" },
 
-        { title: '安全表单', icon: require('../../../assets/icon/liyuan/workTest.svg'), type: 1, to: "/test" }
 
+        { title: '安全表单', icon: require('../../../assets/icon/liyuan/workTest.svg'), type: 1, to: "/sassPlatform",sassPlatFormTypeId:"c85c921d-8a01-11f0-9c7b-005056924926" }
 
       ]
 
     }
 
   },
 
@@ -44,4 +44,4 @@ export default {
 
   width: 100%;
 
   margin-top: 20px;
 
 }
 
-</style>
 
+</style>

+ 8 - 7
src/components/pages/liyuan/teacherDevelop.vue
查看文件 

@@ -2,13 +2,14 @@
 
   <div class="teacherDevelop">
 
     <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" 
+      <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>
 
@@ -39,7 +40,7 @@ export default {
 
         { title: '个人档案', icon: require('../../../assets/icon/liyuan/gerendangan.svg'), type: 1, to: "/userInfoL",role:0 },
 
         { title: '教师画像', icon: require('../../../assets/icon/liyuan/jiaoshihuaxiang.svg'), type: 1, to: "/portraitL",role:0 },
 
         { title: '课堂观察', icon: require('../../../assets/icon/liyuan/ketangguancha.svg'), type: 1, to: "/classroomObservation",role:0 },
 
-        { title: '智能表单', icon: require('../../../assets/icon/liyuan/zhinengbiaodan.svg'), type: 1, to: "/test",role:1 },
 
+        { title: '智能表单', icon: require('../../../assets/icon/liyuan/zhinengbiaodan.svg'), type: 1, to: "/sassPlatform",role:1,sassPlatFormTypeId:"4cdce114-8a00-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 },
 
       ]
 
@@ -64,4 +65,4 @@ export default {
 
   width: 100%;
 
   margin-top: 20px;
 
 }
 
-</style>
 
+</style>

+ 6 - 6
src/components/pages/pptEasy/addCourse.vue
查看文件 

@@ -4566,7 +4566,6 @@ export default {
 
       }
 
     },
 
     async addWork() {
 
-      console.log(this.$refs.pptIframeRef.contentWindow.window.pptLoading)
 
       if(this.$refs.pptIframeRef.contentWindow.window.pptLoading !== 2)return this.$message.info("ppt正在加载中，请稍等")
 
       if(this.uploadWorkLoading)return;
 
       this.uploadWorkLoading = true;
 
@@ -4717,7 +4716,6 @@ export default {
 
         });
 
     },
 
     async updateWork() {
 
-      console.log(this.$refs.pptIframeRef.contentWindow.window.pptLoading)
 
       if(this.$refs.pptIframeRef.contentWindow.window.pptLoading !== 2)return this.$message.info("ppt正在加载中，请稍等")
 
       if(this.uploadWorkLoading)return;
 
       this.uploadWorkLoading = true;
 
@@ -6568,10 +6566,12 @@ export default {
 
               : [];
 
             this.inviteCode = [];
 
             for (var i = 0; i < res.data[2].length; i++) {
 
-              this.inviteCode.push({
 
-                cid: res.data[2][i].classid,
 
-                ic: res.data[2][i].code
 
-              });
 
+              if(res.data[2][i].classid){
 
+                this.inviteCode.push({
 
+                  cid: res.data[2][i].classid,
 
+                  ic: res.data[2][i].code
 
+                });
 
+              }
 
             }
 
 
             this.checkboxList3 = res.data[0][0].course_teacher

+ 26 - 12
src/components/pages/sassPlatform/index.vue
查看文件 

@@ -1,16 +1,14 @@
 
 <template>
 
   <div class="sassPlatform">
 
+    <backPage v-if="gotype" tit="表单管理"></backPage>
 
     <div class="sp_header">
 
-      <!-- <div class="sp_h_logo">
 
-
 
-      </div> -->
 
       <div class="sp_h_tagArea">
 
         <span :class="{tagActive:tagIndex==0}" style="margin-left: 10px;" @click="tagIndex = 0">应用中心</span>
 
         <span :class="{tagActive:tagIndex==1}" style="margin-left: 17.5px;" @click="goTestSmarter()">智能助手</span>
 
       </div>
 
     </div>
 
     <div class="sp_bottom">
 
-      <div class="sp_b_left">
 
+      <div class="sp_b_left" v-if="!sassPlatFormTypeId">
 
         <div class="sp_b_l_form" v-for="(item,index) in navList" :key="item.navIndex">
 
           <span @click="item.open = !item.open">{{ item.name }}<svg :style="`transform: rotate(${item.open?'180':'0'}deg);`" t="1739262423649" class="icon" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="7079" width="200" height="200"><path d="M52.335 261.072c-31.269 30.397-31.269 79.722 0 110.194l403.212 391.718c31.325 30.382 82.114 30.382 113.377 0l403.197-391.718c31.325-30.466 31.325-79.793 0-110.194-31.28-30.449-82.058-30.449-113.39 0l-346.497 336.64-346.457-336.64c-31.325-30.448-82.105-30.448-113.446 0l0 0z" p-id="7080"></path></svg></span>
 
           <div v-show="item.open" v-if="item.children.length>0">
 
@@ -31,11 +29,13 @@
 
 import tableView from './view/tableView.vue';
 
 import examine from './view/examine/index'
 
 import databoard from './view/databoard.vue';
 
+import backPage from "../liyuan/components/backPage.vue";
 
 export default {
 
   components:{
 
     tableView,
 
     examine,
 
-    databoard
 
+    databoard,
 
+    backPage
 
   },
 
   data(){
 
     return{
 
@@ -56,7 +56,9 @@ export default {
 
 				"f235659b-1b6d-11f0-a66a-005056924926",
 
 				"d87b62d3-1b6d-11f0-a66a-005056924926",
 
 				"c25ea59b-1b6d-11f0-a66a-005056924926",
 
-      ]
 
+      ],
 
+      sassPlatFormTypeId:this.$route.query.sassPlatFormTypeId,
 
+      gotype:(window.topU && window.topU.gotype) ?  window.topU.gotype : '',
 
     }
 
   },
 
   computed:{
 
@@ -100,19 +102,24 @@ export default {
 
             i.open = false;
 
 
             if(i.id=='e18d88b3-e828-11ef-b508-005056924926' || i.id=="4cdce114-8a00-11f0-9c7b-005056924926"){
 
-
 
-
 
               if(this.userData && this.userData.type === 1 && this.userData.role == 1){
 
                 _children.push({name:"年度考核",type:"annualAssessment",navIndex:`${index}-1`})
 
               }
 
               _children.push({name:"考核数据可视化",type:"evaluationDataVisualization",navIndex:`${index}-2`})
 
               i.open = true;
 
             }
 
+
 
+
 
+
 
             i.children = _children;
 
             i.typeList = _typeList;
 
             i.navIndex = `${index}`
 
           });
 
 
+
 
+
 
+
 
+
 
           this.navList = _type1;
 
           resolve()
 
         })
 
@@ -159,10 +166,17 @@ export default {
 
   mounted(){
 
     this.getUser(this.userId).then(()=>{
 
       this.getNavType().then(_=>{
 
-      if(this.navList.length>0){
 
-        let _data = this.navList[0].children[0];
 
-        this.changeNavIndex(_data.navIndex,_data)
 
-      }
 
+
 
+        if(this.sassPlatFormTypeId){
 
+          this.navList.forEach(i=>{
 
+            if(i.id == this.sassPlatFormTypeId){
 
+              this.changeNavIndex(`${i.navIndex}-0`,i.children[0])
 
+            }
 
+          })
 
+        }else if(this.navList.length>0){
 
+          let _data = this.navList[0].children[0];
 
+          this.changeNavIndex(_data.navIndex,_data)
 
+        }
 
     });
 
     })

+ 45 - 51
src/components/pages/test/add/addTest.vue
查看文件 

@@ -24,17 +24,7 @@
 
                                     '&role=' +
 
                                     role,
 
                             }">表单管理</el-breadcrumb-item>
 
-                            <el-breadcrumb-item v-else-if="back=='sass'" :to="{
 
-                                path:
 
-                                    '/sassPlatform?userid=' +
 
-                                    userid +
 
-                                    '&oid=' +
 
-                                    oid +
 
-                                    '&org=' +
 
-                                    org +
 
-                                    '&role=' +
 
-                                    role,
 
-                            }">sass平台</el-breadcrumb-item>
 
+                            <el-breadcrumb-item v-else-if="back=='sass'" @click.stop="$router.back()">sass平台</el-breadcrumb-item>
 
                             <el-breadcrumb-item>
 
                                 <span style="color: rgb(15, 126, 255)">新建表单</span>
 
                             </el-breadcrumb-item>
 
@@ -144,16 +134,17 @@ export default {
 
                             this.role
 
                         );
 
                         }else if(this.back == 'sass'){
 
-                          this.goTo(
 
-                            "/sassPlatform?userid=" +
 
-                            this.userid +
 
-                            "&oid=" +
 
-                            this.oid +
 
-                            "&org=" +
 
-                            this.org +
 
-                            "&role=" +
 
-                            this.role
 
-                        );
 
+                          this.$router.back()
 
+                        //   this.goTo(
 
+                        //     "/sassPlatform?userid=" +
 
+                        //     this.userid +
 
+                        //     "&oid=" +
 
+                        //     this.oid +
 
+                        //     "&org=" +
 
+                        //     this.org +
 
+                        //     "&role=" +
 
+                        //     this.role
 
+                        // );
 
                         }
 
                     // if (this.cid == "" || this.cid == undefined) {
 
                     //     if (this.title == "") {
 
@@ -254,16 +245,17 @@ export default {
 
                             this.role
 
                         );
 
                         }else if(back == 'sass'){
 
-                          this.goTo(
 
-                            "/sassPlatform?userid=" +
 
-                            this.userid +
 
-                            "&oid=" +
 
-                            this.oid +
 
-                            "&org=" +
 
-                            this.org +
 
-                            "&role=" +
 
-                            this.role
 
-                        );
 
+                        //   this.goTo(
 
+                        //     "/sassPlatform?userid=" +
 
+                        //     this.userid +
 
+                        //     "&oid=" +
 
+                        //     this.oid +
 
+                        //     "&org=" +
 
+                        //     this.org +
 
+                        //     "&role=" +
 
+                        //     this.role
 
+                        // );
 
+                        this.$router.back()
 
                         }
 
                     }
 
                     // setTimeout(() => {
 
@@ -329,16 +321,17 @@ export default {
 
                             this.role
 
                         );
 
                         }else if(this.back == 'sass'){
 
-                          this.goTo(
 
-                            "/sassPlatform?userid=" +
 
-                            this.userid +
 
-                            "&oid=" +
 
-                            this.oid +
 
-                            "&org=" +
 
-                            this.org +
 
-                            "&role=" +
 
-                            this.role
 
-                        );
 
+                        //   this.goTo(
 
+                        //     "/sassPlatform?userid=" +
 
+                        //     this.userid +
 
+                        //     "&oid=" +
 
+                        //     this.oid +
 
+                        //     "&org=" +
 
+                        //     this.org +
 
+                        //     "&role=" +
 
+                        //     this.role
 
+                        // );
 
+                        this.$router.back()
 
                         }
 
                     } else if (look == 4) {
 
                         this.$message.success("保存成功")
 
@@ -358,16 +351,17 @@ export default {
 
                             this.role
 
                         );
 
                         }else if(this.back == 'sass'){
 
-                          this.goTo(
 
-                            "/sassPlatform?userid=" +
 
-                            this.userid +
 
-                            "&oid=" +
 
-                            this.oid +
 
-                            "&org=" +
 
-                            this.org +
 
-                            "&role=" +
 
-                            this.role
 
-                        );
 
+                        //   this.goTo(
 
+                        //     "/sassPlatform?userid=" +
 
+                        //     this.userid +
 
+                        //     "&oid=" +
 
+                        //     this.oid +
 
+                        //     "&org=" +
 
+                        //     this.org +
 
+                        //     "&role=" +
 
+                        //     this.role
 
+                        // );
 
+                        this.$router.back()
 
                         }
 
                     }
 
                     setTimeout(() => {

+ 1 - 0
src/components/pages/test/add/setInfo/index.vue
查看文件 

@@ -482,6 +482,7 @@ export default {
 
                           this.typeCheck = _type1[_type1Index].children[0].id;
 
                         }
 
                       }
 
+                      this.typeChange2();
 
                     }
 
                     console.log("👉6",_type1)
 
                 })

+ 11 - 10
src/components/pages/test/check/index.vue
查看文件 

@@ -3120,16 +3120,17 @@ ${JSON.stringify(forAllList)}
 
           this.role
 
       );
 
       }else if(this.back=="sass"){
 
-        this.goTo(
 
-        "/sassPlatform?userid=" +
 
-          this.userid +
 
-          "&oid=" +
 
-          this.oid +
 
-          "&org=" +
 
-          this.org +
 
-          "&role=" +
 
-          this.role
 
-      );
 
+        this.$router.back();
 
+      //   this.goTo(
 
+      //   "/sassPlatform?userid=" +
 
+      //     this.userid +
 
+      //     "&oid=" +
 
+      //     this.oid +
 
+      //     "&org=" +
 
+      //     this.org +
 
+      //     "&role=" +
 
+      //     this.role
 
+      // );
 
       }
 
 
     },

+ 1 - 12
src/components/pages/test/smarter.vue
查看文件 

@@ -40,18 +40,7 @@
 
                             role
 
                         )
 
                         ">数据看板</span>
 
-                     <span class="subClick" v-if="back=='sass'" @click="
 
-                        goTo(
 
-                            '/sassPlatform?userid=' +
 
-                            userid +
 
-                            '&oid=' +
 
-                            oid +
 
-                            '&org=' +
 
-                            org +
 
-                            '&role=' +
 
-                            role
 
-                        )
 
-                        ">sass平台</span>
 
+                     <span class="subClick" v-if="back=='sass'" @click="$router.back()">sass平台</span>
 
                     <span class="sub_head">智能助手</span>
 
                 </div>
 
                 <!-- <div class="pb_head_t_right">

Some files were not shown because too many files changed in this diff