Home Explore Help
Sign In
CocoRoboLabs
/
pbl-teacher-table
3
0
Fork 0
Files Issues 0 Pull Requests 0 Wiki
Browse Source

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

SanHQin 10 months ago
parent
a29b7ab566 84afc4099f
commit
9c612b1cdc
16 changed files with 451 additions and 5 deletions
Split View Show Diff Stats
  1. 1 1
      dist/index.html
  2. 0 0
      dist/static/css/app.2cea4e38ca8015c61b8487e1459a8bf2.css
  3. 0 0
      dist/static/css/app.2cea4e38ca8015c61b8487e1459a8bf2.css.map
  4. 0 0
      dist/static/js/app.0506704538bc504fc530.js
  5. 0 0
      dist/static/js/app.0506704538bc504fc530.js.map
  6. 0 0
      dist/static/js/manifest.571c38d63f24b1ae9e16.js.map
  7. 3 2
      src/components/pages/pblCourse/component/chatArea.vue
  8. 1 1
      src/components/pages/pblCourse/guide.vue
  9. 23 1
      src/components/pages/test/add/components/checkOrder.vue
  10. 192 0
      src/components/pages/test/add/components/timeBox/index.vue
  11. 98 0
      src/components/pages/test/add/components/timeBox/time.vue
  12. 6 0
      src/components/pages/test/add/edit/check/index.vue
  13. 102 0
      src/components/pages/test/add/edit/check/time.vue
  14. 10 0
      src/components/pages/test/add/edit/edit/index.vue
  15. 5 0
      src/components/pages/test/add/minxins/minxin.js
  16. 10 0
      src/components/pages/test/add/setInfo/manualCreated.vue

+ 1 - 1
dist/index.html
View File 

@@ -32,7 +32,7 @@
 
       width: 100%;
 
       background: #e6eaf0;
 
       font-family: '黑体';
 
-    }</style><link href=./static/css/app.fa9ca7af5700aebb132ee64a5050866c.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.3cd0a0187ca1f70ded67.js></script><script type=text/javascript src=./static/js/app.1425c86d4c72b2ce0153.js></script></body></html><script>function stopSafari() {
 
+    }</style><link href=./static/css/app.2cea4e38ca8015c61b8487e1459a8bf2.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.3cd0a0187ca1f70ded67.js></script><script type=text/javascript src=./static/js/app.0506704538bc504fc530.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.2cea4e38ca8015c61b8487e1459a8bf2.css


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


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


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


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


+ 3 - 2
src/components/pages/pblCourse/component/chatArea.vue
View File 

@@ -118,6 +118,7 @@ export default {
 
 			loading: false,
 
 			chatLoading:false,
 
 			userId:this.$route.query['userid'],
 
+			cid: this.$route.query.cid,
 
 			chatList: [],
 
 			textValue: "",
 
 		};
 
@@ -269,7 +270,7 @@ export default {
 
 				alltext: _data.aiContent,
 
 				type: "chat",
 
 				filename: _data.filename,
 
-				session_name: `${this.userId}-pblCourse`,
 
+				session_name: `${this.userId}-${this.cid}-pblCourse`,
 
 			};
 
 			this.ajax
 
 				.post("https://gpt4.cocorobo.cn/insert_chat", params)
 
@@ -287,7 +288,7 @@ export default {
 
 					userid: this.userId,
 
 					groupid: "602def61-005d-11ee-91d8-005056b8q12w",
 
 					// session_name:``
 
-					session_name: `${this.userId}-pblCourse`,
 
+					session_name: `${this.userId}-${this.cid}-pblCourse`,
 
 				};
 
 				this.ajax
 
 					.post("https://gpt4.cocorobo.cn/get_agent_park_chat", params)

+ 1 - 1
src/components/pages/pblCourse/guide.vue
View File 

@@ -296,7 +296,7 @@ export default {
 
       if (this.proType == "") {
 
         this.$message({
 
           type: "error",
 
-          message: "请选择项目选题"
 
+          message: "请输入项目选题"
 
         });
 
         return;
 
       }

+ 23 - 1
src/components/pages/test/add/components/checkOrder.vue
View File 

@@ -105,6 +105,12 @@
 
                                         :cJson="cJson" @setJson="setJson">
 
                                     </evaDialog>
 
                                 </div>
 
+                                <div v-if="item3.type == 8">
 
+                                    <timeX :cJson="item3.json"></timeX>
 
+                                    <timeDialog v-if="item3.type == 8 && checkC === `x${index1}-${index2}-${index3}`"
 
+                                        :cJson="cJson" @setJson="setJson">
 
+                                    </timeDialog>
 
+                                </div>
 
                             </div>
 
                         </div>
 
                     </div>
 
@@ -135,6 +141,11 @@
 
                             <evaDialog v-if="item2.type == 7 && checkC === `x${index1}-${index2}`" :cJson="cJson"
 
                                 @setJson="setJson"></evaDialog>
 
                         </div>
 
+                        <div v-else-if="item2.type == 8">
 
+                            <timeX :cJson="item2.json"></timeX>
 
+                            <timeDialog v-if="item2.type == 8 && checkC === `x${index1}-${index2}`" :cJson="cJson"
 
+                                @setJson="setJson"></timeDialog>
 
+                        </div>
 
                     </div>
 
                 </div>
 
             </div>
 
@@ -164,6 +175,11 @@
 
                     <evaDialog v-if="item1.type == 7 && checkC === `x${index1}`" :cJson="cJson" @setJson="setJson">
 
                     </evaDialog>
 
                 </div>
 
+                <div v-else-if="item1.type == 8">
 
+                    <timeX :cJson="item1.json"></timeX>
 
+                    <timeDialog v-if="item1.type == 8 && checkC === `x${index1}`" :cJson="cJson" @setJson="setJson">
 
+                    </timeDialog>
 
+                </div>
 
             </div>
 
         </div>
 
         <el-dialog title="修改名称" :visible.sync="groupDaliog" :append-to-body="true" width="500px"
 
@@ -199,6 +215,8 @@ import courseDialog from './course/index.vue'
 
 import courseX from './course/course.vue'
 
 import evaDialog from './evaBox/index.vue'
 
 import evaX from './evaBox/eva.vue'
 
+import timeDialog from './timeBox/index.vue'
 
+import timeX from './timeBox/time.vue'
 
 export default {
 
     mixins: [minxinVue],
 
     components: {
 
@@ -212,6 +230,8 @@ export default {
 
         courseX,
 
         evaDialog,
 
         evaX,
 
+        timeDialog,
 
+        timeX
 
     },
 
     props: {
 
         checkJson: {
 
@@ -232,7 +252,7 @@ export default {
 
         return {
 
             manualJson: [],
 
             isdrag: "",
 
-            canEdit: [1, 3, 5, 6, 7],
 
+            canEdit: [1, 3, 5, 6, 7, 8],
 
             ctype: "",
 
             dragType: "",
 
             oldIndex: "",
 
@@ -265,6 +285,8 @@ export default {
 
                         className += " test_course_file"
 
                     } else if (item.type == 7) {
 
                         className += " test_eva_file"
 
+                    } else if (item.type == 8) {
 
+                        className += " test_icon_time"
 
                     }
 
                     return index + 1 + "、" + (item.json && this.etype != 'edit' ? `<span class='${className}'></span>` : `<span class='${className}'></span>` + this.options2[item.type]) + (item.json && this.etype != 'edit' ? `${item.json.title}` : "");
 
                 } else if (item.ttype == 2) {

+ 192 - 0
src/components/pages/test/add/components/timeBox/index.vue
View File 

@@ -0,0 +1,192 @@
 
+<template>
 
+    <div class="choice_box jiao" @click.stop="">
 
+        <!-- <div class="title">设置附件</div> -->
 
+        <div class="box">
 
+            <div class="set_title">
 
+                <span>表单问题：</span>
 
+                <textarea v-autoHeight="68" rows="2" class="binfo_input binfo_textarea" cols v-model="checkJson.title"
 
+                    placeholder=""></textarea>
 
+            </div>
 
+            <div class="set_title">
 
+                <span>问题描述：</span>
 
+                <textarea v-autoHeight="68" rows="2" class="binfo_input binfo_textarea" cols v-model="checkJson.detail"
 
+                    placeholder="请输入描述"></textarea>
 
+            </div>
 
+        </div>
 
+    </div>
 
+</template>
 
+
 
+<script>
 
+// import EditorBar from "../../../../../tools/wangEnduit";
 
+export default {
 
+    components: {
 
+        // EditorBar,
 
+    },
 
+    props: {
 
+        cJson: {
 
+            type: Object,
 
+        },
 
+    },
 
+    data() {
 
+        return {
 
+            ctype: 1,
 
+            options: [
 
+                { type: 1, name: '附件' },
 
+                // { type: 2, name: '多选题' }
 
+            ],
 
+            checkJson: {}
 
+        }
 
+    },
 
+    directives: {
 
+        autoHeight: {
 
+            update(el, binding) {
 
+                const { value } = binding
 
+                if (value && typeof value === 'number') {
 
+                    el.style.height = `${value}px`
 
+                } else {
 
+                    el.style.height = 'auto'
 
+                }
 
+            },
 
+            componentUpdated(el) {
 
+                el.style.height = `${el.scrollHeight + 5}px`
 
+            },
 
+        },
 
+    },
 
+    watch: {
 
+        checkJson: {
 
+            handler(newVal) {
 
+                this.$emit("setJson", newVal)
 
+            },
 
+            deep: true
 
+        }
 
+    },
 
+    methods: {
 
+        depthCopy(s) {
 
+            return JSON.parse(JSON.stringify(s));
 
+        },
 
+        changeAnswer() {
 
+            this.checkJson.answer = []
 
+        },
 
+        change(val) {
 
+            this.checkJson.title = val
 
+            this.$forceUpdate();
 
+            console.log(val);
 
+        },
 
+
 
+    },
 
+    mounted() {
 
+        console.log(1);
 
+        // console.log(this.cJson);
 
+        if (!this.cJson) {
 
+            this.checkJson = {
 
+                title: "标题",
 
+                detail: "",
 
+            };
 
+        } else {
 
+            this.checkJson = this.depthCopy(this.cJson);
 
+        }
 
+
 
+    },
 
+}
 
+</script>
 
+
 
+<style scoped>
 
+.choice_box {
 
+    margin-top: 10px;
 
+    width: 100%;
 
+    background: #f5f6f7;
 
+    padding: 10px 10px 10px 36px;
 
+    box-sizing: border-box;
 
+    position: relative;
 
+}
 
+
 
+.choice_box>.box {}
 
+
 
+.set_type {
 
+    margin-top: 10px;
 
+    display: flex;
 
+    align-items: center;
 
+}
 
+
 
+.set_title {
 
+    margin-top: 10px;
 
+    display: flex;
 
+    align-items: flex-start;
 
+    /* flex-direction: column; */
 
+}
 
+
 
+.set_type>span,
 
+.set_title>span {
 
+    min-width: fit-content;
 
+    font-size: 15px;
 
+    min-width: 90px;
 
+    text-align: right;
 
+}
 
+
 
+.set_options {
 
+    margin-top: 10px;
 
+}
 
+
 
+.set_options>.title {
 
+    font-size: 15px;
 
+}
 
+
 
+.xuan_body {
 
+    margin-top: 10px;
 
+    font-size: 14px;
 
+}
 
+
 
+.binfo_input {
 
+    width: 100%;
 
+    margin: 0;
 
+    padding: 12px 14px;
 
+    display: block;
 
+    min-width: 0;
 
+    outline: none;
 
+    box-sizing: border-box;
 
+    background: none;
 
+    border: none;
 
+    border-radius: 4px;
 
+    background: #fff;
 
+    font-size: 16px;
 
+    resize: none;
 
+    font-family: 'Microsoft YaHei';
 
+    min-height: 48px;
 
+    /* border: 1px solid #3682fc00; */
 
+    border: 1px solid #CAD1DC;
 
+}
 
+
 
+.binfo_textarea {
 
+    border: 1px solid #CAD1DC;
 
+    font-size: 16px;
 
+    resize: none;
 
+    /* background: #f6f6f6; */
 
+    font-family: 'Microsoft YaHei';
 
+}
 
+
 
+.binfo_input:focus-visible {
 
+    border: 1px solid #3681FC !important;
 
+}
 
+
 
+
 
+.set_title > .number{
 
+    display: flex;
 
+    align-items: center;
 
+}
 
+
 
+.set_title > .number > span{
 
+    margin: 0 10px;
 
+}
 
+/* .jiao::before{
 
+    content: '';
 
+    position: absolute;
 
+    width: 0px;
 
+    height: 0px;
 
+    top: -20px;
 
+    left: 15px;
 
+    border-left: 12px solid transparent;
 
+    border-right: 12px solid transparent;
 
+    border-bottom: 10px solid #f6f6f6;
 
+    border-top: 10px solid transparent;
 
+} */
 
+</style>

+ 98 - 0
src/components/pages/test/add/components/timeBox/time.vue
View File 

@@ -0,0 +1,98 @@
 
+<template>
 
+    <div class="c_box">
 
+        <div class="mask"></div>
 
+        <div class="choice_box">
 
+            <div class="title" style="display: flex;">
 
+                <span>{{cJson.title }}</span>
 
+            </div>
 
+            <div class="detail" v-if="cJson.detail">{{ cJson.detail }}</div>
 
+        </div>
 
+    </div>
 
+</template>
 
+
 
+<script>
 
+export default {
 
+    props: {
 
+        cJson: {
 
+            type: Object,
 
+        },
 
+    },
 
+    data() {
 
+        return {
 
+            option: {
 
+                1: { name: '附件' },
 
+                // 2: { name: '多选题' }
 
+            }
 
+        }
 
+    },
 
+}
 
+</script>
 
+
 
+<style scoped>
 
+.c_box {
 
+    width: calc(100% - 20px);
 
+    position: relative;
 
+    margin: 0 auto;
 
+    padding-left: 26px;
 
+    box-sizing: border-box;
 
+}
 
+
 
+.mask {
 
+    position: absolute;
 
+    height: 100%;
 
+    width: 100%;
 
+    z-index: 2;
 
+}
 
+
 
+.choice_box {
 
+    white-space: pre-line;
 
+}
 
+
 
+.choice_box>.title {
 
+    font-weight: bold;
 
+    width: 100%;
 
+    word-break: break-all;
 
+}
 
+
 
+.choice_box>.detail {
 
+    width: 100%;
 
+    word-break: break-all;
 
+    color: rgb(136, 139, 146);
 
+    margin: 10px 0 0;
 
+}
 
+
 
+.choice_box>.choices {
 
+    margin-top: 10px;
 
+}
 
+
 
+.binfo_input {
 
+    width: 100%;
 
+    margin: 0;
 
+    padding: 10px;
 
+    display: block;
 
+    min-width: 0;
 
+    outline: none;
 
+    box-sizing: border-box;
 
+    background: none;
 
+    border: none;
 
+    border-radius: 5px;
 
+    background: #fff;
 
+    font-size: 16px;
 
+    resize: none;
 
+    font-family: 'Microsoft YaHei';
 
+    min-height: 120px;
 
+    /* border: 1px solid #3682fc00; */
 
+    border: 1.5px solid #e0e0e0;
 
+}
 
+
 
+.binfo_input>div {
 
+    border: 1.5px dashed #dfdfdf;
 
+    height: 120px;
 
+    width: 100%;
 
+    display: flex;
 
+    align-items: center;
 
+    justify-content: center;
 
+    background: rgb(249, 250, 251);
 
+    color: rgb(124, 124, 124);
 
+    border-radius: 5px;
 
+}</style>

+ 6 - 0
src/components/pages/test/add/edit/check/index.vue
View File 

@@ -12,6 +12,7 @@
 
             <fileV :tindex="index" :cJson.sync="item.json" v-if="item.type == 5"></fileV>
 
             <courseV :tindex="index" :cJson.sync="item.json" v-if="item.type == 6"></courseV>
 
             <evaV :tindex="index" :cJson.sync="item.json" v-if="item.type == 7"></evaV>
 
+            <timeV :tindex="index" :cJson.sync="item.json" v-if="item.type == 8"></timeV>
 
             <span v-else>暂未设置题目</span>
 
           </div>
 
           <div v-for="(item2, index2) in item.array" :key="`${index}-${index2}`" class="check_box_xia">
 
@@ -22,6 +23,7 @@
 
               <fileV :tindex="index2" :cJson.sync="item2.json" v-if="item2.type == 5"></fileV>
 
               <courseV :tindex="index2" :cJson.sync="item2.json" v-if="item2.type == 6"></courseV>
 
               <evaV :tindex="index2" :cJson.sync="item2.json" v-if="item2.type == 7"></evaV>
 
+              <timeV :tindex="index2" :cJson.sync="item2.json" v-if="item2.type == 8"></timeV>
 
               <!-- <span v-else>暂未设置题目</span> -->
 
             </div>
 
           </div>
 
@@ -36,6 +38,7 @@
 
             <fileV :tindex="index" :cJson.sync="item.json" v-if="item.type == 5"></fileV>
 
             <courseV :tindex="index" :cJson.sync="item.json" v-if="item.type == 6"></courseV>
 
             <evaV :tindex="index" :cJson.sync="item.json" v-if="item.type == 7"></evaV>
 
+            <timeV :tindex="index" :cJson.sync="item.json" v-if="item.type == 8"></timeV>
 
             <!-- <span v-else>暂未设置题目</span> -->
 
           </div>
 
           <div v-for="(item2, index2) in item.array" :key="`${index}-${index2}`" class="check_box_xia">
 
@@ -46,6 +49,7 @@
 
               <fileV :tindex="index2" :cJson.sync="item2.json" v-if="item2.type == 5"></fileV>
 
               <courseV :tindex="index2" :cJson.sync="item2.json" v-if="item2.type == 6"></courseV>
 
               <evaV :tindex="index2" :cJson.sync="item2.json" v-if="item2.type == 7"></evaV>
 
+              <timeV :tindex="index2" :cJson.sync="item2.json" v-if="item2.type == 8"></timeV>
 
               <!-- <span v-else>暂未设置题目</span> -->
 
             </div>
 
           </div>
 
@@ -68,6 +72,7 @@ import gapV from './gap.vue';
 
 import fileV from './file.vue';
 
 import courseV from './course.vue';
 
 import evaV from './eva.vue';
 
+import timeV from './time.vue';
 
 export default {
 
   props: {
 
     cJson: {
 
@@ -83,6 +88,7 @@ export default {
 
     fileV,
 
     courseV,
 
     evaV,
 
+    timeV
 
   },
 
   data() {
 
     return {

+ 102 - 0
src/components/pages/test/add/edit/check/time.vue
View File 

@@ -0,0 +1,102 @@
 
+<template>
 
+    <div class="c_box">
 
+        <div class="choice_box">
 
+            <div class="title" style="display: flex;">
 
+                <span style="min-width: fit-content;">{{ tindex + 1 + "、" }}</span>
 
+                <span>{{ checkJson.title }}</span>
 
+            </div>
 
+            <div class="detail" v-if="checkJson.detail" v-html="checkJson.detail"
 
+                style="color: #00000099;margin-top: 5px;">
 
+            </div>
 
+            <div style="margin-top: 10px;">
 
+                <el-date-picker
 
+                    v-model="checkJson.answer2"
 
+                    type="date"
 
+                    format="yyyy 年 MM 月 dd 日"
 
+                    value-format="yyyy年MM月dd日"
 
+                    placeholder="年/月/日">
 
+                </el-date-picker>
 
+            </div>
 
+        </div>
 
+    </div>
 
+</template>
 
+
 
+<script>
 
+
 
+export default {
 
+    props: {
 
+        tindex: {
 
+            type: Number
 
+        },
 
+        cJson: {
 
+            type: Object,
 
+        },
 
+        checktype: {
 
+            type: Number,
 
+            default: 1
 
+        },
 
+        see: {
 
+            type: Boolean,
 
+            default: false
 
+        }
 
+    },
 
+    data() {
 
+        return {
 
+            option: {
 
+                1: { name: '附件' },
 
+            },
 
+            userid: this.$route.query.userid,
 
+            checkJson: undefined,
 
+            progress: 0,
 
+            isFinishSize: 0,
 
+            proVisible: false,
 
+            isAllSize: 0,
 
+            wurl: "",
 
+            isTong: false
 
+        }
 
+    },
 
+    watch: {
 
+        checkJson: {
 
+            handler(newValue) {
 
+                this.$emit('update:cJson', newValue)
 
+            },
 
+            deep: true
 
+        },
 
+    },
 
+    methods: {
 
+        depthCopy(s) {
 
+            return JSON.parse(JSON.stringify(s));
 
+        },
 
+    },
 
+    mounted() {
 
+        this.checkJson = this.cJson ? this.depthCopy(this.cJson) : undefined
 
+
 
+    }
 
+}
 
+</script>
 
+
 
+<style scoped>
 
+.c_box {
 
+    width: 100%;
 
+    position: relative;
 
+}
 
+
 
+/* .mask {
 
+    position: absolute;
 
+    height: 100%;
 
+    width: 100%;
 
+    z-index: 2;
 
+} */
 
+
 
+.choice_box {
 
+    white-space: pre-line;
 
+}
 
+
 
+.choice_box>.title {
 
+    font-weight: bold;
 
+    width: 100%;
 
+    word-break: break-all;
 
+}
 
+
 
+
 
+</style>

+ 10 - 0
src/components/pages/test/add/edit/edit/index.vue
View File 

@@ -245,6 +245,11 @@ export default {
 
             small: 0,
 
             big: 10,
 
           };
 
+        } else if (topicType == 8) {
 
+          json.json = {
 
+            title: "标题",
 
+            detail: "",
 
+          };
 
         }
 
         if (_json.array) {
 
           if (type == 3 && _check.length == 2) {
 
@@ -326,6 +331,11 @@ export default {
 
               small: 0,
 
               big: 10,
 
             };
 
+          } else if (topicType == 8) {
 
+            json1.json = {
 
+              title: "标题",
 
+              detail: "",
 
+            };
 
           }
 
           this.manualJson.push(json1);
 
           this.$forceUpdate()

+ 5 - 0
src/components/pages/test/add/minxins/minxin.js
View File 

@@ -30,6 +30,10 @@ const minxin = {
 
           value: 7,
 
           label: "评分"
 
         },
 
+        // {
 
+        //   value: 8,
 
+        //   label: "时间"
 
+        // },
 
       ],
 
       optionsPin:[
 
        {
 
@@ -45,6 +49,7 @@ const minxin = {
 
         5: "附件",
 
         6: "课程",
 
         7: "评分",
 
+        8: "时间",
 
       },
 
       buttonOptions: [
 
         { name: "分组", type: 1 },

+ 10 - 0
src/components/pages/test/add/setInfo/manualCreated.vue
View File 

@@ -208,6 +208,11 @@ export default {
 
             small: 0,
 
             big: 10,
 
           };
 
+        } else if (this.topicType == 8) {
 
+          json.json = {
 
+            title: "标题",
 
+            detail: "",
 
+          };
 
         }
 
         if (_json.array) {
 
           if (type == 3 && _check.length == 2) {
 
@@ -305,6 +310,11 @@ export default {
 
                 small: 0,
 
                 big: 10,
 
               };
 
+            } else if (this.topicType == 8) {
 
+              json1.json = {
 
+                title: "标题",
 
+                detail: "",
 
+              };
 
             }
 
             this.checkJson.push(json1);
 
           }

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