提交 5787f7e4 编写于 作者: huangwensu's avatar huangwensu

页面接口联调

上级 008c2227
...@@ -139,7 +139,7 @@ ...@@ -139,7 +139,7 @@
:total="totalRows"> :total="totalRows">
</el-pagination> </el-pagination>
</div> </div>
<!-- 新建页面页面 --> <!-- 新建页面 -->
<el-dialog <el-dialog
:title="pageTitle" :title="pageTitle"
:visible.sync="creatPageVisible" :visible.sync="creatPageVisible"
...@@ -187,7 +187,7 @@ ...@@ -187,7 +187,7 @@
<img v-if="pageForm.imageUrl" class="bg-img" :src="pageForm.imageUrl"> <img v-if="pageForm.imageUrl" class="bg-img" :src="pageForm.imageUrl">
</el-upload> </el-upload>
</el-form-item> </el-form-item>
<el-form-item label="发布时间" prop="releaseTime"> <el-form-item v-if="pageForm.implementMethodId == 1" label="发布时间" prop="releaseTime">
<el-date-picker <el-date-picker
type="date" type="date"
placeholder="请选择发布时间" placeholder="请选择发布时间"
...@@ -196,7 +196,7 @@ ...@@ -196,7 +196,7 @@
value-format="yyyy-MM-dd"> value-format="yyyy-MM-dd">
</el-date-picker> </el-date-picker>
</el-form-item> </el-form-item>
<el-form-item label="发布版本" prop="releaseVersion"> <el-form-item v-if="pageForm.implementMethodId == 2" label="发布版本" prop="releaseVersion">
<el-select v-model="pageForm.releaseVersion" clearable placeholder="请选择发布版本" style="width:200px"> <el-select v-model="pageForm.releaseVersion" clearable placeholder="请选择发布版本" style="width:200px">
<el-option <el-option
v-for="(eItem,eIndex) in versionSelect" v-for="(eItem,eIndex) in versionSelect"
...@@ -214,9 +214,9 @@ ...@@ -214,9 +214,9 @@
<el-button type="primary" @click="saveCreatePageMenu">确 定</el-button> <el-button type="primary" @click="saveCreatePageMenu">确 定</el-button>
</span> </span>
</el-dialog> </el-dialog>
<!-- 新建(编辑)埋点 --> <!-- 新建埋点 -->
<el-dialog <el-dialog
title="新建(编辑)menu" title="新建埋点"
:visible.sync="dialogVisible" :visible.sync="dialogVisible"
width="30%"> width="30%">
<el-row :gutter="30" class="row search" type="flex" style="margin-bottom:0;"> <el-row :gutter="30" class="row search" type="flex" style="margin-bottom:0;">
...@@ -229,26 +229,26 @@ ...@@ -229,26 +229,26 @@
size="mini"> size="mini">
<el-col :span="20"> <el-col :span="20">
<el-form-item label="页面名"> <el-form-item label="页面名">
<span>首页</span> <span>{{form.pageName}}</span>
</el-form-item> </el-form-item>
<el-form-item label="页面编码"> <el-form-item label="页面编码">
<span>00010001</span> <span>{{form.pageCode}}</span>
</el-form-item> </el-form-item>
<el-form-item label="事件名"> <el-form-item label="事件名">
<el-input v-model="form.menuName" placeholder="请输入事件名" style="width:200px"></el-input> <el-input v-model="form.actionName" placeholder="请输入事件名" style="width:200px"></el-input>
</el-form-item> </el-form-item>
<el-form-item label="事件类型" prop="style"> <el-form-item label="事件类型" prop="style">
<el-select v-model="form.style" clearable placeholder="请选择事件类型" style="width:200px"> <el-select v-model="form.actionType" clearable placeholder="请选择事件类型" style="width:200px">
<el-option <el-option
v-for="(eItem,eIndex) in styleSelect" v-for="(eItem,eIndex) in actionTypeSelect"
:key="eIndex" :key="eIndex"
:label="eItem" :label="eItem"
:value="eItem"> :value="eItem">
</el-option> </el-option>
</el-select> </el-select>
</el-form-item> </el-form-item>
<el-form-item label="发布版本" prop="bigModule"> <el-form-item v-if="form.implementMethodId == 2" label="发布版本" prop="releaseVersion">
<el-select v-model="form.bigModule" clearable placeholder="请选择发布版本" style="width:200px"> <el-select v-model="form.releaseVersion" clearable placeholder="请选择发布版本" style="width:200px">
<el-option <el-option
v-for="(eItem,eIndex) in versionSelect" v-for="(eItem,eIndex) in versionSelect"
:key="eIndex" :key="eIndex"
...@@ -257,15 +257,24 @@ ...@@ -257,15 +257,24 @@
</el-option> </el-option>
</el-select> </el-select>
</el-form-item> </el-form-item>
<el-form-item v-if="form.implementMethodId == 1" label="发布时间" prop="releaseTime">
<el-date-picker
type="date"
placeholder="请选择发布时间"
v-model="form.releaseTime"
style="width: 200px;"
value-format="yyyy-MM-dd">
</el-date-picker>
</el-form-item>
<el-form-item label="上传图例" prop="location"> <el-form-item label="上传图例" prop="location">
<el-upload <el-upload
v-model="form.imageUrl" v-model="form.actionPath"
class="avatar-uploader" class="avatar-uploader"
action="#" action="#"
:show-file-list="false" :show-file-list="false"
:before-upload="beforeAvatarUpload"> :before-upload="beforeAvatarUpload">
<img v-if="!form.imageUrl" class="bg-img" src="../../../static/img/default.png"> <img v-if="!form.actionPath" class="bg-img" src="../../../static/img/default.png">
<img v-if="form.imageUrl" class="bg-img" :src="form.imageUrl"> <img v-if="form.actionPath" class="bg-img" :src="form.actionPath">
</el-upload> </el-upload>
</el-form-item> </el-form-item>
<el-form-item label="额外投递1" prop="bigModule"> <el-form-item label="额外投递1" prop="bigModule">
...@@ -295,7 +304,7 @@ ...@@ -295,7 +304,7 @@
width="30%"> width="30%">
<el-row :gutter="30" class="row search" type="flex" style="margin-bottom:0;"> <el-row :gutter="30" class="row search" type="flex" style="margin-bottom:0;">
<el-form ref="downForm" <el-form ref="downForm"
:model="form" :model="downForm"
label-width="150px" label-width="150px"
label-suffix=":" label-suffix=":"
label-position="right" label-position="right"
...@@ -303,19 +312,19 @@ ...@@ -303,19 +312,19 @@
size="mini"> size="mini">
<el-col :span="20"> <el-col :span="20">
<el-form-item label="页面名"> <el-form-item label="页面名">
<span>首页</span> <span>{{downForm.pageName}}</span>
</el-form-item> </el-form-item>
<el-form-item label="页面编码"> <el-form-item label="页面编码">
<span>00010001</span> <span>{{downForm.pageCode}}</span>
</el-form-item> </el-form-item>
<el-form-item label="实现方式"> <el-form-item label="实现方式">
<span>首页</span> <span>{{downForm.implementMethod}}</span>
</el-form-item> </el-form-item>
<el-form-item label="归属模块"> <el-form-item label="归属模块">
<span>00010001</span> <span>{{downForm.moduleName2}}</span>
</el-form-item> </el-form-item>
<el-form-item label="下线版本" prop="bigModule"> <el-form-item v-if="downForm.implementMethodId == 2" label="下线版本" prop="offVersion">
<el-select v-model="form.bigModule" clearable placeholder="请选择下线版本" style="width:200px"> <el-select v-model="downForm.offVersion" clearable placeholder="请选择下线版本" style="width:200px">
<el-option <el-option
v-for="(eItem,eIndex) in versionSelect" v-for="(eItem,eIndex) in versionSelect"
:key="eIndex" :key="eIndex"
...@@ -324,11 +333,11 @@ ...@@ -324,11 +333,11 @@
</el-option> </el-option>
</el-select> </el-select>
</el-form-item> </el-form-item>
<el-form-item label="下线时间" prop="time"> <el-form-item v-if="downForm.implementMethodId == 1" label="下线时间" prop="offTime">
<el-date-picker <el-date-picker
type="date" type="date"
placeholder="请选择下线时间" placeholder="请选择下线时间"
v-model="searchParam.time" v-model="downForm.offTime"
style="width: 140px;" style="width: 140px;"
value-format="yyyy-MM-dd"> value-format="yyyy-MM-dd">
</el-date-picker> </el-date-picker>
...@@ -341,7 +350,7 @@ ...@@ -341,7 +350,7 @@
<el-button type="primary" @click="updateConfim">确 定</el-button> <el-button type="primary" @click="updateConfim">确 定</el-button>
</span> </span>
</el-dialog> </el-dialog>
<!-- 流转 --> <!-- 指派 -->
<el-dialog <el-dialog
title="指派" title="指派"
:visible.sync="assignVisible" :visible.sync="assignVisible"
...@@ -355,22 +364,22 @@ ...@@ -355,22 +364,22 @@
size="mini"> size="mini">
<el-col :span="20"> <el-col :span="20">
<el-form-item label="任务状态" prop="changeStatus"> <el-form-item label="任务状态" prop="changeStatus">
<el-select v-model="assignForm.changeStatus" placeholder="请选择任务状态" style="width:200px"> <el-select v-model="assignForm.status" placeholder="请选择任务状态" style="width:200px">
<el-option <el-option
v-for="(eItem,eIndex) in statusSelect" v-for="(eItem,eIndex) in assignstatusSelect"
:key="eIndex" :key="eIndex"
:label="eItem" :label="eItem.name"
:value="eItem"> :value="eItem.id">
</el-option> </el-option>
</el-select> </el-select>
</el-form-item> </el-form-item>
<el-form-item label="指派人" prop="member"> <el-form-item label="指派人" prop="member">
<el-select v-model="assignForm.member" placeholder="请选择指派人" style="width:200px"> <el-select v-model="assignForm.handlerIds" multiple placeholder="请选择指派人" style="width:200px">
<el-option <el-option
v-for="(eItem,eIndex) in memberSelect" v-for="(eItem,eIndex) in assignSelect"
:key="eIndex" :key="eIndex"
:label="eItem" :label="eItem.name"
:value="eItem"> :value="eItem.id + '&' + eItem.name">
</el-option> </el-option>
</el-select> </el-select>
</el-form-item> </el-form-item>
...@@ -417,9 +426,10 @@ export default { ...@@ -417,9 +426,10 @@ export default {
statusSelect: [], statusSelect: [],
versionSelect: [], versionSelect: [],
actionSelect: [], actionSelect: [],
tableData: [{ assignSelect: [],
'menuCode': '001' assignstatusSelect: [],
}], actionTypeSelect: [],
tableData: [],
totalRows: 0, totalRows: 0,
tableText: '无匹配结果', tableText: '无匹配结果',
form: { // 新建埋点页面 form: { // 新建埋点页面
...@@ -439,9 +449,20 @@ export default { ...@@ -439,9 +449,20 @@ export default {
releaseVersion: '' releaseVersion: ''
}, },
assignForm: { // 任务指派 assignForm: { // 任务指派
handlerIds: [],
id: '',
status: ''
},
downForm: { // 下线
pageName: '',
pageCode: '',
implementMethod: '',
implementMethodId: '',
moduleName2: '',
id: '',
offTime: '',
offVersion: ''
}, },
imgUrl: '',
rules: { rules: {
menuCode: [ menuCode: [
{ required: true, message: '请输入menu_code', trigger: 'blur' }, { required: true, message: '请输入menu_code', trigger: 'blur' },
...@@ -467,18 +488,18 @@ export default { ...@@ -467,18 +488,18 @@ export default {
name: [ name: [
{ required: true, message: '请输入页面名称', trigger: 'blur' } { required: true, message: '请输入页面名称', trigger: 'blur' }
], ],
implementMethodId: [
{ required: true, message: '请选择实现方式', trigger: 'change' }
],
moduleId: [ moduleId: [
{ required: true, message: '请选择模块归类', trigger: 'change' } { required: true, message: '请选择模块归类', trigger: 'change' }
], ],
releaseTime: [ implementMethodId: [
{ required: true, message: '请选择发布时间', trigger: 'change' } { required: true, message: '请选择实现方式', trigger: 'change' }
], ],
imageUrl: [ imageUrl: [
{ required: true, message: '请上传图片', trigger: 'change' } { required: true, message: '请上传图片', trigger: 'change' }
], ],
releaseTime: [
{ required: true, message: '请选择发布时间', trigger: 'change' }
],
releaseVersion: [ releaseVersion: [
{ required: true, message: '请选择发布版本', trigger: 'change' } { required: true, message: '请选择发布版本', trigger: 'change' }
] ]
...@@ -556,6 +577,15 @@ export default { ...@@ -556,6 +577,15 @@ export default {
} }
); );
}, },
// 获取页面指派下拉数据
getAssignList() {
this.getData(
"get", `/basic-data/bi/constants/userList/all`, {},
res => {
this.assignSelect = res.data;
}
);
},
// 点击表格某一行 // 点击表格某一行
tableRowClick(row, column, event) { tableRowClick(row, column, event) {
console.log("=========", row) console.log("=========", row)
...@@ -600,16 +630,16 @@ export default { ...@@ -600,16 +630,16 @@ export default {
url = "/basic-data/bi/page/create"; url = "/basic-data/bi/page/create";
}else { }else {
url = "/basic-data/bi/page/save"; url = "/basic-data/bi/page/save";
this.pageForm.id = this.rowId; this.pageForm.pageId = this.rowId;
} }
req = JSON.parse(JSON.stringify(this.pageForm)); req = JSON.parse(JSON.stringify(this.pageForm));
console.log("============",req)
req.releaseTime = new Date(req.releaseTime).getTime(); req.releaseTime = new Date(req.releaseTime).getTime();
this.getData( this.getData(
"post", url, req, "post", url, req,
res => { res => {
this.$message.success("新建页面成功"); this.$message.success("新建页面成功");
this.creatPageVisible = false; this.creatPageVisible = false;
this.searchList();
} }
); );
...@@ -618,36 +648,69 @@ export default { ...@@ -618,36 +648,69 @@ export default {
}, },
// 下线页面 // 下线页面
downPage(row) { downPage(row) {
this.downForm.offTime = '';
this.downForm.offVersion = '';
this.downForm = Object.assign({ id: row.pageId }, row);
this.downPageVisible = true; this.downPageVisible = true;
}, },
// 保存下线页面 // 保存下线页面
updateConfim() { updateConfim() {
this.getData(
"post", `/basic-data/bi/page/offLine`, this.downForm,
res => {
this.$message.success("下线成功");
this.downPageVisible = false;
this.searchList();
}
);
}, },
// 新建埋点埋点 // 新建埋点
createPoing(row) { createPoing(row) {
this.dialogVisible = true; this.dialogVisible = true;
if(this.$refs.menuForm) { if(this.$refs.menuForm) {
this.$refs.menuForm.resetFields(); this.$refs.menuForm.resetFields();
} }
}, },
// 保存新建页面埋点 // 保存新建埋点
saveCreateAndEditMenu() { saveCreateAndEditMenu() {
this.$refs.menuForm.validate((valid) => { this.$refs.menuForm.validate((valid) => {
if (valid) { if (valid) {
this.search(); this.searchList();
} }
}); });
}, },
// 指派 // 指派
assignDialog(row) { assignDialog(row) {
this.assignVisible = true; this.assignVisible = true;
this.assignForm.id = row.pageId;
this.assignForm.handlerIds = [];
this.assignForm.status = '';
this.getData(
"get", `/basic-data/bi/constants/assign/detail?status=${row.status}`, {},
res => {
this.assignstatusSelect = res.data.statusList;
this.assignSelect = res.data.handlerList;
}
);
}, },
// 确定指派 // 确定指派
confirmAssign() { confirmAssign() {
this.assignForm.handlerIds.forEach((item, index) => {
this.assignForm.handlerIds[index] = {
id: item.split("&")[0],
name: item.split("&")[1]
}
})
this.getData(
"post", `/basic-data/bi/page/assign`, this.assignForm,
res => {
this.$message.success("指派成功");
this.assignVisible = false;
this.searchList();
}
);
}, },
// 上传menu图片 // 上传页面图片
beforeAvatarUpload(file) { beforeAvatarUpload(file) {
let _this = this; let _this = this;
if (isEmptyUtils(file)) { if (isEmptyUtils(file)) {
...@@ -662,11 +725,11 @@ export default { ...@@ -662,11 +725,11 @@ export default {
}, },
handleSizeChange(value) { handleSizeChange(value) {
this.searchParam.pageSize = value; this.searchParam.pageSize = value;
this.search(); this.searchList();
}, },
handleCurrentChange(value) { handleCurrentChange(value) {
this.searchParam.pageNo = value; this.searchParam.pageNo = value;
this.search(); this.searchList();
} }
} }
} }
......
Markdown 格式
0% or
您添加了 0 到此讨论。请谨慎行事。
先完成此消息的编辑!
想要评论请 注册