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
Expand all 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 {
requestUrl: '服务地址',
requestParam: '参数',
exception: '异常详细信息',
remark:'备注'
},
user_message_config: {
creationTime: '创建时间',
......
npm-shrinkwrap.json
View file @ 0fec4621
......@@ -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 @ 0fec4621
......@@ -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/basicData/department/Addrow.vue
View file @ 0fec4621
......@@ -7,7 +7,7 @@
</FormItem>
</Col>
<Col :span="12">
<FormItem :label="l('departcode')">
<FormItem :label="l('departcode')" prop="departcode">
<Input v-model="entity.departcode" placeholder="请输入..."></Input>
</FormItem>
</Col>
......@@ -20,10 +20,9 @@
</Col>-->
<Col :span="12">
<FormItem :label="l('upMent')">
<b>{{entity.name}}</b>
<b>{{ entity.name }}</b>
</FormItem>
</Col>
<Col :span="24">
<FormItem :label="l('cityName')">
<Cascader :data="citys" v-model="location"></Cascader>
......@@ -44,7 +43,9 @@
</Col>
</Row>
<FormItem>
<Button type="primary" @click="handleSubmit" :disabled="disabled">保存</Button>
<Button type="primary" @click="handleSubmit" :disabled="disabled"
>保存</Button
>
<Button @click="handleClose" class="ml20">取消</Button>
</FormItem>
<!-- 组织类型 -->
......@@ -63,6 +64,18 @@ export default {
name: "Add",
// components: { OrganizType },
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 {
// showTree: false, //组织类型
disabled: false,
......@@ -73,33 +86,40 @@ export default {
organization_Id: 0,
organization_Type: "",
departcode: "",
name:'',
name: "",
},
property: [],
location: [],
rules: {
title02: [
{ required: true, message: "库位名不能为空", trigger: "blur" }
{ required: true, message: "库位名不能为空", trigger: "blur" },
],
departcode: [
{ required: true, message: "编码不能为空", trigger: "blur" },
],
organizationType: [
{
required: true,
message: "组织类型不能为空",
trigger: "blur"
}
]
}
trigger: "blur",
},
],
departcode: [
{ required: true, message: "必填", trigger: "blur" },
{ validator: validateCode, trigger: "blur" },
],
},
};
},
props: {
val: Object
val: Object,
},
created() {
// this.entity = {};
},
methods: {
handleSubmit() {
this.$refs["form"].validate(value => {
this.$refs["form"].validate((value) => {
if (value) {
let isProduction = 0;
let property = [];
......@@ -120,18 +140,18 @@ export default {
}
let location = this.location;
let paramsdata = {
parentTitle:this.entity.name,
parentTitle: this.entity.name,
name: this.entity.title02, //部门名称
parent_Id: this.entity.id, //上级部门 [id]
code: this.entity.departcode, //部门编号
// organization_Id: this.entity.organization_Id, //组织类型 [id]
location: location.join(","), //省市县
isProduction:isProduction, //是否生产班组：1是，0否
property: property.join(",") //属性
isProduction: isProduction, //是否生产班组：1是，0否
property: property.join(","), //属性
};
Api.create(paramsdata)
.then(r => {
.then((r) => {
this.disabled = false;
if (r.success) {
this.$Message.success("保存成功！");
......@@ -140,7 +160,7 @@ export default {
this.$Message.error("保存失败，请联系管理员");
}
})
.catch(err => {
.catch((err) => {
this.disabled = false;
this.$Message.error("保存失败，请联系管理员");
});
......@@ -156,7 +176,7 @@ export default {
l(key) {
key = "DipartLocation" + "." + key;
return this.$t(key);
}
},
},
watch: {
val(v) {
......@@ -164,7 +184,7 @@ export default {
this.entity = {};
this.entity.name = v.name;
this.entity.id = v.id;
}
}
},
},
};
</script>
\ No newline at end of file
pages/basicData/department/add.vue
View file @ 0fec4621
......@@ -7,7 +7,7 @@
</FormItem>
</Col>
<Col :span="12">
<FormItem :label="l('departcode')">
<FormItem :label="l('departcode')" prop="departcode">
<Input v-model="entity.departcode" placeholder="请输入..."></Input>
</FormItem>
</Col>
......@@ -39,7 +39,9 @@
</Col>
</Row>
<FormItem>
<Button type="primary" @click="handleSubmit" :disabled="disabled">保存</Button>
<Button type="primary" @click="handleSubmit" :disabled="disabled"
>保存</Button
>
<Button @click="handleClose" class="ml20">取消</Button>
</FormItem>
<!-- 组织类型 -->
......@@ -58,6 +60,18 @@ export default {
name: "Add",
// components: { OrganizType },
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 {
// showTree: false, //组织类型
disabled: false,
......@@ -67,28 +81,34 @@ export default {
// organizationType: ""
departcode: "",
title02: "",
},
property: [],
location: [],
rules: {
title02: [
{ required: true, message: "库位名不能为空", trigger: "blur" }
{ required: true, message: "名称不能为空", trigger: "blur" },
],
departcode: [
{ required: true, message: "编码不能为空", trigger: "blur" },
],
organizationType: [
{
// type: 'array',
required: true,
message: "组织类型不能为空",
trigger: "blur"
}
]
}
trigger: "blur",
},
],
departcode: [
{ required: true, message: "必填", trigger: "blur" },
{ validator: validateCode, trigger: "blur" },
],
},
};
},
methods: {
handleSubmit() {
this.$refs["form"].validate(value => {
this.$refs["form"].validate((value) => {
if (value) {
let isProduction = 0;
let property = [];
......@@ -109,17 +129,17 @@ export default {
}
let location = this.location;
let paramsdata = {
parentTitle:'',
parentTitle: "",
name: this.entity.title02, //部门名称
parent_Id: 0, //上级部门 [id]
code: this.entity.departcode, //部门编号
organization_Id: this.entity.organization_Id, //组织类型 [id]
location: location.join(","), //省市县
isProduction: isProduction, //是否生产班组：1是，0否
property: property.join(",") //属性
property: property.join(","), //属性
};
Api.create(paramsdata)
.then(r => {
.then((r) => {
this.disabled = false;
if (r.success) {
this.$Message.success("保存成功！");
......@@ -128,7 +148,7 @@ export default {
this.$Message.error("保存失败，请联系管理员");
}
})
.catch(err => {
.catch((err) => {
this.disabled = false;
this.$Message.error("保存失败，请联系管理员");
});
......@@ -144,7 +164,7 @@ export default {
l(key) {
key = "DipartLocation" + "." + key;
return this.$t(key);
}
}
},
},
};
</script>
\ No newline at end of file
pages/basicData/department/api.js
View file @ 0fec4621
......@@ -20,5 +20,8 @@ export default {
departImport(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 @@
</FormItem>
</Col>
<Col :span="12">
<FormItem :label="l('departcode')">
<FormItem :label="l('departcode')" prop="departcode">
<Input v-model="entity.code" placeholder="请输入..."></Input>
</FormItem>
</Col>
......@@ -72,7 +72,8 @@ export default {
id: -1
},
rules: {
name: [{ required: true, message: "库位名不能为空", trigger: "blur" }],
name: [{ required: true, message: "不能为空", trigger: "blur" }],
departcode: [{ required: true, message: "不能为空", trigger: "blur" }],
property: [
{
required: true,
......
pages/exception/detail.vue
View file @ 0fec4621
<template>
<div class="detail">
<Row>
<!-- <Filed :span="12" :name="l('creationTime')">{{entity.creationTime}}</Filed>
<div class="detail">
<Row>
<!-- <Filed :span="12" :name="l('creationTime')">{{entity.creationTime}}</Filed>
<Filed :span="12" :name="l('creatorUserId')">{{entity.creatorUserId}}</Filed>
<Filed :span="12" :name="l('lastModificationTime')">{{entity.lastModificationTime}}</Filed>
<Filed :span="12" :name="l('lastModifierUserId')">{{entity.lastModifierUserId}}</Filed>
<Filed :span="12" :name="l('isDeleted')">{{entity.isDeleted}}</Filed>
<Filed :span="12" :name="l('deletionTime')">{{entity.deletionTime}}</Filed>
<Filed :span="12" :name="l('deleterUserId')">{{entity.deleterUserId}}</Filed> -->
<Filed :span="12" :name="l('timestamp')">{{entity.timestamp}}</Filed>
<Filed :span="12" :name="l('level')">{{entity.level}}</Filed>
<!-- <Filed :span="12" :name="l('messageTemplate')">{{entity.messageTemplate}}</Filed> -->
<Filed :span="12" :name="l('renderedMessage')">{{entity.renderedMessage}}</Filed>
<Filed :span="12" :name="l('clientIpAddress')">{{entity.clientIpAddress}}</Filed>
<Filed :span="12" :name="l('loginName')">{{entity.loginName}}</Filed>
<Filed :span="12" :name="l('tanentCode')">{{entity.tanentCode}}</Filed>
<Filed :span="12" :name="l('host')">{{entity.host}}</Filed>
<Filed :span="12" :name="l('status')">{{entity.status}}</Filed>
<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>
</div>
<Filed :span="12" :name="l('timestamp')">{{ entity.timestamp }}</Filed>
<Filed :span="12" :name="l('level')">{{ entity.level }}</Filed>
<!-- <Filed :span="12" :name="l('messageTemplate')">{{entity.messageTemplate}}</Filed> -->
<Filed :span="12" :name="l('renderedMessage')">{{
entity.renderedMessage
}}</Filed>
<Filed :span="12" :name="l('clientIpAddress')">{{
entity.clientIpAddress
}}</Filed>
<Filed :span="12" :name="l('loginName')">{{ entity.loginName }}</Filed>
<Filed :span="12" :name="l('tanentCode')">{{ entity.tanentCode }}</Filed>
<Filed :span="12" :name="l('host')">{{ entity.host }}</Filed>
<Filed :span="12" :name="l('status')">{{ entity.status }}</Filed>
<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>
<script>
import Api from './api'
export default {
name: 'Add',
data() {
return {
entity: {},
rules: {
name: [{ required: true, message: '必填', trigger: 'blur' }],
code: [{ required: true, message: '必填', trigger: 'blur' }]
}
}
},
props: {
eid: Number
},
mounted() {
if (this.eid) {
this.load(this.eid);
}
},
methods: {
load(v) {
Api.get({ id: v }).then(r => {
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);
}
}
}
import Api from "./api";
export default {
name: "Add",
data() {
return {
entity: {
exception: "",
properties: {},
status: 0,
},
rules: {
name: [{ required: true, message: "必填", trigger: "blur" }],
code: [{ required: true, message: "必填", trigger: "blur" }],
},
disabled: false,
};
},
props: {
eid: "",
},
mounted() {
if (this.eid) {
this.load(this.eid);
}
},
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>
\ No newline at end of file
pages/exception/index.vue
View file @ 0fec4621
This diff is collapsed.
pages/index.vue
View file @ 0fec4621
......@@ -4,12 +4,4 @@
<h2>欢迎登陆！</h2>
</div>
</template>
<script>
// import iview from './crm/statistical/index.vue'
export default {
// components: {
// iview
// }
}
</script>
\ No newline at end of file
</template>
\ No newline at end of file
pages/system/config/index.vue
View file @ 0fec4621
This diff is collapsed.
plugins/request/index.js
View file @ 0fec4621
......@@ -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 @ 0fec4621
......@@ -10,6 +10,7 @@ let address=systemApi.dev;
//let address=systemApi.local;
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`; // 工艺规程
......
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