【第一轮测试-项目-添加任务】所有添加任务涉及到从列表选择数据都存在选中数据删除后再次选择依旧为选中状态,且无法进行操作

This commit is contained in:
kclf
2022-12-06 14:16:58 +08:00
parent d5ad11d97a
commit ecc54f70b1
3 changed files with 264 additions and 257 deletions

View File

@@ -47,6 +47,7 @@
expandRowByClick="true"
@expand="expandTable"
:pagination="false"
:row-key="(record) => record.assessmentId"
:row-selection="{
selectedRowKeys: selectedRowKeys,
onChange: onSelectChange,
@@ -74,7 +75,7 @@
</a-drawer>
</template>
<script>
import { reactive, toRefs } from "vue";
import { reactive, toRefs, watch } from "vue";
import * as api from "../../api/indexInvist.js";
import dayjs from "dayjs";
export default {
@@ -97,9 +98,17 @@ export default {
assessmentName: {
type: String,
default: null,
}
},
},
setup(props, ctx) {
watch(
props,
(newVal) => {
state.selectedRowKeys = [newVal.assessmentId];
},
{ deep: true }
);
const state = reactive({
assessmentVisible: false,
assessment: null,
@@ -116,7 +125,6 @@ export default {
state.selectedRowKeys = [];
ctx.emit("update:assessmentVisible", false);
ctx.emit("update:titleTag", true);
};
const afterVisibleChange = (bool) => {
console.log("state getAllInvistText", bool, "======", props.titleTag);
@@ -162,7 +170,6 @@ export default {
const rowSelection = {
type: "radio",
onSelect: (selectedRows) => {
state.assessment = selectedRows;
/* state.assessmentId = selectedRows.assessmentId;
@@ -182,15 +189,13 @@ export default {
const onSelectChange = (selectedRowKeys, selectRow) => {
console.log("selectedRowKeys changed: ", selectedRowKeys, selectRow);
state.selectedRowKeys = selectedRowKeys;
state.selectedRows = selectRow;
console.log(selectRow)
console.log(selectRow);
state.assessment = selectRow[0];
state.assessmentId = selectRow[0].assessmentId;
ctx.emit("checkedAss", state.assessment);
ctx.emit("update:assessmentId", state.assessmentId);
ctx.emit("update:assessmentName", state.assessment.name);
state.selectedRowKeys = [];
closeDrawer();
};
@@ -251,7 +256,7 @@ export default {
getAllInvistText,
resetInvist,
handelChangePage,
onSelectChange
onSelectChange,
};
},
};

View File

@@ -83,6 +83,7 @@
<AssessmentList
v-model:assessmentVisible="assessmentVisible"
v-model:titleTag="titleTag"
:assessmentId="assessmentId"
@checkedAss="getCheckedAss"
/>
</div>
@@ -160,7 +161,7 @@ export default {
projectTemplateId: {
type: Number,
default: null,
}
},
},
setup(props, ctx) {
const state = reactive({
@@ -178,6 +179,7 @@ export default {
titleTag: false,
});
const getCheckedAss = (ass) => {
state.assessmentId = ass.assessmentId;
state.assessment = ass;
state.assessment1 = null;
};
@@ -207,7 +209,7 @@ export default {
api
.queryAppraiseDetailById({ assessmentId: props.EditInvistId })
.then((res) => {
console.log(res)
console.log(res);
//更新讨论信息
state.assessment1 = res.data.data;
})

View File

@@ -50,7 +50,6 @@
show-count
:maxlength="200"
:rows="6"
/>
</div>
</div>
@@ -111,8 +110,10 @@
<span style="margin-right: 3px">授课老师</span>
</div>
<div class="btnbox">
<ProjectManager v-model:value="memberValue.value"
v-model:name="memberValue.label"></ProjectManager>
<ProjectManager
v-model:value="memberValue.value"
v-model:name="memberValue.label"
></ProjectManager>
</div>
</div>
<div class="mbl_items2">
@@ -196,19 +197,18 @@
v-model:checked="needEval"
@click="needEval = !needEval"
>需要评估
</a-checkbox
>
</a-checkbox>
</div>
</div>
<div v-if="needEval" class="main_item">
<div class="signbox"></div>
<div class="btnbox">
<button class="xkbtn" @click="showAssessment">选择评估</button>
<div v-if="(assessmentId > 0)">
<div v-if="assessmentId > 0">
<a-tag closable @close="removePG" color="processing">
<span style="font-size: 14px; line-height: 33px"
>{{assessmentName}}</span
>
<span style="font-size: 14px; line-height: 33px">{{
assessmentName
}}</span>
</a-tag>
</div>
<AssessmentList
@@ -303,7 +303,6 @@
</div>
</div>
<div class="main_item">
<div class="signbox">
<span style="margin-right: 3px">其他设置</span>
@@ -313,8 +312,7 @@
v-model:checked="switchC2"
@onclick="switchC2 = !switchC2"
>学员请假后记为任务完成
</a-checkbox
>
</a-checkbox>
</div>
</div>
</div>
@@ -402,7 +400,6 @@ export default {
type: Number,
default: null,
},
},
setup(props, ctx) {
// const router = useRouter();
@@ -494,13 +491,13 @@ export default {
api
.getLiveBroadcastInfor({ liveId: d })
.then((res) => {
console.log("获取的数据",res)
console.log("获取的数据", res);
state.inputV1 = res.data.data.liveName;
state.time = [
dayjs(res.data.data.liveStartTime, "YYYY-MM-DD HH:mm"),
dayjs(res.data.data.liveEndTime, "YYYY-MM-DD HH:mm"),
];
console.log(state.time)
console.log(state.time);
state.inputV2 = res.data.data.liveDuration;
state.inputV3 = res.data.data.liveTeacherId;
@@ -515,10 +512,13 @@ export default {
//state.= res.data.data
state.assessmentId = res.data.data.assessmentId;
state.imageUrl = res.data.data.liveCover;
state.switchC1 = res.data.data.livePlayback === '1' ? true : false;
state.switchC1 = res.data.data.livePlayback === "1" ? true : false;
state.switchC2 = res.data.data.otherSettings == 1 ? true : false;
state.needEval = res.data.data.isEvaluate == '1' ? true : false;
state.memberValue = {value: res.data.data.liveTeacherId || '', label: res.data.data.liveTeacherName || ''};
state.needEval = res.data.data.isEvaluate == "1" ? true : false;
state.memberValue = {
value: res.data.data.liveTeacherId || "",
label: res.data.data.liveTeacherName || "",
};
})
.catch(() => {
//message.error(`查询失败`);
@@ -607,7 +607,6 @@ export default {
};
const showAssessment = () => {
state.assessmentVisible = true;
};
//创建直播
const updateLiveBroadcast = () => {
@@ -648,7 +647,10 @@ export default {
state.obj = {
afterSignIn: state.inputV6,
beforeSignIn: state.inputV7,
assessmentId: state.assessmentId == null || state.assessmentId == "" ? 0 : Number(state.assessmentId),
assessmentId:
state.assessmentId == null || state.assessmentId == ""
? 0
: Number(state.assessmentId),
liveCover: state.imageUrl, //直播封面
liveDuration: Number(state.inputV2),
liveEndTime: endTime,
@@ -667,21 +669,20 @@ export default {
standardSettings: state.radioV1, //1或2
isEvaluate: state.needEval ? "1" : "0",
};
console.log('我是要更新的数据',state.obj )
console.log("我是要更新的数据", state.obj);
if (props.edit) {
api
.updateLiveBroadcastMessage(state.obj)
.then(async (res) => {
console.log(res)
console.log(res);
message.destroy();
message.success("提交成功");
closeDrawer();
await updateTask(res);
})
.catch((err) => {
console.log(err)
console.log(err);
});
} else {
api
@@ -692,8 +693,7 @@ export default {
await updateTask(res);
closeDrawer();
})
.catch(() => {
});
.catch(() => {});
}
};
const beforeUpload = (file) => {
@@ -800,10 +800,10 @@ export default {
// 删除评估
const removePG = () => {
console.log("11111")
console.log("11111");
state.assessmentId = "";
state.isEvaluate = "0";
}
};
return {
...toRefs(state),
@@ -821,7 +821,7 @@ export default {
templateScroll,
handleSearch,
showAssessment,
removePG
removePG,
};
},
};