Skip to content

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

Merge branch 'dev-followUp-20190312' of... 

Merge branch 'dev-followUp-20190312' of http://192.168.110.53/com.pica.cloud.education.frontend/pica.cloud.web-education-admin into dev-followUp-20190312
上级 b2cef9f6 e4495b87
隐藏空白字符变更
内嵌 并排
正在显示 包含 76 行增加 和 19 行删除
src/store/modules/followup/reservationManage.js
浏览文件 @ afd4a0b1
......@@ -8,8 +8,8 @@ export default {
pageSize: 10, //每页数据大小
total: null, //总数
},
checkRevervationData: { //发送预约校验
},
checkRevervationData: {},//发送预约校验
constantsData: {},//获取常量
},
mutations: {
GET_RESERVATION_LIST(state, payload) {
......@@ -18,6 +18,9 @@ export default {
GET_CHECK_RESERVATION(state, payload) {
state.checkRevervationData = payload
},
GET_CONSTANS_DATA(state, payload) {
state.constantsData = payload
},
},
actions: {
getReservationList(context, payload) {
......@@ -37,5 +40,12 @@ export default {
context.commit('GET_CHECK_RESERVATION', data)
})
},
getConstantsData(context, payload) {
followApi.getBasicData({
...payload
}).then(({data}) => {
context.commit('GET_CONSTANS_DATA', data)
})
},
},
}
src/utils/envConfig.js
浏览文件 @ afd4a0b1
......@@ -6,8 +6,8 @@ export const envConfig = {
// baseUrl: 'https://dev-sc.yunqueyi.com/',
// // baseUrl: 'http://10.177.15.180:10202/',
// // baseUrl: 'http://192.168.140.14:10201/',
// baseUrl: 'https://test1-sc.yunqueyi.com/',
// baseUrl: 'https://test1-sc.yunqueyi.com/',
//baseUrl: 'https://uat-sc.yunqueyi.com/',
baseUrl: 'http://localhost:11905/portal/',
qiniuFileUrl: "http://localhost:10201/contents/admin/qiniu/token1",
......@@ -16,7 +16,8 @@ export const envConfig = {
loginUrl: 'https://dev-saas.yunqueyi.com/pica-login/work_station.html',
innerLoginUrl: 'http://localhost:8090/PICA_SSO_FE/html/pica_login.html',
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: {
baseUrl: 'https://dev-sc.yunqueyi.com/portal/',
......@@ -26,6 +27,7 @@ export const envConfig = {
loginUrl: 'https://dev-saas.yunqueyi.com/pica-login/work_station.html',
innerLoginUrl: 'https://dev-sso.yunqueyi.com/PICA_SSO_FE/html/pica_login.html',
followUpApi: '',
basicDataUrl: 'https://dev-sc.yunqueyi.com/',
},
test: {
baseUrl: 'https://test1-sc.yunqueyi.com/portal/',
......@@ -35,6 +37,7 @@ export const envConfig = {
loginUrl: 'https://test1-saas.yunqueyi.com/pica-login/work_station.html',
innerLoginUrl: 'https://test1-sso.yunqueyi.com/PICA_SSO_FE/html/pica_login.html',
followUpApi: '',
basicDataUrl: 'https://test1-sc.yunqueyi.com/',
},
uat: {
baseUrl: 'https://uat-sc.yunqueyi.com/portal/',
......@@ -44,8 +47,9 @@ export const envConfig = {
loginUrl: 'https://uat-saas.yunqueyi.com/pica-login/work_station.html',
innerLoginUrl: 'https://uat-sso.yunqueyi.com/PICA_SSO_FE/html/pica_login.html',
followUpApi: '',
basicDataUrl: 'https://uat-sc.yunqueyi.com/',
},
pro: {
pro: {
baseUrl: 'https://sc.yunqueyi.com/portal/',
qiniuFileUrl: "https://sc.yunqueyi.com/contents/admin/qiniu/token1",
qiniuResourceUrl: "https://videos.yunqueyi.com",
......@@ -53,5 +57,6 @@ export const envConfig = {
loginUrl: 'https://saas.yunqueyi.com/pica-login/work_station.html',
innerLoginUrl: 'https://sso.yunqueyi.com/PICA_SSO_FE/html/pica_login.html',
followUpApi: '',
basicDataUrl: 'https://sc.yunqueyi.com/',
}
}
src/utils/followup/followapis.js
浏览文件 @ afd4a0b1
import fetch from '../fetch';
import { getFollowUpApi } from '@/utils/index'
import { getFollowUpApi, getBasicDataApi } from '@/utils/index'
import utils from './followupUtils';
......@@ -56,15 +56,38 @@ const reservationManageApi = [
]
/*常量API*/
const basicDataApi = [
{
url: '/basic-data/constants/',
method: 'get',
params: 'params',
name: 'getBasicData',
description: '获取常量',
},
]
const api = {};
const apis = [...planManageApi, ...reservationManageApi];
const apis = [...planManageApi, ...reservationManageApi, ...basicDataApi];
apis.forEach(item => api[item.name] = (params = {}, extraConfig = {}) => {
const config = {
url: getFollowUpApi(item.url),
method: item.method,
};
// const config = {
// url: getFollowUpApi(item.url),
// method: item.method,
// };
let config = {};
if(item.name == 'getBasicData'){
config = {
url: getBasicDataApi(item.url),
method: item.method,
};
}else {
config = {
url: getFollowUpApi(item.url),
method: item.method,
};
}
if (extraConfig.urlSuffix) { // 需要做URL拼接的情况(比如*.do/2),,,可以根据自己的实际情况进行扩展
config.url = `${config.url}${extraConfig.urlSuffix}`;
......
src/utils/index.js
浏览文件 @ afd4a0b1
......@@ -9,7 +9,7 @@ export function setEventByModuleCode(itemData){
if( modeCode === 'M001' || modeCode === 'M002' || modeCode === 'M003') {
paramList = ''
}else if( modeCode === 'M100' || modeCode === 'M300' ) {
let urlPara = getUrlParmByCode(paramList);
paramList[0] && (paramList[0].value += urlPara);
......@@ -43,7 +43,7 @@ function getUrlParmByCode(paramList) {
}
// 计算高度
export function resizeHeight(cMinusHeight = 152, iMinuxHeight = 210, refHeightId = 'sidebarWrapperId',
export function resizeHeight(cMinusHeight = 152, iMinuxHeight = 210, refHeightId = 'sidebarWrapperId',
containerHeightId = 'appContainerId', innerHeightId = 'elTableId'){
if (!p_getElm(refHeightId) || !p_getElm(containerHeightId) || !p_getElm(innerHeightId)) {
// window.onresize = null
......@@ -53,14 +53,14 @@ export function resizeHeight(cMinusHeight = 152, iMinuxHeight = 210, refHeightId
p_getElm(containerHeightId).style.height = containerHeight - cMinusHeight + 'px'
p_getElm(innerHeightId).style.height = containerHeight - iMinuxHeight + 'px'
if(p_getElm('elTableIdInner')){
p_getElm('elTableIdInner').style.height = containerHeight - iMinuxHeight + 'px'
p_getElm('elTableIdInner').style.height = containerHeight - iMinuxHeight + 'px'
}
window.onresize = function() {
containerHeight = p_getElm(refHeightId).getBoundingClientRect().height - 50
p_getElm(containerHeightId).style.height = containerHeight - cMinusHeight + 'px'
p_getElm(innerHeightId).style.height = containerHeight - iMinuxHeight + 'px'
if (p_getElm('elTableIdInner')) {
p_getElm('elTableIdInner').style.height = containerHeight - iMinuxHeight + 'px'
p_getElm('elTableIdInner').style.height = containerHeight - iMinuxHeight + 'px'
}
}
}
......@@ -87,7 +87,7 @@ export function deepCopy(obj) {
}
/**
*
*
* @param {Array} originData 初始数据
* @param {Boolean} isUp true: 升序 false: 降序
* @param {String} sortField 排序字段，如果没有，则直接排序
......@@ -109,7 +109,7 @@ export function arraySort(originData, isUp = true, sortedField, converFun) {
sourceB = 0
} else {
sourceA = converFun(sourceA[sortedField])
sourceB = converFun(sourceB[sortedField])
sourceB = converFun(sourceB[sortedField])
}
}
// if(!sourceA || !sourceB) {
......@@ -127,7 +127,7 @@ export function arraySort(originData, isUp = true, sortedField, converFun) {
swap = sortedData[j]
sortedData[j] = sortedData[j + 1]
sortedData[j + 1] = swap
}
}
}
}
}
......@@ -171,6 +171,11 @@ export function getFollowUpApi(url) {
return getConfigByEnvType('followUpApiSoSoApi') + url //当前使用sosoapi mock数据
}
// 获取常量接口域名地址
export function getBasicDataApi(url) {
return getConfigByEnvType('basicDataUrl') + url
}
// 根据不同环境，生成URL
function getConfigByEnvType(urlType) {
return envConfig[process.env.BUILD_ENV][urlType]
......
src/views/followup/record-manage/record-list.vue
浏览文件 @ afd4a0b1
......@@ -123,6 +123,7 @@
import BreadCrumb from "@/components/breadcrumb";
// import customTextarea from "@/components/followup/customTextarea";
import followupDetail from "./dialog/followupDetail";
import { mapState, mapActions } from 'vuex';
export default {
components:{
BreadCrumb,
......@@ -184,7 +185,20 @@
dialogDetailShow: false,
}
},
computed: {
...mapState('reservationManage',{
constantsData: state => state.constantsData,
})
},
created() {
},
mounted() {
this.getConstantsData({
numList: 'P216'
})
},
methods: {
...mapActions('reservationManage', ['getConstantsData']),
search(){
console.log('搜索')
},
......
Markdown 格式
0% or
您添加了 0 人 到此讨论。请谨慎行事。
先完成此消息的编辑！
想要评论请 注册 或