SanHQin 2 月之前
父節點
當前提交
c0fd6d225e

+ 1 - 1
dist/index.html

@@ -32,7 +32,7 @@
       width: 100%;
       background: #e6eaf0;
       font-family: '黑体';
-    }</style><link href=./static/css/app.a38d5e21f0aaef344cdfc1e7485b92eb.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.5c432484391fee1e5137.js></script></body></html><script>function stopSafari() {
+    }</style><link href=./static/css/app.47e0c08c1acd45aabacca9d429b38bec.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.07725c7cec77f8387748.js></script></body></html><script>function stopSafari() {
     //阻止safari浏览器双击放大功能
     let lastTouchEnd = 0  //更新手指弹起的时间
     document.documentElement.addEventListener("touchstart", function (event) {

文件差異過大導致無法顯示
+ 0 - 0
dist/static/css/app.47e0c08c1acd45aabacca9d429b38bec.css


文件差異過大導致無法顯示
+ 0 - 0
dist/static/css/app.47e0c08c1acd45aabacca9d429b38bec.css.map


文件差異過大導致無法顯示
+ 0 - 0
dist/static/js/app.07725c7cec77f8387748.js


文件差異過大導致無法顯示
+ 0 - 0
dist/static/js/app.07725c7cec77f8387748.js.map


文件差異過大導致無法顯示
+ 0 - 0
dist/static/js/manifest.161e82026ac2ae03ab6f.js.map


+ 5 - 5
src/components/pages/appStore/dialog/addAppDialog.vue

@@ -80,7 +80,7 @@
           <div
             style="display: flex;width: 100%;justify-content: space-between;"
           >
-            <el-form-item label="应用标签" prop="label">
+            <el-form-item label="应用类型" prop="label">
               <!-- <el-input
                 v-model="form.label"
                 placeholder="请输入应用标签"
@@ -88,7 +88,7 @@
               ></el-input> -->
               <el-select
                 v-model="form.label"
-                placeholder="请选择应用标签"
+                placeholder="请选择应用类型"
                 style="width: 300px;"
               >
                 <el-option
@@ -100,10 +100,10 @@
                 </el-option>
               </el-select>
             </el-form-item>
-            <el-form-item label="应用类" prop="type">
+            <el-form-item label="应用类" prop="type">
               <el-select
                 v-model="form.type"
-                placeholder="请选择应用类"
+                placeholder="请选择应用类"
                 style="width: 300px;"
               >
                 <el-option
@@ -224,7 +224,7 @@ export default {
         // nlabel: [
         //   { required: true, message: "请输入应用标签", trigger: "blur" }
         // ],
-        type: [{ required: true, message: "请选择应用类", trigger: "blur" }],
+        type: [{ required: true, message: "请选择应用类", trigger: "blur" }],
         // ndetail:[{required:true,message:"请输入应用简介",trigger:"blur"}],
         juri: [{ required: true, message: "请选择权限管理", trigger: "blur" }],
         url: [

+ 3 - 2
src/components/pages/appStore/views/appManagement.vue

@@ -1224,13 +1224,14 @@ export default {
           this.$message.error("获取应用类型失败");
         });
     },
-    openApp(item, type = 0) {
+    async openApp(item, type = 0) {
       window.open(item.url, "_blank");
       if (
         !(this.recentUse.length > 0 && item.id === this.recentUse[0].id) &&
         type === 0
       ) {
-        this.insertSave(item, 1);
+        await this.insertSave(item, 1);
+        this.getRecentUse()
       }
     },
 

+ 11 - 8
src/components/pages/classroomObservation/components/chatArea.vue

@@ -999,6 +999,8 @@ export default {
           body: JSON.stringify(params),
           signal: _this.curRequestController.signal,
           onmessage(ev){
+            console.log(ev)
+            if(ev.data=="")return
             let _data = JSON.parse(ev.data);
             if(_data.content=='[DONE]')return;
             _addText+=_data.content;
@@ -1106,11 +1108,12 @@ export default {
           body: JSON.stringify(params),
           signal: _this.curRequestController.signal,
           onmessage(ev){
-            let _data = JSON.parse(ev.data);
-            if(_data.content=='[DONE]')return;
-            _addText+=_data.content;
-            _this.chatList.find(i => i.uid == _uid).aiContent =  md.render(_addText);
-            _this.chatList.find(i => i.uid == _uid).loading = false;
+            console.log(ev)
+            let _data = ev.data;
+            if(_data=='[DONE]')return;
+            _addText+=_data;
+            _this.chatList.find(i => i.uid == _uuid).aiContent =  md.render(_addText);
+            _this.chatList.find(i => i.uid == _uuid).loading = false;
             _this.scrollBottom();
             console.log(_data)
           },
@@ -1119,9 +1122,9 @@ export default {
             // _this.stopTalkToken = null;
             // _this.faloading = false;
             _this.curRequestController = null;
-            _this.chatList.find(i => i.uid == _uid).isalltext = true;
-            _this.chatList.find(i => i.uid == _uid).isShowSynchronization = true;
-            _this.insertChat(_uid);
+            _this.chatList.find(i => i.uid == _uuid).isalltext = true;
+            _this.chatList.find(i => i.uid == _uuid).isShowSynchronization = true;
+            _this.insertChat(_uuid);
             console.log("连接关闭")
           },
           onerror(err){

+ 81 - 8
src/components/pages/test/add/components/choice/choice.vue

@@ -39,7 +39,11 @@
           placeholder="请填写描述说明"
         />
       <div class="choices">
-        <div class="choice" v-for="(item, index) in cJson.array" :key="index">
+        <div class="choice" :class="{dragTop:(dragIndex!=index&&dragNewIndex==index&&dragIndex>index),dragBottom:(dragIndex!=index&&dragNewIndex==index&&dragIndex<index)}" v-for="(item, index) in cJson.array" :key="index" :draggable="dragIndex==index" @dragStart="dragStart(index)" @dragover.prevent="dragOver(index)"  @dragend="dragEnd()">
+          <span class="dragIcon"  @mousedown="setDrag(index)" @mouseup="clearDrag()">
+            <img v-if="dragIndex===index" src="../../../../../../assets/icon/test/drag_icon.png">
+            <img v-else src="../../../../../../assets/icon/test/drag_icon_active.png">
+          </span>
           <div
             class="choice_c"
             v-if="cJson.type == 2"
@@ -68,13 +72,13 @@
               placeholder="请输入选项标题"
             />
 
-            <div class="changeIndex">
+            <!-- <div class="changeIndex">
               <span  @click.stop="changeIndex(index,0)">
                 <svg t="1737082063936" class="icon" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="4412" width="200" height="200"><path d="M908.8 787.2 512 396.8l-396.8 396.8c-25.6 25.6-70.4 25.6-96 0s-25.6-70.4 0-96l441.6-441.6C480 236.8 492.8 230.4 512 230.4s32 6.4 51.2 19.2l441.6 441.6c25.6 25.6 25.6 70.4 0 96C979.2 819.2 934.4 819.2 908.8 787.2z" p-id="4413"></path></svg>
                 </span>
               <span  @click.stop="changeIndex(index,1)">
                 <svg style="transform: rotate(180deg);" t="1737082063936" class="icon" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="4412" width="200" height="200"><path d="M908.8 787.2 512 396.8l-396.8 396.8c-25.6 25.6-70.4 25.6-96 0s-25.6-70.4 0-96l441.6-441.6C480 236.8 492.8 230.4 512 230.4s32 6.4 51.2 19.2l441.6 441.6c25.6 25.6 25.6 70.4 0 96C979.2 819.2 934.4 819.2 908.8 787.2z" p-id="4413"></path></svg></span>
-            </div>
+            </div> -->
 
             <span
               @click.stop="deleteChoice(index)"
@@ -111,14 +115,14 @@
               @keyup.enter="save"
               placeholder="请输入选项标题"
             />
-
+<!--
             <div class="changeIndex">
               <span  @click.stop="changeIndex(index,0)">
                 <svg t="1737082063936" class="icon" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="4412" width="200" height="200"><path d="M908.8 787.2 512 396.8l-396.8 396.8c-25.6 25.6-70.4 25.6-96 0s-25.6-70.4 0-96l441.6-441.6C480 236.8 492.8 230.4 512 230.4s32 6.4 51.2 19.2l441.6 441.6c25.6 25.6 25.6 70.4 0 96C979.2 819.2 934.4 819.2 908.8 787.2z" p-id="4413"></path></svg>
                 </span>
               <span  @click.stop="changeIndex(index,1)">
                 <svg style="transform: rotate(180deg);" t="1737082063936" class="icon" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="4412" width="200" height="200"><path d="M908.8 787.2 512 396.8l-396.8 396.8c-25.6 25.6-70.4 25.6-96 0s-25.6-70.4 0-96l441.6-441.6C480 236.8 492.8 230.4 512 230.4s32 6.4 51.2 19.2l441.6 441.6c25.6 25.6 25.6 70.4 0 96C979.2 819.2 934.4 819.2 908.8 787.2z" p-id="4413"></path></svg></span>
-            </div>
+            </div> -->
 
             <span
               @click.stop="deleteChoice(index)"
@@ -139,6 +143,8 @@
 </template>
 
 <script>
+import draggable from 'vuedraggable';
+
 export default {
   props: {
     cJson: {
@@ -168,7 +174,9 @@ export default {
         answer: false,
         detail:false,
         answerIndex: 0
-      }
+      },
+      dragIndex:null,
+      dragNewIndex:null,
     };
   },
   watch: {
@@ -260,6 +268,36 @@ export default {
         this.checkJson.array.splice(index + 1, 0, item);
         // this.$message.info("下移");
       }
+    },
+    setDrag(index){
+      this.dragIndex = index;
+    },
+    clearDrag(){
+      this.dragIndex = null;
+    },
+    dragStart(index){
+
+    },
+    dragOver(index){
+      this.dragNewIndex = index;
+    },
+    dragEnd(){
+      if(this.dragIndex == this.dragNewIndex){
+        this.dragIndex = null;
+        this.dragNewIndex = null;
+        return;
+      }else{
+        const item = this.checkJson.array.splice(this.dragIndex, 1)[0];
+        this.checkJson.array.splice(this.dragNewIndex, 0, item);
+
+        // if(this.dragIndex > this.dragNewIndex){
+        //   console.log("上面")
+        // }else if(this.dragIndex < this.dragNewIndex){
+        //   console.log("下面")
+        // }
+        this.dragIndex = null;
+        this.dragNewIndex = null;
+      }
     }
   },
   mounted() {
@@ -285,6 +323,7 @@ export default {
 
 .choice_box > .choices > .choice {
   word-break: break-all;
+  position: relative;
 }
 .choice_box > .choices > .choice + .choice {
   margin-top: 5px;
@@ -299,7 +338,8 @@ export default {
   align-items: center;
   margin-bottom: 10px;
   position: relative;
-  width: calc(100% - 50px - 50px);
+  width: calc(100% - 50px - 50px - 25px);
+  margin-left: 25px;
 }
 .choice_box > .choices > .choice > .choice_c > span {
   /* padding-right: 50px; */
@@ -338,7 +378,7 @@ export default {
   min-width: 25px;
   min-height: 25px;
   position: absolute;
-  right: -60px;
+  right: -30px;
   transform: translateY(2px);
   border-radius: 5px;
   color: #646a73 !important;
@@ -393,4 +433,37 @@ export default {
   height: 100%;
 }
 
+.dragIcon{
+  position: absolute;
+  left: 0;
+  top: 50%;
+  transform: translate(0,-60%);
+  width: 20px;
+  height: 20px;
+  cursor: pointer;
+  display: block;
+}
+
+.dragIcon>img{
+  width: 100%;
+  height: 100%;
+}
+
+.dragTop::after{
+  content: '';
+  width: 100%;
+  height: 2px;
+  position: absolute;
+  top: -6px;
+  background-color: #409EFF;
+}
+
+.dragBottom::after{
+  content: '';
+  width: 100%;
+  height: 2px;
+  position: absolute;
+  bottom: -6px;
+  background-color: #409EFF;
+}
 </style>

+ 6 - 2
src/components/pages/test/check/index.vue

@@ -1121,7 +1121,7 @@
                   <div
                   style="display: flex; align-items: center"
                   >
-                    <span>提交时间</span>
+                    <span :class="{timePickerActive:(submissionTimePicker && submissionTimePicker.length>0)}">提交时间</span>
                     <div class="tableDatePicker">
                       <el-date-picker
                         v-model="submissionTimePicker"
@@ -1181,7 +1181,7 @@
                     v-if="item.type == 8"
                     style="display: flex; align-items: center"
                   >
-                    <span>{{ item.json.title }}</span>
+                    <span :class="{timePickerActive:(tableDatePicker[index] && tableDatePicker[index].length>0)}">{{ item.json.title }}</span>
                     <div class="tableDatePicker">
                       <el-date-picker
                         v-model="tableDatePicker[index]"
@@ -4733,4 +4733,8 @@ ${JSON.stringify(item.array)}
   height: 40px;
   margin-left: 5px;
 }
+
+.timePickerActive{
+  color: #409EFF;
+}
 </style>

部分文件因文件數量過多而無法顯示