Skip to content

M
mes-ui
Commit 54faeb91 authored by 周远喜's avatar 周远喜
Browse files
Options

公司信息修改。

parent b366ac27
Show whitespace changes
Inline Side-by-side
Showing with 186 additions and 104 deletions
assets/css/base.less
View file @ 54faeb91
...@@ -12,7 +12,59 @@ html body { ...@@ -12,7 +12,59 @@ html body {
#__layout { #__layout {
height: 100% height: 100%
} }
/*flex*/
.flex {
display: flex;
//采用flex布局
}
.fc-m {
justify-content: center;
}
.fa-m {
align-items: center;
}
.fc-e {
justify-content: flex-end;
}
.fc-b {
justify-content: space-between;
}
.fc-a {
justify-content: space-around;
}
.fc-ev {
justify-content: space-evenly;
}
.fd {
flex-direction: column;
}
.fg {
flex-grow: 1;
}
.fs {
flex-shrink: 0;
}
.fg2 {
flex-grow: 2;
}
.fos {
order: -1;
}
.foe {
order: 99;
}
/*字体*/ /*字体*/
.ib { .ib {
display: inline; display: inline;
......
i18n/locale/zh-CN.js
View file @ 54faeb91
...@@ -928,6 +928,9 @@ export default { ...@@ -928,6 +928,9 @@ export default {
id: '', id: '',
name: '公司名称', name: '公司名称',
code: '公司编码', code: '公司编码',
url: '系统入口',
remark: '备注',
status: '状态',
typeId: '公司类型', typeId: '公司类型',
startTime: '服务开始时间', startTime: '服务开始时间',
endTime: '服务结束时间', endTime: '服务结束时间',
......
pages/basicData/dic/api.js
View file @ 54faeb91
import api from '@/plugins/request' import api from '@/plugins/request'
// const u=(path)=>`${systemUrl}/Dictionary/${path}` // const u=(path)=>`${systemUrl}/Dictionary/${path}`
const u=(path)=>`${systemNew}/dictionary/${path}` const u=(path)=>`${system}/dictionary/${path}`
export default { export default {
getChildren(id) { getChildren(id) {
return api.get(u("getChildren"), { id }) return api.get(u("getChildren"), { id })
......
pages/system/account/api.js
View file @ 54faeb91
import Api from '@/plugins/request' import Api from '@/plugins/request'
export default { export default {
index:`${systemNew}/account/paged`, index:`${system}/account/paged`,
paged(params){ paged(params){
return Api.post(`${systemNew}/account/paged`,params); return Api.post(`${system}/account/paged`,params);
}, },
get(params){ get(params){
return Api.get(`${systemNew}/account/get`,params); return Api.get(`${system}/account/get`,params);
}, },
create(params){ create(params){
return Api.post(`${systemNew}/account/create`,params); return Api.post(`${system}/account/create`,params);
}, },
update(params){ update(params){
return Api.post(`${systemNew}/account/update`,params); return Api.post(`${system}/account/update`,params);
}, },
//删除： //删除：
delete(params) { delete(params) {
return Api.delete(`${systemNew}/account/delete`,{params:params}); return Api.delete(`${system}/account/delete`,{params:params});
}, },
} }
\ No newline at end of file
pages/system/datasource/api.js
View file @ 54faeb91
import Api from '@/plugins/request' import Api from '@/plugins/request'
export default { export default {
index:`${systemNew}/datasource/paged`, index:`${system}/datasource/paged`,
paged(params){ paged(params){
return Api.post(`${systemNew}/datasource/paged`,params); return Api.post(`${system}/datasource/paged`,params);
}, },
bindhostlist() { bindhostlist() {
return Api.post(`${systemNew}/host/list`, {}); return Api.post(`${system}/host/list`, {});
}, },
get(params){ get(params){
return Api.get(`${systemNew}/datasource/get`,params); return Api.get(`${system}/datasource/get`,params);
}, },
create(params){ create(params){
return Api.post(`${systemNew}/datasource/create`,params); return Api.post(`${system}/datasource/create`,params);
}, },
update(params){ update(params){
return Api.post(`${systemNew}/datasource/update`,params); return Api.post(`${system}/datasource/update`,params);
}, },
//删除： //删除：
delete(params) { delete(params) {
return Api.delete(`${systemNew}/datasource/delete`,{params:params}); return Api.delete(`${system}/datasource/delete`,{params:params});
}, },
} }
\ No newline at end of file
pages/system/dic/api.js
View file @ 54faeb91
import api from '@/plugins/request' import api from '@/plugins/request'
// const u=(path)=>`${systemUrl}/Dictionary/${path}` // const u=(path)=>`${systemUrl}/Dictionary/${path}`
const u=(path)=>`${systemNew}/dictionary/${path}` //49.232.68.61:10130/api/services/app/dictionary/getall const u=(path)=>`${system}/dictionary/${path}` //49.232.68.61:10130/api/services/app/dictionary/getall
export default { export default {
getChildren(id) { getChildren(id) {
return api.get(u("getchildren"), { id }) return api.get(u("getchildren"), { id })
......
pages/system/host/api.js
View file @ 54faeb91
import Api from '@/plugins/request' import Api from '@/plugins/request'
export default { export default {
// index:`${authUrl}/api/services/app/host/paged`, // index:`${authUrl}/api/services/app/host/paged`,
index:`${systemNew}/host/paged`, //new index:`${system}/host/paged`, //new
paged(params){ paged(params){
// return Api.post(`${authUrl}/api/services/app/host/paged`,params); systemNew // return Api.post(`${authUrl}/api/services/app/host/paged`,params); system
return Api.post(`${systemNew}/host/paged`,params); return Api.post(`${system}/host/paged`,params);
}, },
get(params){ get(params){
return Api.get(`${systemNew}/host/get`,params); return Api.get(`${system}/host/get`,params);
}, },
create(params){ create(params){
return Api.post(`${systemNew}/host/create`,params); return Api.post(`${system}/host/create`,params);
}, },
update(params){ update(params){
return Api.post(`${systemNew}/host/update`,params); return Api.post(`${system}/host/update`,params);
}, },
//删除： //删除：
delete(params) { delete(params) {
return Api.delete(`${systemNew}/host/delete`,{params:params}); return Api.delete(`${system}/host/delete`,{params:params});
}, },
} }
\ No newline at end of file
pages/system/tanant/add.vue
View file @ 54faeb91
<template> <template>
<Form ref="form" :model="entity" :rules="rules" :label-width="120"> <Form ref="form" :model="entity" :rules="rules" :label-width="150">
<Row> <Row>
<Col :span="24"> <Col :span="24">
<FormItem :label="l('name')" prop="name"> <FormItem :label="l('name')" prop="name">
<Input v-model="entity.name"></Input> <Input v-model="entity.name"></Input>
</FormItem> </FormItem>
</Col> </Col>
<!-- <Col :span="24"> <Col :span="24">
<FormItem :label="l('code')" prop="code"> <FormItem :label="l('url')" prop="url">
<Input v-model="entity.code"></Input> <Input v-model="entity.url"></Input>
</FormItem> </FormItem>
</Col> --> </Col>
<Col :span="24"> <Col :span="24">
<FormItem :label="l('typeId')" prop="typeId"> <FormItem :label="l('typeId')" prop="typeId">
<Dictionary code="system.Tanant.type" v-model="entity.typeId" type="select"></Dictionary> <Dictionary code="system.Tanant.type" v-model="entity.typeId" type="select"></Dictionary>
...@@ -26,14 +26,23 @@ ...@@ -26,14 +26,23 @@
<DatePicker type="date" v-model="entity.endTime"></DatePicker> <DatePicker type="date" v-model="entity.endTime"></DatePicker>
</FormItem> </FormItem>
</Col> </Col>
<Col :span="24"> <Col :span="24">
<FormItem :label="l('remark')" prop="remark">
<Input v-model="entity.remark" type="textarea"></Input>
</FormItem>
</Col>
<Col :span="24">
<FormItem :label="l('status')" prop="status">
<Dictionary code="system.Tanant.status" v-model="entity.typeId" type="radio"></Dictionary>
</FormItem>
</Col>
<!-- <Col :span="24">
<FormItem :label="l('hostId')" prop="hostId"> <FormItem :label="l('hostId')" prop="hostId">
<Select @on-change="onchange_host" v-model="entity.hostId"> <Select @on-change="onchange_host" v-model="entity.hostId">
<Option v-for="(item,index) in hostlist" :key="index" :value="item.id">{{item.name}}</Option> <Option v-for="(item,index) in hostlist" :key="index" :value="item.id">{{item.name}}</Option>
</Select> </Select>
</FormItem> </FormItem>
</Col> </Col>-->
</Row> </Row>
<FormItem> <FormItem>
<Button type="primary" @click="handleSubmit" :disabled="disabled">保存</Button> <Button type="primary" @click="handleSubmit" :disabled="disabled">保存</Button>
...@@ -42,86 +51,84 @@ ...@@ -42,86 +51,84 @@
</Form> </Form>
</template> </template>
<script> <script>
import Api from './api' import Api from "./api";
export default { export default {
name: 'Add', name: "Add",
data() { data() {
return { return {
disabled: false, disabled: false,
entity: { entity: {
id: 0, id: 0,
name: '', name: "",
code: '', code: "",
typeId: 0, typeId: 0,
startTime: '', startTime: "",
endTime: '', endTime: "",
initialized: 0, initialized: 0,
dataSourceId: 0, dataSourceId: 0,
hostId: '0', hostId: "0",
}, },
hostlist: [], hostlist: [],
rules: { rules: {
name: [{ required: true, message: '必填', trigger: 'blur' }], name: [{ required: true, message: "必填", trigger: "blur" }],
// code: [{ required: true, message: '必填', trigger: 'blur' }] url: [{ required: true, message: "必填", trigger: "blur" }],
},
} };
}
}, },
props: { props: {
v: Object v: Object,
}, },
mounted() { mounted() {
Api.bindhostlist() Api.bindhostlist()
.then((r) => { .then((r) => {
if (r.success) { if (r.success) {
this.hostlist = r.result this.hostlist = r.result;
} else { } else {
} }
}) })
.catch((err) => { .catch((err) => {
console.warn(err) console.warn(err);
}) });
}, },
methods: { methods: {
handleSubmit() { handleSubmit() {
console.log(this.entity.hostId) console.log(this.entity.hostId);
this.$refs.form.validate((v) => { this.$refs.form.validate((v) => {
if (v) { if (v) {
this.disabled = true this.disabled = true;
Api.create(this.entity) Api.create(this.entity)
.then((r) => { .then((r) => {
this.disabled = false this.disabled = false;
if (r.success) { if (r.success) {
this.$Message.success('保存成功') this.$Message.success("保存成功");
this.$emit('on-ok') this.$emit("on-ok");
} else { } else {
this.$Message.error('保存失败') this.$Message.error("保存失败");
} }
}) })
.catch((err) => { .catch((err) => {
this.disabled = false this.disabled = false;
this.$Message.error('保存失败') this.$Message.error("保存失败");
console.warn(err) console.warn(err);
}) });
} }
}) });
}, },
onchange_host(val) { onchange_host(val) {
this.entity.hostId = val this.entity.hostId = val;
}, },
handleClose() { handleClose() {
this.$emit('on-close') this.$emit("on-close");
}, },
l(key) { l(key) {
key = 'tanant' + '.' + key key = "tanant" + "." + key;
return this.$t(key) return this.$t(key);
} },
}, },
watch: { watch: {
v() { v() {
this.entity = this.$u.clone(this.v) this.entity = this.$u.clone(this.v);
} },
} },
} };
</script> </script>
\ No newline at end of file
pages/system/tanant/api.js
View file @ 54faeb91
import Api from '@/plugins/request' import Api from '@/plugins/request'
export default { export default {
index: `${systemNew}/tenant/paged`, index: `${system}/tenant/paged`,
paged(params) { paged(params) {
return Api.post(`${systemNew}/tenant/paged`, params); return Api.post(`${system}/tenant/paged`, params);
}, },
get(params) { get(params) {
return Api.get(`${systemNew}/tenant/get`, params); return Api.get(`${system}/tenant/get`, params);
}, },
create(params) { create(params) {
return Api.post(`${systemNew}/tenant/create`, params); return Api.post(`${system}/tenant/create`, params);
}, },
update(params) { update(params) {
return Api.post(`${systemNew}/tenant/update`, params); return Api.post(`${system}/tenant/update`, params);
}, },
//删除： //删除：
delete(params) { delete(params) {
return Api.delete(`${systemNew}/tenant/delete`, { params: params }); return Api.delete(`${system}/tenant/delete`, { params: params });
}, },
bindhostlist() { bindhostlist() {
return Api.post(`${systemNew}/host/list`, {}); return Api.post(`${system}/host/list`, {});
}, },
tanantinit(params) { tanantinit(params) {
return Api.post(`${systemNew}/tenant/tenantinit`,params ); return Api.post(`${system}/tenant/tenantinit`,params );
}, },
setMenu(params) { setMenu(params) {
return Api.post(`${systemNew}/setmenucompany/create`,params ); return Api.post(`${system}/setmenucompany/create`,params );
}, },
setAps(params){ setAps(params){
return Api.post(`${systemNew}/setschedulecompany/create`,params ); return Api.post(`${system}/setschedulecompany/create`,params );
}, },
apsList(params){ apsList(params){
return Api.post(`${systemNew}/setschedulecompany/list`,params ); return Api.post(`${systemNew}/setschedulecompany/list`,params );
......
pages/system/tanant/detail.vue
View file @ 54faeb91
...@@ -3,9 +3,16 @@ ...@@ -3,9 +3,16 @@
<Row> <Row>
<Filed :span="24" :label-width="120" :name="l('name')">{{entity.name}}</Filed> <Filed :span="24" :label-width="120" :name="l('name')">{{entity.name}}</Filed>
<Filed :span="24" :label-width="120" :name="l('code')">{{entity.code}}</Filed> <Filed :span="24" :label-width="120" :name="l('code')">{{entity.code}}</Filed>
<Filed :span="24" :label-width="120" :name="l('typeId')">{{entity.typeId}}</Filed> <Filed :span="24" :label-width="120" :name="l('url')">{{entity.url}}</Filed>
<Filed :span="24" :label-width="120" :name="l('typeId')">
<state code="system.Tanant.type" :value="entity.typeId"/>
</Filed>
<Filed :span="24" :label-width="120" :name="l('startTime')">{{entity.startTime}}</Filed> <Filed :span="24" :label-width="120" :name="l('startTime')">{{entity.startTime}}</Filed>
<Filed :span="24" :label-width="120" :name="l('endTime')">{{entity.endTime}}</Filed> <Filed :span="24" :label-width="120" :name="l('endTime')">{{entity.endTime}}</Filed>
<Filed :span="24" :label-width="120" :name="l('remark')">{{entity.remark}}</Filed>
<Filed :span="24" :label-width="120" :name="l('status')">
<state code="system.Tanant.status" :value="entity.status"/>
</Filed>
<!-- <Filed :span="24" :name="l('initialized')">{{entity.initialized}}</Filed> <!-- <Filed :span="24" :name="l('initialized')">{{entity.initialized}}</Filed>
<Filed :span="24" :name="l('hostId')">{{entity.hostId}}</Filed> --> <Filed :span="24" :name="l('hostId')">{{entity.hostId}}</Filed> -->
</Row> </Row>
......
pages/system/tanant/edit.vue
View file @ 54faeb91
<template> <template>
<Form ref="form" :model="entity" :rules="rules" :label-width="90"> <Form ref="form" :model="entity" :rules="rules" :label-width="150">
<Row> <Row>
<Col :span="24"> <Col :span="24">
<FormItem :label="l('name')" prop="name"> <FormItem :label="l('name')" prop="name">
<Input v-model="entity.name"></Input> <Input v-model="entity.name"></Input>
</FormItem> </FormItem>
</Col> </Col>
<!-- <Col :span="24"> <Col :span="24">
<FormItem :label="l('code')" prop="code"> <FormItem :label="l('url')" prop="url">
<Input v-model="entity.code"></Input> <Input v-model="entity.url"></Input>
</FormItem> </FormItem>
</Col> --> </Col>
<Col :span="24"> <Col :span="24">
<FormItem :label="l('typeId')" prop="typeId"> <FormItem :label="l('typeId')" prop="typeId">
<Dictionary code="system.Tanant.type" v-model="entity.typeId" type="select"></Dictionary> <Dictionary code="system.Tanant.type" v-model="entity.typeId" type="select"></Dictionary>
...@@ -26,14 +26,23 @@ ...@@ -26,14 +26,23 @@
<DatePicker type="date" v-model="entity.endTime"></DatePicker> <DatePicker type="date" v-model="entity.endTime"></DatePicker>
</FormItem> </FormItem>
</Col> </Col>
<Col :span="24"> <Col :span="24">
<FormItem :label="l('remark')" prop="remark">
<Input v-model="entity.remark" type="textarea"></Input>
</FormItem>
</Col>
<Col :span="24">
<FormItem :label="l('status')" prop="status">
<Dictionary code="system.Tanant.status" v-model="entity.typeId" type="radio"></Dictionary>
</FormItem>
</Col>
<!-- <Col :span="24">
<FormItem :label="l('hostId')" prop="hostId"> <FormItem :label="l('hostId')" prop="hostId">
<Select @on-change="onchange_host" v-model="entity.hostId"> <Select @on-change="onchange_host" v-model="entity.hostId">
<Option v-for="(item,index) in hostlist" :key="index" :value="item.id">{{item.name}}</Option> <Option v-for="(item,index) in hostlist" :key="index" :value="item.id">{{item.name}}</Option>
</Select> </Select>
</FormItem> </FormItem>
</Col> </Col> -->
</Row> </Row>
<FormItem> <FormItem>
<Button type="primary" @click="handleSubmit" :disabled="disabled">保存</Button> <Button type="primary" @click="handleSubmit" :disabled="disabled">保存</Button>
...@@ -62,7 +71,7 @@ export default { ...@@ -62,7 +71,7 @@ export default {
hostlist: [], hostlist: [],
rules: { rules: {
name: [{ required: true, message: '必填', trigger: 'blur' }], name: [{ required: true, message: '必填', trigger: 'blur' }],
code: [{ required: true, message: '必填', trigger: 'blur' }] url: [{ required: true, message: '必填', trigger: 'blur' }]
// hostId: [{ required: true, message: '必填', trigger: 'blur' }] // hostId: [{ required: true, message: '必填', trigger: 'blur' }]
} }
} }
......
pages/system/tanant/index.vue
View file @ 54faeb91
...@@ -18,19 +18,19 @@ ...@@ -18,19 +18,19 @@
<Button type="primary" @click="addModal=true">新增</Button> <Button type="primary" @click="addModal=true">新增</Button>
</template> </template>
</DataGrid> </DataGrid>
<Modal v-model="addModal" title="新增" footer-hide> <Modal v-model="addModal" title="新增" footer-hide width='1000'>
<Add @on-close="cancel" @on-ok="addOk" /> <Add @on-close="cancel" @on-ok="addOk" />
</Modal> </Modal>
<Modal v-model="editModal" title="编辑" footer-hide > <Modal v-model="editModal" title="编辑" footer-hide width='1000'>
<Edit :eid="curId" @on-close="cancel" @on-ok="addOk" /> <Edit :eid="curId" @on-close="cancel" @on-ok="addOk" />
</Modal> </Modal>
<Modal v-model="detailModal" title="详情"> <Modal v-model="detailModal" title="详情">
<Detail :eid="curId" /> <Detail :eid="curId" />
</Modal> </Modal>
<Modal v-model="datadetailModal" title="数据源配置" footer-hide width='830'> <Modal v-model="datadetailModal" title="数据源配置" footer-hide width='1000'>
<dataDetail ref='dataDetail' @set-ok="setSqlOk" :elid="datacurId" /> <dataDetail ref='dataDetail' @set-ok="setSqlOk" :elid="datacurId" />
</Modal> </Modal>
<Modal v-model="setModal" title="套餐配置" footer-hide width='830'> <Modal v-model="setModal" title="套餐配置" footer-hide width='1000'>
<menuSet :companyId="curId" @set-ok="setOk"/> <menuSet :companyId="curId" @set-ok="setOk"/>
</Modal> </Modal>
<Modal v-model="apsModal" title="APS配置" footer-hide > <Modal v-model="apsModal" title="APS配置" footer-hide >
...@@ -102,6 +102,13 @@ export default { ...@@ -102,6 +102,13 @@ export default {
easy: true, easy: true,
high: true high: true
}, },
{
key: 'url',
title: this.l('url'),
align: 'left',
easy: true,
high: true
},
{ {
key: 'typeId', key: 'typeId',
title: this.l('typeId'), title: this.l('typeId'),
...@@ -256,6 +263,13 @@ export default { ...@@ -256,6 +263,13 @@ export default {
]) ])
} }
}, },
{
key: 'status',
title: this.l('status'),
align: 'left',
code: "system.Tanant.status",
high: true
},
{ {
title: '操作', title: '操作',
key: 'id', key: 'id',
......
static/config.js
View file @ 54faeb91
const systemApi = { const systemApi = {
local: 'localhost', local: 'localhost',
product: '39.100.148.168', dev: '39.100.148.168',
dev:"49.232.68.61", product:"49.232.68.61",
aps:'47.92.102.113' aps:'47.92.102.113'
} }
//环境切换（只修改此处）： //环境切换（只修改此处）：
...@@ -9,18 +9,8 @@ let address=systemApi.dev; ...@@ -9,18 +9,8 @@ let address=systemApi.dev;
//let address=systemApi.product; //let address=systemApi.product;
//let address=systemApi.local; //let address=systemApi.local;
window.systemUrl = `http://${address}:10000/system`; //System-api 系统管理（基础数据）
// window.system =`http://${address}:10000/auth`;//多租户后台系统
window.system =`http://${address}:10000/platform`;//多租户后台系统 更换网关 platform window.system =`http://${address}:10000/platform`;//多租户后台系统 更换网关 platform
window.systemNew =`http://${address}:10000/platform`;//多租户后台系统-new 10130/platform/host/paged
window.authUrl = `http://${address}:10010`; //Authentication-api //统一登陆认证 window.authUrl = `http://${address}:10010`; //Authentication-api //统一登陆认证
window.designUrl = `http://${address}:10000/process`; // 工艺规程
window.PlanUrl = `http://${address}:10000/plan`; //订单
window.bugUrl = `http://${address}:10000/bug`; //bug window.bugUrl = `http://${address}:10000/bug`; //bug
window.fileUrl = `http://${address}:10080/fileServer`; //文件上传url window.fileUrl = `http://${address}:10080/fileServer`; //文件上传url
window.fileUrlDown = `http://${address}`; //文件下载url window.fileUrlDown = `http://${address}`; //文件下载url
window.resourceUrl = `http://${address}:10000/resource`; // 制造资源地址
window.workflowUrl = `http://${address}:10000/workflow`; // 工作流地址
window.certificateUrl = `http://${address}:10000/qms`; //质量
window.crmUrl = `http://${address}:10000/crm`; //crm客户、合同、项目管理
window.apsUrl = `http://${systemApi.aps}:10000/aps`;//aps排产
\ No newline at end of file
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment