fea(LED权限): 新增LED模块权限

config/index.js

@@ -13,9 +13,9 @@ module.exports = {
         // 代理后端服务器
         proxyTable: {
             '/host': {
-                // target: 'http://10.100.172.150:9108',  //设置你调用的接口域名和端口号 别忘了加http
+                target: 'http://10.100.172.150:9108',  //设置你调用的接口域名和端口号 别忘了加http
                 // target: 'http://192.168.43.244:8888', // 东伟服务器地址
-                target: 'http://192.168.0.126:8080', // 训浩服务器
+                // target: 'http://192.168.0.199:8080', // 训浩服务器
                 changeOrigin: true,
                 pathRewrite: {
                     '^/host': ''//这里理解成用‘/host’代替target里面的地址，后面组件中我们掉接口时直接用api代替 比如我要调用'http://40.00.100.100:3002/user/add'，直接写‘/api/user/add’即可

src/lang/zh/route.js

@@ -16,11 +16,6 @@ export default {
     Chassis: '底盘车间',
     Final: '总装车间',
     Trial: '试交车间',
-    // 化验室数据
-    Laboratory: '化验室数据',
-    Pickling: '酸化-磷化线槽液日常检测报告',
-    ElectrophoresisTank: '电泳槽液日常检测报告',
-    Pretreatment: '前处理槽液日常检测报告',
     // 设备运行时间
     DeviceRunning: '设备运行时间',
     DeviceRunningTime: '设备运行时间',
@@ -30,6 +25,14 @@ export default {
     WorkshopBasic: '车间基础数据',
     DeviceBasic: '设备基础数据',
     LaneBasic: '车道基础数据',
+    // 化验室报告
+    Laboratory: '化验室报告',
+    Pickling: '酸化-磷化线槽液日常检测报告',
+    ElectrophoresisTank: '电泳槽液日常检测报告',
+    Pretreatment: '前处理槽液日常检测报告',
+    // 涂装生产计划
+    ProductionPlan: '涂装生产计划',
+    ProductionPlanIndex: '涂装生产计划',
     // AVI大屏
     Monitor: 'AVI大屏',
     MonitorIndex: 'AVI大屏',

src/router/index.js

@@ -15,12 +15,14 @@ import Router from 'vue-router'
 import welcomeRouter from './modules/welcome'
 // 车间（设备数据）
 import workshopRouter from './modules/workshop'
-// 化验室数据
-import laboratoryRouter from './modules/laboratory'
 // 设备运行时间
 import deviceRunningTimeRouter from './modules/deviceRunning'
 // 基础数据
 import basicRouter from './modules/basic'
+// 化验室报告
+import laboratoryRouter from './modules/laboratory'
+// 涂装生产计划
+import productionPlanRouter from './modules/productionPlan'
 // AVI大屏
 import monitorRouter from './modules/monitor'
 // 监控大屏
@@ -103,9 +105,10 @@ export const constantRouterMap = [{
 export const asyncRouterMap = [
     welcomeRouter,
     workshopRouter,
-    laboratoryRouter,
     deviceRunningTimeRouter,
     basicRouter,
+    laboratoryRouter,
+    productionPlanRouter,
     monitorRouter,
     centerControl,
     systemRouter,

src/router/modules/laboratory.js

@@ -2,26 +2,26 @@ export default {
     path: '/laboratory',
     component: () => import('@/views/Layout'),
     redirect: '/laboratory/pickling',
-    meta: {title: 'Laboratory', icon: 'template'},
+    meta: {title: 'Laboratory', icon: 'deal'},
     alwaysShow: true,
     children: [
         {
             path: 'pickling',
             component: () => import('@/views/Laboratory/Pickling/list'),
             name: 'Pickling',
-            meta: { title: 'Pickling', icon: 'template', noCache: false }
+            meta: { title: 'Pickling', icon: 'deal', noCache: false }
         },
         {
             path: 'electrophoresisTank',
             component: () => import('@/views/Laboratory/ElectrophoresisTank/list'),
             name: 'ElectrophoresisTank',
-            meta: { title: 'ElectrophoresisTank', icon: 'template', noCache: false }
+            meta: { title: 'ElectrophoresisTank', icon: 'deal', noCache: false }
         },
         {
             path: 'pretreatment',
             component: () => import('@/views/Laboratory/Pretreatment/list'),
             name: 'Pretreatment',
-            meta: { title: 'Pretreatment', icon: 'template', noCache: false }
+            meta: { title: 'Pretreatment', icon: 'deal', noCache: false }
         }
     ]
 }

src/router/modules/productionPlan.js

+export default {
+    path: '/productionPlan',
+    component: () => import('@/views/Layout'),
+    redirect: '/productionPlan/index',
+    meta: { title: 'ProductionPlan', icon: 'edit' },
+    children: [
+        {
+            path: 'index',
+            component: () => import('@/views/ProductionPlan/index'),
+            name: 'ProductionPlanIndex',
+            meta: { title: 'ProductionPlanIndex', icon: 'edit' }
+        }
+    ]
+}

src/views/CenterControl/components/MachineOperatingStatus.vue

@@ -17,6 +17,7 @@
                 placeholder="结束时间">
             </el-date-picker>
             <el-button
+                class="ml-10"
                 @click="doConfirmClick()"
                 type="primary"
                 size="small">

src/views/CenterControl/components/MachineStateTrend.vue

@@ -17,6 +17,7 @@
                 placeholder="结束时间">
             </el-date-picker>
             <el-button
+                class="ml-10"
                 @click="doConfirmClick()"
                 type="primary"
                 size="small">

src/views/ProductionPlan/index.vue

+<template>
+    <div class="page-pack">
+        <div class="title-pack clear-float pl-15 pr-15">
+            <div class="float-left">
+                <span class="page-title-text">涂装生产计划</span>
+            </div>
+            <div class="float-right page-refresh">
+                <span @click="doRefreshClick" class="pointer">
+                    <svg-icon icon-class="refresh"></svg-icon>
+                    <span class="ml-10">刷新</span>
+                </span>
+            </div>
+        </div>
+        <div class="tool-pack clear-float pl-15 pr-15">
+            <Search
+                searchCode="SCADA_EQUIP_INFO"
+                @search="doSearchClick"
+                @reset="doResetClick">
+            </Search>
+            <div class="float-left">
+                <el-button
+                    size="small"
+                    type="primary"
+                    @click="doImportClick">
+                    导入
+                </el-button>
+            </div>
+        </div>
+    </div> 
+</template>
+
+<script>
+    import Table from '@/components/Table/index.vue'
+    import Search from '@/components/Search'
+
+    export default {
+        name: 'ProductionPlanIndex',
+        components: {
+            Table,
+            Search
+        },
+        data () {
+            return {
+                // 精准搜索关键字列表
+                searchList: {}
+            }
+        },
+        methods: {
+            // 点击刷新按钮
+            doRefreshClick () {},
+            // 点击搜索按钮
+            doSearchClick () {},
+            // 点击重置按钮
+            doResetClick () {},
+            // 点击导入按钮
+            doImportClick () {}
+        }
+    }
+</script>
+
+<style lang="scss" scoped>
+    .page-pack {
+        position: relative;
+        min-height: 100%;
+        width: 100%;
+        border: 1px solid #d2d3d5;
+        background-color: #fff;
+        overflow-y: auto;
+
+        .title-pack {
+            height: 38px;
+            line-height: 38px;
+            border-bottom: 1px solid #d2d3d5;
+        }
+
+        .tool-pack {
+            padding-top: 16px;
+            padding-bottom: 16px;
+            .tool-tag {
+                height: 32px;
+                line-height: 32px;
+                font-size: 14px;
+            }
+        }
+
+        .edit-button {
+            color: #538FFD;
+        }
+
+        .status-circle {
+            display: inline-block;
+            width: 6px;
+            height: 6px;
+            border-radius: 6px;
+            margin-right: 5px;
+            vertical-align: middle;
+        }
+        .delete-button {
+            color: #F47476;
+        }
+
+        .view-span {
+            color: #1284fa;
+            border-bottom: 1px solid #1284fa;
+            &:hover {
+                cursor: pointer;
+            }
+        }
+        .el-dialog__body {
+            padding: 30px 30px 10px 20px!important;
+            .el-row {
+
+                .el-col {
+                    line-height: 35px;
+
+                    .el-form-item {
+                        width: 100%;
+
+                        .el-form-item__content {
+                            width: 100%;
+
+                            .el-input {
+                                font-size: 12px;
+                                height: 32px;
+                            }
+                            .el-input__inner {
+                                height: 32px;
+                            }
+                            .el-select {
+                                width: 100%!important;
+                                font-size: 12px;
+                                height: 32px;
+                            }
+                            .el-date-editor {
+                                width: 100%!important;
+                            }
+                        }
+                    }
+                }
+            }
+        }
+    }
+</style>
\ No newline at end of file