Skip to content

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

ok

parent 9ec16474
Show whitespace changes
Inline Side-by-side
Showing with 40 additions and 35 deletions
npm-shrinkwrap.json
View file @ f7870e61
......@@ -4943,7 +4943,7 @@
"dependencies": {
"commander": {
"version": "2.14.1",
"resolved": "https://registry.npm.taobao.org/commander/download/commander-2.14.1.tgz?cache=0&sync_timestamp=1595168224685&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fcommander%2Fdownload%2Fcommander-2.14.1.tgz",
"resolved": "http://r.cnpmjs.org/commander/download/commander-2.14.1.tgz",
"integrity": "sha1-IjUSPjevjKPGXfRbAm29NXsBuao="
}
}
......@@ -5472,7 +5472,7 @@
},
"crc-32": {
"version": "1.2.0",
"resolved": "https://registry.npm.taobao.org/crc-32/download/crc-32-1.2.0.tgz",
"resolved": "http://r.cnpmjs.org/crc-32/download/crc-32-1.2.0.tgz",
"integrity": "sha1-yy224puIUI4y2d0OwWk+e0Ghggg=",
"requires": {
"exit-on-epipe": "~1.0.1",
......@@ -7369,7 +7369,7 @@
},
"exit-on-epipe": {
"version": "1.0.1",
"resolved": "https://registry.npm.taobao.org/exit-on-epipe/download/exit-on-epipe-1.0.1.tgz",
"resolved": "http://r.cnpmjs.org/exit-on-epipe/download/exit-on-epipe-1.0.1.tgz",
"integrity": "sha1-C92S6H1ShdJn2qgXHQ6wYVlolpI="
},
"expand-brackets": {
......@@ -8020,7 +8020,7 @@
},
"frac": {
"version": "1.1.2",
"resolved": "https://registry.npm.taobao.org/frac/download/frac-1.1.2.tgz",
"resolved": "http://r.cnpmjs.org/frac/download/frac-1.1.2.tgz",
"integrity": "sha1-PXT39keMiKG1AgMG10fcYxPHTQs="
},
"fragment-cache": {
......@@ -15097,7 +15097,7 @@
},
"printj": {
"version": "1.1.2",
"resolved": "https://registry.npm.taobao.org/printj/download/printj-1.1.2.tgz",
"resolved": "http://r.cnpmjs.org/printj/download/printj-1.1.2.tgz",
"integrity": "sha1-2Q3rKXWoufYA+zoclOP0xTx4oiI="
},
"private": {
......@@ -20550,7 +20550,7 @@
},
"script-loader": {
"version": "0.7.2",
"resolved": "https://registry.npm.taobao.org/script-loader/download/script-loader-0.7.2.tgz",
"resolved": "http://r.cnpmjs.org/script-loader/download/script-loader-0.7.2.tgz",
"integrity": "sha1-IBbbb4byX1z1baOJFdgzeLsWa6c=",
"dev": true,
"requires": {
......@@ -21138,7 +21138,7 @@
},
"ssf": {
"version": "0.10.3",
"resolved": "https://registry.npm.taobao.org/ssf/download/ssf-0.10.3.tgz",
"resolved": "http://r.cnpmjs.org/ssf/download/ssf-0.10.3.tgz",
"integrity": "sha1-jq4fwpyQpVLnkhII+BiS1vd6yys=",
"requires": {
"frac": "~1.1.2"
......@@ -23805,7 +23805,7 @@
},
"wmf": {
"version": "1.0.2",
"resolved": "https://registry.npm.taobao.org/wmf/download/wmf-1.0.2.tgz",
"resolved": "http://r.cnpmjs.org/wmf/download/wmf-1.0.2.tgz",
"integrity": "sha1-fRnWIQcaCMK9xrfmiKnENSmMwto="
},
"word-wrap": {
......@@ -23960,7 +23960,7 @@
},
"xlsx": {
"version": "0.15.6",
"resolved": "https://registry.npm.taobao.org/xlsx/download/xlsx-0.15.6.tgz?cache=0&sync_timestamp=1597272342311&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fxlsx%2Fdownload%2Fxlsx-0.15.6.tgz",
"resolved": "http://r.cnpmjs.org/xlsx/download/xlsx-0.15.6.tgz",
"integrity": "sha1-Rh+EHW2eoag3XizSRr8jrs4IodU=",
"requires": {
"adler-32": "~1.2.0",
......@@ -23975,7 +23975,7 @@
"dependencies": {
"commander": {
"version": "2.17.1",
"resolved": "https://registry.npm.taobao.org/commander/download/commander-2.17.1.tgz?cache=0&sync_timestamp=1595168224685&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fcommander%2Fdownload%2Fcommander-2.17.1.tgz",
"resolved": "http://r.cnpmjs.org/commander/download/commander-2.17.1.tgz",
"integrity": "sha1-vXerfebelCBc6sxy8XFtKfIKd78="
}
}
......
pages/account/login/index.vue
View file @ f7870e61
......@@ -85,14 +85,14 @@ export default {
}).then(r => {
if (r > 0) {
this.$Message.success("登陆成功！");
this.initUserInfo(r);
this.initUserInfo(r,tenantcode);
} else {
this.$Message.error("登陆失败！");
}
});
}
},
initUserInfo(id) {
initUserInfo(id,tenantCode) {
let parma = {
Id: id
};
......@@ -106,8 +106,7 @@ export default {
res.result.avatarUrl = fileUrlDown + res.result.avatarUrl;
}
let info = res.result;
info.tenantCode =
info.auth = ["admin"];
info.tenantCode =tenantCode;
info.avatar = info.avatarUrl;
info.userId = info.id;
info.name = info.userName;
......
pages/index.vue
View file @ f7870e61
......@@ -5,11 +5,3 @@
</div>
</template>
\ No newline at end of file
<script>
// import iview from './crm/statistical/index.vue'
export default {
// components: {
// iview
// }
}
</script>
\ No newline at end of file
pages/system/config/index.vue
View file @ f7870e61
......@@ -8,8 +8,8 @@
</div>
<div class="main fg">
<div class="tool tr">
<Button type="primary" size="small" @click="save">保存</Button>
<Button type="text">恢复默认</Button>
<Button type="primary" @click="save">保存</Button>
<Button type="text" @click="reset">恢复默认</Button>
</div>
<Form ref="form" :model="config" :rules="rules" :label-width="120">
<div id="site">
......@@ -146,8 +146,22 @@ export default {
};
},
methods: {
save() {},
reset() {},
save() {
var data={
key:'config',
page:"default",
content:JSON.stringify(this.config),
note:"配置信息"
}
this.$api.post(`${systemUrl}/config/create`,data).then(r=>{
if(r.success){
this.$Message.success("保存成功")
}
})
},
reset() {
this.$store.dispatch("loadSiteConfig");
},
},
};
</script>
......@@ -177,8 +191,6 @@ export default {
color: #999;
font-style: italic;
}
height: calc(100vh - 150px);
overflow-y: auto;
}
}
</style>
\ No newline at end of file
plugins/request/index.js
View file @ f7870e61
......@@ -53,7 +53,7 @@ function errorLog (err) {
// 创建一个 axios 实例
const service = axios.create({
baseURL: Setting.apiBaseURL,
timeout: 5000, // 请求超时时间
timeout: 30000, // 请求超时时间
transformRequest:[(data)=>{
function dateFormat(date, fmt) {
if (null == date || undefined == date) return '';
......
static/config.js
View file @ f7870e61
......@@ -9,7 +9,8 @@ let address=systemApi.dev;
//let address=systemApi.product;
//let address=systemApi.local;
window.systemUrl = `http://${address}:10000/system`; //System-api 系统管理（基础数据）
// window.systemUrl = `http://${address}:10000/system`; //System-api 系统管理（基础数据）
window.systemUrl = `http://localhost:10020/api/services/app`; //System-api 系统管理（基础数据）
window.authUrl = `http://${address}:10010`; //Authentication-api //统一登陆认证
window.UserUrl = `http://${address}:10130`; //Authentication-api //用户信息 密码修改。重置等
window.designUrl = `http://${address}:10000/process`; // 工艺规程
......
store/index.js
View file @ f7870e61
......@@ -100,8 +100,9 @@ export const actions = {
let params = {
pageSize: 2,
conditions: [{
"fieldName": "key",
"fieldValue": "defaultConfig,tenant-" + state.userInfo.tenantCode,
"fieldName": "Key",
// "fieldValue": `defaultConfig","tenant-${state.userInfo.tenantCode}"`,
"fieldValue": "abc",
"conditionalType": "In",
}, ]
}
......@@ -120,7 +121,7 @@ export const actions = {
}
},
async saveConfig({commit},config){
await Api.post(`${systemUrl}/config/create`,config)
}
}
......
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