Skip to content

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

Merge branch 'dev-eduadmin-20190222' into dev-followUp-20190312 

# Conflicts:
#	src/store/index.js
#	src/utils/envConfig.js
上级 d47b0cfd dcb5c8d6
展开全部 显示空白字符变更
内嵌 并排
正在显示 包含 917 行增加 和 403 行删除
.gitignore
浏览文件 @ ab84a299
...@@ -7,4 +7,4 @@ dist/ ...@@ -7,4 +7,4 @@ dist/
node_modules/ node_modules/
.DS_Store .DS_Store
.vscode .vscode
envConfig.js src/utils/envConfig.js
\ No newline at end of file \ No newline at end of file
src/App.vue
浏览文件 @ ab84a299
...@@ -51,9 +51,7 @@ export default { ...@@ -51,9 +51,7 @@ export default {
vm.getToken() vm.getToken()
}, },
mounted() { mounted() {
// setInterval(function(){
// vm.pushMessage()
// },60000)
}, },
methods: { methods: {
// 解密token // 解密token
...@@ -64,8 +62,10 @@ export default { ...@@ -64,8 +62,10 @@ export default {
let paramStr = href.substring(offset + 1, href.length) let paramStr = href.substring(offset + 1, href.length)
let pars = base64decode(paramStr) let pars = base64decode(paramStr)
let paramMap = getUrlParamsMap(pars, "&") let paramMap = getUrlParamsMap(pars, "&")
if (isNotEmptyUtils(paramMap["token"]) || localStorage.getItem('storageToken')) { if (isNotEmptyUtils(paramMap["token"])) {
vm.token = paramMap["token"] vm.token = paramMap["token"]
localStorage.setItem('storageToken', vm.token)
vm.$router.push({ path: 'home' })
} else { } else {
window.location.href = getLoginUrl() // 没有token返回登录页面 window.location.href = getLoginUrl() // 没有token返回登录页面
return return
...@@ -79,14 +79,6 @@ export default { ...@@ -79,14 +79,6 @@ export default {
vm.changeToken(vm.token) vm.changeToken(vm.token)
vm.getUserAuth(vm.token) vm.getUserAuth(vm.token)
}, },
// 实时消息推送
pushMessage() {
vm.$notify({
title: '警告',
message: '这是一条警告的提示消息',
type: 'warning'
});
},
// 修改token // 修改token
...mapActions([ ...mapActions([
'changeToken', 'changeToken',
......
src/router/router.js
浏览文件 @ ab84a299
...@@ -8,7 +8,6 @@ const createComponent = r => require.ensure([], () => r(require('../views/educat ...@@ -8,7 +8,6 @@ const createComponent = r => require.ensure([], () => r(require('../views/educat
const roleManager = r => require.ensure([], () => r(require('../views/system/role.vue')),'role') 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 addManager = r => require.ensure([], () => r(require('../views/education/add-manager.vue')), 'add-manager')
const itemRole = r => require.ensure([], () => r(require('../views/system/item-role.vue')), 'item-role') const itemRole = r => require.ensure([], () => r(require('../views/system/item-role.vue')), 'item-role')
const tree = r => require.ensure([], () => r(require('../views/education/tree.vue')), 'tree')
import followRouters from './follow' import followRouters from './follow'
...@@ -46,9 +45,6 @@ export default [{ ...@@ -46,9 +45,6 @@ export default [{
},{ },{
path: '/item-role', path: '/item-role',
component: itemRole component: itemRole
},{
path: '/tree',
component: tree
}, },
followRouters, followRouters,
] ]
......
src/store/education/getters.js 0 → 100644
浏览文件 @ ab84a299
const getters = {
_token: state => state.common._token,
idType: state => state.common.idType
}
export default getters
src/store/getters.js
浏览文件 @ ab84a299
import education from './education/getters'
import { containObject } from '../utils/utils'
const getters = containObject(education)
const getters = {
_token: state => state.common._token,
idType: state => state.common.idType
}
export default getters export default getters
\ No newline at end of file
src/store/index.js
浏览文件 @ ab84a299
import Vue from 'vue' import Vue from 'vue'
import Vuex from 'vuex' import Vuex from 'vuex'
import common from './modules/common' import common from './education/common';
//随访 //随访
import followModules from './modules/followup/index' import followModules from './modules/followup/index';
import getters from './getters' import getters from './getters'
......
src/style/common.scss
浏览文件 @ ab84a299
...@@ -185,6 +185,9 @@ html,body{ ...@@ -185,6 +185,9 @@ html,body{
.el-message-box__status { .el-message-box__status {
display: none; display: none;
} }
.el-message-box__message {
text-align: center
}
.el-message-box__btns { .el-message-box__btns {
text-align: center !important; text-align: center !important;
button { button {
...@@ -199,6 +202,11 @@ html,body{ ...@@ -199,6 +202,11 @@ html,body{
background: #449284 !important; background: #449284 !important;
border: 1px solid #449284 !important; border: 1px solid #449284 !important;
} }
.el-button.is-disabled {
background: #449284 !important;
border: 1px solid #449284 !important;
opacity: 0.5;
}
.el-pagination.is-background .el-pager li:not(.disabled).active { .el-pagination.is-background .el-pager li:not(.disabled).active {
background: #449284 !important; background: #449284 !important;
} }
......
src/utils/envConfig.js
浏览文件 @ ab84a299
...@@ -9,15 +9,15 @@ export const envConfig = { ...@@ -9,15 +9,15 @@ export const envConfig = {
// baseUrl: 'https://test1-sc.yunqueyi.com/', // baseUrl: 'https://test1-sc.yunqueyi.com/',
//baseUrl: 'https://uat-sc.yunqueyi.com/', //baseUrl: 'https://uat-sc.yunqueyi.com/',
baseUrl: 'http://localhost:11905/portal/', baseUrl: 'http://dev-sc.yunqueyi.com/portal/',
qiniuFileUrl: "http://localhost:10201/contents/admin/qiniu/token1", qiniuFileUrl: "http://localhost:10201/contents/admin/qiniu/token1",
qiniuResourceUrl: "https://test1-videos.yunqueyi.com", qiniuResourceUrl: "https://test1-videos.yunqueyi.com",
qiniuImgUrl: "https://test1-file.yunqueyi.com", qiniuImgUrl: "https://test1-file.yunqueyi.com",
loginUrl: 'https://dev-saas.yunqueyi.com/pica-login/work_station.html', loginUrl: 'https://dev-saas.yunqueyi.com/pica-login/work_station.html',
innerLoginUrl: 'http://localhost:8090/PICA_SSO_FE/html/pica_login.html', innerLoginUrl: 'http://localhost:8090/PICA_SSO_FE/html/pica_index.html',
yuequeyiIndexUrl: 'https://dev-saas.yunqueyi.com/pica_index.html',
followUpApi: '', followUpApi: '',
followUpApiSoSoApi:'http://sosoapi.yunqueyi.com/sosoapi-web/pass/mock/73', followUpApiSoSoApi:'http://sosoapi.yunqueyi.com/sosoapi-web/pass/mock/73',
basicDataUrl: 'https://dev-sc.yunqueyi.com/',
}, },
dev: { dev: {
baseUrl: 'https://dev-sc.yunqueyi.com/portal/', baseUrl: 'https://dev-sc.yunqueyi.com/portal/',
...@@ -25,9 +25,9 @@ export const envConfig = { ...@@ -25,9 +25,9 @@ export const envConfig = {
qiniuResourceUrl: "https://test1-videos.yunqueyi.com", qiniuResourceUrl: "https://test1-videos.yunqueyi.com",
qiniuImgUrl: "https://test1-file.yunqueyi.com", qiniuImgUrl: "https://test1-file.yunqueyi.com",
loginUrl: 'https://dev-saas.yunqueyi.com/pica-login/work_station.html', loginUrl: 'https://dev-saas.yunqueyi.com/pica-login/work_station.html',
innerLoginUrl: 'https://dev-sso.yunqueyi.com/PICA_SSO_FE/html/pica_login.html', innerLoginUrl: 'https://dev-sso.yunqueyi.com/PICA_SSO_FE/html/pica_index.html',
yuequeyiIndexUrl: 'https://dev-saas.yunqueyi.com/pica_index.html',
followUpApi: '', followUpApi: '',
basicDataUrl: 'https://dev-sc.yunqueyi.com/',
}, },
test: { test: {
baseUrl: 'https://test1-sc.yunqueyi.com/portal/', baseUrl: 'https://test1-sc.yunqueyi.com/portal/',
...@@ -35,9 +35,9 @@ export const envConfig = { ...@@ -35,9 +35,9 @@ export const envConfig = {
qiniuResourceUrl: "https://test1-videos.yunqueyi.com", qiniuResourceUrl: "https://test1-videos.yunqueyi.com",
qiniuImgUrl: "https://test1-file.yunqueyi.com", qiniuImgUrl: "https://test1-file.yunqueyi.com",
loginUrl: 'https://test1-saas.yunqueyi.com/pica-login/work_station.html', loginUrl: 'https://test1-saas.yunqueyi.com/pica-login/work_station.html',
innerLoginUrl: 'https://test1-sso.yunqueyi.com/PICA_SSO_FE/html/pica_login.html', innerLoginUrl: 'https://test1-sso.yunqueyi.com/PICA_SSO_FE/html/pica_index.html',
yuequeyiIndexUrl: 'https://test-saas.yunqueyi.com/pica_index.html',
followUpApi: '', followUpApi: '',
basicDataUrl: 'https://test1-sc.yunqueyi.com/',
}, },
uat: { uat: {
baseUrl: 'https://uat-sc.yunqueyi.com/portal/', baseUrl: 'https://uat-sc.yunqueyi.com/portal/',
...@@ -45,9 +45,9 @@ export const envConfig = { ...@@ -45,9 +45,9 @@ export const envConfig = {
qiniuResourceUrl: "https://videos.yunqueyi.com", // 视频 qiniuResourceUrl: "https://videos.yunqueyi.com", // 视频
qiniuImgUrl: "https://file.yunqueyi.com", qiniuImgUrl: "https://file.yunqueyi.com",
loginUrl: 'https://uat-saas.yunqueyi.com/pica-login/work_station.html', loginUrl: 'https://uat-saas.yunqueyi.com/pica-login/work_station.html',
innerLoginUrl: 'https://uat-sso.yunqueyi.com/PICA_SSO_FE/html/pica_login.html', innerLoginUrl: 'https://uat-sso.yunqueyi.com/PICA_SSO_FE/html/pica_index.html',
yuequeyiIndexUrl: 'https://uat-saas.yunqueyi.com/pica_index.html',
followUpApi: '', followUpApi: '',
basicDataUrl: 'https://uat-sc.yunqueyi.com/',
}, },
pro: { pro: {
baseUrl: 'https://sc.yunqueyi.com/portal/', baseUrl: 'https://sc.yunqueyi.com/portal/',
...@@ -55,8 +55,8 @@ export const envConfig = { ...@@ -55,8 +55,8 @@ export const envConfig = {
qiniuResourceUrl: "https://videos.yunqueyi.com", qiniuResourceUrl: "https://videos.yunqueyi.com",
qiniuImgUrl: "https://file.yunqueyi.com", qiniuImgUrl: "https://file.yunqueyi.com",
loginUrl: 'https://saas.yunqueyi.com/pica-login/work_station.html', loginUrl: 'https://saas.yunqueyi.com/pica-login/work_station.html',
innerLoginUrl: 'https://sso.yunqueyi.com/PICA_SSO_FE/html/pica_login.html', innerLoginUrl: 'https://sso.yunqueyi.com/PICA_SSO_FE/html/pica_index.html',
yuequeyiIndexUrl: 'https://saas.yunqueyi.com/pica_index.html',
followUpApi: '', followUpApi: '',
basicDataUrl: 'https://sc.yunqueyi.com/',
} }
} }
src/utils/fetch.js
浏览文件 @ ab84a299
...@@ -11,12 +11,8 @@ const service = axios.create({ ...@@ -11,12 +11,8 @@ const service = axios.create({
// request拦截器 // request拦截器
service.interceptors.request.use(config => { service.interceptors.request.use(config => {
if(config.data && config.data.token) {
localStorage.setItem('storageToken',config.data.token)
}
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/index.js
浏览文件 @ ab84a299
...@@ -159,6 +159,11 @@ export function getInnerLoginUrl() { ...@@ -159,6 +159,11 @@ export function getInnerLoginUrl() {
return getConfigByEnvType('innerLoginUrl') return getConfigByEnvType('innerLoginUrl')
} }
// 云鹊医首页
export function getYunQueYiUrl() {
return getConfigByEnvType('yuequeyiIndexUrl')
}
// 七牛上传视频和图片 // 七牛上传视频和图片
export function uploadVideo() { export function uploadVideo() {
return getConfigByEnvType('qiniuResourceUrl') return getConfigByEnvType('qiniuResourceUrl')
......
src/utils/utils.js
浏览文件 @ ab84a299
import axios from 'axios'; import axios from 'axios';
// 对象的合并
export const containObject = function(...obj1) {
let obj = Object.assign(...obj1)
return obj
}
//共通函数 //共通函数
Array.prototype.contains = function (obj) { Array.prototype.contains = function (obj) {
if (this.length > 0) { if (this.length > 0) {
......
src/views/education/add-manager.vue
浏览文件 @ ab84a299
此差异已折叠。
src/views/education/item-component.vue
浏览文件 @ ab84a299
...@@ -45,7 +45,7 @@ ...@@ -45,7 +45,7 @@
</el-table-column> </el-table-column>
<el-table-column label="操作" fixed="right" align="center" min-width="200"> <el-table-column label="操作" fixed="right" align="center" min-width="200">
<template slot-scope="scope"> <template slot-scope="scope">
<el-button type="primary" v-if="scope.row.status == 1 || scope.row.status == 2" size="small" @click="editComponentList(scope.row)">编辑</el-button> <el-button type="primary" size="small" @click="editComponentList(scope.row)">编辑</el-button>
<el-button type="primary" v-if="scope.row.status == 1 || scope.row.status == 2 || scope.row.status == 4" size="small" @click="enableAndDisable(scope.row,1)">启用</el-button> <el-button type="primary" v-if="scope.row.status == 1 || scope.row.status == 2 || scope.row.status == 4" size="small" @click="enableAndDisable(scope.row,1)">启用</el-button>
<el-button type="primary" v-if="scope.row.status == 3" size="small" @click="enableAndDisable(scope.row,2)">禁用</el-button> <el-button type="primary" v-if="scope.row.status == 3" size="small" @click="enableAndDisable(scope.row,2)">禁用</el-button>
<el-button type="primary" v-if="scope.row.status == 1 || scope.row.status == 2" size="small" @click="deleteComponent(scope.row)">删除</el-button> <el-button type="primary" v-if="scope.row.status == 1 || scope.row.status == 2" size="small" @click="deleteComponent(scope.row)">删除</el-button>
...@@ -216,6 +216,11 @@ export default { ...@@ -216,6 +216,11 @@ export default {
}, },
// 删除 // 删除
deleteComponent(row) { deleteComponent(row) {
vm.$confirm('确定要删除该组件吗？', '提示', {
confirmButtonText: '确定',
cancelButtonText: '取消',
type: 'warning'
}).then(() => {
vm.GET('portalComponent/deleteComponentById',{id: row.id}).then((res) => { vm.GET('portalComponent/deleteComponentById',{id: row.id}).then((res) => {
if(res.code == "000000") { if(res.code == "000000") {
vm.$message({ vm.$message({
...@@ -227,6 +232,12 @@ export default { ...@@ -227,6 +232,12 @@ export default {
}).catch(function (error) { }).catch(function (error) {
vm.$message.error(error); vm.$message.error(error);
}); });
}).catch(() => {
vm.$message({
type: 'info',
message: '已取消'
})
})
}, },
handleSizeChange(value) { handleSizeChange(value) {
vm.searchParam.pageSize = value vm.searchParam.pageSize = value
......
src/views/education/item-manager.vue
浏览文件 @ ab84a299
...@@ -10,7 +10,7 @@ ...@@ -10,7 +10,7 @@
<el-input v-model="formInline.projectName" size="mini" placeholder="请输入项目名称"></el-input> <el-input v-model="formInline.projectName" size="mini" placeholder="请输入项目名称"></el-input>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="8"> <!-- <el-col :span="8">
<el-form-item label="项目时间："> <el-form-item label="项目时间：">
<el-date-picker <el-date-picker
v-model="formInline.duringTime" v-model="formInline.duringTime"
...@@ -21,8 +21,40 @@ ...@@ -21,8 +21,40 @@
value-format="yyyy-MM-dd HH:mm:ss" value-format="yyyy-MM-dd HH:mm:ss"
></el-date-picker> ></el-date-picker>
</el-form-item> </el-form-item>
</el-col>-->
<el-col :span="6">
<el-form-item label="项目时间：">
<el-date-picker
v-model="formInline.projectBegintime"
size="mini"
type="date"
placeholder="请选择开始时间"
value-format="yyyy-MM-dd HH:mm:ss"
:picker-options="pickerOptions0"
></el-date-picker>
</el-form-item>
</el-col>
<el-col :span="4">
<el-form-item label="~">
<el-date-picker
v-model="formInline.projectEndtime"
size="mini"
type="date"
placeholder="请选择结束时间"
value-format="yyyy-MM-dd 23:59:59"
:picker-options="pickerOptions1"
></el-date-picker>
</el-form-item>
</el-col> </el-col>
<el-col :span="9" style="padding:0;text-align:right;padding-right:15px;">
<el-button type="primary" size="small" @click="getProjectList">查询</el-button>
<el-button type="default" size="small" @click="resetForm" style="margin-left:0;">重置</el-button>
</el-col>
</el-form>
</el-row>
<el-row>
<el-col :span="5"> <el-col :span="5">
<el-form ref="formInline" :model="formInline" label-width="75px" style="width:100%;">
<el-form-item label="发布状态："> <el-form-item label="发布状态：">
<el-select size="mini" v-model="formInline.projectStatus" placeholder="请选择发布状态"> <el-select size="mini" v-model="formInline.projectStatus" placeholder="请选择发布状态">
<el-option <el-option
...@@ -33,24 +65,16 @@ ...@@ -33,24 +65,16 @@
></el-option> ></el-option>
</el-select> </el-select>
</el-form-item> </el-form-item>
</el-col>
<el-col :span="6" style="padding:0;text-align:right;padding-right:15px;">
<el-button type="primary" size="small" @click="getProjectList">查询</el-button>
<el-button type="default" size="small" @click="resetForm" style="margin-left:0;">重置</el-button>
</el-col>
</el-form> </el-form>
</el-col>
</el-row> </el-row>
<el-form :model="formInline" class="demo-form-inline"> <el-form :model="formInline" class="demo-form-inline">
<el-form-item> <el-form-item>
<el-button class="add-button" size="small" type="primary" @click="toPage()">新建项目</el-button> <el-button class="add-button" size="small" type="primary" @click="toPage()">新建项目</el-button>
</el-form-item> </el-form-item>
</el-form> </el-form>
<el-table <el-table :data="tableData" style="width: 100%">
v-loading="loading" <el-table-column prop="id" label="ID编号" min-width="100" align="center"></el-table-column>
:data="tableData"
:header-cell-style="{background:'#FAFAFA',color:'#000'}"
>
<el-table-column prop="createdId" label="ID编号" min-width="100" align="center"></el-table-column>
<el-table-column prop="projectName" label="项目名称" min-width="100" align="center"></el-table-column> <el-table-column prop="projectName" label="项目名称" min-width="100" align="center"></el-table-column>
<el-table-column prop="createdName" label="创建人" align="center"></el-table-column> <el-table-column prop="createdName" label="创建人" align="center"></el-table-column>
<el-table-column prop="projectIntro" label="项目简介" align="center"></el-table-column> <el-table-column prop="projectIntro" label="项目简介" align="center"></el-table-column>
...@@ -145,6 +169,7 @@ ...@@ -145,6 +169,7 @@
import BreadCrumb from "../../components/breadcrumb.vue"; import BreadCrumb from "../../components/breadcrumb.vue";
import { create } from "domain"; import { create } from "domain";
import { returnData } from "../mock"; import { returnData } from "../mock";
import { openLoading, closeLoading } from "../../utils/utils";
let vm = null; let vm = null;
export default { export default {
components: { components: {
...@@ -197,8 +222,25 @@ export default { ...@@ -197,8 +222,25 @@ export default {
projectEndtime: "", projectEndtime: "",
projectStatus: "", projectStatus: "",
pageNo: 1, pageNo: 1,
pageSize: 10, pageSize: 10
duringTime: "" },
pickerOptions0: {
disabledDate: time => {
if (this.formInline.projectEndtime != "") {
return (
time.getTime() >
new Date(this.formInline.projectEndtime).getTime()
);
}
}
},
pickerOptions1: {
disabledDate: time => {
return (
time.getTime() <
new Date(this.formInline.projectBegintime).getTime()
); //减去一天的时间代表可以选择同一天;
}
} }
}; };
}, },
...@@ -210,38 +252,16 @@ export default { ...@@ -210,38 +252,16 @@ export default {
toPage() { toPage() {
this.$router.push("add-manager"); this.$router.push("add-manager");
}, },
setParam(data) {
let param = {};
if (
data.duringTime !== null &&
data.duringTime !== "" &&
data.duringTime[0] !== null &&
data.duringTime[1] !== null
) {
param.projectBegintime = data.duringTime[0];
param.projectEndtime = data.duringTime[1];
}
for (let key in data) {
if (
key !== "duringTime" &&
key !== "projectBegintime" &&
key !== "projectEndtime"
) {
param[key] = data[key];
}
}
console.log(param);
return param;
},
//查询项目列表 //查询项目列表
getProjectList() { getProjectList() {
let req = {}; let req = {};
req = this.setParam(this.formInline); req = this.formInline;
openLoading(vm);
vm.GET("portalInfo/getProjectList", req).then(res => { vm.GET("portalInfo/getProjectList", req).then(res => {
closeLoading(vm);
if (res.code == "000000") { if (res.code == "000000") {
vm.tableData = res.data.data; vm.tableData = res.data.data;
vm.totalRows = res.data.totalRows; vm.totalRows = res.data.totalRows;
this.loading = false;
} }
}); });
}, },
...@@ -367,19 +387,12 @@ export default { ...@@ -367,19 +387,12 @@ export default {
color: #449284; color: #449284;
border-bottom: 1px solid #efefef; border-bottom: 1px solid #efefef;
} }
.table-option span { // .table-option span {
color: #409eff; // color: #409eff;
} // }
.add-button { .add-button {
float: right; float: right;
} }
.el-table .cell {
color: #929292;
}
.el-table th > .cell {
font-weight: bold;
color: #000;
}
} }
} }
</style> </style>
\ No newline at end of file
src/views/layout/header.vue
浏览文件 @ ab84a299
...@@ -19,7 +19,8 @@ ...@@ -19,7 +19,8 @@
</div> </div>
</template> </template>
<script> <script>
import { getLoginUrl,getInnerLoginUrl } from '../../utils/index.js' import { getLoginUrl,getInnerLoginUrl, getYunQueYiUrl } from '../../utils/index.js'
import { mapGetters } from 'vuex'
let vm = null let vm = null
export default { export default {
props: { props: {
...@@ -39,7 +40,11 @@ export default { ...@@ -39,7 +40,11 @@ export default {
systemInfoList: [] systemInfoList: []
} }
}, },
computed: {}, computed: {
...mapGetters([
'_token'
])
},
created() { created() {
vm = this vm = this
}, },
...@@ -54,7 +59,7 @@ export default { ...@@ -54,7 +59,7 @@ export default {
} }
} }
if(command === 'forward') { if(command === 'forward') {
window.location.href = 'https://www.yunqueyi.com/' window.location.href = getYunQueYiUrl()
} }
} }
} }
......
src/views/layout/slidebar.vue
浏览文件 @ ab84a299
...@@ -22,7 +22,8 @@ ...@@ -22,7 +22,8 @@
</template> </template>
<script> <script>
import { mapGetters } from 'vuex' import { mapGetters } from 'vuex'
import { setTimeout } from 'timers'; import { setTimeout } from 'timers'
import { isNotEmptyUtils } from '../../utils/utils'
let vm = null let vm = null
export default { export default {
props: { props: {
...@@ -36,7 +37,6 @@ export default { ...@@ -36,7 +37,6 @@ export default {
}, },
data() { data() {
return { return {
// authList: {},
items: [ items: [
{ {
title: '数据总览', title: '数据总览',
...@@ -58,11 +58,6 @@ export default { ...@@ -58,11 +58,6 @@ export default {
icon: 'el-icon-setting', icon: 'el-icon-setting',
index: 'item-manager' index: 'item-manager'
}, },
{
title: '树',
icon: 'el-icon-setting',
index: 'tree'
}
] ]
},{ },{
title: '系统管理', title: '系统管理',
...@@ -107,43 +102,22 @@ export default { ...@@ -107,43 +102,22 @@ export default {
}, },
created() { created() {
vm = this vm = this
vm.authSelect()
},
methods: {
// 获取菜单数据
authSelect() {
vm.$nextTick(() => {
vm.getUserAuth()
})
// let req = {
// "token": vm.tokenValue,
// "system_type": "25"
// }
// vm.POST('portalComponent/menu/list',req).then((res) => {
// if( res.code == '000000') {
// vm.items = res.data.picapMenuModels
// vm.$nextTick(() => {
// vm.getUserAuth()
// })
// }
// })
}, },
// 获取用户权限 watch: {
getUserAuth() { authList(newVal, oldVal){
if(vm.authList && vm.authList.length > 0) { if(!newVal.P001) { // 项目管理
if(!vm.authList.P001) { // 项目管理
vm.items[1].subs[1].index = 'blank' vm.items[1].subs[1].index = 'blank'
} }
if(!vm.authList.P002) { // 组件管理 if(!newVal.P002) { // 组件管理
vm.items[1].subs[0].index = 'blank' vm.items[1].subs[0].index = 'blank'
} }
if(!vm.authList.P001) { // 角色管理 if(!newVal.P003) { // 角色管理
vm.items[2].subs[0].index = 'blank' vm.items[2].subs[0].index = 'blank'
} }
} }
} },
methods: {
} }
} }
</script> </script>
...@@ -176,6 +150,9 @@ export default { ...@@ -176,6 +150,9 @@ export default {
color: #fff; color: #fff;
background: #06232C; background: #06232C;
} }
.el-menu-item:focus, .el-menu-item:hover {
background: #06232C !important;
}
} }
} }
</style> </style>
......
src/views/system/item-role.vue
浏览文件 @ ab84a299
...@@ -58,9 +58,8 @@ ...@@ -58,9 +58,8 @@
</el-form> </el-form>
</el-row> </el-row>
<el-table <el-table
v-loading="loading"
:data="tableData" :data="tableData"
:header-cell-style="{background:'#FAFAFA',color:'#000'}" style="width: 100%"
> >
<el-table-column prop="userId" label="用户ID" align="center"></el-table-column> <el-table-column prop="userId" label="用户ID" align="center"></el-table-column>
<el-table-column prop="userName" label="姓名" align="center"></el-table-column> <el-table-column prop="userName" label="姓名" align="center"></el-table-column>
...@@ -88,8 +87,8 @@ ...@@ -88,8 +87,8 @@
<el-button <el-button
type="primary" type="primary"
size="small" size="small"
v-show="showButton(scope.row,'L4')" v-show="showButton(scope.row,'L0')"
@click="openDialog(scope.row,'L4')" @click="openDialog(scope.row,'L0')"
>降为普通用户</el-button> >降为普通用户</el-button>
</template> </template>
</el-table-column> </el-table-column>
...@@ -133,6 +132,7 @@ ...@@ -133,6 +132,7 @@
<script> <script>
import BreadCrumb from "../../components/breadcrumb.vue"; import BreadCrumb from "../../components/breadcrumb.vue";
import { create } from "domain"; import { create } from "domain";
import { openLoading, closeLoading } from "../../utils/utils";
let vm = null; let vm = null;
export default { export default {
components: { components: {
...@@ -142,7 +142,7 @@ export default { ...@@ -142,7 +142,7 @@ export default {
const item = { const item = {
userId: "298490", userId: "298490",
userName: "李雪", userName: "李雪",
projeceRole: "L4", projeceRole: "L0",
organizationName: "浙江省人民医院", organizationName: "浙江省人民医院",
departmentsName: "外科" departmentsName: "外科"
}; };
...@@ -181,7 +181,7 @@ export default { ...@@ -181,7 +181,7 @@ export default {
}, },
{ {
label: "普通用户", label: "普通用户",
value: "L4" value: "L0"
} }
], ],
numL2: 0, numL2: 0,
...@@ -203,7 +203,6 @@ export default { ...@@ -203,7 +203,6 @@ export default {
methods: { methods: {
//查询用户列表 //查询用户列表
queryRoleList() { queryRoleList() {
this.loading = true;
this.formInline.portalProjectId = vm.getUrlSearch( this.formInline.portalProjectId = vm.getUrlSearch(
window.location.href, window.location.href,
"portalProjectId" "portalProjectId"
...@@ -213,11 +212,12 @@ export default { ...@@ -213,11 +212,12 @@ export default {
} }
let req = {}; let req = {};
req = this.formInline; req = this.formInline;
openLoading(vm);
vm.GET("portalProjectOrRole/queryRoleList", req).then(res => { vm.GET("portalProjectOrRole/queryRoleList", req).then(res => {
closeLoading(vm);
if (res.code == "000000") { if (res.code == "000000") {
vm.tableData = res.data.projectRoleInfoModels; vm.tableData = res.data.projectRoleInfoModels;
vm.totalRows = res.data.total; vm.totalRows = res.data.total;
this.loading = false;
//this.roleList = setRoleList(res.data.roleList); //this.roleList = setRoleList(res.data.roleList);
this.organizationList = res.data.organizationList; this.organizationList = res.data.organizationList;
...@@ -232,7 +232,8 @@ export default { ...@@ -232,7 +232,8 @@ export default {
portalProjectId: this.formInline.portalProjectId, portalProjectId: this.formInline.portalProjectId,
updateL: this.scopeRow.updateL, updateL: this.scopeRow.updateL,
userId: this.scopeRow.userId, userId: this.scopeRow.userId,
numL2: this.numL2 numL2: this.numL2,
nowL: this.scopeRow.projeceRole
}; };
vm.GET("portalProjectOrRole/roleLevelUpdate", req).then(res => { vm.GET("portalProjectOrRole/roleLevelUpdate", req).then(res => {
this.dialog.show = false; this.dialog.show = false;
...@@ -272,14 +273,14 @@ export default { ...@@ -272,14 +273,14 @@ export default {
let flag = false; let flag = false;
//console.log("当前等级 " + row.projeceRole + " 改变成等级 " + projeceRole); //console.log("当前等级 " + row.projeceRole + " 改变成等级 " + projeceRole);
if (row.projeceRole == "L2") { if (row.projeceRole == "L2") {
if (projeceRole == "L4") { if (projeceRole == "L0") {
flag = true; flag = true;
} }
} else if (row.projeceRole == "L3") { } else if (row.projeceRole == "L3") {
if (projeceRole == "L2" || projeceRole == "L4") { if (projeceRole == "L2" || projeceRole == "L0") {
flag = true; flag = true;
} }
} else if (row.projeceRole == "L4") { } else if (row.projeceRole == "L0") {
if (projeceRole == "L2" || projeceRole == "L3") { if (projeceRole == "L2" || projeceRole == "L3") {
flag = true; flag = true;
} }
...@@ -299,17 +300,17 @@ export default { ...@@ -299,17 +300,17 @@ export default {
this.scopeRow.updateL = projeceRole; this.scopeRow.updateL = projeceRole;
if (row.projeceRole == "L2") { if (row.projeceRole == "L2") {
this.dialog.role = "项目负责人"; this.dialog.role = "项目负责人";
if (projeceRole == "L4") { if (projeceRole == "L0") {
this.dialog.option = "降级为普通用户"; this.dialog.option = "降级为普通用户";
} }
} else if (row.projeceRole == "L3") { } else if (row.projeceRole == "L3") {
this.dialog.role = "次级负责人"; this.dialog.role = "次级负责人";
if (projeceRole == "L2") { if (projeceRole == "L2") {
this.dialog.option = "升级为项目负责人"; this.dialog.option = "升级为项目负责人";
} else if (projeceRole == "L4") { } else if (projeceRole == "L0") {
this.dialog.option = "降级为普通用户"; this.dialog.option = "降级为普通用户";
} }
} else if (row.projeceRole == "L4") { } else if (row.projeceRole == "L0") {
this.dialog.role = "普通用户"; this.dialog.role = "普通用户";
if (projeceRole == "L2") { if (projeceRole == "L2") {
this.dialog.option = "升级为项目负责人"; this.dialog.option = "升级为项目负责人";
......
src/views/system/role.vue
浏览文件 @ ab84a299
...@@ -13,27 +13,37 @@ ...@@ -13,27 +13,37 @@
<el-col :span="6"> <el-col :span="6">
<el-form-item label="项目时间："> <el-form-item label="项目时间：">
<el-date-picker <el-date-picker
v-model="formInline.projectBegintime"
size="mini" size="mini"
type="daterange" type="date"
start-placeholder="请选择项目开始时间" placeholder="请选择开始时间"
end-placeholder="请选择项目结束时间"
v-model="formInline.duringTime"
value-format="yyyy-MM-dd HH:mm:ss" value-format="yyyy-MM-dd HH:mm:ss"
:picker-options="pickerOptions0"
></el-date-picker> ></el-date-picker>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="12" style="padding:0;text-align:right;padding-right:15px;"> <el-col :span="4">
<el-form-item label="~">
<el-date-picker
v-model="formInline.projectEndtime"
size="mini"
type="date"
placeholder="请选择结束时间"
value-format="yyyy-MM-dd 23:59:59"
:picker-options="pickerOptions1"
></el-date-picker>
</el-form-item>
</el-col>
<el-col :span="8" style="padding:0;text-align:right;padding-right:15px;">
<el-button type="primary" size="small" @click="search">查询</el-button> <el-button type="primary" size="small" @click="search">查询</el-button>
<el-button type="default" size="small" @click="resetForm" style="margin-left:0;">重置</el-button> <el-button type="default" size="small" @click="resetForm" style="margin-left:0;">重置</el-button>
</el-col> </el-col>
</el-form> </el-form>
</el-row> </el-row>
<el-table <el-table
v-loading="loading" :data="tableData" style="width: 100%"
:data="tableData"
:header-cell-style="{background:'#FAFAFA',color:'#000'}"
> >
<el-table-column prop="createdId" label="ID编号" min-width="100" align="center"></el-table-column> <el-table-column prop="id" label="ID编号" min-width="100" align="center"></el-table-column>
<el-table-column prop="projectName" label="项目名称" min-width="100" align="center"></el-table-column> <el-table-column prop="projectName" label="项目名称" min-width="100" align="center"></el-table-column>
<el-table-column prop="createdName" label="创建人" align="center"></el-table-column> <el-table-column prop="createdName" label="创建人" align="center"></el-table-column>
<el-table-column prop="projectIntro" label="项目简介" align="center"></el-table-column> <el-table-column prop="projectIntro" label="项目简介" align="center"></el-table-column>
...@@ -68,6 +78,7 @@ ...@@ -68,6 +78,7 @@
<script> <script>
import BreadCrumb from "../../components/breadcrumb.vue"; import BreadCrumb from "../../components/breadcrumb.vue";
import { create } from "domain"; import { create } from "domain";
import { openLoading, closeLoading } from "../../utils/utils";
let vm = null; let vm = null;
export default { export default {
components: { components: {
...@@ -87,9 +98,24 @@ export default { ...@@ -87,9 +98,24 @@ export default {
projectName: "", projectName: "",
projectBegintime: "", projectBegintime: "",
projectEndtime: "", projectEndtime: "",
duringTime: "",
pageNo: 1, pageNo: 1,
pageSize: 10 pageSize: 10,
type: 2,
},
pickerOptions0: {
disabledDate: time => {
if (this.formInline.projectEndtime != "") {
return time.getTime() > new Date(this.formInline.projectEndtime).getTime();
}
}
},
pickerOptions1: {
disabledDate: time => {
return (
time.getTime() <
new Date(this.formInline.projectBegintime).getTime()
); //减去一天的时间代表可以选择同一天;
}
} }
}; };
}, },
...@@ -98,38 +124,16 @@ export default { ...@@ -98,38 +124,16 @@ export default {
this.search(); this.search();
}, },
methods: { methods: {
setParam(data) {
let param = {};
if (
data.duringTime !== null &&
data.duringTime !== "" &&
data.duringTime[0] !== null &&
data.duringTime[1] !== null
) {
param.projectBegintime = data.duringTime[0];
param.projectEndtime = data.duringTime[1];
}
for (let key in data) {
if (
key !== "duringTime" &&
key !== "projectBegintime" &&
key !== "projectEndtime"
) {
param[key] = data[key];
}
}
console.log(param);
return param;
},
search() { search() {
let req = {}; let req = {};
console.log(this.formInline); //console.log(this.formInline);
req = this.setParam(this.formInline); req = this.formInline;
openLoading(vm);
vm.GET("portalInfo/getProjectList", req).then(res => { vm.GET("portalInfo/getProjectList", req).then(res => {
closeLoading(vm);
if (res.code == "000000") { if (res.code == "000000") {
vm.tableData = res.data.data; vm.tableData = res.data.data;
vm.totalRows = res.data.totalRows; vm.totalRows = res.data.totalRows;
this.loading = false;
} }
}); });
}, },
...@@ -173,19 +177,16 @@ export default { ...@@ -173,19 +177,16 @@ export default {
.to-right { .to-right {
float: right; float: right;
} }
.table-option span {
color: #409eff;
}
.add-button { .add-button {
float: right; float: right;
} }
.el-table .cell { // .el-table .cell {
color: #929292; // color: #929292;
} // }
.el-table th > .cell { // .el-table th > .cell {
font-weight: bold; // font-weight: bold;
color: #000; // color: #000;
} // }
} }
} }
</style> </style>
\ No newline at end of file
Markdown 格式
0% or
您添加了 0 人 到此讨论。请谨慎行事。
先完成此消息的编辑！
想要评论请 注册 或