SanHQin 2 mēneši atpakaļ
vecāks
revīzija
90a4b0542d

+ 1 - 1
dist/index.html

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

Failā izmaiņas netiks attēlotas, jo tās ir par lielu
+ 0 - 0
dist/static/css/app.0c07bb9668ab9ced4639e4dcb79c4487.css


Failā izmaiņas netiks attēlotas, jo tās ir par lielu
+ 0 - 0
dist/static/css/app.0c07bb9668ab9ced4639e4dcb79c4487.css.map


Failā izmaiņas netiks attēlotas, jo tās ir par lielu
+ 0 - 0
dist/static/js/app.abda2f1fc2948c25bb1c.js


Failā izmaiņas netiks attēlotas, jo tās ir par lielu
+ 0 - 0
dist/static/js/app.abda2f1fc2948c25bb1c.js.map


Failā izmaiņas netiks attēlotas, jo tās ir par lielu
+ 0 - 0
dist/static/js/manifest.161e82026ac2ae03ab6f.js.map


+ 17 - 9
src/components/pages/classroomObservation/dialog/batchCreationClassDialog.vue

@@ -47,8 +47,8 @@
                     i =>
                       selectStatus == "99" ||
                       statusList
-                        .find(i => i.value === selectStatus)
-                        .allow.includes(i.state)
+                        .find(i => i.value == selectStatus)
+                        .allow.includes(i.status)
                   ).length
                 }}</span
               >
@@ -83,6 +83,7 @@
               @editBaseMessage="editBaseMessage"
               @changeData="changeData"
               @taskBtn="taskBtn"
+              @goToEdit="goToEdit"
             />
           </div>
         </div>
@@ -200,11 +201,6 @@ export default {
       ).length;
     }
   },
-  watch: {
-    selectList(newValue, oldValue) {
-      console.log(newValue, oldValue);
-    }
-  },
   methods: {
     open() {
       this.show = true;
@@ -896,8 +892,12 @@ export default {
                 _tableList = _result;
               }
 
-              let { editorBarData} = await this.wavAudioToTextAndObjMixin({ wavUrl: _startData.jsonData.fileData.url});
+              let { editorBarData} = await this.automaticCodingMixin({ tableList: _tableList});
+
+
+              _stepList[i].status = "1";
 
+              this.dataList.find(i => i.id === _startData.id).jsonData = _startData.jsonData;
               this.dataList.find(
                 i => i.id === _startData.id
               ).jsonData.baseMessage.editorBarData = editorBarData;
@@ -930,7 +930,7 @@ export default {
             this.dataList.find(
               i => i.id === _startData.id
             ).jsonData.steps = _stepList;
-            let _fileData = _startData.jsonData.fileData;
+            let _fileData = _startData.jsonData.baseMessage.editorBarData;
             let { fileId } = await this.getFileIdMixin(_fileData.url);
             this.dataList.find(
               i => i.id === _startData.id
@@ -1170,6 +1170,14 @@ export default {
         this.dataList.find(i => i.id === id).status = "3";
       }
     },
+    goToEdit(id){
+      let _data = this.dataList.find(i=>i.id===id);
+      if(_data){
+        let createId = _data.jsonData.createId;
+        this.$emit("changeClass",createId);
+        this.close();
+      }
+    },
     test() {
       this.testMixin();
     }

+ 105 - 20
src/components/pages/classroomObservation/dialog/editBaseMessageDialog.vue

@@ -470,8 +470,20 @@ export default {
     },
     //生成词云图
     addNephogram(){
-      this.$message.info("生成词云图")
+      // this.$message.info("生成词云图")
     },
+    delVideo(key){
+			this.$confirm("确定删除该视频吗?", "提示", {
+				confirmButtonText: "确定",
+				cancelButtonText: "取消",
+				type: "warning",
+			}).then(() => {
+				this.data.imageList.videoList = [];
+        this.$message.success("删除成功")
+			}).catch(e=>{
+				console.log("取消删除")
+			});
+		},
     //资源库添加文件
     resourceLibraryDialogAddFile(file){
       let _file = file[0];
@@ -555,25 +567,98 @@ export default {
 		},
     //上传课堂图片
     addImage2(){
-      this.$message.info("上传课堂图片")
-			// let input = document.createElement("input");
-			// input.type = "file";
-			// input.accept = "image/*";
-			// input.multiple = true;
-			// input.click();
-
-
-			// input.onchange = () => {
-			// 	this.uploadImageLoading = true;
-      //   let promise =[];
-      //   for(let i=0;i<input.files.length;i++){
-      //     promise.push(this.uploadFile(input.files[i]));
-      //   }
-      //   Promise.all(promise).then(res=>{
-      //     this.$emit("saveImage2",res);
-      //     this.uploadImageLoading = false;
-      //   })
-			// };
+			let input = document.createElement("input");
+			input.type = "file";
+			input.accept = "image/*";
+			input.multiple = true;
+			input.click();
+
+
+			input.onchange = () => {
+				this.uploadImageLoading = true;
+        let promise =[];
+        for(let i=0;i<input.files.length;i++){
+          promise.push(this.uploadFile(input.files[i]));
+        }
+        Promise.all(promise).then(res=>{
+          this.saveImage2(res)
+          // this.$emit("saveImage2",res);
+          this.uploadImageLoading = false;
+        })
+			};
+    },
+    saveImage2(dataList){
+      for(let i=0;i<dataList.length;i++){
+        if (this.data.imageList.fileList1.length == 0) {
+          this.data.imageList.fileList1.push(dataList[i]);
+        } else if (this.data.imageList.fileList2.length == 0) {
+          this.data.imageList.fileList2.push(dataList[i]);
+        } else if (this.data.imageList.fileList3.length == 0) {
+          this.data.imageList.fileList3.push(dataList[i]);
+        } else {
+          this.$message.error("最多只能上传3张图片");
+          break;
+        }
+      }
+    },
+    delImage(key){
+      this.$confirm("确定删除该图片吗?", "提示", {
+				confirmButtonText: "确定",
+				cancelButtonText: "取消",
+				type: "warning",
+			}).then(() => {
+        this.data.imageList[key] = [];
+				// this.$emit("delImage", key);
+			});
+    },
+    uploadFile(file){
+      return new Promise(resolve=>{
+        var credentials = {
+					accessKeyId: "AKIATLPEDU37QV5CHLMH",
+					secretAccessKey: "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",
+				}; //秘钥形式的登录上传
+				window.AWS.config.update(credentials);
+				window.AWS.config.region = "cn-northwest-1"; //设置区域
+
+				var bucket = new window.AWS.S3({ params: { Bucket: "ccrb" } }); //选择桶
+				var _this = this;
+        if (file) {
+					var params = {
+						Key:
+							file.name.split(".")[0] +
+							new Date().getTime() +
+							"." +
+							file.name.split(".")[file.name.split(".").length - 1],
+						ContentType: file.type,
+						Body: file,
+						"Access-Control-Allow-Credentials": "*",
+						ACL: "public-read",
+					}; //key可以设置为桶的相抵路径,Body为文件, ACL最好要设置
+					var options = {
+						partSize: 2048 * 1024 * 1024,
+						queueSize: 2,
+						leavePartsOnError: true,
+					};
+					bucket
+						.upload(params, options)
+						.on("httpUploadProgress", function (evt) {
+							//这里可以写进度条
+							// console.log("Uploaded : " + parseInt((evt.loaded * 80) / evt.total) + '%');
+						})
+						.send(function (err, data) {
+							if (err) {
+								resolve(0)
+							} else {
+                resolve({
+									name: data.key,
+									status: "success",
+									uid: "1",
+									url: data.Location,
+								})
+							}
+						});
+				}
+      })
     },
     previewVideo(url){
       this.$refs.previewVideoDialogRef.open(url)

+ 2 - 1
src/components/pages/classroomObservation/index.vue

@@ -206,7 +206,7 @@
       ref="changeCourseNameDialogRef"
       @success="changeCourseSuccess"
     />
-    <batchCreationClassDialog ref="batchCreationClassDialogRef" @addNewCourseOption="addNewCourseOption"/>
+    <batchCreationClassDialog ref="batchCreationClassDialogRef" @addNewCourseOption="addNewCourseOption" @changeClass="changeTid"/>
 
     <!-- <addNewCourseDialog
 			:courseList="optionData"
@@ -293,6 +293,7 @@ export default {
   methods: {
     //切换了课堂
     changeTid(newValue) {
+      if(this.tid!=newValue)this.tid = newValue;
       this.$nextTick(async () => {
         this.getFileIdId();
         this.$refs.messageAreaRef.getData();

+ 3 - 3
src/components/pages/classroomObservation/newComponents/batchClassCard.vue

@@ -24,7 +24,7 @@
             <div>
               <span>{{ cardData.jsonData.baseMessage.courseName }}</span>
               <img
-                v-show="!cardData.status=='2'"
+                v-show="cardData.status!='2'"
                 src="../../../../assets/icon/classroomObservation/table_edit.svg"
                 @click="editBaseMessage"
               />
@@ -98,7 +98,7 @@
           <el-button
             size="small"
             @click="goToEdit"
-            v-if="['2'].includes(cardData.status)"
+            v-if="['2'].includes(cardData.status) && cardData.jsonData.createId"
             >前往编辑</el-button
           >
           <el-button
@@ -255,7 +255,7 @@ export default {
     },
     //前往编辑
     goToEdit() {
-      this.$message.info("前往编辑");
+      this.$emit("goToEdit",this.cardData.id)
     },
     //查看报告
     lookReport() {

+ 3 - 3
src/components/pages/classroomObservation/tools/mixin.js

@@ -1354,7 +1354,7 @@ CH:${_CH}
           let _numRole = [];
 
           _roleResult.forEach((txt, index) => {
-            let _oldRole = _getRoleList[index].role;
+            let _oldRole = _ajaxList[index].role;
             if (_numRole.map(i => i.role).includes(_oldRole)) {
               let _findIndex = _numRole.findIndex(
                 i => i.role == _oldRole
@@ -1396,8 +1396,8 @@ CH:${_CH}
 
         console.log("说话人行为编码开始")
         //说话人行为编码
-        while (tableList.some(i => i.code == "" && i.role.indexOf("Guest") == -1)) {
-          let _ajaxList = tableList.filter(i => i.code == "" && i.role.indexOf("Guest") == -1).slice(0, 10);
+        while (tableList.some(i => i.code == "" && i.role.indexOf("Guest") == -1 && i.value!="")) {
+          let _ajaxList = tableList.filter(i => i.code == "" && i.role.indexOf("Guest") == -1 && i.value!="").slice(0, 10);
           console.log(`说话人行为编码:`,_ajaxList)
           let params = {
             inputs: {

Daži faili netika attēloti, jo izmaiņu fails ir pārāk liels