Authored by 王涛

Merge branch 'master-500-dev-lushangqing' into 'master-500-dev'

增加了基本信息动态数据配置表头 vuex tableHeadDataInfo



See merge request !23
... ... @@ -6,6 +6,6 @@ module.exports = merge(prodEnv, {
NODE_ENV: '"development"',
BASE_API: '"http://127.0.0.1:9095"',
// BASE_API_other: '"https://192.168.0.69:8080"'
BASE_API_other: '"http://192.168.0.74:8080"'
BASE_API_other: '"http://192.168.0.75:8080"'
// BASE_API: '"http://10.108.26.197:9095"'
})
... ...
... ... @@ -7,7 +7,9 @@ const getters = {
token: state => state.user.token,
accessUser: state => state.user.accessUser,
cacheViews: state => state.cacheView.cacheViews,
//lsq 2022-02-25
tableHeads:state => state.tableHead.tableHeadData
//lsq 2022-02-25 详情表格动态数据关联 配置 表头
tableHeads:state => state.tableHead.tableHeadData,
//基本信息的动态数据关联 配置 表头
tableHeadInfos: state => state.tableHead.tableHeadDataInfo
}
export default getters
... ...
const tableHead = {
state: {
tableHeadData: []
tableHeadData: [],
tableHeadDataInfo:[]
},
mutations: {
CHANGE_HEAD: (state, val) => {
state.tableHeadData=val;
}
},
CHANGW_HEAD_INFO:(state, val) => {
state.tableHeadDataInfo=val;
},
},
actions: {
... ...
... ... @@ -198,8 +198,6 @@ import textToImage from "../../designerComponents/textToImage";//文字转图片
import textToBg from "../../designerComponents/textToBg";
import {saveClearAalarm} from "../../../../../../api/platform";
import {Message} from "element-ui";
import {mapGetters} from "vuex";
import tableHead from "../../../../../../store/modules/tableHead";
//文字转背景
vue.use(VueSuperSlide);
... ...