浏览代码

踩踩踩

SanHQin 8 月之前
父节点
当前提交
1b716c299e

+ 4 - 0
dist/index.html

@@ -32,7 +32,11 @@
       width: 100%;
       background: #e6eaf0;
       font-family: '黑体';
+<<<<<<< HEAD
     }</style><link href=./static/css/app.50933fac77e483c8eb6d756b039d4370.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.de15001ce66f032e9274.js></script><script type=text/javascript src=./static/js/app.0153b207f55683cc3fd1.js></script></body></html><script>function stopSafari() {
+=======
+    }</style><link href=./static/css/app.581c0d65b13aad7121351d43d56065a3.css rel=stylesheet></head><body><div id=app></div><script type=text/javascript src=./static/js/manifest.3eade43afd174522bb8a.js></script><script type=text/javascript src=./static/js/vendor.6bffbf9058a42e825dbc.js></script><script type=text/javascript src=./static/js/app.47c76dffc3bb38c0544d.js></script></body></html><script>function stopSafari() {
+>>>>>>> 123c948877a9ed5525653b8b16f0cf27850116f0
     //阻止safari浏览器双击放大功能
     let lastTouchEnd = 0  //更新手指弹起的时间
     document.documentElement.addEventListener("touchstart", function (event) {

文件差异内容过多而无法显示
+ 0 - 0
dist/static/css/app.50933fac77e483c8eb6d756b039d4370.css.map


文件差异内容过多而无法显示
+ 0 - 0
dist/static/css/app.581c0d65b13aad7121351d43d56065a3.css


文件差异内容过多而无法显示
+ 1 - 0
dist/static/css/app.581c0d65b13aad7121351d43d56065a3.css.map


文件差异内容过多而无法显示
+ 0 - 0
dist/static/js/0.4f3b05586c3acc102a54.js.map


文件差异内容过多而无法显示
+ 0 - 0
dist/static/js/0.7da288988865a9378b49.js


文件差异内容过多而无法显示
+ 0 - 0
dist/static/js/0.7da288988865a9378b49.js.map


文件差异内容过多而无法显示
+ 1 - 0
dist/static/js/app.0153b207f55683cc3fd1.js


文件差异内容过多而无法显示
+ 0 - 0
dist/static/js/app.0153b207f55683cc3fd1.js.map


文件差异内容过多而无法显示
+ 1 - 0
dist/static/js/app.47c76dffc3bb38c0544d.js


文件差异内容过多而无法显示
+ 1 - 0
dist/static/js/app.47c76dffc3bb38c0544d.js.map


文件差异内容过多而无法显示
+ 0 - 0
dist/static/js/manifest.161e82026ac2ae03ab6f.js.map


+ 2 - 2
dist/static/js/manifest.161e82026ac2ae03ab6f.js → dist/static/js/manifest.3eade43afd174522bb8a.js

@@ -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={6: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.161e82026ac2ae03ab6f.js.map
+!function(e){var n=window.webpackJsonp;window.webpackJsonp=function(r,a,c){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 a)Object.prototype.hasOwnProperty.call(a,i)&&(e[i]=a[i]);for(n&&n(r,a,c);l.length;)l.shift()();if(c)for(s=0;s<c.length;s++)f=o(o.s=c[s]);return f};var r={},t={6: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 a=document.getElementsByTagName("head")[0],c=document.createElement("script");c.type="text/javascript",c.charset="utf-8",c.async=!0,c.timeout=12e4,o.nc&&c.setAttribute("nonce",o.nc),c.src=o.p+"static/js/"+e+"."+{0:"7da288988865a9378b49",1:"14e8e8c7e44fc858e4a6",2:"94e1427bfc7ef0b4c685",3:"3a9f53a78da16650e6b8"}[e]+".js";var i=setTimeout(u,12e4);function u(){c.onerror=c.onload=null,clearTimeout(i);var n=t[e];0!==n&&(n&&n[1](new Error("Loading chunk "+e+" failed.")),t[e]=void 0)}return c.onerror=c.onload=u,a.appendChild(c),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.3eade43afd174522bb8a.js.map

文件差异内容过多而无法显示
+ 1 - 0
dist/static/js/manifest.3eade43afd174522bb8a.js.map


文件差异内容过多而无法显示
+ 0 - 0
dist/static/js/vendor.6bffbf9058a42e825dbc.js


文件差异内容过多而无法显示
+ 0 - 0
dist/static/js/vendor.6bffbf9058a42e825dbc.js.map


+ 1 - 0
src/assets/icon/course/noc.svg

@@ -0,0 +1 @@
+<?xml version="1.0" standalone="no"?><!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"><svg t="1732777714081" class="icon" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="4068" xmlns:xlink="http://www.w3.org/1999/xlink" width="128" height="128"><path d="M512 1024C229.232 1024 0 794.768 0 512 0 229.232 229.232 0 512 0 794.768 0 1024 229.232 1024 512 1024 794.768 794.768 1024 512 1024ZM560 240C560 213.488 538.512 192 512 192 485.488 192 464 213.488 464 240L464 592C464 618.512 485.488 640 512 640 538.512 640 560 618.512 560 592L560 240ZM512 736C485.488 736 464 757.488 464 784 464 810.512 485.488 832 512 832 538.512 832 560 810.512 560 784 560 757.488 538.512 736 512 736Z" fill="#487af4" p-id="4069"></path></svg>

+ 5 - 3
src/components/pages/aiAddCourse/templateDialog.vue

@@ -210,8 +210,9 @@ export default {
 
 <style scoped>
 .addTemplateDialog>>>.el-dialog {
-    min-width: 1200px;
-
+    /* min-width: 1200px; */
+    max-width: 100%;
+    margin-top: 8vh !important;
     height: 700px;
     box-shadow: 0px 0 8px 0px #555555;
     border-radius: 8px;
@@ -223,7 +224,8 @@ export default {
 
 .addTemplateDialog>>>.el-dialog__body {
     height: 100%;
-    min-width: 1200px;
+    /* min-width: 1200px; */
+    max-width: 100%;
     flex-shrink: 0;
     box-sizing: border-box;
     padding-bottom: 50px;

文件差异内容过多而无法显示
+ 260 - 403
src/components/pages/aiEasy/addCourse.vue


+ 21 - 4
src/components/pages/aiEasy/aiBoxRight.vue

@@ -429,6 +429,10 @@ export default {
       type: String,
       default: ""
     },
+    courseTextE: {
+      type: String,
+      default: ""
+    },
     targetCourseText2: {
       type: String,
       default: ""
@@ -610,6 +614,16 @@ export default {
         }
       }
     },
+    courseTextE: {
+      immediate: true,
+      deep: true,
+      handler(newValue, oldValue) {
+        this.jArray = this.getString();
+        if (!this.jArray.length) {
+          this.showjList = false;
+        }
+      }
+    },
     targetCourseText2: {
       immediate: true,
       deep: true,
@@ -817,6 +831,9 @@ export default {
         } else if (string == "aiDetail") {
           area = "课程简要描述";
           text = this.courseText2;
+        } else if (string == "courseTextE") {
+          area = "学习任务内容";
+          text = this.courseTextE;
         } else if (string == "aitargetTextDetail2") {
           area = "课程目标";
           text = this.targetCourseText2;
@@ -876,7 +893,7 @@ export default {
       }
     },
     morePrompt(uid, data){
-      this.$emit('addCourseBehavior', 'courseBehavior', '点击对话框-推荐更多按钮')
+      this.$emit('addCourseBehavior', 'courseBehavior2', '点击对话框-推荐更多按钮')
 
       if(this.array.find(i => i.uid == uid).moreloading){
         this.$message.error('生成中请稍后')
@@ -986,7 +1003,7 @@ Instruction: Based on the context, follow "Format example", write content.`
         this.$message.error('请等待回答完毕在发送')
         return
       }
-      this.$emit('addCourseBehavior', 'courseBehavior', '点击对话框-推荐按钮发送')
+      this.$emit('addCourseBehavior', 'courseBehavior2', '点击对话框-推荐按钮发送')
       this.faloading = true;
       let string = `## 参考资料
 ${data.area + ':' + data.value}
@@ -1056,7 +1073,7 @@ ${data.area + ':' + data.value}
         return
       }
       let message = this.courseText;
-      this.$emit('addCourseBehavior', 'courseBehavior', '点击对话框-发送按钮')
+      this.$emit('addCourseBehavior', 'courseBehavior2', '点击对话框-发送按钮')
 
       if (this.courseText) {
         let msg = ``;
@@ -1746,7 +1763,7 @@ ${message}`;
       this.showRoleList = false;
     },
     onCopy(content) {
-      this.$emit('addCourseBehavior', 'courseBehavior', '点击对话框-复制信息')
+      this.$emit('addCourseBehavior', 'courseBehavior2', '点击对话框-复制信息')
       const turndownService = new TurndownService();
       // 添加自定义规则来处理表格
       turndownService.addRule("table", {

+ 3 - 3
src/components/pages/aiEasy/evaList.vue

@@ -211,14 +211,14 @@ export default {
             if (type == 'elist') {
                 this.aiElist();
                 if(type == 1){
-                    this.$emit('addCourseBehavior','courseBehavior', `右键学历案-任务${this.itemTaskIndex + 1}-工具${this.toolIndex + 1}-评价设置-${(this.eList && this.eList.length) ? '重新生成评价' : '生成评价'}按钮`)
+                    this.$emit('addCourseBehavior','courseBehavior2', `右键学历案-任务${this.itemTaskIndex + 1}-工具${this.toolIndex + 1}-评价设置-${(this.eList && this.eList.length) ? '重新生成评价' : '生成评价'}按钮`)
                 }else{
-                    this.$emit('addCourseBehavior','courseBehavior', `右键学历案-任务${this.itemTaskIndex + 1}-任务${this.toolIndex + 1}-评价设置-${(this.eList && this.eList.length) ? '重新生成评价' : '生成评价'}按钮`)
+                    this.$emit('addCourseBehavior','courseBehavior2', `右键学历案-任务${this.itemTaskIndex + 1}-任务${this.toolIndex + 1}-评价设置-${(this.eList && this.eList.length) ? '重新生成评价' : '生成评价'}按钮`)
                 }
                 this.$emit('')
             } else if (type == 'rule') {
                 this.aiRule(index);
-                this.$emit('addCourseBehavior','courseBehavior', `右键学历案-任务${this.itemTaskIndex + 1}-任务${this.toolIndex + 1}-评价设置-评价${index + 1}-重新生成细则按钮`)
+                this.$emit('addCourseBehavior','courseBehavior2', `右键学历案-任务${this.itemTaskIndex + 1}-任务${this.toolIndex + 1}-评价设置-评价${index + 1}-重新生成细则按钮`)
             }
         },
         aiElist() {

+ 9 - 7
src/components/pages/aiEasy/templateDialog.vue

@@ -157,10 +157,11 @@ export default {
             )
                 .then(() => {
                     let params = [{
-                        id: id
+                        id: id,
+                        stand: 'cn'
                     }]
                     _this.ajax
-                        .post(_this.$store.state.api + "deleteTipsTemplate", params)
+                        .post(_this.$store.state.api + "deleteTipsTemplateE", params)
                         .then((res) => {
                             _this.$message.success("删除成功");
                             _this.getList()
@@ -183,10 +184,11 @@ export default {
                 oid: this.oid,
                 org: this.org,
                 type: this.tagIndex,
-                name: this.input2
+                name: this.input2,
+                stand: 'cn'
             }
             this.ajax
-                .get(this.$store.state.api + "selectTipsTemplate", params)
+                .get(this.$store.state.api + "selectTipsTemplateE", params)
                 .then((res) => {
                     this.loading = false
                     this.searchDataList = res.data[0]
@@ -210,8 +212,8 @@ export default {
 
 <style scoped>
 .addTemplateDialog>>>.el-dialog {
-    min-width: 1200px;
-
+    max-width: 100%;
+    margin-top: 8vh !important;
     height: 700px;
     box-shadow: 0px 0 8px 0px #555555;
     border-radius: 8px;
@@ -223,7 +225,7 @@ export default {
 
 .addTemplateDialog>>>.el-dialog__body {
     height: 100%;
-    min-width: 1200px;
+    max-width: 100%;
     flex-shrink: 0;
     box-sizing: border-box;
     padding-bottom: 50px;

+ 6 - 4
src/components/pages/aiEasy/tipsDialog.vue

@@ -156,10 +156,11 @@ export default {
                 json: JSON.stringify(this.aiJson),
                 o: this.radio,
                 uid: this.userid,
-                isT: this.isT
+                isT: this.isT,
+                stand: 'cn'
             }]
             this.ajax
-                .post(this.$store.state.api + "addTipsTemplate2", params)
+                .post(this.$store.state.api + "addTipsTemplate2E", params)
                 .then((res) => {
                     this.$message.success("保存成功");
                     console.log(res.data);
@@ -184,10 +185,11 @@ export default {
                 json: JSON.stringify(this.aiJson),
                 o: this.radio,
                 uid: this.templateid,
-                isT: this.isT
+                isT: this.isT,
+                stand: 'cn'
             }]
             this.ajax
-                .post(this.$store.state.api + "addTipsTemplate2", params)
+                .post(this.$store.state.api + "addTipsTemplate2E", params)
                 .then((res) => {
                     this.$message.success("修改成功");
                     if(type == 2){

+ 52 - 9
src/components/pages/course.vue

@@ -35,7 +35,7 @@
               
               <!-- v-show="org == '1973f6c7-1561-11ee-91d8-005056b86db5' || org == '777559d2-7239-11ee-b98c-005056b86db5' || org == '884c5665-a453-46f3-b7b6-01d575290aa9'" -->
               <div type="primary" @click="oepnTemplate()" v-show="orgArray.includes(org) || oidArray.includes(oid)">AI模式</div>
-              <div type="primary" @click="goToCourse6()" v-show="false">上课模式</div>
+              <!-- <div type="primary" @click="oepnTemplate2()" v-show="orgArray.includes(org) || oidArray.includes(oid)">上课模式</div> -->
               <!-- oepnTemplate2 -->
             </div>
           </button>
@@ -273,13 +273,6 @@
                 " @click="goToCourse6(item.courseId)">
 									<img src="../../assets/icon/course/edit.svg">
 								</div>
-                <div class="t_b_Item" v-if="((item.userid == userid) ||
-                (item.course_teacher &&
-                  item.course_teacher.indexOf(userid) !== -1) || role == '1') &&
-                item.state == 6
-                " @click="goToCourse3(item.courseId)">
-									<img src="../../assets/icon/course/edit.svg">
-								</div>
     					</el-tooltip>
 
 							<el-tooltip effect="dark" content="删除" placement="top" v-if="item.isCourseType == 1 || role == '1'">
@@ -415,6 +408,7 @@
     </el-dialog>
 		<shareDialog ref="shareDialogRef"/>
     <templateDialog :dialogVisibleTemplate.sync="dialogVisibleTemplate" :userid="userid" :org="org" :oid="oid" @goToCourseTemplate="goToCourseTemplate" @goToCourseTemplate2="goToCourseTemplate2"></templateDialog>
+    <templateDialogE :dialogVisibleTemplate.sync="dialogVisibleTemplate2" :userid="userid" :org="org" :oid="oid" @goToCourseTemplate="goToCourseTemplateE" @goToCourseTemplate2="goToCourseTemplate2E"></templateDialogE>
   </div>
 </template>
 
@@ -424,9 +418,10 @@ import EditorBar from "../../components/tools/wangEnduit";
 import CourseProblem from "./components/courseProblem";
 import shareDialog from './dialog/shareDialog.vue'
 import templateDialog from "./aiAddCourse/templateDialog.vue";
+import templateDialogE from "./aiEasy/templateDialog.vue";
 
 export default {
-  components: { EditorBar, CourseProblem,shareDialog,templateDialog },
+  components: { EditorBar, CourseProblem,shareDialog,templateDialog,templateDialogE },
   data() {
     return {
       itemCount: 1,
@@ -478,6 +473,7 @@ export default {
       pTypeCheckName: [],
       btnDisplay: false,
       dialogVisibleTemplate: false,
+      dialogVisibleTemplate2: false,
       orgArray:[],
       oidArray:[]
     };
@@ -640,6 +636,9 @@ export default {
       // this.goToCourseTemplate('');
       this.dialogVisibleTemplate = true;
     },
+    oepnTemplate2(){
+      this.dialogVisibleTemplate2 = true;
+    },
     goToCourseTemplate(tid){
       this.$router.push(
           "/aiAddCourse?userid=" +
@@ -712,6 +711,50 @@ export default {
       }
       // this.$router.push(path);
     },
+    goToCourseTemplateE(tid){
+      this.$router.push(
+          "/addCourseEAi?userid=" +
+          this.userid +
+          "&oid=" +
+          this.oid +
+          "&org=" +
+          this.org +
+          "&role=" +
+          this.role +
+          "&templateid=" +
+          tid 
+        );
+    },
+    goToCourseTemplate2E(tid){
+      if(tid){
+        this.$router.push(
+          "/addCourseEAi?userid=" +
+          this.userid +
+          "&oid=" +
+          this.oid +
+          "&org=" +
+          this.org +
+          "&role=" +
+          this.role +
+          "&templateid=" +
+          tid +
+          "&istemplate=1"
+        );
+      }else{
+        this.$router.push(
+          "/addCourseEAi?userid=" +
+          this.userid +
+          "&oid=" +
+          this.oid +
+          "&org=" +
+          this.org +
+          "&role=" +
+          this.role +
+          "&templateid=" +
+          "&istemplate=1"
+        );
+      }
+    },
     goToCourse6(courseId){
       if (courseId) {
         this.$router.push(

部分文件因为文件数量过多而无法显示