+ v-model:value="value"
+ show-search
+ placeholder="选择评估"
+ style="width: 364px"
+ :options="options"
+ :filter-option="filterOption"
+ @focus="handleFocus"
+ @blur="handleBlur"
+ @change="handleChange2"
+ >
@@ -298,6 +309,7 @@ const options1 = ref([
},
]);
+
const rowSelection = ref({
checkStrictly: false,
onChange: (selectedRowKeys, selectedRows) => {
@@ -528,9 +540,7 @@ export default {
message.error(`查询失败`)
})
};
- const PlayBack = () => {
- state.playback = !state.playback;
- };
+
const cloradio1 = (value) => {
console.log(value.target._value); //点击的选项
if (state.radioV1 === value.target._value) {
@@ -635,9 +645,17 @@ export default {
if (!regular.test(state.inputV2)) {
message.destroy();
return message.warning("直播时长需大于0");
+ }
+ const reg = /(https?|ftp|file):\/\/[-A-Za-z0-9+&@#/%?=~_|!:,.;]+[-A-Za-z0-9+&@#/%=~_|]/;
+ if (!reg.test(state.inputV3)) {
+ message.destroy();
+ return message.warning("请输入有效直播链接地址");
}
-
- if (!state.inputV3) return message.warning("请输入授课老师");
+ if (!reg.test(state.inputV5)) {
+ message.destroy();
+ return message.warning("请输入有效回放地址");
+ }
+ //if (!state.inputV3) return message.warning("请输入授课老师");
//let check = state.checkedC2 ;
let startTime = toDate(
@@ -663,9 +681,8 @@ export default {
liveId: props.edit?props.EditLiveId:0,
liveLink: state.inputV4,
liveName: state.inputV1,
- livePlayback: "",
- livePlaybackLink: state.inputV5,
- liveTag: "",
+ livePlayback:state.playback ? "true":"false",
+ livePlaybackLink: state.playback?state.inputV5:"",
liveTeacherId: state.inputV3,
otherSettings:0, //1或0
signOutTime: state.inputV8,
@@ -702,12 +719,40 @@ export default {
};
-
+ const options = ref([{
+ value: 'jack',
+ label: 'Jack',
+ }, {
+ value: 'lucy',
+ label: 'Lucy',
+ }, {
+ value: 'tom',
+ label: 'Tom',
+ }]);
+ const handleChange2 = value => {
+ console.log(`selected ${value}`);
+ };
+ const handleBlur = () => {
+ console.log('blur');
+ };
+ const handleFocus = () => {
+ console.log('focus');
+ };
+ const checkRadio = () =>{
+ if(state.checkedC1){
+ state.discussSettings = "true"
+ }else{
+ state.discussSettings = "false";
+ }
+ console.log("state.checkedC1=====",state.discussSettings,state.discussSettings=="true");
+ }
+ const filterOption = (input, option) => {
+ return option.value.toLowerCase().indexOf(input.toLowerCase()) >= 0;
+ };
return {
...toRefs(state),
afterVisibleChange,
closeDrawer,
- PlayBack,
options1,
// columns1,
rowSelection,
@@ -715,6 +760,12 @@ export default {
handleChange,
beforeUpload,
updateLiveBroadcast,
+ filterOption,
+ handleBlur,
+ handleFocus,
+ handleChange2,
+ options,
+ checkRadio,
};
},
};
diff --git a/src/components/drawers/AddRef.vue b/src/components/drawers/AddRef.vue
index e7b28d2e..687243a8 100644
--- a/src/components/drawers/AddRef.vue
+++ b/src/components/drawers/AddRef.vue
@@ -229,7 +229,14 @@ export default {
//创建外链
const updateRef = () => {
if (!state.inputV1) return message.warning("请输入外链名称");
- if (!state.inputV2) return message.warning("请输入链接");
+ if (!state.inputV2){
+ return message.warning("请输入链接");
+ }else{
+ const reg = /(https?|ftp|file):\/\/[-A-Za-z0-9+&@#/%?=~_|!:,.;]+[-A-Za-z0-9+&@#/%=~_|]/;
+ if ((!reg.test(state.inputV2)) && state.inputV2 != '') {
+ return message.warning("请输入合法的链接地址");
+ }
+ }
let obj = {
linkAddress: state.inputV2,
linkDescription: state.textV1,
diff --git a/src/views/learningpath/LevelAddDetail.vue b/src/views/learningpath/LevelAddDetail.vue
index 005269cb..5da3bc3b 100644
--- a/src/views/learningpath/LevelAddDetail.vue
+++ b/src/views/learningpath/LevelAddDetail.vue
@@ -1276,7 +1276,7 @@ export default {
state.addactivevisible = true;
state.EditActiveId = id;
state.routerTaskId = eleId;
- };s
+ };
// tableData数据赋值方法
const dataAssignment = (id) => {
diff --git a/src/views/projectcenter/TaskAdd.vue b/src/views/projectcenter/TaskAdd.vue
index 81f44399..360f5a35 100644
--- a/src/views/projectcenter/TaskAdd.vue
+++ b/src/views/projectcenter/TaskAdd.vue
@@ -235,7 +235,7 @@
v-model:edit="edit"
v-model:projectId="projectId"
v-model:chooseStageId="chooseStageId"
- v-model:editDiscussId="editDiscussId"
+ v-model:EditDiscussId="EditDiscussId"
v-model:projectTaskId="projectTaskId"
@changeData="updateTableData"
/>
@@ -255,7 +255,7 @@
0) {
- //后加选择了阶段id
- // if(state.chooseStageId!==null){
- // let final = res.data.data.stageList.find((item)=>item.id==state.chooseStageId)
- // getTableData(final)
- // }else{
- // //获取任务列表
- // let arr = res.data.data.stageList[0].taskList;
- // console.log("任务列表", arr);
- // getTableData(arr);
- // }
+
let arr = res.data.data.stageList[0].taskList;
console.log("任务列表", arr);
getTableData(arr);
@@ -1676,15 +1667,16 @@ export default {
state.addrefvisible = true;
};
const showDrawerAddDiscuss = (id, eleId) => {
- state.editDiscussId = id;
+ state.EditDiscussId = id;
state.projectTaskId = eleId;
state.adddiscussvisible = true;
};
const showDrawerAddActive = (id, eleId) => {
state.addactivevisible = true;
- state.editActivityId = id;
+ state.EditActiveId = id;
state.projectTaskId = eleId;
+ console.log("active=======",id);
};
const showDrawerAddEval = () => {
state.addevalvisible = true;