|
|
@@ -566,16 +566,16 @@
|
|
|
dragOverBottom: newIndex === tIndex && typeIndex == 'task-'+tIndex && oldIndex < tIndex && stageIndex == checkUnitIndex && dragType == 'task',
|
|
|
}" :style="{display:stage.toolOpen ? 'block' : 'none'}">
|
|
|
<div @dragstart="dragTaskStart(t, tIndex, stageIndex)" @dragover.prevent="dragTaskOver(tIndex, stageIndex)"
|
|
|
- @dragend="dragTaskEnd()" draggable @click="goToTask2(tIndex, stageIndex)" class="navTask" :class="{
|
|
|
+ @dragend="dragTaskEnd()" draggable @click="goToTask2(tIndex, stageIndex)" class="navTask" style="padding-left: 12px;" :class="{
|
|
|
isNavTask:
|
|
|
isClickColor > 0 && isClickColor == tIndex + 1 && stageIndex == unitIndex,
|
|
|
isNavOpen: t.toolOpen
|
|
|
}">
|
|
|
<div
|
|
|
- style="left: 12px;"
|
|
|
+ style="left: 20px;"
|
|
|
class="chapter_upload_drag"
|
|
|
></div>
|
|
|
- <div class="nt_taskBox">
|
|
|
+ <div class="nt_taskBox" style="width: calc(100% - 52px);">
|
|
|
<div class="nt_taskTitle">任务{{ tIndex + 1 }}：</div>
|
|
|
<div class="nt_taskName">
|
|
|
<el-tooltip effect="light" :content="t.task ? t.task : '未命名任务'" placement="top">
|
|
|
@@ -2471,20 +2471,20 @@
|
|
|
<div v-if="itemTask.eList && itemTask.eList.length" class="elist_input">
|
|
|
<div v-for="(eItem, eIndex) in itemTask.eList" :key="eIndex" class="elist_input_box">
|
|
|
<span>评价名称：</span>
|
|
|
- <el-tooltip effect="dark" :content="itemTask.eList[eIndex].value || '填写评价名称'" placement="top" popper-class="text_tooltip2">
|
|
|
+ <!-- <el-tooltip effect="dark" :content="itemTask.eList[eIndex].value || '填写评价名称'" placement="top" popper-class="text_tooltip2"> -->
|
|
|
<input type="input" v-model="itemTask.eList[eIndex].value" placeholder="填写评价名称" />
|
|
|
- </el-tooltip>
|
|
|
- <span>评星等级：</span>
|
|
|
+ <!-- </el-tooltip> -->
|
|
|
+ <!-- <span>评星等级：</span>
|
|
|
<el-rate v-model="itemTask.eList[eIndex].score" @change="setEListStar()"
|
|
|
- disabled></el-rate>
|
|
|
+ disabled></el-rate> -->
|
|
|
<div class="remove" @click="
|
|
|
deletEList(unitIndex, itemTaskIndex, eIndex)
|
|
|
"></div>
|
|
|
<div class="elist_inptu_text">
|
|
|
<span>评价描述：</span>
|
|
|
- <el-tooltip effect="dark" :content="itemTask.eList[eIndex].detail || '填写评价描述'" placement="top" popper-class="text_tooltip2">
|
|
|
+ <!-- <el-tooltip effect="dark" :content="itemTask.eList[eIndex].detail || '填写评价描述'" placement="top" popper-class="text_tooltip2"> -->
|
|
|
<input type="input" v-model="itemTask.eList[eIndex].detail" placeholder="填写评价描述" />
|
|
|
- </el-tooltip>
|
|
|
+ <!-- </el-tooltip> -->
|
|
|
</div>
|
|
|
<div class="elist_inptu_text" v-if="evalua">
|
|
|
<span>目标：</span>
|
|
|
@@ -2813,9 +2813,13 @@
|
|
|
</div>
|
|
|
</div>
|
|
|
</div>
|
|
|
- <div class="people_nav">选择成员</div>
|
|
|
+ <div class="people_nav" style="display: flex;align-items: center;">
|
|
|
+ <div class="check_class_left_title">选择成员</div>
|
|
|
+ <div style="display:flex;align-items:center;margin-left:auto;"><el-checkbox v-model="checkAll2"
|
|
|
+ @change="handleCheckAllChange2" class="all_check">全选</el-checkbox></div>
|
|
|
+ </div>
|
|
|
</div>
|
|
|
- <el-checkbox-group v-model="checkboxList3" class="people_name" v-if="teacherJuri.length">
|
|
|
+ <el-checkbox-group v-model="checkboxList3" class="people_name" v-if="teacherJuri.length" @change="InviteChange2">
|
|
|
<el-checkbox v-for="item in teacherJuri" :key="item.userid" :label="item.userid">
|
|
|
<div class="t_j_box">
|
|
|
<el-tooltip placement="top" :content="item.name ? item.name : '暂无姓名'">
|
|
|
@@ -3909,9 +3913,11 @@ export default {
|
|
|
data() {
|
|
|
return {
|
|
|
checkAll: false,
|
|
|
+ checkAll2: false,
|
|
|
chooseType: 1,
|
|
|
checkedCities: [],
|
|
|
isIndeterminate: true,
|
|
|
+ isIndeterminate2: true,
|
|
|
isSysPic: false,
|
|
|
isSysPic2: false,
|
|
|
steps: 1,
|
|
|
@@ -6228,6 +6234,20 @@ export default {
|
|
|
}
|
|
|
}
|
|
|
this.teacherJuri = teacherJuri;
|
|
|
+
|
|
|
+ let _check = []
|
|
|
+ let _check2 = []
|
|
|
+ for (var i = 0; i < this.teacherJuri.length; i++) {
|
|
|
+ var gid = this.teacherJuri[i].userid
|
|
|
+ _check.push(gid)
|
|
|
+ }
|
|
|
+ for (var i = 0; i < this.checkboxList3.length; i++) {
|
|
|
+ var _id = this.checkboxList3[i]
|
|
|
+ if (_check.indexOf(_id) !== -1) {
|
|
|
+ _check2.push(_id)
|
|
|
+ }
|
|
|
+ }
|
|
|
+ this.checkAll2 = _check2.length === _check.length;
|
|
|
})
|
|
|
.catch((err) => {
|
|
|
console.error(err);
|
|
|
@@ -9544,6 +9564,34 @@ export default {
|
|
|
this.getInviteCode(array[i]);
|
|
|
}
|
|
|
},
|
|
|
+ InviteChange2(val) {
|
|
|
+ console.log(val);
|
|
|
+ let _check = []
|
|
|
+ let _check2 = []
|
|
|
+ for (var i = 0; i < this.teacherJuri.length; i++) {
|
|
|
+ var gid = this.teacherJuri[i].userid
|
|
|
+ _check.push(gid)
|
|
|
+ }
|
|
|
+ for (var i = 0; i < this.checkboxList3.length; i++) {
|
|
|
+ var _id = this.checkboxList3[i]
|
|
|
+ if (_check.indexOf(_id) !== -1) {
|
|
|
+ _check2.push(_id)
|
|
|
+ }
|
|
|
+ }
|
|
|
+ this.checkAll2 = _check2.length === _check.length;
|
|
|
+ this.setMan();
|
|
|
+ return;
|
|
|
+ let array = JSON.parse(JSON.stringify(val));
|
|
|
+ this.inviteCode = this.inviteCode.filter((el) => {
|
|
|
+ if (val.indexOf(el.cid) != -1) {
|
|
|
+ array.splice(array.indexOf(el.cid), 1);
|
|
|
+ return el;
|
|
|
+ }
|
|
|
+ });
|
|
|
+ for (var i = 0; i < array.length; i++) {
|
|
|
+ this.getInviteCode(array[i]);
|
|
|
+ }
|
|
|
+ },
|
|
|
handleCheckAllChange(val) {
|
|
|
if (val) {
|
|
|
for (var i = 0; i < this.grade2.length; i++) {
|
|
|
@@ -9569,6 +9617,31 @@ export default {
|
|
|
}
|
|
|
this.isIndeterminate = false;
|
|
|
},
|
|
|
+ handleCheckAllChange2(val) {
|
|
|
+ if (val) {
|
|
|
+ for (var i = 0; i < this.teacherJuri.length; i++) {
|
|
|
+ var gid = this.teacherJuri[i].userid
|
|
|
+ if (this.checkboxList3.indexOf(gid) === -1) {
|
|
|
+ this.checkboxList3.push(gid)
|
|
|
+ }
|
|
|
+ }
|
|
|
+ } else {
|
|
|
+ let _check = []
|
|
|
+ let _check2 = []
|
|
|
+ for (var i = 0; i < this.teacherJuri.length; i++) {
|
|
|
+ var gid = this.teacherJuri[i].userid
|
|
|
+ _check.push(gid)
|
|
|
+ }
|
|
|
+ for (var i = 0; i < this.checkboxList3.length; i++) {
|
|
|
+ var _id = this.checkboxList3[i]
|
|
|
+ if (_check.indexOf(_id) === -1) {
|
|
|
+ _check2.push(_id)
|
|
|
+ }
|
|
|
+ }
|
|
|
+ this.checkboxList3 = _check2
|
|
|
+ }
|
|
|
+ this.isIndeterminate2 = false;
|
|
|
+ },
|
|
|
async getInviteCode(cid) {
|
|
|
let code = this.randomNumber();
|
|
|
let params = {
|
|
|
@@ -9912,9 +9985,15 @@ export default {
|
|
|
this.oldIndex = i;
|
|
|
this.oldData = val;
|
|
|
},
|
|
|
- dragUnitOver(i, j) {
|
|
|
+ dragUnitOver(i) {
|
|
|
this.typeIndex = "Unit-" + i
|
|
|
this.newIndex = i;
|
|
|
+ console.log(i,this.unitJson[i].toolOpen)
|
|
|
+ if(!this.unitJson[i].toolOpen && this.dragType == 'task'){
|
|
|
+ this.unitJson[i].toolOpen = true
|
|
|
+ this.updateWork()
|
|
|
+ this.$forceUpdate()
|
|
|
+ }
|
|
|
},
|
|
|
dragUnitEnd() {
|
|
|
if(this.dragType != 'Unit'){
|
|
|
@@ -10912,14 +10991,14 @@ export default {
|
|
|
|
|
|
.people_search>>>.el-input__inner {
|
|
|
/* height: 25px; */
|
|
|
- width: 95%;
|
|
|
+ width: 100%;
|
|
|
}
|
|
|
|
|
|
.search_img {
|
|
|
width: 20px;
|
|
|
height: 20px;
|
|
|
position: absolute;
|
|
|
- right: 30px;
|
|
|
+ right: 10px;
|
|
|
top: 50%;
|
|
|
transform: translateY(-50%);
|
|
|
}
|
|
|
@@ -12280,7 +12359,9 @@ ol {
|
|
|
margin-bottom: 10px;
|
|
|
}
|
|
|
|
|
|
-.elist_input {}
|
|
|
+.elist_input {
|
|
|
+ width: 100%;
|
|
|
+}
|
|
|
|
|
|
.elist_input_box {
|
|
|
display: flex;
|
|
|
@@ -12296,7 +12377,8 @@ ol {
|
|
|
font: inherit;
|
|
|
color: currentColor;
|
|
|
width: 100%;
|
|
|
- max-width: calc(100% - 385px);
|
|
|
+ /* max-width: calc(100% - 385px); */
|
|
|
+ max-width: calc(100% - 70px);
|
|
|
padding: 8px 14px;
|
|
|
display: block;
|
|
|
min-width: 0;
|
|
|
@@ -13489,14 +13571,19 @@ ol {
|
|
|
/* max-width: 130px; */
|
|
|
/* width: 100%; */
|
|
|
max-width: calc(100% - 66px);
|
|
|
- white-space: nowrap;
|
|
|
- overflow: hidden;
|
|
|
- text-overflow: ellipsis;
|
|
|
font-size: 16px;
|
|
|
color: #060E17;
|
|
|
/* color: #0E1E33; */
|
|
|
}
|
|
|
|
|
|
+.navTask .nt_taskName span{
|
|
|
+ width: 100%;
|
|
|
+ white-space: nowrap;
|
|
|
+ overflow: hidden;
|
|
|
+ text-overflow: ellipsis;
|
|
|
+ display:block;
|
|
|
+}
|
|
|
+
|
|
|
.gjBox {
|
|
|
width: calc(100% - 25px);
|
|
|
padding: 0 0 0 0;
|
