|
@@ -45,16 +45,16 @@
|
|
|
<div
|
|
|
class="a_h_r_more"
|
|
|
slot="reference"
|
|
|
- v-if="!isDrag"
|
|
|
+ v-if="!isDrag"
|
|
|
@click.stop="visible = !visible"
|
|
|
>
|
|
|
<img src="@/assets/icon/classroomObservation/moreIcon.svg" alt="" />
|
|
|
</div>
|
|
|
|
|
|
- <div class="a_h_r_scBtn" v-if="isDrag">
|
|
|
- <span class="a_h_r_cancel" @click.stop="dragCancel()">取消</span>
|
|
|
- <span class="a_h_r_submit" @click.stop="dragSubmit()">完成</span>
|
|
|
- </div>
|
|
|
+ <div class="a_h_r_scBtn" v-if="isDrag">
|
|
|
+ <span class="a_h_r_cancel" @click.stop="dragCancel()">取消</span>
|
|
|
+ <span class="a_h_r_submit" @click.stop="dragSubmit()">完成</span>
|
|
|
+ </div>
|
|
|
|
|
|
<div
|
|
|
class="a_h_r_boxList"
|
|
@@ -94,10 +94,30 @@
|
|
|
|
|
|
添加模块
|
|
|
</div>
|
|
|
- <div @click="moveAnalysis()" v-if="tid">
|
|
|
- <svg t="1727591669869" class="icon" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="4289" width="200" height="200"><path d="M514.64 511m-84.76 0a84.76 84.76 0 1 0 169.52 0 84.76 84.76 0 1 0-169.52 0Z" fill="#000000" p-id="4290"></path><path d="M661.36 190.85L548.54 78a47.85 47.85 0 0 0-32-14c-1.21-0.09-2.43-0.15-3.66-0.15A48.95 48.95 0 0 0 478.58 78L365.77 190.85a48 48 0 0 0 0 67.88 48 48 0 0 0 67.88 0l31.21-31.21v115.22a48 48 0 0 0 48 48 48 48 0 0 0 48-48V226.11l32.61 32.62a48 48 0 0 0 67.89 0 48 48 0 0 0 0-67.88zM364.23 832.86l112.82 112.81a47.82 47.82 0 0 0 32 14c1.21 0.09 2.43 0.15 3.66 0.15A48.9 48.9 0 0 0 547 945.67l112.83-112.81a48 48 0 0 0 0-67.88 48 48 0 0 0-67.89 0l-31.21 31.2V681a48 48 0 0 0-48-48 48 48 0 0 0-48 48v116.59L432.12 765a48 48 0 0 0-67.89 0 48 48 0 0 0 0 67.86zM831.12 663.76L943.93 551a47.86 47.86 0 0 0 14-32c0.09-1.21 0.15-2.43 0.15-3.67A48.86 48.86 0 0 0 943.93 481L831.12 368.17a48 48 0 0 0-67.89 0 48 48 0 0 0 0 67.88l31.21 31.21H679.23a48 48 0 0 0-48 48 48 48 0 0 0 48 48h116.62l-32.62 32.62a48 48 0 0 0 0 67.88 48 48 0 0 0 67.89 0zM187.88 366.64L75.06 479.45a47.82 47.82 0 0 0-14 32c-0.1 1.21-0.16 2.43-0.16 3.67a48.86 48.86 0 0 0 14.17 34.27l112.81 112.84a48 48 0 0 0 67.88 0 48 48 0 0 0 0-67.88l-31.21-31.21h115.21a48 48 0 0 0 48-48 48 48 0 0 0-48-48H223.14l32.62-32.62a48 48 0 0 0 0-67.88 48 48 0 0 0-67.88 0z" fill="#000000" p-id="4291"></path></svg>
|
|
|
- 移动模块
|
|
|
- </div>
|
|
|
+ <div @click="moveAnalysis()" v-if="tid">
|
|
|
+ <svg
|
|
|
+ t="1727591669869"
|
|
|
+ class="icon"
|
|
|
+ viewBox="0 0 1024 1024"
|
|
|
+ version="1.1"
|
|
|
+ xmlns="http://www.w3.org/2000/svg"
|
|
|
+ p-id="4289"
|
|
|
+ width="200"
|
|
|
+ height="200"
|
|
|
+ >
|
|
|
+ <path
|
|
|
+ d="M514.64 511m-84.76 0a84.76 84.76 0 1 0 169.52 0 84.76 84.76 0 1 0-169.52 0Z"
|
|
|
+ fill="#000000"
|
|
|
+ p-id="4290"
|
|
|
+ ></path>
|
|
|
+ <path
|
|
|
+ d="M661.36 190.85L548.54 78a47.85 47.85 0 0 0-32-14c-1.21-0.09-2.43-0.15-3.66-0.15A48.95 48.95 0 0 0 478.58 78L365.77 190.85a48 48 0 0 0 0 67.88 48 48 0 0 0 67.88 0l31.21-31.21v115.22a48 48 0 0 0 48 48 48 48 0 0 0 48-48V226.11l32.61 32.62a48 48 0 0 0 67.89 0 48 48 0 0 0 0-67.88zM364.23 832.86l112.82 112.81a47.82 47.82 0 0 0 32 14c1.21 0.09 2.43 0.15 3.66 0.15A48.9 48.9 0 0 0 547 945.67l112.83-112.81a48 48 0 0 0 0-67.88 48 48 0 0 0-67.89 0l-31.21 31.2V681a48 48 0 0 0-48-48 48 48 0 0 0-48 48v116.59L432.12 765a48 48 0 0 0-67.89 0 48 48 0 0 0 0 67.86zM831.12 663.76L943.93 551a47.86 47.86 0 0 0 14-32c0.09-1.21 0.15-2.43 0.15-3.67A48.86 48.86 0 0 0 943.93 481L831.12 368.17a48 48 0 0 0-67.89 0 48 48 0 0 0 0 67.88l31.21 31.21H679.23a48 48 0 0 0-48 48 48 48 0 0 0 48 48h116.62l-32.62 32.62a48 48 0 0 0 0 67.88 48 48 0 0 0 67.89 0zM187.88 366.64L75.06 479.45a47.82 47.82 0 0 0-14 32c-0.1 1.21-0.16 2.43-0.16 3.67a48.86 48.86 0 0 0 14.17 34.27l112.81 112.84a48 48 0 0 0 67.88 0 48 48 0 0 0 0-67.88l-31.21-31.21h115.21a48 48 0 0 0 48-48 48 48 0 0 0-48-48H223.14l32.62-32.62a48 48 0 0 0 0-67.88 48 48 0 0 0-67.88 0z"
|
|
|
+ fill="#000000"
|
|
|
+ p-id="4291"
|
|
|
+ ></path>
|
|
|
+ </svg>
|
|
|
+ 移动模块
|
|
|
+ </div>
|
|
|
<div @click="addNewAnalysisGroup(0)">
|
|
|
<svg
|
|
|
t="1727073223211"
|
|
@@ -245,7 +265,7 @@
|
|
|
下移
|
|
|
</div>
|
|
|
|
|
|
- <div @click="deleteAnalysisGroup()" v-if="maxIndex!==0">
|
|
|
+ <div @click="deleteAnalysisGroup()" v-if="maxIndex !== 0">
|
|
|
<svg
|
|
|
width="20"
|
|
|
height="20"
|
|
@@ -284,8 +304,6 @@
|
|
|
</svg>
|
|
|
删除分析
|
|
|
</div>
|
|
|
-
|
|
|
-
|
|
|
</div>
|
|
|
<!-- </el-popover> -->
|
|
|
<!-- <div class="a-h-r-btn" @click.stop="addTemplate">
|
|
@@ -296,15 +314,20 @@
|
|
|
</div>
|
|
|
<div class="a-main" v-show="showItem || isDrag">
|
|
|
<template v-for="(item, index) in analysisItemList">
|
|
|
- <div class="a_m_dragBox" ref="dragBoxRefTop" :type="`${type}_${index}_${item.tIndex}_0`" v-if="isDrag && index===0"></div>
|
|
|
+ <div
|
|
|
+ class="a_m_dragBox"
|
|
|
+ ref="dragBoxRefTop"
|
|
|
+ :type="`${type}_${index}_${item.tIndex}_0`"
|
|
|
+ v-if="isDrag && index === 0"
|
|
|
+ ></div>
|
|
|
<analysisItem
|
|
|
ref="analysisItemRef"
|
|
|
v-if="
|
|
|
- ![
|
|
|
- converter('S-T分析:课堂时间分配'),
|
|
|
- converter('S-T分析:师生互动分析'),
|
|
|
- converter('S-T分析:教学模式分析')
|
|
|
- ].includes(converter(item.jsonData.name)) &&
|
|
|
+ ![
|
|
|
+ converter('S-T分析:课堂时间分配'),
|
|
|
+ converter('S-T分析:师生互动分析'),
|
|
|
+ converter('S-T分析:教学模式分析')
|
|
|
+ ].includes(converter(item.jsonData.name)) &&
|
|
|
!['bfe844b1-7a45-11ef-9b30-005056b86db5'].includes(
|
|
|
item.jsonData.mId
|
|
|
)
|
|
@@ -315,15 +338,15 @@
|
|
|
:key="item.id + item.Type + '-' + index"
|
|
|
:data="item"
|
|
|
:tid="tid"
|
|
|
- :dialogTagList="dialogTagList"
|
|
|
+ :dialogTagList="dialogTagList"
|
|
|
:fileId="fileId"
|
|
|
:index="index"
|
|
|
:showBrief="showBrief"
|
|
|
- :isDrag="isDrag"
|
|
|
+ :isDrag="isDrag"
|
|
|
@delItem="delItem"
|
|
|
@editItem="editItem"
|
|
|
@saveItem="saveItem"
|
|
|
- @moveAnalysis="moveAnalysisSubmit"
|
|
|
+ @moveAnalysis="moveAnalysisSubmit"
|
|
|
/>
|
|
|
<analysisSpecialItem
|
|
|
v-if="
|
|
@@ -342,21 +365,31 @@
|
|
|
:key="item.id + item.Type + '-' + index"
|
|
|
:data="item"
|
|
|
:tid="tid"
|
|
|
- :dialogTagList="dialogTagList"
|
|
|
+ :dialogTagList="dialogTagList"
|
|
|
:fileId="fileId"
|
|
|
:index="index"
|
|
|
- :isDrag="isDrag"
|
|
|
+ :isDrag="isDrag"
|
|
|
:showBrief="showBrief"
|
|
|
@delItem="delItem"
|
|
|
@editItem="editItem"
|
|
|
@saveItem="saveItem"
|
|
|
- @moveAnalysis="moveAnalysisSubmit"
|
|
|
+ @moveAnalysis="moveAnalysisSubmit"
|
|
|
/>
|
|
|
- <div class="a_m_dragBox" ref="dragBoxRefBottom" :type="`${type}_${index}_${item.tIndex}_1`" v-if="isDrag"></div>
|
|
|
+ <div
|
|
|
+ class="a_m_dragBox"
|
|
|
+ ref="dragBoxRefBottom"
|
|
|
+ :type="`${type}_${index}_${item.tIndex}_1`"
|
|
|
+ v-if="isDrag"
|
|
|
+ ></div>
|
|
|
</template>
|
|
|
<div class="a_m_empty" v-if="analysisItemList.length == 0">
|
|
|
<span v-if="!isDrag">暂无模块...</span>
|
|
|
- <div class="a_m_dragBox" ref="dragBoxRefBottom" :type="`${type}_0_0_2`" v-if="isDrag"></div>
|
|
|
+ <div
|
|
|
+ class="a_m_dragBox"
|
|
|
+ ref="dragBoxRefBottom"
|
|
|
+ :type="`${type}_0_0_2`"
|
|
|
+ v-if="isDrag"
|
|
|
+ ></div>
|
|
|
</div>
|
|
|
</div>
|
|
|
<editNameDialog ref="editNameDialogRef" @success="editNameSuccess" />
|
|
@@ -451,14 +484,16 @@ export default {
|
|
|
type: Number,
|
|
|
default: 0
|
|
|
},
|
|
|
- isDrag:{
|
|
|
- type:Boolean,
|
|
|
- default:false
|
|
|
- },
|
|
|
- dialogTagList:{
|
|
|
- type:Array,
|
|
|
- default:()=>{return []}
|
|
|
- },
|
|
|
+ isDrag: {
|
|
|
+ type: Boolean,
|
|
|
+ default: false
|
|
|
+ },
|
|
|
+ dialogTagList: {
|
|
|
+ type: Array,
|
|
|
+ default: () => {
|
|
|
+ return [];
|
|
|
+ }
|
|
|
+ }
|
|
|
},
|
|
|
components: {
|
|
|
analysisItem,
|
|
@@ -470,7 +505,7 @@ export default {
|
|
|
return function(word) {
|
|
|
return converter2(word);
|
|
|
};
|
|
|
- },
|
|
|
+ }
|
|
|
},
|
|
|
data() {
|
|
|
return {
|
|
@@ -515,9 +550,11 @@ export default {
|
|
|
getReport(id) {
|
|
|
if (!id) {
|
|
|
this.$nextTick(() => {
|
|
|
- this.$refs.analysisItemRef.forEach(i => {
|
|
|
- i.editBtn(false);
|
|
|
- });
|
|
|
+ if (this.$refs.analysisItemRef) {
|
|
|
+ this.$refs.analysisItemRef.forEach(i => {
|
|
|
+ i.editBtn(false);
|
|
|
+ });
|
|
|
+ }
|
|
|
});
|
|
|
} else {
|
|
|
this.$nextTick(() => {
|
|
@@ -590,20 +627,20 @@ export default {
|
|
|
if (!this.tid) return this.$message.error("请新建课堂,或选择历史课堂");
|
|
|
this.$emit("setTheLocation", { value: this.type, type: type });
|
|
|
},
|
|
|
- moveAnalysis(){
|
|
|
- this.visible = false;
|
|
|
- this.$parent.isDrag = true;
|
|
|
- },
|
|
|
- dragSubmit(){
|
|
|
- this.visible = false;
|
|
|
- this.$parent.moveAnalysisSubmit()
|
|
|
- },
|
|
|
- moveAnalysisSubmit(data){
|
|
|
- this.$emit('moveAnalysis',data)
|
|
|
- },
|
|
|
- dragCancel(){
|
|
|
- this.$parent.moveAnalysisCancel()
|
|
|
- }
|
|
|
+ moveAnalysis() {
|
|
|
+ this.visible = false;
|
|
|
+ this.$parent.isDrag = true;
|
|
|
+ },
|
|
|
+ dragSubmit() {
|
|
|
+ this.visible = false;
|
|
|
+ this.$parent.moveAnalysisSubmit();
|
|
|
+ },
|
|
|
+ moveAnalysisSubmit(data) {
|
|
|
+ this.$emit("moveAnalysis", data);
|
|
|
+ },
|
|
|
+ dragCancel() {
|
|
|
+ this.$parent.moveAnalysisCancel();
|
|
|
+ }
|
|
|
}
|
|
|
};
|
|
|
</script>
|
|
@@ -1029,52 +1066,51 @@ export default {
|
|
|
margin-bottom: 0;
|
|
|
}
|
|
|
|
|
|
-.a_m_dragBox{
|
|
|
- width: 100%;
|
|
|
- height: 40px;
|
|
|
- border-radius: 3px;
|
|
|
- box-sizing: border-box;
|
|
|
- margin-bottom: 10px;
|
|
|
- border: 1px dashed rgba(54, 129, 252, 1);
|
|
|
- background-color: #F8F9FA;
|
|
|
- transition: .3s;
|
|
|
- cursor: pointer;
|
|
|
+.a_m_dragBox {
|
|
|
+ width: 100%;
|
|
|
+ height: 40px;
|
|
|
+ border-radius: 3px;
|
|
|
+ box-sizing: border-box;
|
|
|
+ margin-bottom: 10px;
|
|
|
+ border: 1px dashed rgba(54, 129, 252, 1);
|
|
|
+ background-color: #f8f9fa;
|
|
|
+ transition: 0.3s;
|
|
|
+ cursor: pointer;
|
|
|
}
|
|
|
|
|
|
-.a_h_r_scBtn{
|
|
|
- height: 100%;
|
|
|
- padding: 0 10px 0;
|
|
|
- display: flex;
|
|
|
- justify-content: center;
|
|
|
- align-items: center;
|
|
|
+.a_h_r_scBtn {
|
|
|
+ height: 100%;
|
|
|
+ padding: 0 10px 0;
|
|
|
+ display: flex;
|
|
|
+ justify-content: center;
|
|
|
+ align-items: center;
|
|
|
}
|
|
|
|
|
|
-.a_h_r_scBtn>.a_h_r_submit{
|
|
|
- padding: 5px 10px;
|
|
|
- background-color: rgba(54, 129, 252, 1);
|
|
|
- border-radius: 3px;
|
|
|
- color: #fff;
|
|
|
- cursor: pointer;
|
|
|
- font-size: 14px;
|
|
|
+.a_h_r_scBtn > .a_h_r_submit {
|
|
|
+ padding: 5px 10px;
|
|
|
+ background-color: rgba(54, 129, 252, 1);
|
|
|
+ border-radius: 3px;
|
|
|
+ color: #fff;
|
|
|
+ cursor: pointer;
|
|
|
+ font-size: 14px;
|
|
|
}
|
|
|
|
|
|
-.a_h_r_submit>a_h_r_submit:hover{
|
|
|
- background-color: rgb(19, 106, 247);
|
|
|
+.a_h_r_submit > a_h_r_submit:hover {
|
|
|
+ background-color: rgb(19, 106, 247);
|
|
|
}
|
|
|
|
|
|
-.a_h_r_scBtn>.a_h_r_cancel{
|
|
|
- padding: 5px 10px;
|
|
|
- background-color: #fff;
|
|
|
- border-radius: 3px;
|
|
|
- color: black;
|
|
|
- cursor: pointer;
|
|
|
- border: solid 1px #e7e7e7;
|
|
|
- font-size: 14px;
|
|
|
- margin-right: 10px;
|
|
|
+.a_h_r_scBtn > .a_h_r_cancel {
|
|
|
+ padding: 5px 10px;
|
|
|
+ background-color: #fff;
|
|
|
+ border-radius: 3px;
|
|
|
+ color: black;
|
|
|
+ cursor: pointer;
|
|
|
+ border: solid 1px #e7e7e7;
|
|
|
+ font-size: 14px;
|
|
|
+ margin-right: 10px;
|
|
|
}
|
|
|
|
|
|
-.a_h_r_submit>.a_h_r_cancel:hover{
|
|
|
- background-color: #e0d9d9;
|
|
|
+.a_h_r_submit > .a_h_r_cancel:hover {
|
|
|
+ background-color: #e0d9d9;
|
|
|
}
|
|
|
-
|
|
|
</style>
|