Skip to content

P
pica.cloud.web-education-admin
提交 7a4775f4 编写于 作者: guangjun.yang's avatar guangjun.yang
浏览文件
操作

Merge branch 'dev-coop-phase3-0918' into release

上级 99c133dc d2f6e948
展开全部 隐藏空白字符变更
内嵌 并排
正在显示 包含 4393 行增加 和 116 行删除
src/router/router.js
浏览文件 @ 7a4775f4
......@@ -9,6 +9,7 @@ const itemComponent = r => require.ensure([], () => r(require('../views/educatio
const createComponent = r => require.ensure([], () => r(require('../views/education/create-component.vue')),'create-component')
const roleManager = r => require.ensure([], () => r(require('../views/system/role.vue')),'role')
const addManager = r => require.ensure([], () => r(require('../views/education/add-manager.vue')), 'add-manager')
const editManager = r => require.ensure([], () => r(require('../views/education/edit-manager.vue')), 'edit-manager')
const itemRole = r => require.ensure([], () => r(require('../views/system/item-role.vue')), 'item-role')
const msgPush = r => require.ensure([], () => r(require('../views/msgpush/msg-push.vue')), 'msg-push')
......@@ -50,6 +51,9 @@ export default [{
},{
path: '/add-manager',
component: addManager
},{
path: '/edit-manager',
component: editManager
},{
path: '/item-component',
component: itemComponent
......
src/utils/education/educationApi.js
浏览文件 @ 7a4775f4
......@@ -2,7 +2,7 @@ import fetch from '../fetch';
import { getBaseUrl } from '@/utils/index';
export const uploadExcel = (data,projectId) => {
export const uploadExcel = (data, projectId) => {
// return utils.checkAuth(()=>{
return fetch({
headers: {
......@@ -10,10 +10,40 @@ export const uploadExcel = (data,projectId) => {
sysCode: 12,
token: localStorage.getItem('storageToken'),
},
url: getBaseUrl('portal/portalProjectOrRole/importRoleFile?projectId='+projectId),
url: getBaseUrl('portal/v2/role/importRoleFile?projectId=' + projectId),
method: 'post',
data: data,
description: '上传excel文件',
})
// })
}
export const uploadOrgExcel = (data, projectId) => {
// return utils.checkAuth(()=>{
return fetch({
headers: {
'Content-Type': 'application/json;charset=UTF-8',
sysCode: 12,
token: localStorage.getItem('storageToken'),
},
url: getBaseUrl('portal/new/scope/org/v1/' + projectId + '/import'),
method: 'put',
data: data,
description: '上传excel文件',
})
// })
}
export const uploadPersonExcel = (data, projectId) => {
// return utils.checkAuth(()=>{
return fetch({
headers: {
'Content-Type': 'application/json;charset=UTF-8',
sysCode: 12,
token: localStorage.getItem('storageToken'),
},
url: getBaseUrl('portal/new/scope/doctor/v1/' + projectId + '/import'),
method: 'put',
data: data,
description: '上传excel文件',
})
// })
}
\ No newline at end of file
src/utils/env-config.js
浏览文件 @ 7a4775f4
......@@ -10,8 +10,8 @@ export const envConfig = {
// baseUrl: 'https://uat-sc.yunqueyi.com/',
// baseUrl: 'http://10.177.15.150:10401/',
// baseUrl: 'http://10.177.15.150:11905/',
baseUrl: 'https://dev-sc.yunqueyi.com/',
// baseUrl: 'https://test1-sc.yunqueyi.com/',
// baseUrl: 'https://dev-sc.yunqueyi.com/',
baseUrl: 'https://test1-sc.yunqueyi.com/',
// baseUrl: 'https://uat-sc.yunqueyi.com/',
apiUrl: 'https://dev-api.yunqueyi.com/',
qiniuFileUrl: "https://dev-sc.yunqueyi.com/contents/admin/qiniu/token1",
......@@ -27,10 +27,11 @@ export const envConfig = {
workApiSrc: 'https://dev-work.yunqueyi.com',
// reportUrl: 'http://10.177.15.150:10401/',
// reportUrl: 'http://192.168.140.13:10401/',
reportUrl: 'https://dev-sc-report.yunqueyi.com/',
// reportUrl: 'https://test1-sc-report.yunqueyi.com/',
// reportUrl: 'https://dev-sc-report.yunqueyi.com/',
reportUrl: 'https://test1-sc-report.yunqueyi.com/',
// reportUrl: 'https://uat-sc-report.yunqueyi.com/',
excelUrl: 'https://test-file.yunqueyi.com/File/template/portal/',
itemFileUrl: 'http://pica-test-huabei2.oss-cn-beijing.aliyuncs.com/File/template/portal/',
},
dev: {
baseUrl: 'https://dev-sc.yunqueyi.com/',
......@@ -47,6 +48,7 @@ export const envConfig = {
workApiSrc: 'https://dev-work.yunqueyi.com',
reportUrl: 'https://dev-sc-report.yunqueyi.com/',
excelUrl: 'https://test-file.yunqueyi.com/File/template/portal/',
itemFileUrl: 'http://pica-test-huabei2.oss-cn-beijing.aliyuncs.com/File/template/portal/',
},
test: {
baseUrl: 'https://test1-sc.yunqueyi.com/',
......@@ -63,6 +65,7 @@ export const envConfig = {
workApiSrc: 'https://test1-work.yunqueyi.com',
reportUrl: 'https://test1-sc-report.yunqueyi.com/',
excelUrl: 'https://test-file.yunqueyi.com/File/template/portal/',
itemFileUrl: 'http://pica-test-huabei2.oss-cn-beijing.aliyuncs.com/File/template/portal/',
},
test2: {
baseUrl: 'https://test2-work.yunqueyi.com/sc/',
......@@ -78,6 +81,7 @@ export const envConfig = {
workApiSrc: 'https://test2-work.yunqueyi.com',
reportUrl: 'https://test2-sc-report.yunqueyi.com/',
excelUrl: 'https://test-file.yunqueyi.com/File/template/portal/',
itemFileUrl: 'http://pica-test-huabei2.oss-cn-beijing.aliyuncs.com/File/template/portal/',
},
uat: {
baseUrl: 'https://uat-sc.yunqueyi.com/',
......@@ -94,6 +98,7 @@ export const envConfig = {
workApiSrc: 'https://uat-work.yunqueyi.com',
reportUrl: 'https://uat-sc-report.yunqueyi.com/',
excelUrl: 'https://test-file.yunqueyi.com/File/template/portal/',
itemFileUrl: 'http://pica-test-huabei2.oss-cn-beijing.aliyuncs.com/File/template/portal/',
},
pro: {
baseUrl: 'https://sc.yunqueyi.com/',
......@@ -110,5 +115,6 @@ export const envConfig = {
workApiSrc: 'https://work.yunqueyi.com',
reportUrl: 'https://sc-report.yunqueyi.com/',
excelUrl: 'https://file.yunqueyi.com/File/template/portal/',
itemFileUrl: 'http://pica-test-huabei2.oss-cn-beijing.aliyuncs.com/File/template/portal/',
}
}
src/utils/fetch.js
浏览文件 @ 7a4775f4
......@@ -55,7 +55,8 @@ service.interceptors.request.use(config => {
if( process.env.BUILD_ENV == "development" ){ // 本地开发环境
// console.log('环境变量>>>> ', process.env.BUILD_ENV);
// config.headers['token'] = 'BFD804F3A3194FBBBE113962222839F6';
config.headers['token'] = 'F8209898391C40A0B8DBC1ED9E157291';
// config.headers['token'] = 'F8209898391C40A0B8DBC1ED9E157291';
config.headers['token'] = 'E5F82EDD958941C29BCDDDED410ACDB3';
}else{
config.headers['token'] = localStorage.getItem('storageToken')
}
......
src/utils/filter.js
浏览文件 @ 7a4775f4
......@@ -237,17 +237,17 @@ const vueFilter = {
return time;
},
shieldStatus: (value) => {
if(value == 0) {
return '已屏蔽';
} else if(value == 1) {
if(value == 1) {
return '未屏蔽';
} else if(value == 2) {
return '已屏蔽';
}
},
shieldButton: (value) => {
if(value == 0) {
return '取消屏蔽';
} else if(value == 1) {
if(value == 1) {
return '屏蔽';
} else if(value == 2) {
return '取消屏蔽';
}
},
areaText: (value) => {
......
src/utils/index.js
浏览文件 @ 7a4775f4
......@@ -212,7 +212,12 @@ export function getReportUrl(url) {
return getConfigByEnvType('reportUrl') + url
}
// 获取SC服务器域名地址
// 获取Excel地址
export function getExeclUrl(url) {
return getConfigByEnvType('excelUrl') + url
}
// 获取教培项目文件地址
export function getItemFileUrl(url) {
return getConfigByEnvType('itemFileUrl') + url
}
\ No newline at end of file
src/utils/mixins.js
浏览文件 @ 7a4775f4
......@@ -186,7 +186,15 @@ module.exports = {
data: para
})
},
// 通用PUT请求
PUT(api, para, callback) {
// para.token = para.token || this.token || "343BCABC890349ACAF357FA79122F9FE"
return fetch({
url: getBaseUrl(api),
method: 'put',
data: para
})
},
// 通用POST请求
POST(api, para, callback) {
// para.token = para.token || this.token || "343BCABC890349ACAF357FA79122F9FE"
......
src/utils/operation.js
浏览文件 @ 7a4775f4
......@@ -285,7 +285,7 @@ export function isOverlap(startA, endA, startB, endB) {
}
export function setRegionOption(data) {
let option = [];
option[0] = {id: 0, value: 0, label: "全部", leaf: true};
option[0] = { id: 0, value: 0, label: "全部", leaf: true };
for (let i = 0; i < data.length; i++) {
let obj = data[i];
obj.label = data[i].provinceName;
......@@ -294,6 +294,24 @@ export function setRegionOption(data) {
}
return option;
}
export function setRegionOption2(data) {
let option = [];
option[0] = { id: 0, value: '0', label: "全部地区", leaf: true };
for (let i = 0; i < data.length; i++) {
let obj = data[i];
obj.label = data[i].provinceName;
obj.value = data[i].provinceId;
option.push(obj);
}
return option;
}
export function setAdministrativeId(value) {
let areaId = '000';
for (let i = 0; i < value.length; i++) {
areaId += '_' + value[i];
}
return areaId;
}
export function getRegionOption() {
let option = [{
value: 1,
......@@ -313,7 +331,7 @@ export function getRegionOption() {
return option;
}
export function getLearnOrganization(data) {
if(data.length == 0) {
if (data.length == 0) {
let arr = [];
return arr;
}
......@@ -480,11 +498,11 @@ export function getRank(xAxisData, seriesData) {
};
return option;
}
export function getSearchType(formData,checkAll) {
export function getSearchType(formData, checkAll) {
let type = 0;
if (formData.region.length == 1 || formData.region.length == 2) {
type = formData.region.length;
if(formData.region.length == 1 && formData.region[0] == 0) {
if (formData.region.length == 1 && formData.region[0] == 0) {
type = 6;
}
} else if (formData.region.length == 3) {
......@@ -493,7 +511,7 @@ export function getSearchType(formData,checkAll) {
} else {
type = 4;
}
} else if (formData.region.length == 4) {
} else if (formData.region.length == 4) {
if (formData.organization.length == 0 || checkAll === true) {
type = 5;
} else {
......@@ -560,23 +578,23 @@ export function getAjustmentList(data) {
}
export function removeZero(data) {
let list = [];
for(let i = 0;i<data.length;i++) {
if(data[i].value != 0) {
for (let i = 0; i < data.length; i++) {
if (data[i].value != 0) {
list.push(data[i]);
}
}
return list;
}
export function initRank(data) {
let list = [{gradeFlag: -1, gradeName: "全部"}];
for(let i=0;i<data.length;i++) {
let list = [{ gradeFlag: -1, gradeName: "全部" }];
for (let i = 0; i < data.length; i++) {
list.push(data[i]);
}
return list;
}
export function getAvgTime(data) {
let list = [0,0];
if(data != null && data !='') {
let list = [0, 0];
if (data != null && data != '') {
list[0] = Math.floor(data / 60);
list[1] = data % 60;
}
......@@ -584,16 +602,16 @@ export function getAvgTime(data) {
}
export function getComponent(data) {
let list = [];
for(let i=0;i<data.length;i++) {
for (let i = 0; i < data.length; i++) {
list.push(data[i].value);
}
return list;
}
export function getSimpleCheckedNodes(store) {
const checkedNodes = [];
const traverse = function(node) {
const traverse = function (node) {
const childNodes = node.root ? node.root.childNodes : node.childNodes;
childNodes.forEach(child => {
if (child.checked) {
checkedNodes.push(child.data);
......@@ -606,16 +624,16 @@ export function getSimpleCheckedNodes(store) {
traverse(store)
return checkedNodes;
}
export function setSelectedKeys(checkedKeys,halfCheckedKeys) {
export function setSelectedKeys(checkedKeys, halfCheckedKeys) {
let selected = [];
for(let i=0;i<checkedKeys.length;i++) {
for (let i = 0; i < checkedKeys.length; i++) {
let obj = {
key: checkedKeys[i].id,
type: 1,
};
selected.push(obj);
}
for(let j=0;j<halfCheckedKeys.length;j++) {
for (let j = 0; j < halfCheckedKeys.length; j++) {
let obj = {
key: halfCheckedKeys[j],
type: 2,
......
src/views/education/add-manager.vue
浏览文件 @ 7a4775f4
......@@ -281,6 +281,9 @@
</el-tree>
</el-col>
<el-col :span="11">
<p class="area-p">
项目范围包含下列区域所有机构和人员({{ tagsRegion.length }})
</p>
<el-tag
v-for="tag in tagsRegion"
:key="tag.name"
......@@ -3570,6 +3573,10 @@ export default {
}
.second-step {
margin: 10px 0 0 20px;
.area-p {
margin-bottom: 15px;
font-size: 14px;
}
.span_ecology {
line-height: 45px;
margin-left: 8px;
......
src/views/education/edit-manager.vue 0 → 100644
浏览文件 @ 7a4775f4
因为 它太大了无法显示 源差异 。您可以改为 查看blob。
src/views/education/item-manager.vue
浏览文件 @ 7a4775f4
......@@ -92,7 +92,7 @@
<span>{{ [scope.row.projectStatus , idType] | statusProject }}</span>
</template>
</el-table-column>
<el-table-column fixed="right" label="操作" min-width="200" align="center">
<el-table-column fixed="right" label="操作" min-width="300" align="center">
<template slot-scope="scope">
<el-button
@click="changeStatus(scope.row,0)"
......@@ -155,6 +155,12 @@
type="primary"
size="small"
>删除</el-button>
<el-button
@click="toShield(scope.row)"
v-show="scope.row.blackModifiable == true"
type="primary"
size="small"
>屏蔽</el-button>
</template>
</el-table-column>
<div slot="empty">
......@@ -286,7 +292,10 @@ export default {
},
methods: {
toPage() {
this.$router.push("add-manager");
this.$router.push("edit-manager");
},
toShield(row) {
this.$router.push("item-shield?projectId="+row.id);
},
searchList() {
this.formInline.pageNo = 1;
......@@ -344,7 +353,7 @@ export default {
let level = row.level;
if (type === 0) {
//编辑
this.$router.push("add-manager?projectId=" + projectId +"&level="+level);
this.$router.push("edit-manager?projectId=" + projectId +"&level="+level);
} else if (type === 7) {
//提醒审核
let req = {
......
src/views/education/item-shield.vue
浏览文件 @ 7a4775f4
此差异已折叠。
src/views/system/item-role.vue
浏览文件 @ 7a4775f4
......@@ -213,7 +213,7 @@
</el-dialog>
<el-dialog title="导入失败" :visible.sync="dialogFail" width="30%" class="dialog-fail" center>
<div class="fail-type" v-if="failType == 1">
<p>表格不符合格式要求，请修正后再次导入</p>
<p>导入数据量已超限额，请修正后再次导入</p>
<p class="fail-notice">仅支持一次导入5000条数据</p>
</div>
<div class="fail-type" v-if="failType == 2">
......@@ -384,7 +384,7 @@ export default {
attachRegionId: "",
creator: false,
hospitalMasterAdmin: false,
hospitalMasterAdmin: false
};
},
created() {
......@@ -493,7 +493,7 @@ export default {
let req = {};
req = this.formInline;
openLoading(vm);
vm.GET("portal/portalProjectOrRole/queryRoleList", req).then(res => {
vm.GET("portal/v2/role/queryRoleList", req).then(res => {
closeLoading(vm);
if (res.code == "000000") {
vm.tableData = res.data.projectRoleInfoModels;
......@@ -518,7 +518,8 @@ export default {
numL2: this.numL2,
nowL: this.scopeRow.projeceRole
};
vm.GET("portal/portalProjectOrRole/roleLevelUpdate", req).then(res => {
// vm.GET("portal/portalProjectOrRole/roleLevelUpdate", req).then(res => {
vm.GET("portal/v2/role/roleLevelUpdate", req).then(res => {
vm.dialog.show = false;
if (res.code == "000000") {
console.log(res);
......@@ -528,7 +529,7 @@ export default {
type: "success"
});
} else {
this.$message.error(res.message);
this.$message.error(res.code);
}
});
},
......@@ -687,7 +688,8 @@ export default {
doctorId: row.userId
};
openLoading(vm);
vm.GET("portal/portalProjectOrRole/getAttachRegion", req).then(res => {
// vm.GET("portal/portalProjectOrRole/getAttachRegion", req).then(res => {
vm.GET("portal/v2/role/getAttachRegion", req).then(res => {
closeLoading(vm);
if (res.code == "000000") {
let administrativeAll = res.data.administrativeAll;
......@@ -926,10 +928,7 @@ export default {
scopeOfAdministrative: vm.getScope()
};
console.log("req", req);
vm.POST(
"portal/portalProjectOrRole/insertOrUpdateAttachRegion",
req
).then(res => {
vm.POST("portal/v2/role/insertOrUpdateAttachRegion", req).then(res => {
if (res.code == "000000") {
vm.$message({
message: "设置成功",
......
Markdown 格式
0% or
您添加了 0 人 到此讨论。请谨慎行事。
先完成此消息的编辑！
想要评论请 注册 或