Skip to content

P
pica.cloud.web-education-admin
提交 e39af569 编写于 作者: guofeng.chen's avatar guofeng.chen
浏览文件
操作

Merge branch 'dev-liveSix-20200817' of... 

Merge branch 'dev-liveSix-20200817' of 192.168.110.53:com.pica.cloud.education.frontend/pica.cloud.web-education-admin into dev-liveSix-20200817
上级 6cdec0b3 e794938f
展开全部 显示空白字符变更
内嵌 并排
正在显示 包含 430 行增加 和 26 行删除
src/components/yqrange/baseinfo.vue
浏览文件 @ e39af569
......@@ -87,6 +87,10 @@
<!--<span class="el-icon-info"></span>-->
<i class="el-icon-info" style="color: #449284;"></i>
</el-tooltip>
<div style="margin-top: 60px;margin-left: 250px;">
<el-button type="primary" @click="save()" center>保存</el-button>
<el-button @click="cancle()">取 消</el-button>
</div>
</el-form-item>
<el-dialog
......@@ -325,6 +329,16 @@
});
},
save(){
this.submitForm();
},
cancle(){
const _this = this;
setTimeout(function () {
_this.$router.go(-1)
}, 100);
}
}
}
</script>
......
src/router/router.js
浏览文件 @ e39af569
......@@ -60,6 +60,8 @@ const roleManage = r => require.ensure([], () => r(require('../views/yqrange/rol
const createRange = r => require.ensure([], () => r(require('../views/yqrange/create-range.vue')), 'create-range')
const editRange = r => require.ensure([], () => r(require('../views/yqrange/edit-range.vue')), 'edit-range')
const createLive = r => require.ensure([], () => r(require('../views/yqrange/create-live.vue')), 'create-live')
const adminManage = r => require.ensure([], () => r(require('../views/yqrange/admin-manage.vue')), 'admin-manage')
export default [{
path: '/',
......@@ -226,6 +228,10 @@ export default [{
path: '/role-manage',
component: roleManage
},
{
path: '/admin-manage',
component: adminManage
},
{
path: '/create-range',
component: createRange
......
src/utils/filter.js
浏览文件 @ e39af569
......@@ -305,6 +305,28 @@ const vueFilter = {
} else if (value == 2) {
return '取消屏蔽';
}
},
roleAdminStatus: (value) => {
if(value == 1) {
return '普通成员';
} else if(value == 2) {
return '主管理员';
}else if(value == 3) {
return '高级主管理员';
}else if(value == 4) {
return '管理员';
}
},
roleAdminButton: (value) => {
if(value == 1) {
return '升为管理员';
} else if(value == 2) {
return '';
}else if(value == 3) {
return '';
}else if(value == 4) {
return '降为普通成员';
}
},
areaText: (value) => {
let text = '-';
......@@ -474,7 +496,7 @@ const vueFilter = {
if (value == 0) {
return '暂存'
}else if (value == 10) {
return '下线'
return '待发布'
}else if (value == 20) {
return ''
}else if (value == 30) {
......
src/views/yqrange/admin-manage.vue 0 → 100644
浏览文件 @ e39af569
此差异已折叠。
src/views/yqrange/create-live.vue
浏览文件 @ e39af569
......@@ -55,7 +55,9 @@
<el-radio label="1" :disabled="styleEditFlag">网页直播</el-radio>
<el-radio label="2" :disabled="styleEditFlag">拉流直播</el-radio>
</el-radio-group>
<el-tooltip class="item" effect="dark" content="网页直播即通过生成的网页地址进行直播，拉流直播是指进入第三方流进行转播" placement="top">
<i class="el-icon-info" style="color: #449284;margin-left: 15px;"></i>
</el-tooltip>
</el-form-item>
<el-form-item label="拉流地址" v-if="pullFlag" class="required-label">
......@@ -112,9 +114,9 @@
</el-form-item>
<!-- <el-form-item label="直播开始通知">-->
<!-- <el-checkbox size="small" v-model="checked" :disabled="styleEditFlag">App通知</el-checkbox>-->
<!-- </el-form-item>-->
<el-form-item label="直播开始通知">
<el-checkbox size="small" v-model="checked" :disabled="styleEditFlag">App通知</el-checkbox>
</el-form-item>
<el-form-item label="直播中人数显示规则" prop="streamType">
......@@ -342,6 +344,9 @@
<el-radio label="0">否</el-radio>
<el-radio label="1">是</el-radio>
</el-radio-group>
<el-tooltip class="item" effect="dark" content="此tab会出现在直播详情页上，用于直播内容进行拓展说明" placement="top">
<i class="el-icon-info" style="color: #449284;margin-left: 15px;"></i>
</el-tooltip>
</el-form-item>
......@@ -1622,7 +1627,7 @@
this.changeSign();
// this.checked = this.formData.isAppPush == 1 ? true: false;
this.checked = this.formData.isAppPush == 1 ? true: false;
if(this.formData.signMinute == 0 || this.formData.signMinute == undefined){
......@@ -1716,7 +1721,7 @@
}
}
// this.formData.isAppPush = this.checked == true ? 1: 0;
this.formData.isAppPush = this.checked == true ? 1: 0;
if(this.formData.signMinute == "" || this.formData.signMinute == undefined){
this.formData.signMinute = 0;
......
src/views/yqrange/create-range.vue
浏览文件 @ e39af569
......@@ -4,26 +4,27 @@
<div class="yqrange-index-content screenSet" id="screenSet">
<el-row class="step-content">
<el-col :span="14">
<el-steps :active="active" simple class>
<span class="step-num" v-bind:class="{ 'on-step': stepData[0] }">1</span>
<el-step title="基础信息"></el-step>
<span class="step-num" v-bind:class="{ 'on-step': stepData[1] }">2</span>
<el-step title="选择成员">2</el-step>
</el-steps>
</el-col>
<el-col :span="5" :offset="5">
<el-button v-if="active<1" size="small" type="primary" @click="nextStep">下一步</el-button>
<el-button v-if="active>=1" size="small" type="primary" @click="complete">完成</el-button>
<p class="p-title">新建/编辑小圈</p>
<!--<el-steps :active="active" simple class>-->
<!--<span class="step-num" v-bind:class="{ 'on-step': stepData[0] }">1</span>-->
<!--<el-step title="基础信息"></el-step>-->
<!--<span class="step-num" v-bind:class="{ 'on-step': stepData[1] }">2</span>-->
<!--<el-step title="选择成员">2</el-step>-->
<!--</el-steps>-->
</el-col>
<!--<el-col :span="5" :offset="5">-->
<!--<el-button v-if="active<1" size="small" type="primary" @click="nextStep">下一步</el-button>-->
<!--<el-button v-if="active>=1" size="small" type="primary" @click="complete">完成</el-button>-->
<!--</el-col>-->
</el-row>
<div class="first-step" v-if="active === 0">
<p class="p-title">基础信息</p>
<base-info :formData="formData" @returnTypeData="returnTypeData" @returnIsNext="returnIsNext" ref="child">
</base-info>
</div>
<div class="second-step" v-else-if="active === 1">
<organzation :formData="formData" ref="org"></organzation>
</div>
<!--<div class="second-step" v-else-if="active === 1">-->
<!--<organzation :formData="formData" ref="org"></organzation>-->
<!--</div>-->
</div>
</div>
</template>
......@@ -163,10 +164,15 @@
vm.POST("circle/circle/save", req).then(res => {
if (res.code == "000000") {
// console.log(res);
console.log(this.$refs);
vm.formData.id = res.data;
this.active = 1;
this.stepData = [false, true];
// console.log(this.$refs);
// vm.formData.id = res.data;
// // this.active = 1;
// this.stepData = [false, true];
this.$message.success('保存成功');
const _this = this;
setTimeout(function () {
_this.$router.go(-1)
}, 100);
} else {
......
src/views/yqrange/live-manage.vue
浏览文件 @ e39af569
......@@ -1047,8 +1047,7 @@ export default {
createTime: res.data.pageContents[i].createdTime,
startTime: res.data.pageContents[i].openTime,
endTime: res.data.pageContents[i].endTime,
rtcId: res.data.pageContents[i].id,
isSign: res.data.pageContents[i].isSign
rtcId: res.data.pageContents[i].id
};
listData.push(obj);
}
......
Markdown 格式
0% or
您添加了 0 人 到此讨论。请谨慎行事。
先完成此消息的编辑！
想要评论请 注册 或