Domů Procházet Nápověda
Přihlásit se
CocoRoboLabs
/
pbl-teacher-table
3
0
Rozštěpit 0
Soubory Úkoly 0 Pull Requesty 0 Wiki
Procházet zdrojové kódy

update

lsc před 7 měsíci
rodič
85ae7537ab
revize
2e1b52200d
12 změnil soubory, kde provedl 190 přidání a 45 odebrání
Rozdělené zobrazení Ukázat statistiku rozdílových dat
  1. 1 1
      dist/index.html
  2. 0 0
      dist/static/css/app.f96475d6b90b7bcf401e65f2267d50b8.css
  3. 0 0
      dist/static/css/app.f96475d6b90b7bcf401e65f2267d50b8.css.map
  4. 0 0
      dist/static/js/app.cff08c147350b8d00ab5.js
  5. 0 0
      dist/static/js/app.cff08c147350b8d00ab5.js.map
  6. 0 0
      dist/static/js/manifest.571c38d63f24b1ae9e16.js.map
  7. 0 0
      dist/static/js/vendor.99ecd68f0ea1b548f2f6.js
  8. 0 0
      dist/static/js/vendor.99ecd68f0ea1b548f2f6.js.map
  9. 37 39
      src/components/pages/aiAddCourse/addCourse.vue
  10. 11 2
      src/components/pages/test/add/addTest.vue
  11. 140 2
      src/components/pages/test/add/setInfo/index.vue
  12. 1 1
      src/components/pages/test/check/index.vue

+ 1 - 1
dist/index.html
Zobrazit soubor 

@@ -32,7 +32,7 @@
 
       width: 100%;
 
       background: #e6eaf0;
 
       font-family: '黑体';
 
-    }</style><link href=./static/css/app.65d6ee61810732d9071df67e1f569f8b.css rel=stylesheet></head><body><div id=app></div><script type=text/javascript src=./static/js/manifest.571c38d63f24b1ae9e16.js></script><script type=text/javascript src=./static/js/vendor.35dfb1d95a63059f336f.js></script><script type=text/javascript src=./static/js/app.b1052619100b372cb78c.js></script></body></html><script>function stopSafari() {
 
+    }</style><link href=./static/css/app.f96475d6b90b7bcf401e65f2267d50b8.css rel=stylesheet></head><body><div id=app></div><script type=text/javascript src=./static/js/manifest.571c38d63f24b1ae9e16.js></script><script type=text/javascript src=./static/js/vendor.99ecd68f0ea1b548f2f6.js></script><script type=text/javascript src=./static/js/app.cff08c147350b8d00ab5.js></script></body></html><script>function stopSafari() {
 
     //阻止safari浏览器双击放大功能
 
     let lastTouchEnd = 0  //更新手指弹起的时间
 
     document.documentElement.addEventListener("touchstart", function (event) {

Rozdílová data souboru nebyla zobrazena, protože soubor je příliš velký
+ 0 - 0
dist/static/css/app.f96475d6b90b7bcf401e65f2267d50b8.css


Rozdílová data souboru nebyla zobrazena, protože soubor je příliš velký
+ 0 - 0
dist/static/css/app.f96475d6b90b7bcf401e65f2267d50b8.css.map


Rozdílová data souboru nebyla zobrazena, protože soubor je příliš velký
+ 0 - 0
dist/static/js/app.cff08c147350b8d00ab5.js


Rozdílová data souboru nebyla zobrazena, protože soubor je příliš velký
+ 0 - 0
dist/static/js/app.cff08c147350b8d00ab5.js.map


Rozdílová data souboru nebyla zobrazena, protože soubor je příliš velký
+ 0 - 0
dist/static/js/manifest.571c38d63f24b1ae9e16.js.map


Rozdílová data souboru nebyla zobrazena, protože soubor je příliš velký
+ 0 - 0
dist/static/js/vendor.99ecd68f0ea1b548f2f6.js


Rozdílová data souboru nebyla zobrazena, protože soubor je příliš velký
+ 0 - 0
dist/static/js/vendor.99ecd68f0ea1b548f2f6.js.map


+ 37 - 39
src/components/pages/aiAddCourse/addCourse.vue
Zobrazit soubor 

@@ -7348,6 +7348,7 @@ export default {
 
       isTeacherTextCancelSource: null,
 
       isTargetCancelSource1: null,
 
       isTargetCancelSource2: null,
 
+      fileidArray: []
 
     };
 
   },
 
   directives: {
 
@@ -21602,50 +21603,45 @@ ${this.targetCourseText && this.aiCallBack == 2 ? '注意，优化原有的<参
 
       await _this.aitargetTextDetail2getAiContent(_uuid)
 
     },
 
     importFileid(sub){
 
-      // file-SNthYVubrHGg4HjFcp3FPkZq 英语
 
-      // file-QOKhi8i84T8eR6DYhb9TaTlG 科学核心素养
 
-      // file-nkAUyRCEMncICGuFBC1WXnM1 科学素养内涵
 
-      // file-aQmfmgrwdrHa9sCTTZkjvK7Z 语文
 
-      // file-G1bRfSFnQaQtzA3c8dLshg0a 数学核心素养
 
-      // file-35koyXrFO2T4FsrQe4qXm0io 数学素养内涵
 
+      // file-SNthYVubrHGg4HjFcp3FPkZq 英语核心素养（总目标+学段目标）
 
+      // file-QOKhi8i84T8eR6DYhb9TaTlG 科学核心素养学段目标
 
+      // file-nkAUyRCEMncICGuFBC1WXnM1 科学核心素养内涵目标
 
+      // file-aQmfmgrwdrHa9sCTTZkjvK7Z 语文核心素养内涵目标
 
+      // file-G1bRfSFnQaQtzA3c8dLshg0a 数学学科核心素养学段目标
 
+      // file-35koyXrFO2T4FsrQe4qXm0io 数学学科核心素养内涵和总目标
 
       let _sub = converter(sub.join(","))
 
       let fileid = []
 
-      if(_sub.indexOf(converter('STEM')) != -1){
 
-        fileid.push('file-SNthYVubrHGg4HjFcp3FPkZq')
 
-        fileid.push('file-QOKhi8i84T8eR6DYhb9TaTlG')
 
-        fileid.push('file-nkAUyRCEMncICGuFBC1WXnM1')
 
-        fileid.push('file-aQmfmgrwdrHa9sCTTZkjvK7Z')
 
-        fileid.push('file-G1bRfSFnQaQtzA3c8dLshg0a')
 
-        fileid.push('file-35koyXrFO2T4FsrQe4qXm0io')
 
-      }
 
-      if(_sub.indexOf(converter('语文')) != -1){
 
-        if(fileid.indexOf('file-aQmfmgrwdrHa9sCTTZkjvK7Z') == -1){
 
-          fileid.push('file-aQmfmgrwdrHa9sCTTZkjvK7Z')
 
-        }
 
-      }
 
-      if(_sub.indexOf(converter('数学')) != -1){
 
-        if(fileid.indexOf('file-G1bRfSFnQaQtzA3c8dLshg0a') == -1){
 
-          fileid.push('file-G1bRfSFnQaQtzA3c8dLshg0a')
 
-        }
 
-        if(fileid.indexOf('file-35koyXrFO2T4FsrQe4qXm0io') == -1){
 
-          fileid.push('file-35koyXrFO2T4FsrQe4qXm0io')
 
-        }
 
-      }
 
-      if(_sub.indexOf(converter('英语')) != -1){
 
-        if(fileid.indexOf('file-SNthYVubrHGg4HjFcp3FPkZq') == -1){
 
-          fileid.push('file-SNthYVubrHGg4HjFcp3FPkZq')
 
-        }
 
-      }
 
-      if(_sub.indexOf(converter('科学')) != -1){
 
-        if(fileid.indexOf('file-QOKhi8i84T8eR6DYhb9TaTlG') == -1){
 
-          fileid.push('file-QOKhi8i84T8eR6DYhb9TaTlG')
 
-        }
 
-        if(fileid.indexOf('file-nkAUyRCEMncICGuFBC1WXnM1') == -1){
 
-          fileid.push('file-nkAUyRCEMncICGuFBC1WXnM1')
 
+      
+      for(var i = 0; i < this.fileidArray.length; i++){
 
+        if(_sub.indexOf(converter(this.fileidArray[i].name)) != -1){
 
+          if(fileid.indexOf(this.fileidArray[i].fileid) == -1){
 
+            fileid.push(this.fileidArray[i].fileid)
 
+          }
 
         }
 
       }
 
+
 
       return fileid
 
     },
 
+    selectFileid(){
 
+      let params = {
 
+        oid: this.oid,
 
+      };
 
+      this.ajax
 
+        .get(this.$store.state.api + "selectFileid", params)
 
+        .then((res) => {
 
+          this.fileidArray = res.data[0]
 
+          if(res.data[1].length){
 
+            this.fileidArray = res.data[1]
 
+          }
 
+          if(res.data[2].length){
 
+            this.fileidArray = res.data[2]
 
+          }
 
+
 
+        })
 
+        .catch((err) => {
 
+          console.error(err);
 
+        });
 
+    },
 
     async aitargetTextDetail22(msg,msg2) {
 
       let _this = this
 
       let fileid = [] 
@@ -22250,8 +22246,9 @@ ${msg}
 
             let dArray = []
 
             try {
 
               let regex2 = new RegExp("/([{,])(\w+):/g")
 
+              let regex3 = new RegExp('/(?<!")content(?!")/g')
 
               // 
-              dArray = JSON.parse(data.message.replaceAll('```json','').replaceAll('```','').replaceAll('\'',"\"").replace(regex2, '$1"$2":').replace(/(?<!")content(?!")/g, '"content"'))
 
+              dArray = JSON.parse(data.message.replaceAll('```json','').replaceAll('```','').replaceAll('\'',"\"").replace(regex2, '$1"$2":').replace(regex3, '"content"'))
 
             } catch (error) {
 
                 // callback ? callback() : ''
 
                 console.log("error_________________" + error);
 
@@ -22334,6 +22331,7 @@ ${msg}
 
     next();
 
   },
 
   created() {
 
+    this.selectFileid();
 
     this.getStudent();
 
     this.getTeacher();
 
     this.getClass();

+ 11 - 2
src/components/pages/test/add/addTest.vue
Zobrazit soubor 

@@ -33,7 +33,7 @@
 
         <el-dialog title="发布表单" :visible.sync="dialogVisible" width="550px" @close="dialogVisible = false" class="eld">
 
             <setInfo :oid="oid" :org="org" :steps.sync="steps" :title.sync="title" :testType.sync="testType"
 
                 :see.sync="see" :cJson.sync="cJson" :typeid.sync="typeid" :brief.sync="brief" :juri.sync="juri"
 
-                :overDate.sync="overDate" :juriList.sync="juriList" :typeInfo.sync="typeInfo">
 
+                :overDate.sync="overDate" :juriList.sync="juriList" :typeInfo.sync="typeInfo" :origin="origin">
 
             </setInfo>
 
             <span slot="footer" class="dialog-footer">
 
                 <el-button type="primary" @click="updateWork(3)">发 布 </el-button>
 
@@ -72,10 +72,15 @@ export default {
 
             overDate: "",
 
             juriList: [],
 
             typeInfo: [],
 
-            dialogVisible: false
 
+            dialogVisible: false,
 
+            origin: ""
 
         }
 
     },
 
     watch: {
 
+        cid(newValue, oldValue){
 
+            let url = "https://beta.cloud.cocorobo.cn/#/testDetail?testid=" + newValue
 
+            this.origin = url
 
+        },
 
         steps(newValue, oldValue) {
 
             if (!this.title) {
 
                 this.$message.error("请补充填写课程名称");
 
@@ -397,6 +402,10 @@ export default {
 
         },
 
     },
 
     mounted() {
 
+        if(this.cid){
 
+            let url = "https://beta.cloud.cocorobo.cn/#/testDetail?testid=" + this.cid
 
+            this.origin = url
 
+        }
 
         this.getTypeInfo();
 
     },
 
 }

+ 140 - 2
src/components/pages/test/add/setInfo/index.vue
Zobrazit soubor 

@@ -76,6 +76,25 @@
 
                                     </el-select>
 
                                 </div>
 
                             </div>
 
+
 
+                            <div class="url_box">
 
+                                <div class="title">
 
+                                    分享方式
 
+                                </div>
 
+                                <div class="url">
 
+                                    <el-tooltip :content="origin" placement="top" effect="dark">
 
+                                        <!-- content to trigger tooltip here -->
 
+                                        <span>{{ origin }}</span>
 
+                                    </el-tooltip>
 
+                                    <span @click="copy" :data-clipboard-text="copyText" class="tag-read">复制链接</span>
 
+                                </div>
 
+                            </div>
 
+                            <div class="qrcode_box">
 
+                                <div class="qrcode">
 
+                                    <span class="qrcodeUrl" ref="qrCodeUrl"></span>
 
+                                    <span @click="downQr">下载二维码</span>
 
+                                </div>
 
+                            </div>
 
                             <!-- <div class="whiteBg" style="border-radius: 0; margin-top: 0px">
 
                                 <div class="c_info_title" style="padding: 0 0 15px;margin: 0 auto 0 0;">表单描述</div>
 
                                 <div style="width: 100%;box-sizing: border-box;">
 
@@ -128,6 +147,8 @@
 
 <script>
 
 import manualCreate from './manualCreated.vue';
 
 import aiCreate from './aiCreate.vue';
 
+import Clipboard from "clipboard";
 
+import QRCode from "qrcodejs2";
 
 export default {
 
     components: {
 
         manualCreate,
 
@@ -172,6 +193,9 @@ export default {
 
         },
 
         typeInfo: {
 
             type: Array
 
+        },
 
+        origin: {
 
+            type: String
 
         }
 
     },
 
     data() {
 
@@ -203,6 +227,7 @@ export default {
 
             teaType: [],
 
             teacherArray:[],
 
             dialogTeacher: false,
 
+            copyText: "",
 
         }
 
     },
 
     computed: {
 
@@ -250,11 +275,14 @@ export default {
 
             immediate: true,
 
             deep: true,
 
             async handler(newValue, oldValue) {
 
-                if(newValue){
 
+                if(newValue.length){
 
                     await this.getTestWorkTeacherCount()
 
                 }
 
             },
 
         },
 
+        origin(){
 
+            this.setQr()
 
+        }
 
     },
 
     methods: {
 
         async getTestWorkTeacherCount(){
 
@@ -472,7 +500,43 @@ export default {
 
         },
 
         checkTeacher(){
 
             this.dialogTeacher = true
 
-        }
 
+        },
 
+        setQr() {
 
+            setTimeout(() => {
 
+                this.$refs.qrCodeUrl.innerHTML = "";
 
+                var qrcode = new QRCode(this.$refs.qrCodeUrl, {
 
+                    text: this.origin, // 需要转换为二维码的内容
 
+                    width: 100,
 
+                    height: 100,
 
+                    colorDark: "#000000",
 
+                    colorLight: "#ffffff",
 
+                    correctLevel: QRCode.CorrectLevel.H,
 
+                });
 
+            }, 500);
 
+        },
 
+        downQr() {
 
+
 
+            // 创建一个虚拟链接，并将 canvas 转换为图片文件
 
+            const link = document.createElement('a');
 
+            link.href = this.$refs.qrCodeUrl.querySelector('img').src;
 
+            link.download = 'qrcode.png';
 
+
 
+            // 模拟点击链接进行下载
 
+            link.click();
 
+        },
 
+        copy() {
 
+            this.copyText = this.origin;
 
+            var clipboard = new Clipboard(".tag-read");
 
+            clipboard.on("success", (e) => {
 
+                this.$message.success("复制成功");
 
+                console.log("复制成功");
 
+                clipboard.destroy(); // 释放内存
 
+            });
 
+            clipboard.on("error", (e) => {
 
+                console.log("不支持复制,该浏览器不支持自动复制");
 
+                clipboard.destroy(); // 释放内存
 
+            });
 
+        },
 
     },
 
     async mounted() {
 
         this.courseTypeId = this.depthCopy(this.testType)
 
@@ -491,6 +555,7 @@ export default {
 
         this.getClass2();
 
         await this.getTestWorkTeacherCount()
 
         console.log('getTestWorkTeacherCount')
 
+        this.setQr();
 
     }
 
 }
 
 </script>
 
@@ -810,4 +875,77 @@ export default {
 
 .people_name2>>>.el-checkbox__label {
 
     width: calc(100% - 130px);
 
 }
 
+
 
+
 
+.url_box {
 
+    margin-bottom: 20px;
 
+}
 
+
 
+.qrcode_box {
 
+    margin-bottom: 20px;
 
+}
 
+
 
+.url_box>.url {
 
+    width: 100%;
 
+    display: flex;
 
+    align-items: center;
 
+    border: 1px solid #e7e7e7;
 
+    border-radius: 4px;
 
+    height: 35px;
 
+    padding: 0 7px;
 
+    box-sizing: border-box;
 
+}
 
+
 
+.url_box>.url>span {
 
+    font-size: 16px;
 
+    color: #000000;
 
+}
 
+
 
+.url_box>.url>span:nth-child(1) {
 
+    width: 100%;
 
+    white-space: nowrap;
 
+    overflow: hidden;
 
+    text-overflow: ellipsis;
 
+}
 
+
 
+.url_box>.url>span:nth-child(2) {
 
+    margin-left: auto;
 
+    border-left: 1px solid #e7e7e7;
 
+    padding-left: 7px;
 
+    cursor: pointer;
 
+    min-width: fit-content;
 
+}
 
+
 
+.url_box>.title,
 
+.qrcode_box>.title {
 
+    font-weight: bold;
 
+    font-size: 14px;
 
+    margin-bottom: 10px;
 
+    color:#000;
 
+}
 
+
 
+.qrcode_box>.qrcode {
 
+    padding: 7px;
 
+    border: 1px solid #e7e7e7;
 
+    width: fit-content;
 
+    border-radius: 4px;
 
+    display: flex;
 
+    align-items: flex-end;
 
+}
 
+
 
+.qrcode_box>.qrcode>span:nth-child(1) {
 
+    width: 100px;
 
+    display: block;
 
+    height: 100px;
 
+}
 
+
 
+.qrcode_box>.qrcode>span:nth-child(2) {
 
+    background: #f0f2f5;
 
+    padding: 7px 15px;
 
+    font-size: 16px;
 
+    border-radius: 4px;
 
+    cursor: pointer;
 
+    color: #000;
 
+    margin-left: 7px;
 
+}
 
 </style>

+ 1 - 1
src/components/pages/test/check/index.vue
Zobrazit soubor 

@@ -639,7 +639,7 @@
 
             <div v-for="(i,index) in worksArray"  :key="i.id" class="isDesktopTable_content">
 
               <div class="isDTitle CutCss">
 
                 <div style="font-size: 16px;font-weight: 600;">{{ i.name }}</div>
 
-                <div :style="'font-size: 14px',i.cut?'color:rgba(54, 129, 252, 1)':'color: rgba(0, 0, 0, 0.6);'">{{ i.time }}</div>
 
+                <div :style="'font-size: 14px'+i.cut?'color:rgba(54, 129, 252, 1)':'color: rgba(0, 0, 0, 0.6);'">{{ i.time }}</div>
 
                 <div @click="i.cut=!i.cut">
 
                   <img v-if="!i.cut" src="../../../../assets/icon/fileIcon/downImg.png" alt="">
 
                   <img v-else src="../../../../assets/icon/fileIcon/upImg.png" alt="">

Některé soubory nejsou zobrazeny, neboť je v těchto rozdílových datech změněno mnoho souborů