Skip to content

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

add app.vue

上级 f9fddc27
显示空白字符变更
内嵌 并排
正在显示 包含 161 行增加 和 65 行删除
src/App.vue
浏览文件 @ f7ef1f14
...@@ -62,10 +62,10 @@ export default { ...@@ -62,10 +62,10 @@ export default {
if (isNotEmptyUtils(paramMap["token"])) { if (isNotEmptyUtils(paramMap["token"])) {
vm.token = paramMap["token"] vm.token = paramMap["token"]
} else { } else {
window.location.href = getInnerLoginUrl() // 没有token返回登录页面 window.location.href = getLoginUrl() // 没有token返回登录页面
} }
}else { }else {
window.location.href = getInnerLoginUrl() // 没有token返回登录页面 window.location.href = getLoginUrl() // 没有token返回登录页面
} }
vm.changeToken(vm.token) vm.changeToken(vm.token)
vm.getUserAuth(vm.token) vm.getUserAuth(vm.token)
......
src/utils/envConfig.js
浏览文件 @ f7ef1f14
...@@ -13,7 +13,7 @@ export const envConfig = { ...@@ -13,7 +13,7 @@ export const envConfig = {
// apiUrl: 'https://test1-api.yunqueyi.com/', // apiUrl: 'https://test1-api.yunqueyi.com/',
// webPageUrl: 'https://test1-phome.yunqueyi.com/' // webPageUrl: 'https://test1-phome.yunqueyi.com/'
//baseUrl: 'https://uat-sc.yunqueyi.com/', //baseUrl: 'https://uat-sc.yunqueyi.com/',
baseUrl: 'http://localhost:11905/portal/', baseUrl: 'http://192.168.110.226:11905/portal/',
apiUrl: 'https://uat-api.yunqueyi.com/', apiUrl: 'https://uat-api.yunqueyi.com/',
webPageUrl: 'https://uat-phome.yunqueyi.com/', webPageUrl: 'https://uat-phome.yunqueyi.com/',
qiniuUrl: "http://localhost:10201/contents/admin/qiniu/token", qiniuUrl: "http://localhost:10201/contents/admin/qiniu/token",
......
src/utils/fetch.js
浏览文件 @ f7ef1f14
...@@ -16,6 +16,7 @@ service.interceptors.request.use(config => { ...@@ -16,6 +16,7 @@ service.interceptors.request.use(config => {
} }
config.headers['sysCode'] = 12 config.headers['sysCode'] = 12
config.headers['token'] = localStorage.getItem('storageToken') config.headers['token'] = localStorage.getItem('storageToken')
//config.headers['token'] = 'AB14D7D7675E4D09B4B1566170076122'
config.headers['deviceInfo'] = JSON.stringify({ "app_channel": "", "app_mac": "", "app_uuid": "", "app_version": "", "device_brand": "", "device_ip": "", "device_model": "", "device_net": "", "device_ops": "", "resolution_wh": "", "system_level": "", "device_type": '10' }) config.headers['deviceInfo'] = JSON.stringify({ "app_channel": "", "app_mac": "", "app_uuid": "", "app_version": "", "device_brand": "", "device_ip": "", "device_model": "", "device_net": "", "device_ops": "", "resolution_wh": "", "system_level": "", "device_type": '10' })
// if (config.data && config.data.setEntry) { // if (config.data && config.data.setEntry) {
// config.headers['sysCode'] = config.data.sysCode || 10 // config.headers['sysCode'] = config.data.sysCode || 10
......
src/utils/mixins.js
浏览文件 @ f7ef1f14
...@@ -156,7 +156,7 @@ module.exports = { ...@@ -156,7 +156,7 @@ module.exports = {
// 通用DELETE请求 // 通用DELETE请求
DELETE(api, para, callback,str) { DELETE(api, para, callback,str) {
// para.token = para.token || this.token || "343BCABC890349ACAF357FA79122F9FE" // para.token = para.token || this.token || "343BCABC890349ACAF357FA79122F9FE"
// let url = api + this.getUrlPara(para) let url = api + this.getUrlPara(para)
return fetch({ return fetch({
url: getBaseUrl(url), url: getBaseUrl(url),
method: 'delete', method: 'delete',
......
src/views/education/add-manager.vue
浏览文件 @ f7ef1f14
...@@ -519,6 +519,7 @@ export default { ...@@ -519,6 +519,7 @@ export default {
this.$nextTick(function() { this.$nextTick(function() {
this.getComponentInfo(); this.getComponentInfo();
this.getDepartment();
}); });
}, },
methods: { methods: {
...@@ -527,7 +528,7 @@ export default { ...@@ -527,7 +528,7 @@ export default {
let flag = null; let flag = null;
this.$refs[formName].validate(valid => { this.$refs[formName].validate(valid => {
if (valid) { if (valid) {
console.log("success"); //console.log("success");
flag = true; flag = true;
} else { } else {
console.log("error submit!!"); console.log("error submit!!");
...@@ -540,23 +541,47 @@ export default { ...@@ -540,23 +541,47 @@ export default {
resetForm(formName) { resetForm(formName) {
this.$refs[formName].resetFields(); this.$refs[formName].resetFields();
}, },
//设置编辑数据
setEditData(editData) {
//console.log(editData);
this.formData = {
id: vm.getUrlSearch(window.location.href, "projectId"),
projectName: editData.projectData.projectName,
projectBegintime: editData.projectData.projectBegintime,
projectEndtime: editData.projectData.projectBegintime,
duringTime: [
editData.projectData.projectBegintime,
editData.projectData.projectBegintime
],
projectIntro: editData.projectData.projectIntro,
type: editData.attachmentModel[1].kind,
attachmentUrl1: editData.attachmentModel[0].attachmentUrl,
attachmentUrl2: editData.attachmentModel[1].attachmentUrl,
attachmentUrl3: ""
};
},
//编辑管理 //编辑管理
editManager(data) { editManager(data) {
let req = {}; let req = {};
let projectId = 23; let projectId = vm.getUrlSearch(window.location.href, "projectId");
if (projectId != null && projectId != "") {
vm.GET("portalInfo/getProjectInfo/" + projectId, req).then(res => { vm.GET("portalInfo/getProjectInfo/" + projectId, req).then(res => {
if (res.code == "000000") { if (res.code == "000000" && res.data.projectData != null) {
let editData = res.data;
this.setEditData(editData);
} else {
console.log(res); console.log(res);
} }
}); });
}
}, },
//编辑/更新 基础信息 //编辑/更新 基础信息
insertOrUpdate() { insertOrUpdate(option) {
//console.log(this.formData); //console.log(this.formData);
let projectModel = { let projectModel = {
projectName: this.formData.projectName, projectName: this.formData.projectName,
projectBegintime: this.formData.projectBegintime, projectBegintime: this.formData.duringTime[0],
projectEndtime: this.formData.projectEndtime, projectEndtime: this.formData.duringTime[1],
projectIntro: this.formData.projectIntro projectIntro: this.formData.projectIntro
}; };
let attachmentModel = [ let attachmentModel = [
...@@ -567,9 +592,9 @@ export default { ...@@ -567,9 +592,9 @@ export default {
seqNo: 1 seqNo: 1
}, },
{ {
attachmentType: 2, attachmentType: this.formData.type,
attachmentUrl: this.formData.attachmentUrl2, attachmentUrl: this.formData.attachmentUrl2,
kind: this.formData.type, kind: 2,
seqNo: 1 seqNo: 1
} }
]; ];
...@@ -580,12 +605,22 @@ export default { ...@@ -580,12 +605,22 @@ export default {
kind: 3 kind: 3
} }
]; ];
if (option == "edit") {
//编辑
projectModel.id = this.formData.id;
for (let i = 0; i < attachmentModel.length; i++) {
attachmentModel[i].portalProjectId = this.formData.id;
}
for (let i = 0; i < attachmentPDFModel.length; i++) {
attachmentPDFModel[i].portalProjectId = this.formData.id;
}
}
let postData = { let postData = {
projectModel: JSON.stringify(projectModel), projectModel: JSON.stringify(projectModel),
attachmentModel: JSON.stringify(attachmentModel), attachmentModel: JSON.stringify(attachmentModel),
attachmentPDFModel: JSON.stringify(attachmentPDFModel) attachmentPDFModel: JSON.stringify(attachmentPDFModel)
}; };
console.log(postData); //console.log(postData);
vm.POST("portalInfo/insertOrUpdate", postData).then(res => { vm.POST("portalInfo/insertOrUpdate", postData).then(res => {
if (res.code == "000000") { if (res.code == "000000") {
console.log(res); console.log(res);
...@@ -687,13 +722,16 @@ export default { ...@@ -687,13 +722,16 @@ export default {
console.log("判断移动" + removeState); console.log("判断移动" + removeState);
if (removeState === true) { if (removeState === true) {
//校验名字 //校验名字
let projectId = vm.getUrlSearch(window.location.href, "projectId");
if (projectId == null) {
//新建
let param = { let param = {
projectName: this.formData.projectName projectName: this.formData.projectName
}; };
vm.GET("portalInfo/checkProjectName", param).then(res => { vm.GET("portalInfo/checkProjectName", param).then(res => {
if (res.code == "000000") { if (res.code == "000000") {
//移动到第二页 选择范围 //移动到第二页 选择范围
this.insertOrUpdate(); this.insertOrUpdate("add");
this.active++; this.active++;
this.stepData = [false, true, false]; this.stepData = [false, true, false];
this.checkAllTable(); this.checkAllTable();
...@@ -701,6 +739,13 @@ export default { ...@@ -701,6 +739,13 @@ export default {
this.$message.error("项目名称" + res.message); this.$message.error("项目名称" + res.message);
} }
}); });
} else {
//编辑
this.insertOrUpdate("edit");
this.active++;
this.stepData = [false, true, false];
this.checkAllTable();
}
} }
} else if (this.active == 1) { } else if (this.active == 1) {
let removeState = true; let removeState = true;
...@@ -758,7 +803,6 @@ export default { ...@@ -758,7 +803,6 @@ export default {
1 1
).then(function(path) { ).then(function(path) {
console.log(path); console.log(path);
//vm.formData[fileLimit.key] = path.fullPath;
vm.$message.success("上传成功"); vm.$message.success("上传成功");
}); });
} }
...@@ -937,13 +981,13 @@ export default { ...@@ -937,13 +981,13 @@ export default {
//改变 设定机构选项 //改变 设定机构选项
handleSelectionOrganization(val) { handleSelectionOrganization(val) {
this.multipleSelectionOrganization = val; this.multipleSelectionOrganization = val;
console.log(this.multipleSelectionOrganization); //console.log(this.multipleSelectionOrganization);
this.updatePerson(this.multipleSelectionOrganization); this.updatePerson(this.multipleSelectionOrganization);
}, },
//改变 table的check状态 //改变 table的check状态
handleSelectionChange(val) { handleSelectionChange(val) {
this.multipleSelection = val; this.multipleSelection = val;
console.log(this.multipleSelection); //console.log(this.multipleSelection);
}, },
//设定机构table全选 //设定机构table全选
checkAll(flag, name) { checkAll(flag, name) {
...@@ -954,6 +998,17 @@ export default { ...@@ -954,6 +998,17 @@ export default {
//this.$refs[name].clearSelection(); //this.$refs[name].clearSelection();
} }
}, },
//获取科室信息
getDepartment() {
let req = {
projectId: vm.getUrlSearch(window.location.href, "projectId")
};
vm.GET("scope/v1/department", req).then(res => {
if (res.code == "000000") {
this.tableDepartment = res.data.department;
}
});
},
//机构table修改 //机构table修改
handleSizeOrganization(val) { handleSizeOrganization(val) {
console.log(`每页 ${val} 条`); console.log(`每页 ${val} 条`);
......
src/views/education/item-manager.vue
浏览文件 @ f7ef1f14
...@@ -245,6 +245,7 @@ export default { ...@@ -245,6 +245,7 @@ export default {
} }
}); });
}, },
//按钮展示情况
showButton(row, type) { showButton(row, type) {
// 按钮type类型： 0-编辑 // 按钮type类型： 0-编辑
// 1-暂存 2-完成 3-上架 4-通过 5-下架 6-拒绝 // 1-暂存 2-完成 3-上架 4-通过 5-下架 6-拒绝
...@@ -255,22 +256,15 @@ export default { ...@@ -255,22 +256,15 @@ export default {
let typeStr = parseInt(type); let typeStr = parseInt(type);
//console.log("状态："+projectStatus+ "等级：" + level + " 按钮类型：" + type); //console.log("状态："+projectStatus+ "等级：" + level + " 按钮类型：" + type);
let buttonStatus = returnData().buttonStatus; let buttonStatus = returnData().buttonStatus;
if (level != null) {
let statusSet = buttonStatus[projectStatus - 1][level]; let statusSet = buttonStatus[projectStatus - 1][level];
let flagValue = statusSet.indexOf(typeStr); let flagValue = statusSet.indexOf(typeStr);
// console.log(
// "所有状态：" +
// statusSet +
// " 当前状态" +
// typeStr +
// " 展示情况:" +
// flagValue
// );
if (flagValue >= 0) { if (flagValue >= 0) {
flag = true; flag = true;
} else { } else {
flag = false; flag = false;
} }
}
//flag = true; //flag = true;
return flag; return flag;
}, },
...@@ -303,8 +297,10 @@ export default { ...@@ -303,8 +297,10 @@ export default {
delItem(row) { delItem(row) {
let req = {}; let req = {};
let that = this; let that = this;
console.log(row);
vm.DELETE("portalInfo/delete/" + row.id, req).then(res => { vm.DELETE("portalInfo/delete/" + row.id, req).then(res => {
if (res.code == "000000") { if (res.code == "000000") {
console.log(res);
this.$notify({ this.$notify({
title: "删除项目", title: "删除项目",
message: "ID为：" + row.id + "的项目删除成功" message: "ID为：" + row.id + "的项目删除成功"
......
src/views/mock.js
浏览文件 @ f7ef1f14
...@@ -105,7 +105,7 @@ let treeData = [ ...@@ -105,7 +105,7 @@ let treeData = [
let buttonStatus = [ let buttonStatus = [
//L1 内部管理员 L2项目负责人 L3次级负责人 //L1 内部管理员 L2项目负责人 L3次级负责人
//草稿 //草稿
{ L1: "", L2: "09", L3: "" }, { L1: "09", L2: "09", L3: "" },
//未上架 //未上架
{ L1: "09", L2: "039", L3: "0" }, { L1: "09", L2: "039", L3: "0" },
//待审批、审批中 //待审批、审批中
......
src/views/system/item-role.vue
浏览文件 @ f7ef1f14
...@@ -11,27 +11,38 @@ ...@@ -11,27 +11,38 @@
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="5"> <el-col :span="5">
<el-form-item label="所属机构："> <el-form-item label="角色：">
<el-select size="mini" v-model="formInline.projeceRole" placeholder="请选择角色"> <el-select size="mini" v-model="formInline.projeceRole" placeholder="请选择角色">
<el-option label="项目负责人" value="L2"></el-option> <el-option
<el-option label="次级负责人" value="L3"></el-option> v-for="(item, index) in roleList"
<el-option label="普通用户" value="L4"></el-option> :key="index"
:label="item.label"
:value="item.value"
></el-option>
</el-select> </el-select>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="5"> <el-col :span="5">
<el-form-item label="所属机构："> <el-form-item label="所属机构：">
<el-select size="mini" v-model="formInline.organization" placeholder="请选择所属机构"> <el-select size="mini" v-model="formInline.organizationName" placeholder="请选择所属机构">
<el-option label="机构1" value="organization1"></el-option> <el-option
<el-option label="机构2" value="organization2"></el-option> v-for="(item, index) in organizationList"
:key="index"
:label="item"
:value="item"
></el-option>
</el-select> </el-select>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="5"> <el-col :span="5">
<el-form-item label="所属科室："> <el-form-item label="所属科室：">
<el-select size="mini" v-model="formInline.department" placeholder="请选择所属科室"> <el-select size="mini" v-model="formInline.departmentsName" placeholder="请选择所属科室">
<el-option label="科室1" value="department1"></el-option> <el-option
<el-option label="科室2" value="department12"></el-option> v-for="(item, index) in departmentsList"
:key="index"
:label="item"
:value="item"
></el-option>
</el-select> </el-select>
</el-form-item> </el-form-item>
</el-col> </el-col>
...@@ -153,6 +164,27 @@ export default { ...@@ -153,6 +164,27 @@ export default {
projeceRole: "", projeceRole: "",
userName: "" userName: ""
}, },
departmentsList: [],
organizationList: [],
roleList: [
{
label: "内部管理员",
value: "L1"
},
{
label: "项目管理员",
value: "L2"
},
{
label: "次级负责人",
value: "L3"
},
{
label: "普通用户",
value: "L4"
}
],
numL2: 0,
dialog: { dialog: {
show: false, show: false,
role: "项目负责人", role: "项目负责人",
...@@ -182,9 +214,14 @@ export default { ...@@ -182,9 +214,14 @@ export default {
req = this.formInline; req = this.formInline;
vm.GET("portalProjectOrRole/queryRoleList", req).then(res => { vm.GET("portalProjectOrRole/queryRoleList", req).then(res => {
if (res.code == "000000") { if (res.code == "000000") {
vm.tableData = res.data; vm.tableData = res.data.projectRoleInfoModels;
vm.totalRows = res.data.total; vm.totalRows = res.data.total;
this.loading = false; this.loading = false;
//this.roleList = setRoleList(res.data.roleList);
this.organizationList = res.data.organizationList;
this.departmentsList = res.data.departmentsList;
this.numL2 = res.data.numL2;
} }
}); });
}, },
...@@ -192,11 +229,15 @@ export default { ...@@ -192,11 +229,15 @@ export default {
changeRole() { changeRole() {
let req = { let req = {
portalProjectId: this.formInline.portalProjectId, portalProjectId: this.formInline.portalProjectId,
updateL: this.scopeRow.updateL updateL: this.scopeRow.updateL,
userId: this.scopeRow.userId,
numL2: this.numL2
}; };
vm.GET("portalProjectOrRole/roleLevelUpdate", req).then(res => { vm.GET("portalProjectOrRole/roleLevelUpdate", req).then(res => {
this.dialog.show = false;
if (res.code == "000000") { if (res.code == "000000") {
console.log(res); console.log(res);
this.queryRoleList();
} }
}); });
}, },
...@@ -243,7 +284,12 @@ export default { ...@@ -243,7 +284,12 @@ export default {
}, },
//打开弹出框 //打开弹出框
openDialog(row, projeceRole) { openDialog(row, projeceRole) {
console.log(row);
if (projeceRole == "L2" && this.numL2 >= 5) {
this.dialogFull = true;
} else {
this.dialog.show = true; this.dialog.show = true;
}
this.dialog.name = row.userName; this.dialog.name = row.userName;
this.scopeRow = row; this.scopeRow = row;
this.scopeRow.updateL = projeceRole; this.scopeRow.updateL = projeceRole;
...@@ -256,7 +302,6 @@ export default { ...@@ -256,7 +302,6 @@ export default {
this.dialog.role = "次级负责人"; this.dialog.role = "次级负责人";
if (projeceRole == "L2") { if (projeceRole == "L2") {
this.dialog.option = "升级为项目负责人"; this.dialog.option = "升级为项目负责人";
this.dialogFull = true;
} else if (projeceRole == "L4") { } else if (projeceRole == "L4") {
this.dialog.option = "降级为普通用户"; this.dialog.option = "降级为普通用户";
} }
...@@ -264,7 +309,6 @@ export default { ...@@ -264,7 +309,6 @@ export default {
this.dialog.role = "普通用户"; this.dialog.role = "普通用户";
if (projeceRole == "L2") { if (projeceRole == "L2") {
this.dialog.option = "升级为项目负责人"; this.dialog.option = "升级为项目负责人";
this.dialogFull = true;
} else if (projeceRole == "L3") { } else if (projeceRole == "L3") {
this.dialog.option = "升级为次级负责人"; this.dialog.option = "升级为次级负责人";
} }
......
Markdown 格式
0% or
您添加了 0 人 到此讨论。请谨慎行事。
先完成此消息的编辑！
想要评论请 注册 或