Skip to content

N
NLT-e-cigarette
Commit 928c71d9 authored by 秦嘉's avatar 秦嘉
Browse files
Options

Merge remote-tracking branch 'origin/master'

parents e6e2ffa9 ff6fee60
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 255 additions and 139 deletions
src/api/badDefinition.js
View file @ 928c71d9
...@@ -34,17 +34,25 @@ export function deleteLogical(businessId) { ...@@ -34,17 +34,25 @@ export function deleteLogical(businessId) {
method: 'delete' method: 'delete'
}) })
} }
// 不良定义修改状态 // 不良定义修改
export function updateStatus(data) { export function updateStatus(data) {
const businessId = data.businessId const businessId = data.businessId
data = Qs.stringify(data) data = Qs.stringify(data)
console.log(data)
return request({ return request({
url: '/nltdisadvantage/update/' + businessId, url: '/nltdisadvantage/update/' + businessId,
method: 'put', method: 'put',
data, data
headers: { })
'Content-Type': 'application/x-www-form-urlencoded' }
} // 不良定义修改状态
export function updateData(data) {
const businessId = data.businessId
data = Qs.stringify(data)
return request({
url: '/nltdisadvantage/update/' + businessId,
method: 'put',
data
}) })
} }
// 新增不良定义 // 新增不良定义
...@@ -59,3 +67,12 @@ export function addBad(data) { ...@@ -59,3 +67,12 @@ export function addBad(data) {
} }
}) })
} }
// 导出不良定义
export function exportBad(query) {
return request({
url: '/nltdisadvantage/export',
method: 'get',
params: query,
responseType: 'blob'
})
}
src/layout/components/header.vue
View file @ 928c71d9
...@@ -117,7 +117,7 @@ export default { ...@@ -117,7 +117,7 @@ export default {
<style lang="scss" scoped> <style lang="scss" scoped>
.navbar { .navbar {
height: 6.4vh; height: 50px;
overflow: hidden; overflow: hidden;
position: relative; position: relative;
background: #D20A10; background: #D20A10;
......
src/styles/element-ui.scss
View file @ 928c71d9
...@@ -118,16 +118,46 @@ body .el-table th.gutter{ ...@@ -118,16 +118,46 @@ body .el-table th.gutter{
.redBtn{ .redBtn{
border-color: #D20A10; border-color: #D20A10;
background-color: #D20A10; background-color: #D20A10;
&:hover {
border-color: #D20A10!important;
background-color: #D20A10!important;
color: white!important;
}
&:focus {
border-color: #D20A10!important;
background-color: #D20A10!important;
color: white!important;
}
} }
// 按钮默认颜色(黑) // 按钮默认颜色(黑)
.blackBtn{ .blackBtn{
border-color: #2C333A; border-color: #2C333A;
background-color: #2C333A; background-color: #2C333A;
&:hover {
border-color: #2C333A!important;
background-color: #2C333A!important;
color: white!important;
}
&:focus {
border-color: #2C333A!important;
background-color: #2C333A!important;
color: white!important;
}
} }
// 重置按钮颜色 // 重置按钮颜色
.resetBtn{ .resetBtn{
border-color: #D20A10; border-color: #D20A10;
color: #D20A10; color: #D20A10;
&:hover {
border-color: #D20A10!important;
background-color: white!important;
color: #D20A10!important;
}
&:focus {
border-color: #D20A10!important;
background-color: white!important;
color: #D20A10!important;
}
} }
// 表格操作删除颜色 // 表格操作删除颜色
.deleteLink { .deleteLink {
......
src/views/productionInfo/badDefinition.vue
View file @ 928c71d9
This diff is collapsed.
src/views/system/dept/index.vue
View file @ 928c71d9
...@@ -185,7 +185,7 @@ ...@@ -185,7 +185,7 @@
<div class="labelName">部门名称</div> <div class="labelName">部门名称</div>
<div class="labelName">Dept Name</div> <div class="labelName">Dept Name</div>
</div> </div>
<el-input v-model.trim="form.deptName" placeholder="请输入部门名称" /> <el-input v-model.trim="form.deptName" :maxlength="20" placeholder="请输入部门名称" />
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="12"> <el-col :span="12">
...@@ -194,7 +194,7 @@ ...@@ -194,7 +194,7 @@
<div class="labelName">部门编码</div> <div class="labelName">部门编码</div>
<div class="labelName">Dept Number</div> <div class="labelName">Dept Number</div>
</div> </div>
<el-input v-model.trim="form.deptCode" placeholder="请输入部门编码" maxlength="20" /> <el-input v-model.trim="form.deptCode" :maxlength="100" placeholder="请输入部门编码" />
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="12"> <el-col :span="12">
...@@ -212,27 +212,27 @@ ...@@ -212,27 +212,27 @@
<div class="labelName">负责人</div> <div class="labelName">负责人</div>
<div class="labelName">Leader</div> <div class="labelName">Leader</div>
</div> </div>
<el-input v-model.trim="form.leader" placeholder="请输入负责人" maxlength="20" /> <el-input v-model.trim="form.leader" placeholder="请输入负责人" maxlength="10" />
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item class="labelHeight" label="联系电话" prop="phone">
<div slot="label" class="labelClass">
<div class="labelName">联系电话</div>
<div class="labelName">Phone</div>
</div>
<el-input v-model.trim="form.phone" placeholder="请输入联系电话" show-word-limit maxlength="11" />
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item class="labelHeight" label="邮箱" prop="email">
<div slot="label" class="labelClass">
<div class="labelName">邮箱</div>
<div class="labelName">Email</div>
</div>
<el-input v-model.trim="form.email" placeholder="请输入邮箱" maxlength="50" />
</el-form-item> </el-form-item>
</el-col> </el-col>
<!-- <el-col :span="12">-->
<!-- <el-form-item class="labelHeight" label="联系电话" prop="phone">-->
<!-- <div slot="label" class="labelClass">-->
<!-- <div class="labelName">联系电话</div>-->
<!-- <div class="labelName">Phone</div>-->
<!-- </div>-->
<!-- <el-input v-model.trim="form.phone" placeholder="请输入联系电话" show-word-limit maxlength="11" />-->
<!-- </el-form-item>-->
<!-- </el-col>-->
<!-- <el-col :span="12">-->
<!-- <el-form-item class="labelHeight" label="邮箱" prop="email">-->
<!-- <div slot="label" class="labelClass">-->
<!-- <div class="labelName">邮箱</div>-->
<!-- <div class="labelName">Email</div>-->
<!-- </div>-->
<!-- <el-input v-model.trim="form.email" placeholder="请输入邮箱" maxlength="50" />-->
<!-- </el-form-item>-->
<!-- </el-col>-->
<el-col :span="12"> <el-col :span="12">
<el-form-item class="labelHeight" label="部门状态"> <el-form-item class="labelHeight" label="部门状态">
<div slot="label" class="labelClass"> <div slot="label" class="labelClass">
...@@ -260,7 +260,7 @@ ...@@ -260,7 +260,7 @@
</el-form> </el-form>
<div slot="footer" class="dialog-footer"> <div slot="footer" class="dialog-footer">
<el-button @click="cancel">取 消</el-button> <el-button @click="cancel">取 消</el-button>
<el-button type="primary" @click="submitForm">确 定</el-button> <el-button type="danger" class="redBtn" @click="submitForm">确 定</el-button>
</div> </div>
</el-dialog> </el-dialog>
</div> </div>
...@@ -406,7 +406,7 @@ export default { ...@@ -406,7 +406,7 @@ export default {
leader: undefined, leader: undefined,
phone: undefined, phone: undefined,
email: undefined, email: undefined,
flag: '0' flag: '1'
} }
this.resetForm('form') this.resetForm('form')
}, },
......
src/views/system/dict/data.vue
View file @ 928c71d9
...@@ -223,7 +223,7 @@ ...@@ -223,7 +223,7 @@
<div class="labelName">参数键值</div> <div class="labelName">参数键值</div>
<div class="labelName">Dict Value</div> <div class="labelName">Dict Value</div>
</div> </div>
<el-input v-model="form.dictValue" show-word-limit maxlength="300" placeholder="请输入参数键值" /> <el-input v-model="form.dictValue" show-word-limit maxlength="90" placeholder="请输入参数键值" />
</el-form-item> </el-form-item>
<el-form-item class="labelHeight" label="参数排序" prop="dictSort"> <el-form-item class="labelHeight" label="参数排序" prop="dictSort">
<div slot="label" class="labelClassRequired"> <div slot="label" class="labelClassRequired">
...@@ -250,12 +250,12 @@ ...@@ -250,12 +250,12 @@
<div class="labelName">备注</div> <div class="labelName">备注</div>
<div class="labelName">Remarks</div> <div class="labelName">Remarks</div>
</div> </div>
<el-input v-model="form.remarks" type="textarea" show-word-limit maxlength="200" placeholder="请输入内容" /> <el-input v-model="form.remarks" type="textarea" show-word-limit maxlength="400" placeholder="请输入内容" />
</el-form-item> </el-form-item>
</el-form> </el-form>
<div slot="footer" class="dialog-footer"> <div slot="footer" class="dialog-footer">
<el-button type="primary" @click="submitForm">确 定</el-button>
<el-button @click="cancel">取 消</el-button> <el-button @click="cancel">取 消</el-button>
<el-button type="danger" class="redBtn" @click="submitForm">确 定</el-button>
</div> </div>
</el-dialog> </el-dialog>
</div> </div>
......
src/views/system/dict/index.vue
View file @ 928c71d9
...@@ -281,12 +281,12 @@ ...@@ -281,12 +281,12 @@
<div class="labelName">备注</div> <div class="labelName">备注</div>
<div class="labelName">Remarks</div> <div class="labelName">Remarks</div>
</div> </div>
<el-input v-model="form.remarks" maxlength="200" type="textarea" placeholder="请输入内容" /> <el-input v-model="form.remarks" maxlength="400" type="textarea" placeholder="请输入内容" />
</el-form-item> </el-form-item>
</el-form> </el-form>
<div slot="footer" class="dialog-footer"> <div slot="footer" class="dialog-footer">
<el-button type="primary" :loading="manageLoading" :disabled="manageLoading" @click="submitForm">确 定</el-button>
<el-button @click="cancel">取 消</el-button> <el-button @click="cancel">取 消</el-button>
<el-button type="danger" class="redBtn" :loading="manageLoading" :disabled="manageLoading" @click="submitForm">确 定</el-button>
</div> </div>
</el-dialog> </el-dialog>
</div> </div>
......
src/views/system/menu/index.vue
View file @ 928c71d9
...@@ -225,7 +225,7 @@ ...@@ -225,7 +225,7 @@
<div class="labelName">菜单名称</div> <div class="labelName">菜单名称</div>
<div class="labelName">Menu Name</div> <div class="labelName">Menu Name</div>
</div> </div>
<el-input v-model="form.menuName" style="width: 95%" show-word-limit maxlength="60" placeholder="请输入菜单名称" /> <el-input v-model="form.menuName" style="width: 95%" show-word-limit maxlength="40" placeholder="请输入菜单名称" />
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="12"> <el-col :span="12">
...@@ -332,7 +332,7 @@ ...@@ -332,7 +332,7 @@
</el-form> </el-form>
<div slot="footer" class="dialog-footer"> <div slot="footer" class="dialog-footer">
<el-button @click="cancel">取 消</el-button> <el-button @click="cancel">取 消</el-button>
<el-button type="primary" @click="submitForm">确 定</el-button> <el-button type="danger" class="redBtn" @click="submitForm">确 定</el-button>
</div> </div>
</el-dialog> </el-dialog>
</div> </div>
......
src/views/system/role/index.vue
View file @ 928c71d9
...@@ -188,7 +188,7 @@ ...@@ -188,7 +188,7 @@
<div class="labelName">权限字符</div> <div class="labelName">权限字符</div>
<div class="labelName">Limit</div> <div class="labelName">Limit</div>
</div> </div>
<el-input v-model.trim="form.roleKey" show-word-limit :maxlength="30" placeholder="请输入权限字符" /> <el-input v-model.trim="form.roleKey" show-word-limit :maxlength="90" placeholder="请输入权限字符" />
</el-form-item> </el-form-item>
<el-form-item class="labelHeight" label="角色排序" prop="roleSort"> <el-form-item class="labelHeight" label="角色排序" prop="roleSort">
<div slot="label" class="labelClassRequired"> <div slot="label" class="labelClassRequired">
...@@ -234,12 +234,12 @@ ...@@ -234,12 +234,12 @@
<div class="labelName">备注</div> <div class="labelName">备注</div>
<div class="labelName">Remarks</div> <div class="labelName">Remarks</div>
</div> </div>
<el-input v-model.trim="form.remark" maxlength="200" show-word-limit type="textarea" placeholder="请输入内容" /> <el-input v-model.trim="form.remark" maxlength="400" show-word-limit type="textarea" placeholder="请输入内容" />
</el-form-item> </el-form-item>
</el-form> </el-form>
<div slot="footer" class="dialog-footer"> <div slot="footer" class="dialog-footer">
<el-button @click="cancel">取 消</el-button> <el-button @click="cancel">取 消</el-button>
<el-button type="primary" @click="submitForm">确 定</el-button> <el-button type="danger" class="redBtn" @click="submitForm">确 定</el-button>
</div> </div>
</el-dialog> </el-dialog>
......
src/views/system/user/index.vue
View file @ 928c71d9
...@@ -264,7 +264,7 @@ ...@@ -264,7 +264,7 @@
<div class="labelName">工号</div> <div class="labelName">工号</div>
<div class="labelName">B/N</div> <div class="labelName">B/N</div>
</div> </div>
<el-input v-model="form.username" placeholder="请输入登录名" /> <el-input v-model="form.username" :maxlength="20" placeholder="请输入工号" />
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="12"> <el-col :span="12">
...@@ -273,7 +273,7 @@ ...@@ -273,7 +273,7 @@
<div class="labelName">班组</div> <div class="labelName">班组</div>
<div class="labelName">Group</div> <div class="labelName">Group</div>
</div> </div>
<el-input v-model="form.nltBz" placeholder="请输入班组" /> <el-input v-model="form.nltBz" :maxlength="90" placeholder="请输入班组" />
</el-form-item> </el-form-item>
</el-col> </el-col>
</el-row> </el-row>
...@@ -284,7 +284,7 @@ ...@@ -284,7 +284,7 @@
<div class="labelName">姓名</div> <div class="labelName">姓名</div>
<div class="labelName">Name</div> <div class="labelName">Name</div>
</div> </div>
<el-input v-model="form.name" placeholder="请输入姓名" /> <el-input v-model="form.name" :maxlength="6" placeholder="请输入姓名" />
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="12"> <el-col :span="12">
...@@ -293,7 +293,7 @@ ...@@ -293,7 +293,7 @@
<div class="labelName">劳务</div> <div class="labelName">劳务</div>
<div class="labelName">Labour</div> <div class="labelName">Labour</div>
</div> </div>
<el-input v-model.trim="form.nltLw" placeholder="请输入劳务" maxlength="18" /> <el-input v-model.trim="form.nltLw" :maxlength="90" placeholder="请输入劳务" />
</el-form-item> </el-form-item>
</el-col> </el-col>
</el-row> </el-row>
...@@ -304,7 +304,7 @@ ...@@ -304,7 +304,7 @@
<div class="labelName">职位</div> <div class="labelName">职位</div>
<div class="labelName">Position</div> <div class="labelName">Position</div>
</div> </div>
<el-input v-model="form.nltPosition" placeholder="请输入职位" /> <el-input v-model="form.nltPosition" :maxlength="90" placeholder="请输入职位" />
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="12"> <el-col :span="12">
...@@ -340,41 +340,41 @@ ...@@ -340,41 +340,41 @@
</el-select> </el-select>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="12"> <!-- <el-col :span="12">-->
<el-form-item class="labelHeight" label="身份证号" prop="idNumber"> <!-- <el-form-item class="labelHeight" label="身份证号" prop="idNumber">-->
<div slot="label" class="labelClass"> <!-- <div slot="label" class="labelClass">-->
<div class="labelName">身份证号</div> <!-- <div class="labelName">身份证号</div>-->
<div class="labelName">ID Number</div> <!-- <div class="labelName">ID Number</div>-->
</div> <!-- </div>-->
<el-input v-model.trim="form.idNumber" placeholder="请输入身份证号" maxlength="18" /> <!-- <el-input v-model.trim="form.idNumber" placeholder="请输入身份证号" maxlength="18" />-->
</el-form-item> <!-- </el-form-item>-->
</el-col> <!-- </el-col>-->
</el-row>
<el-row>
<el-col :span="12">
<el-form-item class="labelHeight" label="手机号码" prop="phone">
<div slot="label" class="labelClassRequired">
<div class="labelName">手机号码</div>
<div class="labelName">Phone Number</div>
</div>
<el-input
v-model.trim="form.phone"
value="phone"
placeholder="请输入手机号码"
maxlength="11"
/>
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item class="labelHeight" label="邮箱" prop="email">
<div slot="label" class="labelClass">
<div class="labelName">邮箱</div>
<div class="labelName">Mailbox</div>
</div>
<el-input v-model.trim="form.email" placeholder="请输入邮箱" maxlength="25" />
</el-form-item>
</el-col>
</el-row> </el-row>
<!-- <el-row>-->
<!-- <el-col :span="12">-->
<!-- <el-form-item class="labelHeight" label="手机号码" prop="phone">-->
<!-- <div slot="label" class="labelClass">-->
<!-- <div class="labelName">手机号码</div>-->
<!-- <div class="labelName">Phone Number</div>-->
<!-- </div>-->
<!-- <el-input-->
<!-- v-model.trim="form.phone"-->
<!-- value="phone"-->
<!-- placeholder="请输入手机号码"-->
<!-- maxlength="11"-->
<!-- />-->
<!-- </el-form-item>-->
<!-- </el-col>-->
<!-- <el-col :span="12">-->
<!-- <el-form-item class="labelHeight" label="邮箱" prop="email">-->
<!-- <div slot="label" class="labelClass">-->
<!-- <div class="labelName">邮箱</div>-->
<!-- <div class="labelName">Mailbox</div>-->
<!-- </div>-->
<!-- <el-input v-model.trim="form.email" placeholder="请输入邮箱" maxlength="25" />-->
<!-- </el-form-item>-->
<!-- </el-col>-->
<!-- </el-row>-->
<el-row> <el-row>
<el-col :span="12"> <el-col :span="12">
<el-form-item v-if="form.businessId == undefined" class="labelHeight" label="状态" prop="flag"> <el-form-item v-if="form.businessId == undefined" class="labelHeight" label="状态" prop="flag">
...@@ -397,7 +397,7 @@ ...@@ -397,7 +397,7 @@
<div class="labelName">角色</div> <div class="labelName">角色</div>
<div class="labelName">Role</div> <div class="labelName">Role</div>
</div> </div>
<el-select style="width: 100%" v-model="form.roleList" multiple placeholder="请选择角色"> <el-select v-model="form.roleList" style="width: 100%" multiple placeholder="请选择角色">
<el-option <el-option
v-for="(item,index) in roleOptions" v-for="(item,index) in roleOptions"
:key="index" :key="index"
...@@ -426,21 +426,21 @@ ...@@ -426,21 +426,21 @@
</el-form-item> </el-form-item>
</el-col> </el-col>
</el-row> </el-row>
<el-row> <!-- <el-row>-->
<el-col :span="24"> <!-- <el-col :span="24">-->
<el-form-item class="labelHeight" label="备注"> <!-- <el-form-item class="labelHeight" label="备注">-->
<div slot="label" class="labelClass"> <!-- <div slot="label" class="labelClass">-->
<div class="labelName">备注</div> <!-- <div class="labelName">备注</div>-->
<div class="labelName">Remarks</div> <!-- <div class="labelName">Remarks</div>-->
</div> <!-- </div>-->
<el-input v-model="form.remarks" type="textarea" placeholder="请输入内容" /> <!-- <el-input v-model="form.remarks" type="textarea" placeholder="请输入内容" />-->
</el-form-item> <!-- </el-form-item>-->
</el-col> <!-- </el-col>-->
</el-row> <!-- </el-row>-->
</el-form> </el-form>
<div slot="footer" class="dialog-footer"> <div slot="footer" class="dialog-footer">
<el-button @click="cancel">取 消</el-button> <el-button @click="cancel">取 消</el-button>
<el-button type="primary" @click="submitForm">确 定</el-button> <el-button type="danger" class="redBtn" @click="submitForm">确 定</el-button>
</div> </div>
</el-dialog> </el-dialog>
<!-- 用户导入对话框 --> <!-- 用户导入对话框 -->
...@@ -720,16 +720,16 @@ export default { ...@@ -720,16 +720,16 @@ export default {
{ required: true, message: '请输入密码', trigger: 'blur' }, { required: true, message: '请输入密码', trigger: 'blur' },
{ min: 8, max: 16, message: '长度在 8 到 16 个字符', trigger: 'blur' }, { min: 8, max: 16, message: '长度在 8 到 16 个字符', trigger: 'blur' },
{ validator: passwordCheck, trigger: 'blur' } { validator: passwordCheck, trigger: 'blur' }
],
phone: [
{ required: true, message: '请输入手机号码', trigger: 'blur' },
{
pattern: /^1[3|4|5|6|7|8|9][0-9]\d{8}$/,
message: '请输入正确的手机号码',
trigger: 'blur'
},
{ validator: phone, trigger: 'blur' }
] ]
// phone: [
// { required: true, message: '请输入手机号码', trigger: 'blur' },
// {
// pattern: /^1[3|4|5|6|7|8|9][0-9]\d{8}$/,
// message: '请输入正确的手机号码',
// trigger: 'blur'
// },
// { validator: phone, trigger: 'blur' }
// ]
// idNumber: [ // idNumber: [
// { required: true, message: '请输入身份证号', trigger: 'blur' }, // { required: true, message: '请输入身份证号', trigger: 'blur' },
// { min: 18, max: 18, message: '长度18字符', trigger: 'blur' }, // { min: 18, max: 18, message: '长度18字符', trigger: 'blur' },
......
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