Skip to content

N
NLT-e-cigarette
Commit 73789aa0 authored by 张伯涛's avatar 张伯涛
Browse files
Options

修改

parent 31326375
Hide whitespace changes
Inline Side-by-side
Showing with 240 additions and 221 deletions
public/index.html
View file @ 73789aa0
......@@ -4,7 +4,7 @@
<meta charset="utf-8">
<meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
<meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1, user-scalable=no">
<link rel="icon" href="<%= BASE_URL %>home_logo.png">
<link rel="icon" href="<%= BASE_URL %>liulan_logo2.png">
<link rel="stylesheet" href="//at.alicdn.com/t/font_2011217_f70ptj9y4oc.css">
<!-- <title><%= webpackConfig.name %></title>-->
<title>电子加热器追溯平台系统</title>
......
src/layout/components/Sidebar/Logo.vue
View file @ 73789aa0
<template>
<div class="sidebar-logo-container" :class="{'collapse':collapse}">
<transition name="sidebarLogoFade">
<router-link v-if="collapse" key="collapse" class="sidebar-logo-link" to="/">
<div v-if="collapse" key="collapse" class="sidebar-logo-link">
<img v-if="logo" :src="logo" class="sidebar-logo">
<h1 v-else class="sidebar-title">{{ title }} </h1>
</router-link>
<router-link v-else key="expand" class="sidebar-logo-link" to="/">
</div>
<div v-else key="expand" class="sidebar-logo-link">
<img v-if="logo" :src="logo" class="sidebar-logo">
<h1 class="sidebar-title">{{ title }} </h1>
</router-link>
</div>
</transition>
</div>
</template>
......@@ -25,8 +25,7 @@ export default {
data() {
return {
title: '诺兰特（北京）',
logo: ''
// logo: require('@/assets/image/NLT.png')
logo: require('@/assets/image/loginLogo.png')
}
}
}
......@@ -57,8 +56,8 @@ export default {
width: 100%;
& .sidebar-logo {
width: 32px;
height: 32px;
width: 67px;
height: 36px;
vertical-align: middle;
margin-right: 12px;
}
......
src/router/index.js
View file @ 73789aa0
......@@ -35,7 +35,7 @@ import LayoutLogin from '@/layoutLogin'
export const constantRoutes = [
{
path: '/',
redirect: '/login',
redirect: '/homePage/index',
hidden: true
},
{
......
src/views/homePage.vue
View file @ 73789aa0
......@@ -5,7 +5,7 @@
<el-col :span="8">
<el-card class="box-card">
<div v-for="(item, index) in productionList" :key="index" class="topChild">
<img :src="item.icon" class="sidebar-logo">
<img :src="item.icon" class="logoClass">
<div class="cardLabel">
<div>{{ item.name }}</div>
<div>{{ item.count }}</div>
......@@ -15,8 +15,8 @@
</el-col>
<el-col :span="8">
<el-card class="box-card">
<div v-for="(item, index) in productionList" :key="index" class="topChild">
<img :src="item.icon" class="sidebar-logo">
<div v-for="(item, index) in productionList2" :key="index" class="topChild">
<img :src="item.icon" class="logoClass">
<div class="cardLabel">
<div>{{ item.name }}</div>
<div>{{ item.count }}</div>
......@@ -70,10 +70,16 @@ export default {
data() {
return {
productionList: [
{ icon: require('@/assets/image/logo.png'), name: '完成订单数', count: '10' },
{ icon: require('@/assets/image/logo.png'), name: '生产工单数', count: '15' },
{ icon: require('@/assets/image/logo.png'), name: '开工工单数', count: '15' },
{ icon: require('@/assets/image/logo.png'), name: '完工工单数', count: '15' }
{ icon: require('@/assets/image/proCount.png'), name: '完成订单数', count: '10' },
{ icon: require('@/assets/image/starCount.png'), name: '生产工单数', count: '15' },
{ icon: require('@/assets/image/homeLoge3.png'), name: '开工工单数', count: '15' },
{ icon: require('@/assets/image/homeLoge4.png'), name: '完工工单数', count: '15' }
],
productionList2: [
{ icon: require('@/assets/image/planeCount.png'), name: '计划数量', count: '1000' },
{ icon: require('@/assets/image/completeCount.png'), name: '完成数量', count: '819' },
{ icon: require('@/assets/image/completeRate.png'), name: '完工率', count: '81.9%' },
{ icon: require('@/assets/image/qualifiedRate.png'), name: '合格率', count: '97.3%' }
],
planList: []
}
......@@ -406,6 +412,9 @@ export default {
width:160px;
padding: 15px;
display:inline-flex;
.logoClass{
width: 40px;
}
.cardLabel{
padding-left: 10px;
text-align: center;
......
src/views/navigation.vue 0 → 100644
View file @ 73789aa0
<template>
<router-view></router-view>
</template>
<script>
export default {
name: 'Navigation'
}
</script>
src/views/system/dept/index.vue
View file @ 73789aa0
......@@ -27,108 +27,112 @@
size="small"
@click="getList"
>查询</el-button>
<el-button type="primary" size="small" @click="resetQuery">重置</el-button>
</el-form-item>
</el-form>
<div class="placeholder" />
<div style="padding:10px">
<div style="float: right;position: relative;bottom: 10px">
<el-button
class="filter-item"
type="primary"
size="small"
@click="handleAdd"
>新增</el-button>
<!-- <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>-->
</el-form-item>
</el-form>
<el-table
v-loading="Loading"
:data="deptList"
row-key="businessId"
default-expand-all
:tree-props="{children: 'children', hasChildren: 'hasChildren'}"
>
<!-- <el-table-column-->
<!-- label="序号"-->
<!-- type="index"-->
<!-- width="50">-->
<!-- </el-table-column>-->
<!-- <el-table-column-->
<!-- label="部门编号">-->
<!-- <template v-slot:default="scope">-->
<!-- {{ scope.row.businessId }}-->
<!-- </template>-->
<!-- </el-table-column>-->
<el-table-column :show-overflow-tooltip="true" prop="deptName" label="部门名称" width="260" />
<el-table-column :show-overflow-tooltip="true" prop="orderNum" label="排序" width="200" />
<el-table-column label="状态" align="center" width="100">
<template slot-scope="scope">
<el-switch
v-model="scope.row.flag"
active-value="1"
inactive-value="0"
@change="handleStatusChange(scope.row)"
/>
</template>
</el-table-column>
<el-table-column :show-overflow-tooltip="true" label="创建时间" align="center" prop="createDate" width="200">
<template slot-scope="scope">
<span>{{ scope.row.createDate | transformDateByFormat('YYYY-MM-DD HH:mm') }}</span>
</template>
</el-table-column>
<el-table-column label="操作" align="center" class-name="small-padding fixed-width">
<!-- <template slot-scope="scope">-->
<!-- <el-button-->
<!-- v-hasPermi="['system:dept:edit']"-->
<!-- size="mini"-->
<!-- type="text"-->
<!-- icon="el-icon-edit"-->
<!-- @click="handleUpdate(scope.row)"-->
<!-- >修改</el-button>-->
<!-- <el-button-->
<!-- v-hasPermi="['system:dept:add']"-->
<!-- size="mini"-->
<!-- type="text"-->
<!-- icon="el-icon-plus"-->
<!-- @click="handleAdd(scope.row)"-->
<!-- >新增</el-button>-->
<!-- <el-button-->
<!-- v-if="scope.row.parentId != 0"-->
<!-- v-hasPermi="['system:dept:remove']"-->
<!-- size="mini"-->
<!-- type="text"-->
<!-- icon="el-icon-delete"-->
<!-- @click="handleDelete(scope.row)"-->
<!-- >删除</el-button>-->
</div>
<div class="mb12 font-small-bold">部门管理列表</div>
<el-table
v-loading="Loading"
:data="deptList"
row-key="businessId"
default-expand-all
:tree-props="{children: 'children', hasChildren: 'hasChildren'}"
>
<!-- <el-table-column-->
<!-- label="序号"-->
<!-- type="index"-->
<!-- width="50">-->
<!-- </el-table-column>-->
<!-- <el-table-column-->
<!-- label="部门编号">-->
<!-- <template v-slot:default="scope">-->
<!-- {{ scope.row.businessId }}-->
<!-- </template>-->
<template slot-scope="scope">
<el-button
v-hasPermi="['sys:dept:update']"
size="mini"
type="text"
style="color: #49cec9"
@click="handleUpdate(scope.row)"
>修改</el-button>
<!-- <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"
@click="handleAdd(scope.row)"
>新增</el-button>
<el-button
v-if="scope.row.parentId !== 0"
v-hasPermi="['sys:dept:delete']"
size="mini"
type="text"
@click="handleDelete(scope.row)"
>删除</el-button>
</template>
</el-table-column>
</el-table>
<!-- </el-table-column>-->
<el-table-column :show-overflow-tooltip="true" prop="deptName" label="部门名称" width="260" />
<el-table-column :show-overflow-tooltip="true" prop="orderNum" label="排序" width="200" />
<el-table-column label="状态" align="center" width="100">
<template slot-scope="scope">
<el-switch
v-model="scope.row.flag"
active-value="1"
inactive-value="0"
@change="handleStatusChange(scope.row)"
/>
</template>
</el-table-column>
<el-table-column :show-overflow-tooltip="true" label="创建时间" align="center" prop="createDate" width="200">
<template slot-scope="scope">
<span>{{ scope.row.createDate | transformDateByFormat('YYYY-MM-DD HH:mm') }}</span>
</template>
</el-table-column>
<el-table-column label="操作" align="center" class-name="small-padding fixed-width">
<!-- <template slot-scope="scope">-->
<!-- <el-button-->
<!-- v-hasPermi="['system:dept:edit']"-->
<!-- size="mini"-->
<!-- type="text"-->
<!-- icon="el-icon-edit"-->
<!-- @click="handleUpdate(scope.row)"-->
<!-- >修改</el-button>-->
<!-- <el-button-->
<!-- v-hasPermi="['system:dept:add']"-->
<!-- size="mini"-->
<!-- type="text"-->
<!-- icon="el-icon-plus"-->
<!-- @click="handleAdd(scope.row)"-->
<!-- >新增</el-button>-->
<!-- <el-button-->
<!-- v-if="scope.row.parentId != 0"-->
<!-- v-hasPermi="['system:dept:remove']"-->
<!-- size="mini"-->
<!-- type="text"-->
<!-- icon="el-icon-delete"-->
<!-- @click="handleDelete(scope.row)"-->
<!-- >删除</el-button>-->
<!-- </template>-->
<template slot-scope="scope">
<el-button
v-hasPermi="['sys:dept:update']"
size="mini"
type="text"
style="color: #49cec9"
@click="handleUpdate(scope.row)"
>修改</el-button>
<!-- <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"
@click="handleAdd(scope.row)"
>新增</el-button>
<el-button
v-if="scope.row.parentId !== 0"
v-hasPermi="['sys:dept:delete']"
size="mini"
type="text"
@click="handleDelete(scope.row)"
>删除</el-button>
</template>
</el-table-column>
</el-table>
</div>
<!-- 添加或修改部门对话框 -->
<el-dialog title="部门信息" :visible.sync="open" width="600px" append-to-body>
<el-form ref="form" :model="form" :rules="rules" label-width="80px">
......@@ -138,7 +142,7 @@
<treeselect v-model="form.parentId" :options="deptOptions" :normalizer="normalizer" placeholder="选择上级部门" />
</el-form-item>
</el-col>
<el-col :span="12">
<el-col :span="24">
<el-form-item label="部门名称" prop="deptName">
<el-input v-model.trim="form.deptName" placeholder="请输入部门名称" />
</el-form-item>
......@@ -429,3 +433,27 @@ export default {
}
}
</script>
<style lang="scss" scoped>
.app-container {
font-size: 18px;
padding: 0;
.placeholder{
height:1.3vh;
background-color: #F4F4F4;
margin-bottom:10px
}
.table-drop{
vertical-align: 2px;
line-height: 20px;
margin-left: 15px
}
.el-switch{
margin-left: 15px;
}
.icon-list {
div {
white-space: nowrap;
}
}
}
</style>
src/views/system/dict/index.vue
View file @ 73789aa0
......@@ -52,56 +52,46 @@
/>
</el-form-item>
<el-form-item>
<el-button type="primary" icon="el-icon-search" size="small" @click="handleQuery">搜索</el-button>
<el-button icon="el-icon-refresh" size="small" @click="resetQuery">重置</el-button>
<el-button type="primary" size="small" @click="handleQuery">搜索</el-button>
<el-button type="primary" size="small" @click="resetQuery">重置</el-button>
</el-form-item>
<el-row :gutter="10" class="mb8">
<el-col :span="1.5">
<el-button
v-hasPermi="['sys:dict:add']"
type="primary"
icon="el-icon-plus"
size="small"
@click="handleAdd"
>新增</el-button>
</el-col>
<el-col :span="1.5">
<el-button
v-hasPermi="['sys:dict:update']"
type="success"
icon="el-icon-edit"
size="mini"
:disabled="single"
@click="handleUpdate"
>修改
</el-button>
</el-col>
<el-col :span="1.5">
<el-button
v-hasPermi="['sys:dict:delete']"
type="danger"
icon="el-icon-delete"
size="mini"
:disabled="multiple"
@click="handleDelete"
>删除
</el-button>
</el-col>
<el-col :span="1.5">
<el-button
v-hasPermi="['sys:dict:export']"
type="success"
icon="el-icon-download"
size="small"
@click="handleExport"
>导出</el-button>
</el-col>
<right-toolbar :show-search.sync="showSearch" @queryTable="getList" />
</el-row>
</el-form>
<div class="placeholder" />
<div style="min-height: 445px;padding:10px">
<h5 style="margin: 0 0 12px 0;font-size: 14px">字典管理列表</h5>
<div style="float: right;position: relative;bottom: 10px">
<el-button
v-hasPermi="['sys:dict:add']"
type="primary"
size="small"
@click="handleAdd"
>新增</el-button>
<el-button
v-hasPermi="['sys:dict:update']"
type="success"
size="mini"
:disabled="single"
@click="handleUpdate"
>修改
</el-button>
<el-button
v-hasPermi="['sys:dict:delete']"
type="danger"
size="mini"
:disabled="multiple"
@click="handleDelete"
>删除
</el-button>
<el-button
v-hasPermi="['sys:dict:export']"
type="success"
size="small"
@click="handleExport"
>导出</el-button>
</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 label="字典编号" align="center" prop="businessId" />
......@@ -580,10 +570,7 @@ export default {
.el-form {
padding: 0 0 0 10px;
.el-form-item {
margin-top: 0;
margin-left: 0;
margin-bottom: 15px;
margin-right: 10px;
margin: 0 10px 15px 0;
}
}
}
......
src/views/system/menu/index.vue
View file @ 73789aa0
......@@ -13,16 +13,14 @@
</el-form-item>
<el-form-item>
<el-button v-hasPermi="['sys:menu:query']" type="primary" size="small" @click="handleQuery">查询</el-button>
<el-button type="primary" size="small" @click="resetQuery">重置</el-button>
</el-form-item>
<div style="float: right">
<el-form-item>
<el-button v-hasPermi="['sys:menu:add']" type="primary" size="small" @click="handleAdd">新增</el-button>
<!-- <el-button size="small" @click="resetQuery">重置</el-button>-->
</el-form-item>
</div>
</el-form>
<div class="placeholder" />
<div style="padding:10px">
<div style="float: right;position: relative;bottom: 10px">
<el-button v-hasPermi="['sys:menu:add']" type="primary" size="small" @click="handleAdd">新增</el-button>
</div>
<div class="mb12 font-small-bold">菜单管理列表</div>
<el-table
v-loading="loading"
......
src/views/system/role/index.vue
View file @ 73789aa0
......@@ -40,29 +40,26 @@
</el-form-item>
<el-form-item>
<el-button type="primary" size="small" @click="handleQuery">查询</el-button>
<el-button type="primary" size="small" @click="resetQuery">重置</el-button>
</el-form-item>
<div style="float: right">
<el-form-item>
<el-button
v-hasPermi="['sys:role:add']"
type="primary"
size="small"
@click="handleAdd"
>新增</el-button>
<el-button
v-hasPermi="['sys:role:export']"
style="padding: 8px 7px;"
type="success"
size="small"
icon="el-icon-download"
@click="handleExport"
>导出</el-button>
</el-form-item>
</div>
</el-form>
<div class="placeholder" />
<div class="placeholder" style="margin-bottom: 0!important;" />
<div style="float: right;margin: 10px">
<el-button
v-hasPermi="['sys:role:add']"
type="primary"
size="small"
@click="handleAdd"
>新增</el-button>
<el-button
v-hasPermi="['sys:role:export']"
type="success"
size="small"
@click="handleExport"
>导出</el-button>
</div>
<div style="padding:5px 10px">
<div class="mb12 font-small-bold">角色管理列表</div>
<div style="line-height: 35px" class="mb12 font-small-bold">角色管理列表</div>
<el-table v-loading="loading" border :data="roleList" @selection-change="handleSelectionChange">
<el-table-column type="index" label="序号" width="50" />
<el-table-column label="角色编号" prop="businessId">
......
src/views/system/user/index.vue
View file @ 73789aa0
......@@ -39,41 +39,8 @@
</el-select>
</el-form-item>
<el-form-item>
<el-button type="primary" style="padding: 8px 7px;" icon="el-icon-search" size="small" @click="handleQuery">查询</el-button>
<el-button type="primary" style="padding: 8px 7px;" icon="el-icon-refresh" size="small" @click="resetQuery">重置</el-button>
</el-form-item>
<el-form-item style="float: right">
<el-button
v-hasPermi="['sys:user:add']"
style="padding: 8px 7px;"
type="primary"
size="small"
icon="el-icon-plus"
@click="handleFormAdd"
>表单页新增模板</el-button>
<el-button
v-hasPermi="['sys:user:add']"
style="padding: 8px 7px;"
type="primary"
size="small"
icon="el-icon-plus"
@click="handleAdd"
>新增</el-button>
<el-button
style="padding: 8px 7px;"
type="warning"
icon="el-icon-upload"
size="small"
@click="handleImport"
>导入</el-button>
<el-button
v-hasPermi="['sys:user:export']"
style="padding: 8px 7px;"
type="success"
size="small"
icon="el-icon-download"
@click="handleExport"
>导出</el-button>
<el-button type="primary" size="small" @click="handleQuery">查询</el-button>
<el-button type="primary" size="small" @click="resetQuery">重置</el-button>
</el-form-item>
</el-form>
</div>
......@@ -110,6 +77,32 @@
</el-col>
<!--用户数据-->
<el-col :span="20" :xs="24">
<div style="float: right;margin: 10px">
<!-- <el-button-->
<!-- v-hasPermi="['sys:user:add']"-->
<!-- style="padding: 8px 7px;"-->
<!-- type="primary"-->
<!-- size="small"-->
<!-- @click="handleFormAdd"-->
<!-- >表单页新增模板</el-button>-->
<el-button
v-hasPermi="['sys:user:add']"
type="primary"
size="small"
@click="handleAdd"
>新增</el-button>
<el-button
type="warning"
size="small"
@click="handleImport"
>导入</el-button>
<el-button
v-hasPermi="['sys:user:export']"
type="success"
size="small"
@click="handleExport"
>导出</el-button>
</div>
<div class="mb12 font-small-bold" style="margin-top: 20px">用户管理列表</div>
<el-table
v-loading="loading"
......
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