Home Esplora Aiuto
Accedi
CocoRoboLabs
/
pbl-teacher-table
3
0
Forka 0
File Problemi 0 Pull Requests 0 Wiki
Sfoglia il codice sorgente

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

lsc 4 giorni fa
parent
cb0a07047f 7762e8e279
commit
8f7037607a
10 ha cambiato i file con 117 aggiunte e 130 eliminazioni
Visualizzazione separata Mostra Diff Stats
  1. 1 1
      dist/index.html
  2. 0 0
      dist/static/css/app.4a4e4a545517c810d085418a3ba123ce.css
  3. 0 0
      dist/static/css/app.4a4e4a545517c810d085418a3ba123ce.css.map
  4. 0 0
      dist/static/js/app.d616fe0a302b735045e5.js
  5. 0 0
      dist/static/js/app.d616fe0a302b735045e5.js.map
  6. 0 0
      dist/static/js/manifest.161e82026ac2ae03ab6f.js.map
  7. 58 61
      src/components/pages/sassPlatform/view/tableView.vue
  8. 41 63
      src/components/pages/test/checkAi/aiLeader.vue
  9. 1 0
      src/components/pages/test/smarter.vue
  10. 16 5
      src/components/pages/testPerson/test/test.vue

+ 1 - 1
dist/index.html
Vedi File 

@@ -32,7 +32,7 @@
 
       width: 100%;
 
       background: #e6eaf0;
 
       font-family: '黑体';
 
-    }</style><link href=./static/css/app.dc0dc652867efcbce5d144fc927474c5.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.c046dd5e92c8da101466.js></script><script type=text/javascript src=./static/js/app.33b6b4cd5c2722ad925d.js></script></body></html><script>function stopSafari() {
 
+    }</style><link href=./static/css/app.4a4e4a545517c810d085418a3ba123ce.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.c046dd5e92c8da101466.js></script><script type=text/javascript src=./static/js/app.d616fe0a302b735045e5.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.4a4e4a545517c810d085418a3ba123ce.css


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


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


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


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


+ 58 - 61
src/components/pages/sassPlatform/view/tableView.vue
Vedi File 

@@ -44,13 +44,27 @@
 
         ></el-table-column>
 
         <el-table-column prop="title" width="400" label="表单名称">
 
         </el-table-column>
 
-        <el-table-column prop="typeN" width="200" label="所属栏目">
 
+        <el-table-column prop="typeN" width="200" :filters="typeFilterList" :filter-method="typeFilterFn" label="所属栏目">
 
         </el-table-column>
 
         <el-table-column
 
           prop="uname"
 
           width="150"
 
           label="创建人"
 
-        ></el-table-column>
 
+        >
 
+        <template slot="header" slot-scope="scope">
 
+          <div class="creator_column">
 
+            <el-dropdown trigger="click" @command="creatorFilterFn">
 
+              <span class="creator_column_span">
 
+                创建人<i class="el-icon-caret-bottom el-icon--right"></i>
 
+              </span>
 
+              <el-dropdown-menu slot="dropdown">
 
+                <el-dropdown-item v-for="item in creatorFilterList" :key="item.value" :command="item.value">{{ item.text }}</el-dropdown-item>
 
+              </el-dropdown-menu>
 
+            </el-dropdown>
 
+
 
+          </div>
 
+        </template>
 
+      </el-table-column>
 
         <el-table-column prop="look" width="150" label="表单状态">
 
           <template slot-scope="scope">
 
             <span>{{ getLook(scope.row) }}</span>
 
@@ -59,6 +73,7 @@
 
         <el-table-column
 
           prop="worksCount"
 
           width="150"
 
+          sortable
 
           label="提交数量"
 
         ></el-table-column>
 
         <el-table-column fixed="right" label="操作" min-width="300">
 
@@ -142,54 +157,6 @@
 
               />
 
             </el-tooltip>
 
            </div>
 
-            <!--<el-button
 
-              type="text"
 
-              size="small"
 
-              @click="editForm(scope.row)"
 
-              v-if="
 
-                scope.row.userid == userId ||
 
-                  (scope.row.course_teacher &&
 
-                    scope.row.course_teacher.indexOf(userId) !== -1) ||
 
-                  role == '1'
 
-              "
 
-              >编辑</el-button
 
-            >
 
-            <el-button
 
-              type="text"
 
-              size="small"
 
-              @click="checkForm(scope.row.courseId)"
 
-              >查看</el-button
 
-            >
 
-            <el-button
 
-              type="text"
 
-              size="small"
 
-              @click="copyForm(scope.row.courseId)"
 
-              >复制</el-button
 
-            >
 
-            <el-button
 
-              @click="warnForm(scope.row)"
 
-              type="text"
 
-              size="small"
 
-              v-if="
 
-                scope.row.userid == userId ||
 
-                  (scope.row.course_teacher &&
 
-                    scope.row.course_teacher.indexOf(userId) !== -1) ||
 
-                  role == '1'
 
-              "
 
-              >提醒</el-button
 
-            >
 
-            <el-button
 
-              type="text"
 
-              size="small"
 
-              @click="deleteForm(scope.row.courseId)"
 
-              v-if="
 
-                scope.row.userid == userId ||
 
-                  (scope.row.course_teacher &&
 
-                    scope.row.course_teacher.indexOf(userId) !== -1) ||
 
-                  role == '1'
 
-              "
 
-              >删除</el-button
 
-            >-->
 
           </template>
 
         </el-table-column>
 
       </el-table>
 
@@ -231,16 +198,6 @@
 
             {{ getTType(item.id, scope.row.cclassid) }}
 
           </template>
 
         </el-table-column>
 
-        <!-- <el-table-column
 
-          prop="class"
 
-          width="200"
 
-          label="年级"
 
-        ></el-table-column>
 
-        <el-table-column
 
-          prop="teachingAge"
 
-          width="200"
 
-          label="教龄"
 
-        ></el-table-column> -->
 
         <el-table-column
 
           prop="worksCount"
 
           width="200"
 
@@ -304,7 +261,14 @@ export default {
 
       role: this.$route.query.role,
 
       tableLoading: false,
 
       teaType: [],
 
-      loading: false
 
+      loading: false,
 
+      creatorFilterList:[{
 
+        text:"我的",
 
+        value:0,
 
+      },{
 
+        text:"所有人",
 
+        value:4
 
+      }],
 
     };
 
   },
 
   computed: {
 
@@ -390,6 +354,27 @@ export default {
 
             }))
 
           : null;
 
       };
 
+    },
 
+    typeFilterList(){
 
+      let _result = [];
 
+
 
+      if(this.typeList.length){
 
+        _result = this.typeList.map(i=>{
 
+          let _list = [];
 
+          if(i.pidList){
 
+            _list = i.pidList.split(",")
 
+          }
 
+          _list.push(i.id);
 
+
 
+          return {
 
+            text:i.name,
 
+            value:_list.join(',')
 
+          }
 
+        })
 
+      }
 
+
 
+      return _result;
 
+
 
     }
 
   },
 
   watch: {
 
@@ -483,6 +468,13 @@ export default {
 
     filterTType(value, row, index) {
 
       return row.cclassid && row.cclassid.indexOf(value) != -1;
 
     },
 
+    typeFilterFn(value,row){
 
+      return row.typeid && value.indexOf(row.typeid)!=-1;
 
+    },
 
+    creatorFilterFn(value){
 
+      this.displayRange = value;
 
+      this.getData();
 
+    },
 
     checkPerson(uid) {
 
       this.$router.push(
 
         "/checkToTest2?uid=" +
 
@@ -698,4 +690,9 @@ export default {
 
   margin-right: 25px;
 
   cursor: pointer;
 
 }
 
+
 
+.creator_column_span{
 
+  cursor: pointer;
 
+  color: #909399;
 
+}
 
 </style>

+ 41 - 63
src/components/pages/test/checkAi/aiLeader.vue
Vedi File 

@@ -421,13 +421,12 @@
 
           </svg>
 
           <span>清屏</span>
 
         </span>
 
-        <span
 
-          class="clear"
 
-          @click.stop="showjList = !showjList"
 
-          v-if="jArray.length"
 
-        >
 
-          <span>查看</span>
 
-        </span>
 
+        <span class="switchBtn">
 
+					<span>连续对话</span>
 
+					<el-switch
 
+				  v-model="continuousDialogue">
 
+				</el-switch>
 
+				</span>
 
         <!-- <div style="margin-left: auto;">
 
           <el-switch v-model="continuous"></el-switch>
 
           <span @click.stop="continuous = !continuous">连续对话</span>
 
@@ -823,6 +822,7 @@ export default {
 
       hasGeneratedGuess: false,
 
       showPopoverUid: null,
 
       curRequestController:null,
 
+      continuousDialogue:true,
 
     };
 
   },
 
   watch: {
 
@@ -1401,62 +1401,22 @@ ${fileText}
 
           loading: true
 
         });
 
 
-        // let history = [];
 
-        // if (this.continuous) {
 
-        //   this.array.forEach((i, index) => {
 
-        //     if (i.content) history.push({ role: "user", content: index == this.array.length - 1 ? message : i.content });
 
-        //     if (i.aiContent)
 
-        //       history.push({ role: "assistant", content: i.aiContent });
 
-        //   });
 
-        // } else {
 
-        //   history.push({ role: "user", content: message });
 
-        // }
 
-        // history = history.filter(
 
-        //   i =>
 
-        //     i.content !=
 
-        //     "您好，我是您的助手小可"
 
-        // );
 
-
 
-        // history = history.map(i => ({
 
-        //   role: i.role,
 
-        //   content: `${i.content}`
 
-        // }));
 
-        // this.$nextTick(() => {
 
-        //   this.$refs.chatDialog.scrollTop = this.$refs.chatDialog.scrollHeight;
 
-        // });
 
-        // let params = JSON.stringify({
 
-        //   // model: "gpt-3.5-turbo",
 
-        //   // model: "gpt-4o-mini",
 
-        //   model: "qwen-plus",
 
-        //   temperature: 0,
 
-        //   max_tokens: 4096,
 
-        //   top_p: 1,
 
-        //   frequency_penalty: 0,
 
-        //   presence_penalty: 0,
 
-        //   messages: history,
 
-        //   uid: _uuid,
 
-        //   mind_map_question: ""
 
-        // });
 
-        // this.courseText = "";
 
-
 
-        // this.ajax
 
-        //   .post("https://gpt4.cocorobo.cn/chat", params)
 
-        //   .then(res => {
 
-        //     if (
 
-        //       converter(res.data.FunctionResponse.result) ==
 
-        //       converter("发送成功")
 
-        //     ) {
 
-        //     } else {
 
-        //       this.$message.warning(res.data.FunctionResponse.result);
 
-        //     }
 
-        //   })
 
-        //   .catch(e => {
 
-        //     console.log(e);
 
-        //   });
 
-        // this.getAiContent(_uuid);\
 
+        let _history = [];
 
+
 
+        if(this.continuousDialogue){
 
+          this.array.forEach(i=>{
 
+            _history.push({
 
+              role: "user", content: i.content
 
+            },{
 
+              role: "assistant", content: i.aiContent
 
+            })
 
+          })
 
+        }
 
+
 
+
 
         let params = {
 
           prompt: message,
 
-          messages: [],
 
+          messages: _history,
 
           file: this.fileList ? this.fileList : []
 
         };
 
         this.stopTalkToken = this.ajax.setCancelSource();
 
@@ -1552,9 +1512,26 @@ ${fileText}
 
           loading: true
 
         });
 
 
+        let _history = [];
 
+
 
+        if(this.continuousDialogue){
 
+          this.array.forEach(i=>{
 
+            _history.push({
 
+              role: "user", content: i.content
 
+            },{
 
+              role: "assistant", content: i.aiContent
 
+            })
 
+          })
 
+
 
+          _history.pop();
 
+          _history.pop();
 
+        }
 
+
 
+
 
+
 
         let params = {
 
           prompt: message,
 
-          messages: [],
 
+          messages: _history,
 
           file: this.fileList ? this.fileList : []
 
         };
 
         this.stopTalkToken = this.ajax.setCancelSource();
 
@@ -2888,7 +2865,8 @@ ${_echartsType[type].text}
 
   bottom: calc(100% + 5px);
 
   height: 30px;
 
   display: flex;
 
-  /* justify-content: space-between; */
 
+  justify-content: space-between;
 
+	align-items: center;
 
 }
 
 
 .ai_b_i_btnArea > div {

+ 1 - 0
src/components/pages/test/smarter.vue
Vedi File 

@@ -1176,6 +1176,7 @@ p.docx-num-1-0 {
 
     width: 50%;
 
     height: 100%;
 
     box-sizing: border-box;
 
+		overflow: auto;
 
 }
 
 
 .preview_file,

+ 16 - 5
src/components/pages/testPerson/test/test.vue
Vedi File 

@@ -4,7 +4,7 @@
 
             <!-- <div class="nav all" v-show="this.ExamineBase.length > 0" :class="{ active: type == '1' }" @click="checkType('1')">
 
                 年度考核
 
             </div> -->
 
-            <div class="nav all" :class="{ active: checkTypeValue == typeId }" @click="changeShowType(typeId)">
 
+            <div class="nav all" :class="{ active: checkTypeValue == typeListStr }" @click="changeShowType(typeListStr)">
 
                 全部
 
             </div>
 
             <div class="nav" v-for="item in typeList" :key="item.id" :class="{ active: checkTypeValue == item.id,all:['8bfa67ce-e82a-11ef-b508-005056924926','9d3289d2-e82a-11ef-b508-005056924926','a824c728-e82a-11ef-b508-005056924926','8085418b-e82a-11ef-b508-005056924926'].includes(item.id)}" @click="changeShowType(item.id,item)">{{ item.name }}</div>
 
@@ -280,6 +280,17 @@ export default {
 
                 }
 
                 return _img;
 
             };
 
+        },
 
+        typeListStr(){
 
+          let _result = "";
 
+
 
+          if(this.typeList.length){
 
+            _result = this.typeList.map(i=>i.id)
 
+            _result.push(this.typeId);
 
+            _result = _result.join(',')
 
+          }
 
+
 
+          return _result;
 
         }
 
     },
 
     watch:{
 
@@ -665,15 +676,15 @@ export default {
 
     mounted() {
 
         // this.selectTestType(1);
 
         // this.getPageBase()
 
-        if(this.typeId){
 
-          this.changeShowType(this.typeId)
 
+        if(this.typeListStr){
 
+          this.changeShowType(this.typeListStr)
 
           // this.checkTypeValue = this.typeId
 
         }
 
     },
 
     activated(){
 
         // this.selectTestType(2);
 
-        if(this.typeId){
 
-          this.changeShowType(this.typeId)
 
+        if(this.typeListStr){
 
+          this.changeShowType(this.typeListStr)
 
           // this.checkTypeValue = this.typeId
 
         }
 
     },

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