Skip to content

N
NLT-e-cigarette
Commit db6b361f authored by 11528's avatar 11528
Browse files
Options

Merge remote-tracking branch 'origin/master' into master

parents cdadb140 7f66d60d
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 289 additions and 302 deletions
src/layout/components/header.vue
View file @ db6b361f
......@@ -117,7 +117,7 @@ export default {
<style lang="scss" scoped>
.navbar {
height: 6.4vh;
height: 50px;
overflow: hidden;
position: relative;
background: #D20A10;
......
src/styles/element-ui.scss
View file @ db6b361f
......@@ -118,16 +118,31 @@ body .el-table th.gutter{
.redBtn{
border-color: #D20A10;
background-color: #D20A10;
&:hover {
border-color: #D20A10!important;
background-color: #D20A10!important;
color: white!important;
}
}
// 按钮默认颜色(黑)
.blackBtn{
border-color: #2C333A;
background-color: #2C333A;
&:hover {
border-color: #2C333A!important;
background-color: #2C333A!important;
color: white!important;
}
}
// 重置按钮颜色
.resetBtn{
border-color: #D20A10;
color: #D20A10;
&:hover {
border-color: #D20A10!important;
background-color: white!important;
color: #D20A10!important;
}
}
// 表格操作删除颜色
.deleteLink {
......
src/views/system/dept/index.vue
View file @ db6b361f
......@@ -143,24 +143,10 @@
<el-link
v-hasPermi="['sys:dept:update']"
size="mini"
type="primary"
type="success"
style="margin-left: 10px"
@click="handleUpdate(scope.row)"
>修改</el-link>
<!-- <el-switch-->
<!-- v-model="scope.row.flag"-->
<!-- v-hasPermi="['system:dept:toggle']"-->
<!-- active-value="0"-->
<!-- inactive-value="1"-->
<!-- @change="handleStatusChange(scope.row)"-->
<!-- />-->
<el-button
v-hasPermi="['sys:dept:add']"
size="mini"
type="text"
style="margin-left: 10px"
@click="handleAdd(scope.row)"
>新增</el-button>
<el-link
v-if="scope.row.parentId !== 0"
v-hasPermi="['sys:dept:delete']"
......@@ -169,6 +155,13 @@
style="margin-left: 10px"
@click="handleDelete(scope.row)"
>删除</el-link>
<el-link
v-hasPermi="['sys:dept:add']"
size="mini"
type="primary"
style="margin-left: 10px"
@click="handleAdd(scope.row)"
>新增</el-link>
</template>
</el-table-column>
</el-table>
......@@ -222,24 +215,24 @@
<el-input v-model.trim="form.leader" placeholder="请输入负责人" maxlength="20" />
</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-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-form-item class="labelHeight" label="部门状态">
<div slot="label" class="labelClass">
......@@ -267,7 +260,7 @@
</el-form>
<div slot="footer" class="dialog-footer">
<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>
</el-dialog>
</div>
......@@ -413,7 +406,7 @@ export default {
leader: undefined,
phone: undefined,
email: undefined,
flag: '0'
flag: '1'
}
this.resetForm('form')
},
......@@ -517,6 +510,7 @@ export default {
<style lang="scss">
.app-container {
.deptSearch{
padding-left: 10px;
.el-form-item--small .el-form-item__label{
line-height: 17px;
}
......
src/views/system/device/index.vue
View file @ db6b361f
......@@ -125,20 +125,20 @@
<div>Operation</div>
</template>
<template slot-scope="scope">
<el-button
<el-link
v-hasPermi="['sys:device:update']"
size="mini"
type="text"
style="color: #49cec9"
type="primary"
style="margin-left: 10px"
@click="handleUpdate(scope.row)"
>修改</el-button>
<el-button
>修改</el-link>
<el-link
v-hasPermi="['sys:device:delete']"
size="mini"
type="text"
class="deleteLink"
type="danger"
style="margin-left: 10px"
@click="handleDelete(scope.row)"
>删除</el-button>
>删除</el-link>
</template>
</el-table-column>
</el-table>
......@@ -161,7 +161,7 @@
<div class="labelName">Equipment</div>
<div class="labelName">Name</div>
</div>
<el-input v-model.trim="form.deviceName" placeholder="请输入设备名称" />
<el-input :maxlength="30" v-model.trim="form.deviceName" placeholder="请输入设备名称" />
</el-form-item>
</el-col>
<el-col :span="12">
......@@ -187,14 +187,14 @@
<div class="labelName">Equipment</div>
<div class="labelName">Number</div>
</div>
<el-input v-model.trim="form.deviceCode" placeholder="请输入设备编号" />
<el-input :maxlength="30" v-model.trim="form.deviceCode" placeholder="请输入设备编号" />
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item class="labelHeight" label="工站" prop="staId">
<div slot="label" class="labelClassRequired">
<div class="labelName">设备类型</div>
<div class="labelName">Equipment Type</div>
<div class="labelName">工站</div>
<div class="labelName">Position</div>
</div>
<el-select v-model="form.staId" placeholder="请选择工站" clearable size="small">
<el-option
......@@ -224,7 +224,7 @@
<div class="labelName">备注</div>
<div class="labelName">PS</div>
</div>
<el-input v-model.trim="form.remarks" type="textarea" :row="3" placeholder="请输入备注" />
<el-input maxlength="400" show-word-limit v-model.trim="form.remarks" type="textarea" :row="3" placeholder="请输入备注" />
</el-form-item>
</el-col>
</el-row>
......@@ -289,9 +289,10 @@ export default {
open: false,
// 表格数据
deviceList: [],
// 表格总条数
total: 0,
// 加载遮罩
Loading: false,
Loading: true,
// 表单参数
form: {},
// 表单验证
......@@ -332,11 +333,11 @@ export default {
methods: {
/** 查询设备表方法 **/
getDevTable() {
this.loading = true
this.Loading = true
listDevice(this.queryParams).then(response => {
this.deviceList = response.rows
this.total = response.total
this.loading = false
this.Loading = false
})
},
/** 查询按钮方法 **/
......
src/views/system/dict/data.vue
View file @ db6b361f
......@@ -5,7 +5,7 @@
<el-form-item label="字典名称" prop="dictType">
<div slot="label" class="labelClass">
<div>字典名称</div>
<div>DictName</div>
<div>Dict Name</div>
</div>
<el-select v-model="queryParams.dictType" placeholder="请选择字典名称" clearable size="small">
<el-option
......@@ -19,7 +19,7 @@
<el-form-item label="字典标签" prop="dictLabel">
<div slot="label" class="labelClass">
<div>字典标签</div>
<div>DictLabel</div>
<div>Dict Label</div>
</div>
<el-input
v-model="queryParams.dictLabel"
......@@ -97,13 +97,13 @@
<el-table-column label="字典编码" align="center" prop="businessId">
<template slot="header">
<div>字典编码</div>
<div>DataNumber</div>
<div>Data Number</div>
</template>
</el-table-column>
<el-table-column align="center" :show-overflow-tooltip="true" label="字典标签" prop="dictLabel">
<template slot="header">
<div>字典标签</div>
<div>DataLabel</div>
<div>Data Label</div>
</template>
<template slot-scope="scope">
{{ scope.row.dictLabel || '-' }}
......@@ -112,7 +112,7 @@
<el-table-column align="center" :show-overflow-tooltip="true" label="字典键值" prop="dictValue">
<template slot="header">
<div>字典键值</div>
<div>DataKeyValue</div>
<div>Data Key Value</div>
</template>
<template slot-scope="scope">
{{ scope.row.dictValue || '-' }}
......@@ -121,7 +121,7 @@
<el-table-column align="center" :show-overflow-tooltip="true" label="字典排序" prop="dictSort">
<template slot="header">
<div>字典排序</div>
<div>DataSort</div>
<div>Data Sort</div>
</template>
<template slot-scope="scope">
{{ isNaN(scope.row.dictSort) ? '-' : scope.row.dictSort }}
......@@ -154,7 +154,7 @@
<el-table-column align="center" :show-overflow-tooltip="true" label="创建时间" prop="createDate">
<template slot="header">
<div>创建时间</div>
<div>BuildTime</div>
<div>Build Time</div>
</template>
<template slot-scope="scope">
<span>{{ scope.row.createDate | transformDateByFormat('YYYY-MM-DD HH:mm') }}</span>
......@@ -254,8 +254,8 @@
</el-form-item>
</el-form>
<div slot="footer" class="dialog-footer">
<el-button type="primary" @click="submitForm">确 定</el-button>
<el-button @click="cancel">取 消</el-button>
<el-button type="danger" class="redBtn" @click="submitForm">确 定</el-button>
</div>
</el-dialog>
</div>
......
src/views/system/dict/index.vue
View file @ db6b361f
......@@ -2,76 +2,82 @@
<div class="app-container-dict">
<div class="dictSearch">
<el-form ref="queryForm" style="padding: 0 0 0 10px" :model="queryParams" :inline="true" label-width="auto">
<el-form-item label="字典名称" prop="dictName">
<div slot="label" class="labelClass">
<div>字典名称</div>
<div>Dict Name</div>
</div>
<el-input
v-model="queryParams.dictName"
placeholder="请输入字典名称"
clearable
:maxlength="30"
size="small"
style="width: 200px"
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item label="字典类型" prop="dictType">
<div slot="label" class="labelClass">
<div>字典类型</div>
<div>Dict Type</div>
</div>
<el-input
v-model="queryParams.dictType"
placeholder="请输入字典类型"
clearable
:maxlength="30"
size="small"
style="width: 200px"
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item label="状态" prop="flag">
<div slot="label" class="labelClass">
<div>状态</div>
<div>Status</div>
</div>
<el-select
v-model="queryParams.flag"
placeholder="字典状态"
clearable
size="small"
style="width: 200px"
>
<el-option
v-for="dict in statusOptions"
:key="dict.dictValue"
:label="dict.dictLabel"
:value="dict.dictValue"
/>
</el-select>
</el-form-item>
<el-form-item label="创建时间">
<div slot="label" class="labelClass">
<div>创建时间</div>
<div>Build Time</div>
</div>
<el-date-picker
v-model="dateRange"
size="small"
style="width: 200px"
value-format="yyyy-MM-dd"
type="daterange"
range-separator="-"
start-placeholder="开始日期"
end-placeholder="结束日期"
/>
</el-form-item>
<el-form-item>
<el-button class="redBtn" type="danger" size="small" @click="handleQuery">查询 Query</el-button>
<el-button class="resetBtn" size="small" @click="resetQuery">重置 Reset</el-button>
</el-form-item>
<el-row>
<el-col :span="18">
<el-form-item label="字典名称" prop="dictName">
<div slot="label" class="labelClass">
<div>字典名称</div>
<div>Dict Name</div>
</div>
<el-input
v-model="queryParams.dictName"
placeholder="请输入字典名称"
clearable
:maxlength="30"
size="small"
style="width: 200px"
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item label="字典类型" prop="dictType">
<div slot="label" class="labelClass">
<div>字典类型</div>
<div>Dict Type</div>
</div>
<el-input
v-model="queryParams.dictType"
placeholder="请输入字典类型"
clearable
:maxlength="30"
size="small"
style="width: 200px"
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item label="状态" prop="flag">
<div slot="label" class="labelClass">
<div>状态</div>
<div>Status</div>
</div>
<el-select
v-model="queryParams.flag"
placeholder="字典状态"
clearable
size="small"
style="width: 200px"
>
<el-option
v-for="dict in statusOptions"
:key="dict.dictValue"
:label="dict.dictLabel"
:value="dict.dictValue"
/>
</el-select>
</el-form-item>
<el-form-item label="创建时间">
<div slot="label" class="labelClass">
<div>创建时间</div>
<div>Build Time</div>
</div>
<el-date-picker
v-model="dateRange"
size="small"
style="width: 300px"
value-format="yyyy-MM-dd"
type="daterange"
range-separator="-"
start-placeholder="开始日期"
end-placeholder="结束日期"
/>
</el-form-item>
</el-col>
<el-col :span="6">
<el-form-item style="float: right">
<el-button class="redBtn" type="danger" size="small" @click="handleQuery">查询 Query</el-button>
<el-button class="resetBtn" size="small" @click="resetQuery">重置 Reset</el-button>
</el-form-item>
</el-col>
</el-row>
<el-row :gutter="10" class="mb8">
<right-toolbar :show-search.sync="showSearch" @queryTable="getList" />
</el-row>
......@@ -87,22 +93,22 @@
size="small"
@click="handleAdd"
>新增 Add</el-button>
<!-- <el-button-->
<!-- v-hasPermi="['sys:dict:update']"-->
<!-- type="success"-->
<!-- size="mini"-->
<!-- :disabled="single"-->
<!-- @click="handleUpdate"-->
<!-- >修改 Update-->
<!-- </el-button>-->
<!-- <el-button-->
<!-- v-hasPermi="['sys:dict:delete']"-->
<!-- type="danger"-->
<!-- size="mini"-->
<!-- :disabled="multiple"-->
<!-- @click="handleDelete"-->
<!-- >删除 Delete-->
<!-- </el-button>-->
<!-- <el-button-->
<!-- v-hasPermi="['sys:dict:update']"-->
<!-- type="success"-->
<!-- size="mini"-->
<!-- :disabled="single"-->
<!-- @click="handleUpdate"-->
<!-- >修改 Update-->
<!-- </el-button>-->
<!-- <el-button-->
<!-- v-hasPermi="['sys:dict:delete']"-->
<!-- type="danger"-->
<!-- size="mini"-->
<!-- :disabled="multiple"-->
<!-- @click="handleDelete"-->
<!-- >删除 Delete-->
<!-- </el-button>-->
<!-- <el-button-->
<!-- v-hasPermi="['sys:dict:export']"-->
<!-- type="success"-->
......@@ -112,7 +118,7 @@
</div>
<div class="mb12 font-small-bold" style="margin: 0 0 12px 0;font-size: 14px">字典管理列表</div>
<el-table v-loading="loading" border :data="typeList" @selection-change="handleSelectionChange">
<!-- <el-table-column type="selection" width="55" align="center" />-->
<!-- <el-table-column type="selection" width="55" align="center" />-->
<el-table-column align="center" prop="businessId">
<template slot="header">
<div>字典编号</div>
......@@ -279,8 +285,8 @@
</el-form-item>
</el-form>
<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 type="danger" class="redBtn" :loading="manageLoading" :disabled="manageLoading" @click="submitForm">确 定</el-button>
</div>
</el-dialog>
</div>
......
src/views/system/menu/index.vue
View file @ db6b361f
......@@ -332,7 +332,7 @@
</el-form>
<div slot="footer" class="dialog-footer">
<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>
</el-dialog>
</div>
......@@ -450,12 +450,12 @@ export default {
} else {
this.getList()
}
this.getDicts(dictCons['SHOW_HIDE']).then(response => {
this.visibleOptions = response.data
})
this.getDicts(dictCons['NORMAL_DISABLE']).then(response => {
this.statusOptions = response.data
})
// this.getDicts(dictCons['SHOW_HIDE']).then(response => {
// this.visibleOptions = response.data
// })
// this.getDicts(dictCons['NORMAL_DISABLE']).then(response => {
// this.statusOptions = response.data
// })
},
methods: {
// 选择图标
......
src/views/system/role/index.vue
View file @ db6b361f
......@@ -31,26 +31,26 @@
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item label="角色状态" prop="flag">
<div slot="label" class="labelClass">
<div>角色状态</div>
<div>Role Status</div>
</div>
<el-select
v-model="queryParams.flag"
placeholder="请选择角色状态"
clearable
size="small"
style="width: 150px"
>
<el-option
v-for="dict in statusOptions"
:key="dict.dictValue"
:label="dict.dictLabel"
:value="dict.dictValue"
/>
</el-select>
</el-form-item>
<!-- <el-form-item label="角色状态" prop="flag">-->
<!-- <div slot="label" class="labelClass">-->
<!-- <div>角色状态</div>-->
<!-- <div>Role Status</div>-->
<!-- </div>-->
<!-- <el-select-->
<!-- v-model="queryParams.flag"-->
<!-- placeholder="请选择角色状态"-->
<!-- clearable-->
<!-- size="small"-->
<!-- style="width: 150px"-->
<!-- >-->
<!-- <el-option-->
<!-- v-for="dict in statusOptions"-->
<!-- :key="dict.dictValue"-->
<!-- :label="dict.dictLabel"-->
<!-- :value="dict.dictValue"-->
<!-- />-->
<!-- </el-select>-->
<!-- </el-form-item>-->
<el-form-item>
<el-button class="redBtn" type="danger" size="small" @click="handleQuery">查询 Query</el-button>
<el-button class="resetBtn" size="small" @click="resetQuery">重置 Reset</el-button>
......@@ -239,7 +239,7 @@
</el-form>
<div slot="footer" class="dialog-footer">
<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>
</el-dialog>
......
src/views/system/user/index.vue
View file @ db6b361f
This diff is collapsed.
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