Skip to content

M
mes-ui
Commit 0fec4621 authored by renjintao's avatar renjintao
Browse files
Options

Merge branch 'portal' of git.mes123.com:zhouyx/mes-ui into portal

parents 9896e145 c26d050f
Hide whitespace changes
Inline Side-by-side
Showing with 658 additions and 515 deletions
i18n/locale/zh-CN.js
View file @ 0fec4621
...@@ -1177,6 +1177,8 @@ export default { ...@@ -1177,6 +1177,8 @@ export default {
requestUrl: '服务地址', requestUrl: '服务地址',
requestParam: '参数', requestParam: '参数',
exception: '异常详细信息', exception: '异常详细信息',
remark:'备注'
}, },
user_message_config: { user_message_config: {
creationTime: '创建时间', creationTime: '创建时间',
......
npm-shrinkwrap.json
View file @ 0fec4621
...@@ -4943,7 +4943,7 @@ ...@@ -4943,7 +4943,7 @@
"dependencies": { "dependencies": {
"commander": { "commander": {
"version": "2.14.1", "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=" "integrity": "sha1-IjUSPjevjKPGXfRbAm29NXsBuao="
} }
} }
...@@ -5472,7 +5472,7 @@ ...@@ -5472,7 +5472,7 @@
}, },
"crc-32": { "crc-32": {
"version": "1.2.0", "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=", "integrity": "sha1-yy224puIUI4y2d0OwWk+e0Ghggg=",
"requires": { "requires": {
"exit-on-epipe": "~1.0.1", "exit-on-epipe": "~1.0.1",
...@@ -7369,7 +7369,7 @@ ...@@ -7369,7 +7369,7 @@
}, },
"exit-on-epipe": { "exit-on-epipe": {
"version": "1.0.1", "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=" "integrity": "sha1-C92S6H1ShdJn2qgXHQ6wYVlolpI="
}, },
"expand-brackets": { "expand-brackets": {
...@@ -8020,7 +8020,7 @@ ...@@ -8020,7 +8020,7 @@
}, },
"frac": { "frac": {
"version": "1.1.2", "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=" "integrity": "sha1-PXT39keMiKG1AgMG10fcYxPHTQs="
}, },
"fragment-cache": { "fragment-cache": {
...@@ -15097,7 +15097,7 @@ ...@@ -15097,7 +15097,7 @@
}, },
"printj": { "printj": {
"version": "1.1.2", "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=" "integrity": "sha1-2Q3rKXWoufYA+zoclOP0xTx4oiI="
}, },
"private": { "private": {
...@@ -20550,7 +20550,7 @@ ...@@ -20550,7 +20550,7 @@
}, },
"script-loader": { "script-loader": {
"version": "0.7.2", "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=", "integrity": "sha1-IBbbb4byX1z1baOJFdgzeLsWa6c=",
"dev": true, "dev": true,
"requires": { "requires": {
...@@ -21138,7 +21138,7 @@ ...@@ -21138,7 +21138,7 @@
}, },
"ssf": { "ssf": {
"version": "0.10.3", "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=", "integrity": "sha1-jq4fwpyQpVLnkhII+BiS1vd6yys=",
"requires": { "requires": {
"frac": "~1.1.2" "frac": "~1.1.2"
...@@ -23805,7 +23805,7 @@ ...@@ -23805,7 +23805,7 @@
}, },
"wmf": { "wmf": {
"version": "1.0.2", "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=" "integrity": "sha1-fRnWIQcaCMK9xrfmiKnENSmMwto="
}, },
"word-wrap": { "word-wrap": {
...@@ -23960,7 +23960,7 @@ ...@@ -23960,7 +23960,7 @@
}, },
"xlsx": { "xlsx": {
"version": "0.15.6", "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=", "integrity": "sha1-Rh+EHW2eoag3XizSRr8jrs4IodU=",
"requires": { "requires": {
"adler-32": "~1.2.0", "adler-32": "~1.2.0",
...@@ -23975,7 +23975,7 @@ ...@@ -23975,7 +23975,7 @@
"dependencies": { "dependencies": {
"commander": { "commander": {
"version": "2.17.1", "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=" "integrity": "sha1-vXerfebelCBc6sxy8XFtKfIKd78="
} }
} }
......
pages/account/login/index.vue
View file @ 0fec4621
...@@ -85,14 +85,14 @@ export default { ...@@ -85,14 +85,14 @@ export default {
}).then(r => { }).then(r => {
if (r > 0) { if (r > 0) {
this.$Message.success("登陆成功！"); this.$Message.success("登陆成功！");
this.initUserInfo(r); this.initUserInfo(r, tenantcode);
} else { } else {
this.$Message.error("登陆失败！"); this.$Message.error("登陆失败！");
} }
}); });
} }
}, },
initUserInfo(id) { initUserInfo(id, tenantCode) {
let parma = { let parma = {
Id: id Id: id
}; };
...@@ -106,8 +106,7 @@ export default { ...@@ -106,8 +106,7 @@ export default {
res.result.avatarUrl = fileUrlDown + res.result.avatarUrl; res.result.avatarUrl = fileUrlDown + res.result.avatarUrl;
} }
let info = res.result; let info = res.result;
info.tenantCode = ''; info.tenantCode = tenantCode;
info.auth = ["admin"];
info.avatar = info.avatarUrl; info.avatar = info.avatarUrl;
info.userId = info.id; info.userId = info.id;
info.name = info.userName; info.name = info.userName;
......
pages/basicData/department/Addrow.vue
View file @ 0fec4621
...@@ -7,7 +7,7 @@ ...@@ -7,7 +7,7 @@
</FormItem> </FormItem>
</Col> </Col>
<Col :span="12"> <Col :span="12">
<FormItem :label="l('departcode')"> <FormItem :label="l('departcode')" prop="departcode">
<Input v-model="entity.departcode" placeholder="请输入..."></Input> <Input v-model="entity.departcode" placeholder="请输入..."></Input>
</FormItem> </FormItem>
</Col> </Col>
...@@ -20,10 +20,9 @@ ...@@ -20,10 +20,9 @@
</Col>--> </Col>-->
<Col :span="12"> <Col :span="12">
<FormItem :label="l('upMent')"> <FormItem :label="l('upMent')">
<b>{{entity.name}}</b> <b>{{ entity.name }}</b>
</FormItem> </FormItem>
</Col> </Col>
<Col :span="24"> <Col :span="24">
<FormItem :label="l('cityName')"> <FormItem :label="l('cityName')">
<Cascader :data="citys" v-model="location"></Cascader> <Cascader :data="citys" v-model="location"></Cascader>
...@@ -44,7 +43,9 @@ ...@@ -44,7 +43,9 @@
</Col> </Col>
</Row> </Row>
<FormItem> <FormItem>
<Button type="primary" @click="handleSubmit" :disabled="disabled">保存</Button> <Button type="primary" @click="handleSubmit" :disabled="disabled"
>保存</Button
>
<Button @click="handleClose" class="ml20">取消</Button> <Button @click="handleClose" class="ml20">取消</Button>
</FormItem> </FormItem>
<!-- 组织类型 --> <!-- 组织类型 -->
...@@ -63,6 +64,18 @@ export default { ...@@ -63,6 +64,18 @@ export default {
name: "Add", name: "Add",
// components: { OrganizType }, // components: { OrganizType },
data() { data() {
const validateCode = (rule, value, callback) => {
if (!value) {
return callback(new Error("编号不能为空"));
}
Api.isExist(value).then((r) => {
if (r.result) {
return callback(new Error("编号已经存在"));
} else {
callback();
}
});
};
return { return {
// showTree: false, //组织类型 // showTree: false, //组织类型
disabled: false, disabled: false,
...@@ -73,33 +86,40 @@ export default { ...@@ -73,33 +86,40 @@ export default {
organization_Id: 0, organization_Id: 0,
organization_Type: "", organization_Type: "",
departcode: "", departcode: "",
name:'', name: "",
}, },
property: [], property: [],
location: [], location: [],
rules: { rules: {
title02: [ title02: [
{ required: true, message: "库位名不能为空", trigger: "blur" } { required: true, message: "库位名不能为空", trigger: "blur" },
],
departcode: [
{ required: true, message: "编码不能为空", trigger: "blur" },
], ],
organizationType: [ organizationType: [
{ {
required: true, required: true,
message: "组织类型不能为空", message: "组织类型不能为空",
trigger: "blur" trigger: "blur",
} },
] ],
} departcode: [
{ required: true, message: "必填", trigger: "blur" },
{ validator: validateCode, trigger: "blur" },
],
},
}; };
}, },
props: { props: {
val: Object val: Object,
}, },
created() { created() {
// this.entity = {}; // this.entity = {};
}, },
methods: { methods: {
handleSubmit() { handleSubmit() {
this.$refs["form"].validate(value => { this.$refs["form"].validate((value) => {
if (value) { if (value) {
let isProduction = 0; let isProduction = 0;
let property = []; let property = [];
...@@ -120,18 +140,18 @@ export default { ...@@ -120,18 +140,18 @@ export default {
} }
let location = this.location; let location = this.location;
let paramsdata = { let paramsdata = {
parentTitle:this.entity.name, parentTitle: this.entity.name,
name: this.entity.title02, //部门名称 name: this.entity.title02, //部门名称
parent_Id: this.entity.id, //上级部门 [id] parent_Id: this.entity.id, //上级部门 [id]
code: this.entity.departcode, //部门编号 code: this.entity.departcode, //部门编号
// organization_Id: this.entity.organization_Id, //组织类型 [id] // organization_Id: this.entity.organization_Id, //组织类型 [id]
location: location.join(","), //省市县 location: location.join(","), //省市县
isProduction:isProduction, //是否生产班组：1是，0否 isProduction: isProduction, //是否生产班组：1是，0否
property: property.join(",") //属性 property: property.join(","), //属性
}; };
Api.create(paramsdata) Api.create(paramsdata)
.then(r => { .then((r) => {
this.disabled = false; this.disabled = false;
if (r.success) { if (r.success) {
this.$Message.success("保存成功！"); this.$Message.success("保存成功！");
...@@ -140,7 +160,7 @@ export default { ...@@ -140,7 +160,7 @@ export default {
this.$Message.error("保存失败，请联系管理员"); this.$Message.error("保存失败，请联系管理员");
} }
}) })
.catch(err => { .catch((err) => {
this.disabled = false; this.disabled = false;
this.$Message.error("保存失败，请联系管理员"); this.$Message.error("保存失败，请联系管理员");
}); });
...@@ -156,7 +176,7 @@ export default { ...@@ -156,7 +176,7 @@ export default {
l(key) { l(key) {
key = "DipartLocation" + "." + key; key = "DipartLocation" + "." + key;
return this.$t(key); return this.$t(key);
} },
}, },
watch: { watch: {
val(v) { val(v) {
...@@ -164,7 +184,7 @@ export default { ...@@ -164,7 +184,7 @@ export default {
this.entity = {}; this.entity = {};
this.entity.name = v.name; this.entity.name = v.name;
this.entity.id = v.id; this.entity.id = v.id;
} },
} },
}; };
</script> </script>
\ No newline at end of file
pages/basicData/department/add.vue
View file @ 0fec4621
...@@ -7,7 +7,7 @@ ...@@ -7,7 +7,7 @@
</FormItem> </FormItem>
</Col> </Col>
<Col :span="12"> <Col :span="12">
<FormItem :label="l('departcode')"> <FormItem :label="l('departcode')" prop="departcode">
<Input v-model="entity.departcode" placeholder="请输入..."></Input> <Input v-model="entity.departcode" placeholder="请输入..."></Input>
</FormItem> </FormItem>
</Col> </Col>
...@@ -39,7 +39,9 @@ ...@@ -39,7 +39,9 @@
</Col> </Col>
</Row> </Row>
<FormItem> <FormItem>
<Button type="primary" @click="handleSubmit" :disabled="disabled">保存</Button> <Button type="primary" @click="handleSubmit" :disabled="disabled"
>保存</Button
>
<Button @click="handleClose" class="ml20">取消</Button> <Button @click="handleClose" class="ml20">取消</Button>
</FormItem> </FormItem>
<!-- 组织类型 --> <!-- 组织类型 -->
...@@ -58,6 +60,18 @@ export default { ...@@ -58,6 +60,18 @@ export default {
name: "Add", name: "Add",
// components: { OrganizType }, // components: { OrganizType },
data() { data() {
const validateCode = (rule, value, callback) => {
if (!value) {
return callback(new Error("编号不能为空"));
}
Api.isExist(value).then((r) => {
if (r.result) {
return callback(new Error("编号已经存在"));
} else {
callback();
}
});
};
return { return {
// showTree: false, //组织类型 // showTree: false, //组织类型
disabled: false, disabled: false,
...@@ -67,28 +81,34 @@ export default { ...@@ -67,28 +81,34 @@ export default {
// organizationType: "" // organizationType: ""
departcode: "", departcode: "",
title02: "", title02: "",
}, },
property: [], property: [],
location: [], location: [],
rules: { rules: {
title02: [ title02: [
{ required: true, message: "库位名不能为空", trigger: "blur" } { required: true, message: "名称不能为空", trigger: "blur" },
],
departcode: [
{ required: true, message: "编码不能为空", trigger: "blur" },
], ],
organizationType: [ organizationType: [
{ {
// type: 'array', // type: 'array',
required: true, required: true,
message: "组织类型不能为空", message: "组织类型不能为空",
trigger: "blur" trigger: "blur",
} },
] ],
} departcode: [
{ required: true, message: "必填", trigger: "blur" },
{ validator: validateCode, trigger: "blur" },
],
},
}; };
}, },
methods: { methods: {
handleSubmit() { handleSubmit() {
this.$refs["form"].validate(value => { this.$refs["form"].validate((value) => {
if (value) { if (value) {
let isProduction = 0; let isProduction = 0;
let property = []; let property = [];
...@@ -109,17 +129,17 @@ export default { ...@@ -109,17 +129,17 @@ export default {
} }
let location = this.location; let location = this.location;
let paramsdata = { let paramsdata = {
parentTitle:'', parentTitle: "",
name: this.entity.title02, //部门名称 name: this.entity.title02, //部门名称
parent_Id: 0, //上级部门 [id] parent_Id: 0, //上级部门 [id]
code: this.entity.departcode, //部门编号 code: this.entity.departcode, //部门编号
organization_Id: this.entity.organization_Id, //组织类型 [id] organization_Id: this.entity.organization_Id, //组织类型 [id]
location: location.join(","), //省市县 location: location.join(","), //省市县
isProduction: isProduction, //是否生产班组：1是，0否 isProduction: isProduction, //是否生产班组：1是，0否
property: property.join(",") //属性 property: property.join(","), //属性
}; };
Api.create(paramsdata) Api.create(paramsdata)
.then(r => { .then((r) => {
this.disabled = false; this.disabled = false;
if (r.success) { if (r.success) {
this.$Message.success("保存成功！"); this.$Message.success("保存成功！");
...@@ -128,7 +148,7 @@ export default { ...@@ -128,7 +148,7 @@ export default {
this.$Message.error("保存失败，请联系管理员"); this.$Message.error("保存失败，请联系管理员");
} }
}) })
.catch(err => { .catch((err) => {
this.disabled = false; this.disabled = false;
this.$Message.error("保存失败，请联系管理员"); this.$Message.error("保存失败，请联系管理员");
}); });
...@@ -144,7 +164,7 @@ export default { ...@@ -144,7 +164,7 @@ export default {
l(key) { l(key) {
key = "DipartLocation" + "." + key; key = "DipartLocation" + "." + key;
return this.$t(key); return this.$t(key);
} },
} },
}; };
</script> </script>
\ No newline at end of file
pages/basicData/department/api.js
View file @ 0fec4621
...@@ -20,5 +20,8 @@ export default { ...@@ -20,5 +20,8 @@ export default {
departImport(params) { departImport(params) {
return Api.post(`${systemUrl}/departmentimport/import`, params); return Api.post(`${systemUrl}/departmentimport/import`, params);
}, },
// 编号是否存在
isExist(value) {
return Api.post(`${systemUrl}/Department/IsExist`, value);
},
} }
\ No newline at end of file
pages/basicData/department/edit.vue
View file @ 0fec4621
...@@ -7,7 +7,7 @@ ...@@ -7,7 +7,7 @@
</FormItem> </FormItem>
</Col> </Col>
<Col :span="12"> <Col :span="12">
<FormItem :label="l('departcode')"> <FormItem :label="l('departcode')" prop="departcode">
<Input v-model="entity.code" placeholder="请输入..."></Input> <Input v-model="entity.code" placeholder="请输入..."></Input>
</FormItem> </FormItem>
</Col> </Col>
...@@ -72,7 +72,8 @@ export default { ...@@ -72,7 +72,8 @@ export default {
id: -1 id: -1
}, },
rules: { rules: {
name: [{ required: true, message: "库位名不能为空", trigger: "blur" }], name: [{ required: true, message: "不能为空", trigger: "blur" }],
departcode: [{ required: true, message: "不能为空", trigger: "blur" }],
property: [ property: [
{ {
required: true, required: true,
......
pages/exception/detail.vue
View file @ 0fec4621
<template> <template>
<div class="detail"> <div class="detail">
<Row>
<Row> <!-- <Filed :span="12" :name="l('creationTime')">{{entity.creationTime}}</Filed>
<!-- <Filed :span="12" :name="l('creationTime')">{{entity.creationTime}}</Filed>
<Filed :span="12" :name="l('creatorUserId')">{{entity.creatorUserId}}</Filed> <Filed :span="12" :name="l('creatorUserId')">{{entity.creatorUserId}}</Filed>
<Filed :span="12" :name="l('lastModificationTime')">{{entity.lastModificationTime}}</Filed> <Filed :span="12" :name="l('lastModificationTime')">{{entity.lastModificationTime}}</Filed>
<Filed :span="12" :name="l('lastModifierUserId')">{{entity.lastModifierUserId}}</Filed> <Filed :span="12" :name="l('lastModifierUserId')">{{entity.lastModifierUserId}}</Filed>
<Filed :span="12" :name="l('isDeleted')">{{entity.isDeleted}}</Filed> <Filed :span="12" :name="l('isDeleted')">{{entity.isDeleted}}</Filed>
<Filed :span="12" :name="l('deletionTime')">{{entity.deletionTime}}</Filed> <Filed :span="12" :name="l('deletionTime')">{{entity.deletionTime}}</Filed>
<Filed :span="12" :name="l('deleterUserId')">{{entity.deleterUserId}}</Filed> --> <Filed :span="12" :name="l('deleterUserId')">{{entity.deleterUserId}}</Filed> -->
<Filed :span="12" :name="l('timestamp')">{{entity.timestamp}}</Filed> <Filed :span="12" :name="l('timestamp')">{{ entity.timestamp }}</Filed>
<Filed :span="12" :name="l('level')">{{entity.level}}</Filed> <Filed :span="12" :name="l('level')">{{ entity.level }}</Filed>
<!-- <Filed :span="12" :name="l('messageTemplate')">{{entity.messageTemplate}}</Filed> --> <!-- <Filed :span="12" :name="l('messageTemplate')">{{entity.messageTemplate}}</Filed> -->
<Filed :span="12" :name="l('renderedMessage')">{{entity.renderedMessage}}</Filed> <Filed :span="12" :name="l('renderedMessage')">{{
<Filed :span="12" :name="l('clientIpAddress')">{{entity.clientIpAddress}}</Filed> entity.renderedMessage
<Filed :span="12" :name="l('loginName')">{{entity.loginName}}</Filed> }}</Filed>
<Filed :span="12" :name="l('tanentCode')">{{entity.tanentCode}}</Filed> <Filed :span="12" :name="l('clientIpAddress')">{{
<Filed :span="12" :name="l('host')">{{entity.host}}</Filed> entity.clientIpAddress
<Filed :span="12" :name="l('status')">{{entity.status}}</Filed> }}</Filed>
<Filed :span="12" :name="l('requestUrl')">{{entity.requestUrl}}</Filed> <Filed :span="12" :name="l('loginName')">{{ entity.loginName }}</Filed>
<Filed :span="12" :name="l('requestParam')">{{entity.requestParam}}</Filed> <Filed :span="12" :name="l('tanentCode')">{{ entity.tanentCode }}</Filed>
<Filed :span="24" :name="l('exception')">{{entity.exception}}</Filed> <Filed :span="12" :name="l('host')">{{ entity.host }}</Filed>
</Row> <Filed :span="12" :name="l('status')">{{ entity.status }}</Filed>
</div> <Filed :span="12" :name="l('requestUrl')">{{ entity.requestUrl }}</Filed>
<Filed :span="12" :name="l('requestParam')">{{
entity.requestParam
}}</Filed>
<Filed :span="24" :name="l('exception')">{{ entity.exception }}</Filed>
</Row>
<Form
class="form"
ref="form"
:model="entity"
:rules="rules"
:label-width="90"
>
<Row>
<Col :span="12">
<FormItem :label="l('status')" prop="status">
<Dictionary
code="error.status"
v-model="entity.status"
type="radio"
></Dictionary>
</FormItem>
</Col>
<Col :span="24">
<FormItem :label="l('remark')" prop="remark">
<Input v-model="entity.remark" type="textarea" :rows="5"></Input>
</FormItem>
</Col>
</Row>
<FormItem>
<Button type="primary" @click="handleSubmit" :disabled="disabled"
>保存</Button
>
<Button @click="handleClose" class="ml20">取消</Button>
</FormItem>
</Form>
</div>
</template> </template>
<script> <script>
import Api from './api' import Api from "./api";
export default { export default {
name: 'Add', name: "Add",
data() { data() {
return { return {
entity: {}, entity: {
rules: { exception: "",
name: [{ required: true, message: '必填', trigger: 'blur' }], properties: {},
code: [{ required: true, message: '必填', trigger: 'blur' }] status: 0,
} },
} rules: {
}, name: [{ required: true, message: "必填", trigger: "blur" }],
props: { code: [{ required: true, message: "必填", trigger: "blur" }],
eid: Number },
}, disabled: false,
mounted() { };
if (this.eid) { },
this.load(this.eid); props: {
} eid: "",
}, },
methods: { mounted() {
load(v) { if (this.eid) {
Api.get({ id: v }).then(r => { this.load(this.eid);
this.entity = r.result;
this.$emit('on-load')
})
},
handleClose() {
this.$emit('on-close')
},
l(key) {
key = "run_log" + "." + key;
return this.$t(key)
}
},
watch: {
eid(v) {
if (v > 0) {
this.load(v);
}
}
}
} }
},
methods: {
load(v) {
Api.get({ id: v }).then((r) => {
if (r.result.status == "" || r.result.status == null) {
r.result.status = 0;
}
this.entity = r.result;
this.$emit("on-load");
});
},
handleClose() {
this.$emit("on-close");
},
l(key) {
key = "run_log" + "." + key;
return this.$t(key);
},
handleSubmit() {
this.disabled = true;
Api.update({
id: this.entity.id,
status: this.entity.status,
remark: this.entity.remark,
})
.then((r) => {
this.disabled = false;
if (r.success) {
this.$Message.success("保存成功");
this.$emit("on-ok");
} else {
this.$Message.error("保存失败");
}
})
.catch((err) => {
this.disabled = false;
this.$Message.error("保存失败");
cosole.warn(err);
});
},
},
watch: {
eid(v) {
if (v > 0) {
this.load(v);
}
},
},
};
</script> </script>
\ No newline at end of file
pages/exception/index.vue
View file @ 0fec4621
<template> <template>
<div> <div>
<DataGrid :columns="columns" ref="grid" :action="action" exportTitle="异常记录"> <DataGrid
<template slot="easySearch"> :columns="columns"
<Form ref="formInline" :model="easySearch" inline> ref="grid"
<FormItem prop="keys"> :action="action"
<Input placeholder="请输入关键字登录账号/租户编号" v-model="easySearch.keys.value" v-width="300" /> exportTitle="异常记录"
</FormItem> >
<FormItem> <template slot="easySearch">
<Button type="primary" @click="search">查询</Button> <Form ref="formInline" :model="easySearch" inline>
</FormItem> <FormItem prop="keys">
</Form> <Input
</template> placeholder="请输入关键字登录账号/租户编号"
<template slot="searchForm"> v-model="easySearch.keys.value"
<Search /> v-width="300"
</template> />
<template slot="buttons"> </FormItem>
<DatePicker type="date" v-model="end" placeholder="选择终止日期" style="width: 150px"></DatePicker> <FormItem>
<Button type="error" @click="clear" :disabled="dis">清理</Button> <Button type="primary" @click="search">查询</Button>
</template> </FormItem>
</Form>
</template>
<template slot="searchForm">
<Search />
</template>
<template slot="buttons">
<DatePicker
type="date"
v-model="end"
placeholder="选择终止日期"
style="width: 150px"
></DatePicker>
<Button type="error" @click="clear" :disabled="dis">清理</Button>
</template>
</DataGrid> </DataGrid>
<Modal v-model="modal" :title="title" fullscreen footer-hide> <Modal v-model="modal" :title="title" fullscreen footer-hide>
<component :is="detail" :eid="curId" @on-close="cancel" @on-ok="ok" /> <component :is="detail" :eid="curId" @on-close="cancel" @on-ok="ok" />
</Modal> </Modal>
</div> </div>
</template> </template>
<script> <script>
import Api from "./api"; import Api from "./api";
import Search from "./search"; import Search from "./search";
export default { export default {
name: "list", name: "list",
components: { components: {
Search, Search,
}, },
head: { head: {
title: "系统异常日志", title: "系统异常日志",
author: "henq", author: "henq",
description: "run_log 7/23/2020 10:55:35 AM", description: "run_log 7/23/2020 10:55:35 AM",
}, },
data() { data() {
return { return {
action: Api.index, action: Api.index,
easySearch: { easySearch: {
keys: { keys: {
op: "loginName,tanentCode", op: "loginName,tanentCode",
value: null value: null,
}, },
}, },
end: null, end: null,
modal: false, modal: false,
title: "新增", title: "新增",
detail: null, detail: null,
curId: 0, curId: 0,
columns: [{ columns: [
key: "id", {
title: this.$t("id"), key: "id",
hide: true, title: this.$t("id"),
align: "left", hide: true,
high: true, align: "left",
}, high: true,
// { key:"creationTime",title:this.l("creationTime") ,align:"left" ,high:true }, },
// { key:"creatorUserId",title:this.l("creatorUserId") ,align:"left" ,high:true }, // { key:"creationTime",title:this.l("creationTime") ,align:"left" ,high:true },
// { key:"lastModificationTime",title:this.l("lastModificationTime") ,align:"left" ,high:true }, // { key:"creatorUserId",title:this.l("creatorUserId") ,align:"left" ,high:true },
// { key:"lastModifierUserId",title:this.l("lastModifierUserId") ,align:"left" ,high:true }, // { key:"lastModificationTime",title:this.l("lastModificationTime") ,align:"left" ,high:true },
// { key:"isDeleted",title:this.l("isDeleted") ,align:"left" ,high:true }, // { key:"lastModifierUserId",title:this.l("lastModifierUserId") ,align:"left" ,high:true },
// { key:"deletionTime",title:this.l("deletionTime") ,align:"left" ,high:true }, // { key:"isDeleted",title:this.l("isDeleted") ,align:"left" ,high:true },
// { key:"deleterUserId",title:this.l("deleterUserId") ,align:"left" ,high:true }, // { key:"deletionTime",title:this.l("deletionTime") ,align:"left" ,high:true },
// { key:"deleterUserId",title:this.l("deleterUserId") ,align:"left" ,high:true },
{
key: "level",
title: this.l("level"),
align: "left",
high: true,
width: 100,
},
{
key: "requestUrl",
title: this.l("requestUrl"),
align: "left",
width: 300,
high: true,
tooltip: true,
},
// { key:"messageTemplate",title:this.l("messageTemplate") ,align:"left" ,high:true },
{
key: "renderedMessage",
title: this.l("renderedMessage"),
align: "left",
high: true,
tooltip: true,
},
{
key: "timestamp",
title: this.l("timestamp"),
align: "left",
high: true,
width: 200,
},
{
key: "clientIpAddress",
title: this.l("clientIpAddress"),
align: "left",
width: 150,
high: true,
},
{
key: "loginName",
title: this.l("loginName"),
align: "left",
easy: true,
high: true,
width: 150,
},
{
key: "tanentCode",
title: this.l("tanentCode"),
align: "left",
easy: true,
high: true,
width: 80,
},
{
key: "host",
title: this.l("host"),
align: "left",
hide: true,
high: true,
},
// { key:"status",title:this.l("status") ,align:"left" ,high:true },
{
key: "requestParam",
title: this.l("requestParam"),
hide: true,
align: "left",
high: true,
},
// { key:"exception",title:this.l("exception") ,align:"left" ,high:true },
{
title: "操作",
key: "action",
width: 140,
align: "center",
render: (h, params) => {
return h("div", {
class: "action"
}, [
h(
"op", {
attrs: {
oprate: "detail"
},
on: {
click: () => this.view(params.row.id)
},
},
"查看"
),
//h('op', { attrs: { oprate: 'copy' }, on: { click: () => this.copy(params.row.id) } }, '克隆'),
// h('op', { attrs: { oprate: 'edit'}, on: { click: () => this.edit(params.row.id) } }, '编辑'),
h(
"op", {
attrs: {
oprate: "delete"
},
on: {
click: () => this.remove(params.row.id)
},
},
"删除"
),
]);
},
},
],
};
},
created() {
var date = new Date().getTime() - 24 * 60 * 60 * 1000 * 5;
this.end = new Date(date);
console.log(this); {
}, key: "level",
async fetch({ title: this.l("level"),
store, align: "left",
params high: true,
}) { width: 100,
await store.dispatch("loadDictionary"); // 加载数据字典 },
}, {
methods: { key: "requestUrl",
ok() { title: this.l("requestUrl"),
this.$refs.grid.load(); align: "left",
this.modal = false; width: 300,
this.curId = 0; high: true,
tooltip: true,
},
// { key:"messageTemplate",title:this.l("messageTemplate") ,align:"left" ,high:true },
{
key: "renderedMessage",
title: this.l("renderedMessage"),
align: "left",
high: true,
tooltip: true,
}, },
search() { {
this.$refs.grid.reload(this.easySearch); key: "timestamp",
title: this.l("timestamp"),
align: "left",
high: true,
width: 200,
}, },
add() { {
this.curId = 0; key: "clientIpAddress",
this.title = "新增"; title: this.l("clientIpAddress"),
this.detail = () => import("./add"); align: "left",
this.modal = true; width: 150,
high: true,
}, },
copy(id) { {
this.curId = id; key: "loginName",
this.title = "克隆"; title: this.l("loginName"),
this.detail = () => import("./add"); align: "left",
this.modal = true; easy: true,
high: true,
width: 150,
}, },
view(id) { {
this.curId = id; key: "tanentCode",
this.title = "详情"; title: this.l("tanentCode"),
this.detail = () => import("./detail"); align: "left",
this.modal = true; easy: true,
high: true,
width: 80,
}, },
edit(id) { {
this.curId = id; key: "host",
this.title = "编辑"; title: this.l("host"),
this.detail = () => import("./edit"); align: "left",
this.modal = true; hide: true,
high: true,
}, },
remove(id) { {
Api.delete(id).then((r) => { key: "status",
if (r.success) { title: this.l("status"),
this.$refs.grid.load(); align: "left",
this.$Message.success("删除成功"); high: true,
} render: (h, params) => {
}); return h("span", {}, params.row.status == 1 ? "已解决" : "未解决");
},
}, },
clear() { { key: "remark", title: this.l("remark"), align: "left", high: true },
this.$Modal.confirm({ {
title: "确认", key: "requestParam",
content: "确认要删除" + this.$u.toDate(this.end) + "以前的数据吗", title: this.l("requestParam"),
onOk: () => { hide: true,
Api.deleteAll(this.end).then(r => { align: "left",
if (r.success) { high: true,
this.$Message.success("删除成功")
this.$refs.grid.load();
} else {
this.$Message.error("出现异常")
}
})
}
})
}, },
cancel() { // { key:"exception",title:this.l("exception") ,align:"left" ,high:true },
this.curId = 0; {
this.modal = false; title: "操作",
key: "action",
width: 140,
align: "center",
render: (h, params) => {
return h(
"div",
{
class: "action",
},
[
h(
"op",
{
attrs: {
oprate: "detail",
},
on: {
click: () => this.view(params.row.id),
},
},
"查看"
),
//h('op', { attrs: { oprate: 'copy' }, on: { click: () => this.copy(params.row.id) } }, '克隆'),
// h('op', { attrs: { oprate: 'edit'}, on: { click: () => this.edit(params.row.id) } }, '编辑'),
h(
"op",
{
attrs: {
oprate: "delete",
},
on: {
click: () => this.remove(params.row.id),
},
},
"删除"
),
]
);
},
}, },
l(key) { ],
/* };
},
created() {
var date = new Date().getTime() - 24 * 60 * 60 * 1000 * 5;
this.end = new Date(date);
console.log(this);
},
async fetch({ store, params }) {
await store.dispatch("loadDictionary"); // 加载数据字典
},
methods: {
ok() {
this.$refs.grid.load();
this.modal = false;
this.curId = 0;
},
search() {
this.$refs.grid.reload(this.easySearch);
},
add() {
this.curId = 0;
this.title = "新增";
this.detail = () => import("./add");
this.modal = true;
},
copy(id) {
this.curId = id;
this.title = "克隆";
this.detail = () => import("./add");
this.modal = true;
},
view(id) {
this.curId = id;
this.title = "详情";
this.detail = () => import("./detail");
this.modal = true;
},
edit(id) {
this.curId = id;
this.title = "编辑";
this.detail = () => import("./edit");
this.modal = true;
},
remove(id) {
Api.delete(id).then((r) => {
if (r.success) {
this.$refs.grid.load();
this.$Message.success("删除成功");
}
});
},
clear() {
this.$Modal.confirm({
title: "确认",
content: "确认要删除" + this.$u.toDate(this.end) + "以前的数据吗",
onOk: () => {
Api.deleteAll(this.end).then((r) => {
if (r.success) {
this.$Message.success("删除成功");
this.$refs.grid.load();
} else {
this.$Message.error("出现异常");
}
});
},
});
},
cancel() {
this.curId = 0;
this.modal = false;
},
l(key) {
/*
run_log:{ run_log:{
creationTime:'创建时间', creationTime:'创建时间',
creatorUserId:'创建人', creatorUserId:'创建人',
...@@ -273,16 +299,17 @@ export default { ...@@ -273,16 +299,17 @@ export default {
exception:'异常详细信息', exception:'异常详细信息',
} }
*/ */
let vkey = "run_log" + "." + key; let vkey = "run_log" + "." + key;
return this.$t(vkey) || key; return this.$t(vkey) || key;
},
}, },
computed: { },
dis() { computed: {
var num = (new Date().getTime() - this.end.getTime()) / (1000 * 60 * 60 * 24); dis() {
return num < 1 var num =
} (new Date().getTime() - this.end.getTime()) / (1000 * 60 * 60 * 24);
} return num < 1;
},
},
}; };
</script> </script>
......
pages/index.vue
View file @ 0fec4621
...@@ -4,12 +4,4 @@ ...@@ -4,12 +4,4 @@
<h2>欢迎登陆！</h2> <h2>欢迎登陆！</h2>
</div> </div>
</template> </template>
<script> \ No newline at end of file
// 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 @ 0fec4621
<template> <template>
<div class="config flex"> <div class="config flex">
<div class="menu"> <div class="menu">
<Menu theme="light" active-name="site" @on-select="pageTo"> <Menu theme="light" active-name="site">
<MenuItem name="site">站点设置</MenuItem> <MenuItem name="site" to="#site">站点设置</MenuItem>
<MenuItem name="bus">业务设置</MenuItem> <MenuItem name="bus" to="#bus">业务设置</MenuItem>
</Menu> </Menu>
</div> </div>
<div class="main fg" id="mainDiv"> <<<<<<< HEAD <div class="main fg" id="mainDiv">
<div class="tr lt40 fr divTop pr20"> <div class="tr lt40 fr divTop pr20">
<Button type="primary" size="small" @click="save">保存</Button> <Button type="primary" size="small" @click="save">保存</Button>
<Button type="text" size="small" @click="reset">恢复默认</Button> <Button type="text" size="small" @click="reset">恢复默认</Button>
</div> =======
<Form ref="form" :model="config" :rules="rules" :label-width="120"> <div class="main fg">
<div id="site" class="mt50"> <div class="tool tr">
<h3>站点设置</h3> <Button type="primary" @click="save">保存</Button>
<FormItem label="默认语言" prop="site.language"> <Button type="text" @click="reset">恢复默认</Button>
<Input v-model="config.site.language"></Input> </div>
</FormItem> <Form ref="form" :model="config" :rules="rules" :label-width="120">
<FormItem label="默认密码" prop="site.password"> <div id="site">
<Input v-model="config.site.password"></Input> <h3>站点设置</h3>
</FormItem> <FormItem label="默认语言" prop="site.language">
<FormItem label="密码规则" prop="site.password"> <Input v-model="config.site.language"></Input>
<RadioGroup v-model="config.site.passwordRule"> </FormItem>
<Radio :label="0">简易</Radio> <FormItem label="默认密码" prop="site.password">
<Radio :label="1">中级 <span class="tip"> 密码长度6位以上</span></Radio> <Input v-model="config.site.password"></Input>
<Radio :label="2">高级 </FormItem>
<span class="tip"> 密码需要包含数字字母和特殊字符，长度8位以上</span> <FormItem label="密码规则" prop="site.password">
</Radio> <RadioGroup v-model="config.site.passwordRule">
</RadioGroup> <Radio :label="0">简易</Radio>
</FormItem> <Radio :label="1">中级 <span class="tip"> 密码长度6位以上</span></Radio>
<FormItem label="密码安全校验"> <Radio :label="2">高级
<i-switch v-model="config.site.loginEditPassword" /> <span class="tip"> 密码需要包含数字字母和特殊字符，长度8位以上</span>
<span class="tip">开启后，用户密码安全级别低时，登陆后强制修改密码</span> </Radio>
</FormItem> </RadioGroup>
<FormItem label="验证码"> </FormItem>
<i-switch v-model="config.site.loginCode" /> <FormItem label="密码安全校验">
<span class="tip">开启后用户登陆需要输入验证码</span> <i-switch v-model="config.site.loginEditPassword" />
</FormItem> <span class="tip">开启后，用户密码安全级别低时，登陆后强制修改密码</span>
<FormItem label="注册邀请码"> </FormItem>
<Input v-model="config.site.regCode"></Input> <FormItem label="验证码">
<span class="tip">1.为空时：不对外开放注册;2.设置为“666”时用户免输入注册邀请码就可以进行注册；3.其它情况，注册时需要输入注册邀请码</span> <i-switch v-model="config.site.loginCode" />
</FormItem> <span class="tip">开启后用户登陆需要输入验证码</span>
<FormItem label="登陆有效期"> </FormItem>
<InputNumber v-model="config.site.loginValidHoure" :min="1" :max="2400"></InputNumber> <FormItem label="注册邀请码">
<span class="tip">单位为小时，设置后用户登陆此时长后自动过期</span> <Input v-model="config.site.regCode"></Input>
</FormItem> <span class="tip">1.为空时：不对外开放注册;2.设置为“666”时用户免输入注册邀请码就可以进行注册；3.其它情况，注册时需要输入注册邀请码</span>
<FormItem label="Bug反馈"> </FormItem>
<i-switch v-model="config.site.bug" /> <FormItem label="登陆有效期">
<span class="tip">开启后，用户可以提交bug并管理自己的bug</span> <InputNumber v-model="config.site.loginValidHoure" :min="1" :max="2400"></InputNumber>
</FormItem> <span class="tip">单位为小时，设置后用户登陆此时长后自动过期</span>
<FormItem label="异常管理"> </FormItem>
<i-switch v-model="config.site.exception" /> <FormItem label="Bug反馈">
<span class="tip">开启后可以查看系统异常</span> <i-switch v-model="config.site.bug" />
</FormItem> <span class="tip">开启后，用户可以提交bug并管理自己的bug</span>
<FormItem label="异常消息"> </FormItem>
<Input v-model="config.site.exceptionMessage"></Input> <FormItem label="异常管理">
<span class="tip">设置后，接口发生异常，统一返回次内容。为空时返回系统异常</span> <i-switch v-model="config.site.exception" />
</FormItem> <span class="tip">开启后可以查看系统异常</span>
<FormItem label="列表显示方式"> </FormItem>
<RadioGroup v-model="config.site.gridType"> <FormItem label="异常消息">
<Radio :label="0">表格</Radio> <Input v-model="config.site.exceptionMessage"></Input>
<Radio :label="1">卡片</Radio> <span class="tip">设置后，接口发生异常，统一返回次内容。为空时返回系统异常</span>
<!-- <Radio label="2">无限下拉</Radio> --> </FormItem>
</RadioGroup> <FormItem label="列表显示方式">
</FormItem> <RadioGroup v-model="config.site.gridType">
<FormItem label="默认分页大小"> <Radio :label="0">表格</Radio>
<Select v-model="config.site.pageSize"> <Radio :label="1">卡片</Radio>
<Option :value="20">每页20条</Option> <!-- <Radio label="2">无限下拉</Radio> -->
<Option :value="50">每页50条</Option> </RadioGroup>
<Option :value="100">每页100条</Option> </FormItem>
</Select> <FormItem label="默认分页大小">
</FormItem> <Select v-model="config.site.pageSize">
<FormItem label="弹窗宽度"> <Option :value="20">每页20条</Option>
<InputNumber v-model="config.site.windowWidth" :min="1" :max="2400"></InputNumber> <Option :value="50">每页50条</Option>
<span class="tip">设置弹窗页面宽度</span> <Option :value="100">每页100条</Option>
</FormItem> </Select>
<FormItem label="弹窗移动"> </FormItem>
<i-switch v-model="config.site.windowMove" /> <FormItem label="弹窗宽度">
<span class="tip">开启后弹框可以进行移动</span> <InputNumber v-model="config.site.windowWidth" :min="1" :max="2400"></InputNumber>
</FormItem> <span class="tip">设置弹窗页面宽度</span>
</div> </FormItem>
<div id="bus"> <FormItem label="弹窗移动">
<h3>业务设置</h3> <i-switch v-model="config.site.windowMove" />
<FormItem label="订单开工预警"> <span class="tip">开启后弹框可以进行移动</span>
<InputNumber v-model="config.bus.orderStartWarning" :min="0" :max="2400" /> </FormItem>
<span class="tip">单位为小时，为0时不预警；大于0进行预警</span> >>>>>>> c26d050f1ec6b064c32ac1a3b4f647500a3dfe83
</FormItem> </div>
<FormItem label="订单完工预警"> <div id="bus">
<InputNumber v-model="config.bus.orderFinishWarning" :min="0" :max="2400" /> <h3>业务设置</h3>
<span class="tip">单位为小时，为0时不预警；大于0进行预警</span> <FormItem label="订单开工预警">
</FormItem> <InputNumber v-model="config.bus.orderStartWarning" :min="0" :max="2400" />
<FormItem label="工单开工预警"> <span class="tip">单位为小时，为0时不预警；大于0进行预警</span>
<InputNumber v-model="config.bus.excuteStartWarning" :min="0" :max="2400" /> </FormItem>
<span class="tip">单位为小时，为0时不预警；大于0进行预警</span> <FormItem label="订单完工预警">
</FormItem> <InputNumber v-model="config.bus.orderFinishWarning" :min="0" :max="2400" />
<FormItem label="工单完工预警"> <span class="tip">单位为小时，为0时不预警；大于0进行预警</span>
<InputNumber v-model="config.bus.excuteEndWarning" :min="0" :max="2400" /> </FormItem>
<span class="tip">单位为小时，为0时不预警；大于0进行预警</span> <FormItem label="工单开工预警">
</FormItem> <InputNumber v-model="config.bus.excuteStartWarning" :min="0" :max="2400" />
<FormItem label="库存预警"> <span class="tip">单位为小时，为0时不预警；大于0进行预警</span>
<i-switch v-model="config.site.storeWarning" /> </FormItem>
</FormItem> <FormItem label="工单完工预警">
<FormItem label="多工艺"> <InputNumber v-model="config.bus.excuteEndWarning" :min="0" :max="2400" />
<i-switch v-model="config.bus.multipleHeader" /> <span class="tip">单位为小时，为0时不预警；大于0进行预警</span>
<span class="tip">开启后，一个生产计划可以设置多本工艺规程</span> </FormItem>
</FormItem> <FormItem label="库存预警">
<FormItem label="按序执行"> <i-switch v-model="config.site.storeWarning" />
<i-switch v-model="config.bus.detailFirst" /> </FormItem>
<span class="tip">开启后，工单执行必须按照工序次序先后次序执行；关闭后，工单可以不按工序次序执行。</span> <FormItem label="多工艺">
</FormItem> <i-switch v-model="config.bus.multipleHeader" />
<FormItem label="工艺设置预警"> <span class="tip">开启后，一个生产计划可以设置多本工艺规程</span>
<InputNumber v-model="config.bus.setHeaderWarning" :min="0" :max="2400" /> </FormItem>
<span class="tip">单位为小时，为0时不预警；大于0进行预警</span> <FormItem label="按序执行">
</FormItem> <i-switch v-model="config.bus.detailFirst" />
<FormItem label="配套完成预警"> <span class="tip">开启后，工单执行必须按照工序次序先后次序执行；关闭后，工单可以不按工序次序执行。</span>
<InputNumber v-model="config.bus.setHeaderWarning" :min="0" :max="2400" /> </FormItem>
<span class="tip">单位为小时，为0时不预警；大于0进行预警</span> <FormItem label="工艺设置预警">
</FormItem> <InputNumber v-model="config.bus.setHeaderWarning" :min="0" :max="2400" />
<FormItem label="转序交接"> <span class="tip">单位为小时，为0时不预警；大于0进行预警</span>
<i-switch v-model="config.bus.excuteHandover" /> </FormItem>
<span class="tip">开启后，工单转序必须进行交接</span> <FormItem label="配套完成预警">
</FormItem> <InputNumber v-model="config.bus.setHeaderWarning" :min="0" :max="2400" />
<FormItem label="同车间转序交接"> <span class="tip">单位为小时，为0时不预警；大于0进行预警</span>
<i-switch v-model="config.bus.inenerExcuteHandover" /> </FormItem>
<span class="tip">开启后，同车间工单转序必须进行交接</span> <FormItem label="转序交接">
</FormItem> <i-switch v-model="config.bus.excuteHandover" />
<FormItem label="配套前置"> <span class="tip">开启后，工单转序必须进行交接</span>
<i-switch v-model="config.site.suportingFirst" /> </FormItem>
<span class="tip">开启配套前置后，工单只有完成配套才可以进行开工</span> <FormItem label="同车间转序交接">
</FormItem> <i-switch v-model="config.bus.inenerExcuteHandover" />
<span class="tip">开启后，同车间工单转序必须进行交接</span>
</FormItem>
<FormItem label="配套前置">
<i-switch v-model="config.site.suportingFirst" />
<span class="tip">开启配套前置后，工单只有完成配套才可以进行开工</span>
</FormItem>
</div>
</Form>
</div> </div>
</Form> </div>
</div>
</div>
</template> </template>
<script> <script>
...@@ -175,7 +181,12 @@ export default { ...@@ -175,7 +181,12 @@ export default {
mainDiv.scrollTop = site.scrollHeight; mainDiv.scrollTop = site.scrollHeight;
} }
} }
}, })
},
reset() {
this.$store.dispatch("loadSiteConfig");
},
},
}; };
</script> </script>
...@@ -194,34 +205,34 @@ export default { ...@@ -194,34 +205,34 @@ export default {
width: 100%; width: 100%;
top: 5px; top: 5px;
} }
}
.main { .main {
margin: 0px -10px; margin: 0px -10px;
padding: 10px 20px; padding: 10px 20px;
h3 { h3 {
font-size: 16px; font-size: 16px;
} }
.tip { .tip {
font-size: 13px; font-size: 13px;
color: #999; color: #999;
font-style: italic; font-style: italic;
} }
.divTop {
position: fixed;
background: #fff;
height: 40px;
width: calc(~'100% - 560px');
z-index: 100;
border-bottom: 1px #e4e6ed solid;
top: 105px
}
.divTop { height: calc(100vh - 150px);
position: fixed; overflow-y: auto;
background: #fff;
height: 40px;
width: calc(~'100% - 560px');
z-index: 100;
border-bottom: 1px #e4e6ed solid;
top: 105px
} }
height: calc(100vh - 150px);
overflow-y: auto;
} }
}
</style> </style>
plugins/request/index.js
View file @ 0fec4621
...@@ -53,7 +53,7 @@ function errorLog (err) { ...@@ -53,7 +53,7 @@ function errorLog (err) {
// 创建一个 axios 实例 // 创建一个 axios 实例
const service = axios.create({ const service = axios.create({
baseURL: Setting.apiBaseURL, baseURL: Setting.apiBaseURL,
timeout: 5000, // 请求超时时间 timeout: 30000, // 请求超时时间
transformRequest:[(data)=>{ transformRequest:[(data)=>{
function dateFormat(date, fmt) { function dateFormat(date, fmt) {
if (null == date || undefined == date) return ''; if (null == date || undefined == date) return '';
......
static/config.js
View file @ 0fec4621
...@@ -10,6 +10,7 @@ let address=systemApi.dev; ...@@ -10,6 +10,7 @@ let address=systemApi.dev;
//let address=systemApi.local; //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.authUrl = `http://${address}:10010`; //Authentication-api //统一登陆认证
window.UserUrl = `http://${address}:10130`; //Authentication-api //用户信息 密码修改。重置等 window.UserUrl = `http://${address}:10130`; //Authentication-api //用户信息 密码修改。重置等
window.designUrl = `http://${address}:10000/process`; // 工艺规程 window.designUrl = `http://${address}:10000/process`; // 工艺规程
......
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