Commit e887cd17 authored by renjintao's avatar renjintao

config index

parent a99070f4
......@@ -4943,7 +4943,7 @@
"dependencies": {
"commander": {
"version": "2.14.1",
"resolved": "http://r.cnpmjs.org/commander/download/commander-2.14.1.tgz",
"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",
"integrity": "sha1-IjUSPjevjKPGXfRbAm29NXsBuao="
}
}
......@@ -5472,7 +5472,7 @@
},
"crc-32": {
"version": "1.2.0",
"resolved": "http://r.cnpmjs.org/crc-32/download/crc-32-1.2.0.tgz",
"resolved": "https://registry.npm.taobao.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": "http://r.cnpmjs.org/exit-on-epipe/download/exit-on-epipe-1.0.1.tgz",
"resolved": "https://registry.npm.taobao.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": "http://r.cnpmjs.org/frac/download/frac-1.1.2.tgz",
"resolved": "https://registry.npm.taobao.org/frac/download/frac-1.1.2.tgz",
"integrity": "sha1-PXT39keMiKG1AgMG10fcYxPHTQs="
},
"fragment-cache": {
......@@ -15097,7 +15097,7 @@
},
"printj": {
"version": "1.1.2",
"resolved": "http://r.cnpmjs.org/printj/download/printj-1.1.2.tgz",
"resolved": "https://registry.npm.taobao.org/printj/download/printj-1.1.2.tgz",
"integrity": "sha1-2Q3rKXWoufYA+zoclOP0xTx4oiI="
},
"private": {
......@@ -20550,7 +20550,7 @@
},
"script-loader": {
"version": "0.7.2",
"resolved": "http://r.cnpmjs.org/script-loader/download/script-loader-0.7.2.tgz",
"resolved": "https://registry.npm.taobao.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": "http://r.cnpmjs.org/ssf/download/ssf-0.10.3.tgz",
"resolved": "https://registry.npm.taobao.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": "http://r.cnpmjs.org/wmf/download/wmf-1.0.2.tgz",
"resolved": "https://registry.npm.taobao.org/wmf/download/wmf-1.0.2.tgz",
"integrity": "sha1-fRnWIQcaCMK9xrfmiKnENSmMwto="
},
"word-wrap": {
......@@ -23960,7 +23960,7 @@
},
"xlsx": {
"version": "0.15.6",
"resolved": "http://r.cnpmjs.org/xlsx/download/xlsx-0.15.6.tgz",
"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",
"integrity": "sha1-Rh+EHW2eoag3XizSRr8jrs4IodU=",
"requires": {
"adler-32": "~1.2.0",
......@@ -23975,7 +23975,7 @@
"dependencies": {
"commander": {
"version": "2.17.1",
"resolved": "http://r.cnpmjs.org/commander/download/commander-2.17.1.tgz",
"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",
"integrity": "sha1-vXerfebelCBc6sxy8XFtKfIKd78="
}
}
......
<template>
<div class="config flex">
<div class="menu">
<Menu theme="light" active-name="site">
<MenuItem name="site" to="#site">站点设置</MenuItem>
<MenuItem name="bus" to="#bus">业务设置</MenuItem>
<Menu theme="light" active-name="site" @on-select="pageTo">
<MenuItem name="site">站点设置</MenuItem>
<MenuItem name="bus">业务设置</MenuItem>
</Menu>
</div>
<<<<<<< HEAD <div class="main fg" id="mainDiv">
<div class="main fg" id="mainDiv">
<div class="tr lt40 fr divTop pr20">
<Button type="primary" size="small" @click="save">保存</Button>
<Button type="text" size="small" @click="reset">恢复默认</Button>
=======
<div class="main fg">
<div class="tool tr">
<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">
<h3>站点设置</h3>
<FormItem label="默认语言" prop="site.language">
<Input v-model="config.site.language"></Input>
</FormItem>
<FormItem label="默认密码" prop="site.password">
<Input v-model="config.site.password"></Input>
</FormItem>
<FormItem label="密码规则" prop="site.password">
<RadioGroup v-model="config.site.passwordRule">
<Radio :label="0">简易</Radio>
<Radio :label="1">中级 <span class="tip"> 密码长度6位以上</span></Radio>
<Radio :label="2">高级
<span class="tip"> 密码需要包含数字字母和特殊字符,长度8位以上</span>
</Radio>
</RadioGroup>
</FormItem>
<FormItem label="密码安全校验">
<i-switch v-model="config.site.loginEditPassword" />
<span class="tip">开启后,用户密码安全级别低时,登陆后强制修改密码</span>
</FormItem>
<FormItem label="验证码">
<i-switch v-model="config.site.loginCode" />
<span class="tip">开启后用户登陆需要输入验证码</span>
</FormItem>
<FormItem label="注册邀请码">
<Input v-model="config.site.regCode"></Input>
<span class="tip">1.为空时:不对外开放注册;2.设置为“666”时用户免输入注册邀请码就可以进行注册;3.其它情况,注册时需要输入注册邀请码</span>
</FormItem>
<FormItem label="登陆有效期">
<InputNumber v-model="config.site.loginValidHoure" :min="1" :max="2400"></InputNumber>
<span class="tip">单位为小时,设置后用户登陆此时长后自动过期</span>
</FormItem>
<FormItem label="Bug反馈">
<i-switch v-model="config.site.bug" />
<span class="tip">开启后,用户可以提交bug并管理自己的bug</span>
</FormItem>
<FormItem label="异常管理">
<i-switch v-model="config.site.exception" />
<span class="tip">开启后可以查看系统异常</span>
</FormItem>
<FormItem label="异常消息">
<Input v-model="config.site.exceptionMessage"></Input>
<span class="tip">设置后,接口发生异常,统一返回次内容。为空时返回系统异常</span>
</FormItem>
<FormItem label="列表显示方式">
<RadioGroup v-model="config.site.gridType">
<Radio :label="0">表格</Radio>
<Radio :label="1">卡片</Radio>
<!-- <Radio label="2">无限下拉</Radio> -->
</RadioGroup>
</FormItem>
<FormItem label="默认分页大小">
<Select v-model="config.site.pageSize">
<Option :value="20">每页20条</Option>
<Option :value="50">每页50条</Option>
<Option :value="100">每页100条</Option>
</Select>
</FormItem>
<FormItem label="弹窗宽度">
<InputNumber v-model="config.site.windowWidth" :min="1" :max="2400"></InputNumber>
<span class="tip">设置弹窗页面宽度</span>
</FormItem>
<FormItem label="弹窗移动">
<i-switch v-model="config.site.windowMove" />
<span class="tip">开启后弹框可以进行移动</span>
</FormItem>
>>>>>>> c26d050f1ec6b064c32ac1a3b4f647500a3dfe83
</div>
<div id="bus">
<h3>业务设置</h3>
<FormItem label="订单开工预警">
<InputNumber v-model="config.bus.orderStartWarning" :min="0" :max="2400" />
<span class="tip">单位为小时,为0时不预警;大于0进行预警</span>
</FormItem>
<FormItem label="订单完工预警">
<InputNumber v-model="config.bus.orderFinishWarning" :min="0" :max="2400" />
<span class="tip">单位为小时,为0时不预警;大于0进行预警</span>
</FormItem>
<FormItem label="工单开工预警">
<InputNumber v-model="config.bus.excuteStartWarning" :min="0" :max="2400" />
<span class="tip">单位为小时,为0时不预警;大于0进行预警</span>
</FormItem>
<FormItem label="工单完工预警">
<InputNumber v-model="config.bus.excuteEndWarning" :min="0" :max="2400" />
<span class="tip">单位为小时,为0时不预警;大于0进行预警</span>
</FormItem>
<FormItem label="库存预警">
<i-switch v-model="config.site.storeWarning" />
</FormItem>
<FormItem label="多工艺">
<i-switch v-model="config.bus.multipleHeader" />
<span class="tip">开启后,一个生产计划可以设置多本工艺规程</span>
</FormItem>
<FormItem label="按序执行">
<i-switch v-model="config.bus.detailFirst" />
<span class="tip">开启后,工单执行必须按照工序次序先后次序执行;关闭后,工单可以不按工序次序执行。</span>
</FormItem>
<FormItem label="工艺设置预警">
<InputNumber v-model="config.bus.setHeaderWarning" :min="0" :max="2400" />
<span class="tip">单位为小时,为0时不预警;大于0进行预警</span>
</FormItem>
<FormItem label="配套完成预警">
<InputNumber v-model="config.bus.setHeaderWarning" :min="0" :max="2400" />
<span class="tip">单位为小时,为0时不预警;大于0进行预警</span>
</FormItem>
<FormItem label="转序交接">
<i-switch v-model="config.bus.excuteHandover" />
<span class="tip">开启后,工单转序必须进行交接</span>
</FormItem>
<FormItem label="同车间转序交接">
<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 ref="form" :model="config" :rules="rules" :label-width="120">
<div id="site" class="mt50">
<h3>站点设置</h3>
<FormItem label="默认语言" prop="site.language">
<Input v-model="config.site.language"></Input>
</FormItem>
<FormItem label="默认密码" prop="site.password">
<Input v-model="config.site.password"></Input>
</FormItem>
<FormItem label="密码规则" prop="site.password">
<RadioGroup v-model="config.site.passwordRule">
<Radio :label="0">简易</Radio>
<Radio :label="1">中级 <span class="tip"> 密码长度6位以上</span></Radio>
<Radio :label="2">高级
<span class="tip"> 密码需要包含数字字母和特殊字符,长度8位以上</span>
</Radio>
</RadioGroup>
</FormItem>
<FormItem label="密码安全校验">
<i-switch v-model="config.site.loginEditPassword" />
<span class="tip">开启后,用户密码安全级别低时,登陆后强制修改密码</span>
</FormItem>
<FormItem label="验证码">
<i-switch v-model="config.site.loginCode" />
<span class="tip">开启后用户登陆需要输入验证码</span>
</FormItem>
<FormItem label="注册邀请码">
<Input v-model="config.site.regCode"></Input>
<span class="tip">1.为空时:不对外开放注册;2.设置为“666”时用户免输入注册邀请码就可以进行注册;3.其它情况,注册时需要输入注册邀请码</span>
</FormItem>
<FormItem label="登陆有效期">
<InputNumber v-model="config.site.loginValidHoure" :min="1" :max="2400"></InputNumber>
<span class="tip">单位为小时,设置后用户登陆此时长后自动过期</span>
</FormItem>
<FormItem label="Bug反馈">
<i-switch v-model="config.site.bug" />
<span class="tip">开启后,用户可以提交bug并管理自己的bug</span>
</FormItem>
<FormItem label="异常管理">
<i-switch v-model="config.site.exception" />
<span class="tip">开启后可以查看系统异常</span>
</FormItem>
<FormItem label="异常消息">
<Input v-model="config.site.exceptionMessage"></Input>
<span class="tip">设置后,接口发生异常,统一返回次内容。为空时返回系统异常</span>
</FormItem>
<FormItem label="列表显示方式">
<RadioGroup v-model="config.site.gridType">
<Radio :label="0">表格</Radio>
<Radio :label="1">卡片</Radio>
<!-- <Radio label="2">无限下拉</Radio> -->
</RadioGroup>
</FormItem>
<FormItem label="默认分页大小">
<Select v-model="config.site.pageSize">
<Option :value="20">每页20条</Option>
<Option :value="50">每页50条</Option>
<Option :value="100">每页100条</Option>
</Select>
</FormItem>
<FormItem label="弹窗宽度">
<InputNumber v-model="config.site.windowWidth" :min="1" :max="2400"></InputNumber>
<span class="tip">设置弹窗页面宽度</span>
</FormItem>
<FormItem label="弹窗移动">
<i-switch v-model="config.site.windowMove" />
<span class="tip">开启后弹框可以进行移动</span>
</FormItem>
</div>
<div id="bus">
<h3>业务设置</h3>
<FormItem label="订单开工预警">
<InputNumber v-model="config.bus.orderStartWarning" :min="0" :max="2400" />
<span class="tip">单位为小时,为0时不预警;大于0进行预警</span>
</FormItem>
<FormItem label="订单完工预警">
<InputNumber v-model="config.bus.orderFinishWarning" :min="0" :max="2400" />
<span class="tip">单位为小时,为0时不预警;大于0进行预警</span>
</FormItem>
<FormItem label="工单开工预警">
<InputNumber v-model="config.bus.excuteStartWarning" :min="0" :max="2400" />
<span class="tip">单位为小时,为0时不预警;大于0进行预警</span>
</FormItem>
<FormItem label="工单完工预警">
<InputNumber v-model="config.bus.excuteEndWarning" :min="0" :max="2400" />
<span class="tip">单位为小时,为0时不预警;大于0进行预警</span>
</FormItem>
<FormItem label="库存预警">
<i-switch v-model="config.site.storeWarning" />
</FormItem>
<FormItem label="多工艺">
<i-switch v-model="config.bus.multipleHeader" />
<span class="tip">开启后,一个生产计划可以设置多本工艺规程</span>
</FormItem>
<FormItem label="按序执行">
<i-switch v-model="config.bus.detailFirst" />
<span class="tip">开启后,工单执行必须按照工序次序先后次序执行;关闭后,工单可以不按工序次序执行。</span>
</FormItem>
<FormItem label="工艺设置预警">
<InputNumber v-model="config.bus.setHeaderWarning" :min="0" :max="2400" />
<span class="tip">单位为小时,为0时不预警;大于0进行预警</span>
</FormItem>
<FormItem label="配套完成预警">
<InputNumber v-model="config.bus.setHeaderWarning" :min="0" :max="2400" />
<span class="tip">单位为小时,为0时不预警;大于0进行预警</span>
</FormItem>
<FormItem label="转序交接">
<i-switch v-model="config.bus.excuteHandover" />
<span class="tip">开启后,工单转序必须进行交接</span>
</FormItem>
<FormItem label="同车间转序交接">
<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>
</template>
<script>
......@@ -181,12 +175,7 @@ export default {
mainDiv.scrollTop = site.scrollHeight;
}
}
})
},
reset() {
this.$store.dispatch("loadSiteConfig");
},
},
},
};
</script>
......@@ -205,35 +194,34 @@ reset() {
width: 100%;
top: 5px;
}
}
.main {
margin: 0px -10px;
padding: 10px 20px;
h3 {
font-size: 16px;
}
.main {
margin: 0px -10px;
padding: 10px 20px;
.tip {
font-size: 13px;
color: #999;
font-style: italic;
}
h3 {
font-size: 16px;
}
.divTop {
position: fixed;
background: #fff;
height: 40px;
width: calc(~'100% - 560px');
z-index: 100;
border-bottom: 1px #e4e6ed solid;
top: 105px
}
.tip {
font-size: 13px;
color: #999;
font-style: italic;
}
height: calc(100vh - 150px);
overflow-y: auto;
.divTop {
position: fixed;
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>
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