Browse Source

调整logo

yhluo 2 months ago
parent
commit
a24be06e61

+ 2 - 1
src/assets/scss/indexpackage.scss

@@ -112,7 +112,8 @@
         top: 0;
         height: 50px;
         width: 50px;
-        background-color: #1a5cd7;
+        // background-color: #1a5cd7;
+        background-color: #a5d8ff;
         transform: skewX(-45deg);
       }
 

+ 9 - 21
src/assets/scss/indexquality.scss

@@ -62,8 +62,7 @@
     }
     .react-r-s,
     .react-l-s {
-      background-color: #a5d8ff;
-      color: #000;
+      background-color: #0f1325;
     }
 
     // 平行四边形
@@ -84,7 +83,7 @@
         top: 0;
         height: 50px;
         width: 50px;
-        background-color: #a5d8ff;
+        background-color: #0f1325;
         transform: skewX(45deg);
       }
 
@@ -100,13 +99,12 @@
         text-align: left;
       }
       font-size: 20px;
-      width: 30%;
+      width: 300px;
       height: 50px;
       line-height: 50px;
       text-align: center;
-      // transform: skewX(45deg);
-      background-color: #a5d8ff;
-      color: #000;
+      transform: skewX(45deg);
+      background-color: #0f1325;
 
       .react-left {
         position: absolute;
@@ -114,24 +112,14 @@
         top: 0;
         height: 50px;
         width: 50px;
-        background-color: #1a5cd7;
-        // transform: skewX(-45deg);
+        // background-color: #1a5cd7;
+        background-color: #a5d8ff;
+        transform: skewX(-45deg);
       }
 
       .text {
         display: inline-block;
-        // transform: skewX(-45deg);
-      }
-      position: relative;
-      ::after {
-        content: "";
-        position: absolute;
-        right: -59.5px;
-        top: 0;
-        height: 50px;
-        width: 60px;
-        background-color: #a5d8ff;
-        clip-path: polygon(0 0, 0 100%, 100% 100%);
+        transform: skewX(-45deg);
       }
     }
 

+ 9 - 22
src/assets/scss/indexsmt.scss

@@ -62,8 +62,7 @@
     }
     .react-r-s,
     .react-l-s {
-      background-color: #a5d8ff;
-      color: #000;
+      background-color: #0f1325;
     }
 
     // 平行四边形
@@ -84,7 +83,7 @@
         top: 0;
         height: 50px;
         width: 50px;
-        background-color: #a5d8ff;
+        background-color: #0f1325;
         transform: skewX(45deg);
       }
 
@@ -100,13 +99,12 @@
         text-align: left;
       }
       font-size: 20px;
-      width: 30%;
+      width: 300px;
       height: 50px;
       line-height: 50px;
       text-align: center;
-      // transform: skewX(45deg);
-      background-color: #a5d8ff;
-      color: #000;
+      transform: skewX(45deg);
+      background-color: #0f1325;
 
       .react-left {
         position: absolute;
@@ -114,25 +112,14 @@
         top: 0;
         height: 50px;
         width: 50px;
-        background-color: #1a5cd7;
-        // transform: skewX(-45deg);
+        // background-color: #1a5cd7;
+        background-color: #a5d8ff;
+        transform: skewX(-45deg);
       }
 
       .text {
         display: inline-block;
-        // transform: skewX(-45deg);
-      }
-
-      position: relative;
-      ::after {
-        content: "";
-        position: absolute;
-        right: -59.5px;
-        top: 0;
-        height: 50px;
-        width: 60px;
-        background-color: #a5d8ff;
-        clip-path: polygon(0 0, 0 100%, 100% 100%);
+        transform: skewX(-45deg);
       }
     }
 

+ 105 - 91
src/router/index.js

@@ -1,98 +1,112 @@
-import Vue from 'vue'
-import VueRouter from 'vue-router'
+import Vue from "vue";
+import VueRouter from "vue-router";
 
-Vue.use(VueRouter)
+Vue.use(VueRouter);
 
-const routes = [{
-  path: '/',
-  name: 'login',
-  component: () => import('../views/login.vue'),
-  meta: {
-    title: "登录",
-    requireAuth: true // 标识该路由是否需要登录
-  }
-},{
-  path: '/login',
-  name: 'login',
-  meta: {
-    title: '登录'
+const routes = [
+  {
+    path: "/",
+    name: "login",
+    component: () => import("../views/login.vue"),
+    meta: {
+      title: "登录",
+      requireAuth: true, // 标识该路由是否需要登录
+    },
+  },
+  {
+    path: "/login",
+    name: "login",
+    meta: {
+      title: "登录",
+    },
+    component: () => import("../views/login.vue"),
+  },
+  {
+    path: "/smt",
+    name: "smt",
+    component: () => import("../views/smt/index.vue"),
+    meta: {
+      title: "SMT",
+      requireAuth: true, // 标识该路由是否需要登录
+    },
   },
-  component: () => import('../views/login.vue')
-},{
-  path: '/smt',
-  name: 'smt',
-  component: () => import('../views/smt/index.vue'),
-  meta: {
-    title: "SMT",
-    requireAuth: true // 标识该路由是否需要登录
-  }
-},{
-  path: '/package',
-  name: 'package',
-  component: () => import('../views/package/index.vue'),
-  meta: {
-    title: "PACKAGE",
-    requireAuth: true // 标识该路由是否需要登录
-  }
-},{
-  path: '/assembly',
-  name: 'assembly',
-  component: () => import('../views/assembly/index.vue'),
-  meta: {
-    title: "ASSEMBLY",
-    requireAuth: true // 标识该路由是否需要登录
-  }
-},{
-  path: '/dpl',
-  name: 'dpl',
-  component: () => import('../views/dpl/index.vue'),
-  meta: {
-    title: "DPL",
-    requireAuth: true // 标识该路由是否需要
-  }
-},{
-  path: '/dj',
-  name: 'dj',
-  component: () => import('../views/dj/index.vue'),
-  meta: {
-    title: "DJ",
-    requireAuth: true // 标识该路由是否需要登录
-  }
-},{
-  path: '/dip',
-  name: 'dip',
-  component: () => import('../views/dip/index.vue'),
-  meta: {
-    title: "DIP",
-    requireAuth: true // 标识该路由是否需要登录
-  }
-},{
-  path: '/total',
-  name: 'total',
-  component: () => import('../views/total/index.vue'),
-  meta: {
-    title: "TOTAL",
-    requireAuth: true // 标识该路由是否需要登录
-  }
-}, {
-  path: '/smttest',
-  name: 'smttest',
-  component: () => import('../views/smttest/index.vue'),
-  meta: {
-    title: "SMTTEST",
-    requireAuth: true // 标识该路由是否需要登录
-  }
-},{
-    path: '/iqc',
-    name: 'iqc',
-    component: () => import('../views/quality/index.vue'),
+  {
+    path: "/iqc",
+    name: "iqc",
+    component: () => import("../views/quality/index.vue"),
     meta: {
       title: "IQC",
-      requireAuth: true // 标识该路由是否需要登录
-    }
-}]
+      requireAuth: true, // 标识该路由是否需要登录
+    },
+  },
+  {
+    path: "/dip",
+    name: "dip",
+    component: () => import("../views/dip/index.vue"),
+    meta: {
+      title: "DIP",
+      requireAuth: true, // 标识该路由是否需要登录
+    },
+  },
+  // ,
+  // {
+  //   path: "/package",
+  //   name: "package",
+  //   component: () => import("../views/package/index.vue"),
+  //   meta: {
+  //     title: "PACKAGE",
+  //     requireAuth: true, // 标识该路由是否需要登录
+  //   },
+  // },
+  // {
+  //   path: "/assembly",
+  //   name: "assembly",
+  //   component: () => import("../views/assembly/index.vue"),
+  //   meta: {
+  //     title: "ASSEMBLY",
+  //     requireAuth: true, // 标识该路由是否需要登录
+  //   },
+  // },
+  // {
+  //   path: "/dpl",
+  //   name: "dpl",
+  //   component: () => import("../views/dpl/index.vue"),
+  //   meta: {
+  //     title: "DPL",
+  //     requireAuth: true, // 标识该路由是否需要
+  //   },
+  // },
+  // {
+  //   path: "/dj",
+  //   name: "dj",
+  //   component: () => import("../views/dj/index.vue"),
+  //   meta: {
+  //     title: "DJ",
+  //     requireAuth: true, // 标识该路由是否需要登录
+  //   },
+  // },
+
+  // {
+  //   path: "/total",
+  //   name: "total",
+  //   component: () => import("../views/total/index.vue"),
+  //   meta: {
+  //     title: "TOTAL",
+  //     requireAuth: true, // 标识该路由是否需要登录
+  //   },
+  // },
+  // {
+  //   path: "/smttest",
+  //   name: "smttest",
+  //   component: () => import("../views/smttest/index.vue"),
+  //   meta: {
+  //     title: "SMTTEST",
+  //     requireAuth: true, // 标识该路由是否需要登录
+  //   },
+  // }
+];
 const router = new VueRouter({
-  routes
-})
+  routes,
+});
 
-export default router
+export default router;

+ 9 - 11
src/views/dip/index.vue

@@ -19,9 +19,13 @@
         <!-- 第二行 -->
         <div class="d-flex jc-between px-2">
           <div class="d-flex aside-width">
-            <div class="react-left ml-4 react-l-s bg-color-blue">
+            <div class="react-left ml-4 react-l-s" style="background-color: #a5d8ff;">
               <span class="react-left"></span>
-              <span class="text fw-b" style="font-size:24px;">奥维精密电子有限公司</span>
+              <div style="width: 50%;height: 50px;display: flex;align-items: center;padding-left: 20px; padding-right: 20px;
+              transform: skewX(-45deg);">
+                <img src="../../assets/awlogo.png" alt="Logo" style="display: block; height: 90%;" />
+              </div>
+              <!-- <span class="text fw-b" style="font-size:24px;">奥维精密电子有限公司</span> -->
             </div>
             <div class="react-left ml-3">
               <span class="text">生产实况分析</span>
@@ -37,17 +41,11 @@
               <span class="react-after"></span>
               <el-dropdown class="dropdown">
                 <span class="el-dropdown-link" ref="echarType">
-                  笔电组装车间<i class="el-icon-arrow-down el-icon&#45;&#45;right"></i>&nbsp;&nbsp;&nbsp;&nbsp;
+                  DIP<i class="el-icon-arrow-down el-icon&#45;&#45;right"></i>&nbsp;&nbsp;&nbsp;&nbsp;
                 </span>
                 <el-dropdown-menu slot="dropdown">
-                  <el-dropdown-item><router-link to="dpl"> 笔电包装车间 </router-link></el-dropdown-item>
-                  <el-dropdown-item><router-link to="dj"> 点胶车间 </router-link></el-dropdown-item>
-                  <el-dropdown-item><router-link to="package"> 包装车间 </router-link></el-dropdown-item>
-                  <el-dropdown-item><router-link to="assembly"> 组装车间 </router-link></el-dropdown-item>
-                  <el-dropdown-item><router-link to="smt">SMT车间</router-link></el-dropdown-item>
-                  <el-dropdown-item><router-link to="smttest">SMT测试车间</router-link></el-dropdown-item>
-                  <el-dropdown-item class="dropdownitem"><router-link to="total">
-                      各车间总看板</router-link></el-dropdown-item>
+                  <el-dropdown-item><router-link to="smt"> SMT </router-link></el-dropdown-item>
+                  <el-dropdown-item><router-link to="iqc"> 品质IQC </router-link></el-dropdown-item>
                 </el-dropdown-menu>
               </el-dropdown>
               <el-select v-model="linecode" class="dropdown" @change="handleBlur" style="width: 150px">

+ 207 - 211
src/views/login.vue

@@ -5,31 +5,24 @@
                 UAS-MES可视化平台
             </h3>
             <el-form-item prop="sob">
-                <el-select v-model="loginForm.sob"  placeholder="请选择账套" style="width:100%">
-                    <el-option
-                            v-for="item in options"
-                            :key="item.value"
-                            :label="item.label"
-                            :value="item.value">
+                <el-select v-model="loginForm.sob" placeholder="请选择账套" style="width:100%">
+                    <el-option v-for="item in options" :key="item.value" :label="item.label" :value="item.value">
                     </el-option>
                 </el-select>
             </el-form-item>
             <el-form-item prop="workshop">
-                <el-select v-model="loginForm.workshop"  placeholder="请选择车间" style="width:100%">
-                    <el-option
-                            v-for="item in workshopoptions"
-                            :key="item.value"
-                            :label="item.label"
-                            :value="item.value">
+                <el-select v-model="loginForm.workshop" placeholder="请选择车间" style="width:100%">
+                    <el-option v-for="item in workshopoptions" :key="item.value" :label="item.label"
+                        :value="item.value">
                     </el-option>
                 </el-select>
             </el-form-item>
             <el-form-item prop="username">
-                <el-input type="text" v-model="loginForm.username" placeholder="请输入用户名" >
+                <el-input type="text" v-model="loginForm.username" placeholder="请输入用户名">
                 </el-input>
             </el-form-item>
             <el-form-item prop="password">
-                <el-input type="password" v-model="loginForm.password" placeholder="请输入密码" >
+                <el-input type="password" v-model="loginForm.password" placeholder="请输入密码">
                 </el-input>
             </el-form-item>
             <el-checkbox v-model="checked" class="loginRemember">记住我</el-checkbox>
@@ -39,219 +32,222 @@
 </template>
 
 <script>
-    import CryptoJS from "crypto-js";
+import CryptoJS from "crypto-js";
 
-    export default {
-        name: "Login",
-        data(){
-            return{
-                captchaUrl: "",
-                loginForm:{
-                    sob:"",
-                    username:"",
-                    password:"",
-                    workshop:"SMT"
-                },
-                checked: true,
-                rules:{
-                    sob :[{required:true,message:"请选择账套",trigger:"blur"}],
-                    username:[{required:true,message:"请输入用户名",trigger:"blur"}/*,{ min: 5, max: 14, message: '长度在 5 到 14 个字符', trigger: 'blur' }*/],
-                    password:[{required:true,message:"请输入密码",trigger:"blur"} /*,{ min: 6,  message: '密码长度要大于6', trigger: 'blur' }*/],
-                    workshop:[{required:true,message:"请选择车间",trigger:"blur"}]
-                },
-                options: [],
-                workshopoptions:[
-                    {label: 'SMT', value: 'SMT'},
-                    {label: '组装', value: '组装'},
-                    {label: '包装', value: '包装'},
-                    {label: '品质IQC', value: '品质IQC'},
-                ]
-
-            }
-        },
-        created() {
-            //默认数据
-            this.getCookies();
-            //获取账套信息
-            this.getMasters();
-            //获取工作中心数据
-            // this.getWorkCenter();
-        },
-        mounted() {
-            //监听enter键
-            this.$refs.loginForm.$el.addEventListener('keydown',this.handleEnter);
-        },
-        beforeDestroy(){
-            this.$refs.loginForm.$el.removeEventListener('keydown',this.handleEnter);
-        },
-        methods:{
-            //获取账套
-            getMasters(){
-                this.$http.get("kanban/getAllMasters.action").then(
-                    (result)=>{
-                        var res = JSON.parse(JSON.stringify(result.data.masters));
-                        for (let i = 0; i < res.length; i++) {
-                            this.options.push({label: res[i].ma_function, value: res[i].ma_user});
-                        }
-                        //设置默认值
-                        if("" == this.loginForm.sob || !result.data.masters.some(item => item.ma_function === this.loginForm.sob) ){
-                            this.loginForm.sob = res[0].ma_user;
-                        }
-                    },(result)=>{
-                        console.error(result)
-                    });
+export default {
+    name: "Login",
+    data() {
+        return {
+            captchaUrl: "",
+            loginForm: {
+                sob: "",
+                username: "",
+                password: "",
+                workshop: "SMT"
             },
-            //获取工作中心
-            getWorkCenter(){
-                this.$http.get("kanban/getAllWorkCenter.action").then(
-                    (result)=>{
-                        var res = JSON.parse(JSON.stringify(result.data.workCenter));
-                        for (let i = 0; i < res.length; i++) {
-                            this.workshopoptions.push({label: res[i].wc_code, value: res[i].wc_name});
-                        }
-                        //设置默认值
-                        if("" == this.loginForm.workshop || !result.data.workCenter.some(item => item.ma_function === this.loginForm.workshop) ){
-                            this.loginForm.workshop = res[0].ma_user;
-                        }
-                    },(result)=>{
-                        console.error(result)
-                    });
+            checked: true,
+            rules: {
+                sob: [{ required: true, message: "请选择账套", trigger: "blur" }],
+                username: [{ required: true, message: "请输入用户名", trigger: "blur" }/*,{ min: 5, max: 14, message: '长度在 5 到 14 个字符', trigger: 'blur' }*/],
+                password: [{ required: true, message: "请输入密码", trigger: "blur" } /*,{ min: 6,  message: '密码长度要大于6', trigger: 'blur' }*/],
+                workshop: [{ required: true, message: "请选择车间", trigger: "blur" }]
             },
-            //登录操作
-            submitLogin(){
-                this.$refs.loginForm.validate((valid) => {
-                    if (valid) {
-                       // console.log('登录',this.loginForm);
-                        //?username=zhongyl&password=asd&sob=N_MES_TEST
-                        this.$http.get("kanban/login.action",{
-                                params:{
-                                    username:this.loginForm.username,
-                                    password:this.loginForm.password,
-                                    sob:this.loginForm.sob,
-                                    wccode:this.loginForm.workshop
-                                }}).then(
-                            (result)=>{
-                                var res = result.data;
-                                if(res.success || "检测到您已登录本系统,请不要重复登录、打开空白页!" == res.reason) {
-                                    //登录成功返回session
-                                    sessionStorage.setItem('x-access-token', res.token);
-                                    sessionStorage.setItem('user',res);
-                                    this.$store.commit('setUser',res);
-                                    this.setCookieData();
-                                    if(this.loginForm.workshop =='SMT'){
-                                        this.$router.push({path: this.redirect || '/smt'});
-                                    }else if(this.loginForm.workshop =='包装'){
-                                        this.$router.push({path: this.redirect || '/package'});
-                                    }else if(this.loginForm.workshop =='组装'){
-                                        this.$router.push({path: this.redirect || '/assembly'});
-                                    }else if(this.loginForm.workshop =='品质IQC'){
-                                        this.$router.push({path: this.redirect || '/iqc'});
-                                  }
-                                }else{
-                                    this.$message.error(res.reason);
-                                }
-                            },(result)=>{
-                                console.error(result)
-                            });
+            options: [],
+            workshopoptions: [
+                { label: 'SMT', value: 'SMT' },
+                { label: 'DIP', value: 'DIP' },
+                // {label: '组装', value: '组装'},
+                // {label: '包装', value: '包装'},
+                { label: '品质IQC', value: '品质IQC' },
+            ]
 
-                        /*this.$store.dispatch('kanban/login.action',this.form).then(() => {
-                            this.$router.push({ path: this.redirect || '/' })
-                        }).catch(() => {
-                            this.loading = false;
-                        })*/
-                    } else {
-                        this.$message.error('登录出错请重新输入');
-                        return false;
+        }
+    },
+    created() {
+        //默认数据
+        this.getCookies();
+        //获取账套信息
+        this.getMasters();
+        //获取工作中心数据
+        // this.getWorkCenter();
+    },
+    mounted() {
+        //监听enter键
+        this.$refs.loginForm.$el.addEventListener('keydown', this.handleEnter);
+    },
+    beforeDestroy() {
+        this.$refs.loginForm.$el.removeEventListener('keydown', this.handleEnter);
+    },
+    methods: {
+        //获取账套
+        getMasters() {
+            this.$http.get("kanban/getAllMasters.action").then(
+                (result) => {
+                    var res = JSON.parse(JSON.stringify(result.data.masters));
+                    for (let i = 0; i < res.length; i++) {
+                        this.options.push({ label: res[i].ma_function, value: res[i].ma_user });
+                    }
+                    //设置默认值
+                    if ("" == this.loginForm.sob || !result.data.masters.some(item => item.ma_function === this.loginForm.sob)) {
+                        this.loginForm.sob = res[0].ma_user;
                     }
+                }, (result) => {
+                    console.error(result)
                 });
-
-
-            },
-            handleEnter(event){
-                if(event.key === 'Enter'){
-                    //处理回车键按下时间
-                    this.submitLogin();
-                }
-            },
-            setCookieData(){
-                if (this.checked) {
-                    this.$cookie.set(
-                        "password",
-                        CryptoJS.AES.encrypt(this.loginForm.password, "123456"),
-                        {
-                            expires: 30
+        },
+        //获取工作中心
+        getWorkCenter() {
+            this.$http.get("kanban/getAllWorkCenter.action").then(
+                (result) => {
+                    var res = JSON.parse(JSON.stringify(result.data.workCenter));
+                    for (let i = 0; i < res.length; i++) {
+                        this.workshopoptions.push({ label: res[i].wc_code, value: res[i].wc_name });
+                    }
+                    //设置默认值
+                    if ("" == this.loginForm.workshop || !result.data.workCenter.some(item => item.ma_function === this.loginForm.workshop)) {
+                        this.loginForm.workshop = res[0].ma_user;
+                    }
+                }, (result) => {
+                    console.error(result)
+                });
+        },
+        //登录操作
+        submitLogin() {
+            this.$refs.loginForm.validate((valid) => {
+                if (valid) {
+                    // console.log('登录',this.loginForm);
+                    //?username=zhongyl&password=asd&sob=N_MES_TEST
+                    this.$http.get("kanban/login.action", {
+                        params: {
+                            username: this.loginForm.username,
+                            password: this.loginForm.password,
+                            sob: this.loginForm.sob,
+                            wccode: this.loginForm.workshop
                         }
-                    );
+                    }).then(
+                        (result) => {
+                            var res = result.data;
+                            if (res.success || "检测到您已登录本系统,请不要重复登录、打开空白页!" == res.reason) {
+                                //登录成功返回session
+                                sessionStorage.setItem('x-access-token', res.token);
+                                sessionStorage.setItem('user', res);
+                                this.$store.commit('setUser', res);
+                                this.setCookieData();
+                                if (this.loginForm.workshop == 'SMT') {
+                                    this.$router.push({ path: this.redirect || '/smt' });
+                                } else if (this.loginForm.workshop == 'DIP') {
+                                    this.$router.push({ path: this.redirect || '/dip' });
+                                } else if (this.loginForm.workshop == '品质IQC') {
+                                    this.$router.push({ path: this.redirect || '/iqc' });
+                                }
+                            } else {
+                                this.$message.error(res.reason);
+                            }
+                        }, (result) => {
+                            console.error(result)
+                        });
+
+                    /*this.$store.dispatch('kanban/login.action',this.form).then(() => {
+                        this.$router.push({ path: this.redirect || '/' })
+                    }).catch(() => {
+                        this.loading = false;
+                    })*/
                 } else {
-                    this.$cookie.remove("password");
+                    this.$message.error('登录出错请重新输入');
+                    return false;
                 }
-                this.$cookie.set("username", this.loginForm.username, {
-                    expires: 30,
-                });
-                this.$cookie.set("sob", this.loginForm.sob, {
-                    expires: 30,
-                });
-                this.$cookie.set("workshop", this.loginForm.workshop, {
-                    expires: 30,
-                });
-                this.$cookie.set("checked", this.checked, {
-                    expires: 30,
-                });
-            },
-            getCookies(){
-                if(this.$cookie.get("sob")) {
-                    this.loginForm.sob = this.$cookie.get("sob");
-                }
-                this.loginForm.username = this.$cookie.get("username");
-                if (this.$cookie.get("password")) {
-                    this.loginForm.password = CryptoJS.AES.decrypt(
-                        this.$cookie.get("password"),
-                        "123456"
-                    ).toString(CryptoJS.enc.Utf8);
-                }
-                if(this.$cookie.get("workshop")) {
-                    this.loginForm.workshop = this.$cookie.get("workshop");
-                }
-                if(this.$cookie.get("checked")) {
-                    if(this.$cookie.get("checked") == 'false') {
-                        this.checked = false;
+            });
+
+
+        },
+        handleEnter(event) {
+            if (event.key === 'Enter') {
+                //处理回车键按下时间
+                this.submitLogin();
+            }
+        },
+        setCookieData() {
+            if (this.checked) {
+                this.$cookie.set(
+                    "password",
+                    CryptoJS.AES.encrypt(this.loginForm.password, "123456"),
+                    {
+                        expires: 30
                     }
-                }
+                );
+            } else {
+                this.$cookie.remove("password");
             }
+            this.$cookie.set("username", this.loginForm.username, {
+                expires: 30,
+            });
+            this.$cookie.set("sob", this.loginForm.sob, {
+                expires: 30,
+            });
+            this.$cookie.set("workshop", this.loginForm.workshop, {
+                expires: 30,
+            });
+            this.$cookie.set("checked", this.checked, {
+                expires: 30,
+            });
         },
-    };
+        getCookies() {
+            if (this.$cookie.get("sob")) {
+                this.loginForm.sob = this.$cookie.get("sob");
+            }
+            this.loginForm.username = this.$cookie.get("username");
+            if (this.$cookie.get("password")) {
+                this.loginForm.password = CryptoJS.AES.decrypt(
+                    this.$cookie.get("password"),
+                    "123456"
+                ).toString(CryptoJS.enc.Utf8);
+            }
+            if (this.$cookie.get("workshop")) {
+                this.loginForm.workshop = this.$cookie.get("workshop");
+            }
+            if (this.$cookie.get("checked")) {
+                if (this.$cookie.get("checked") == 'false') {
+                    this.checked = false;
+                }
+            }
+        }
+    },
+};
 </script>
 
 <style lang="less" scoped>
-    .loginContainer{
-        border-radius: 15px;
-        background-clip: padding-box;
-        margin: 180px auto;
-        width: 350px;
-        padding: 15px 35px 15px 35px;
-        background: aliceblue;
-        border:1px solid blueviolet;
-        box-shadow: 0 0 25px #f885ff;
-    }
-    .loginTitle{
-        margin: 0px auto 35px auto;
-        text-align: center;
-        font-size: 24px;
-    }
-    .loginRemember{
-        text-align: left;
-        margin: 0px 0px 15px 0px;
-    }
-    .bg {
-        width: 100%;
-        height: 100%;
-        background-image: url("../assets/pageBg.png");
-        background-size: cover;
-        background-position: center center;
-    }
-    /*body{
+.loginContainer {
+    border-radius: 15px;
+    background-clip: padding-box;
+    margin: 180px auto;
+    width: 350px;
+    padding: 15px 35px 15px 35px;
+    background: aliceblue;
+    border: 1px solid blueviolet;
+    box-shadow: 0 0 25px #f885ff;
+}
+
+.loginTitle {
+    margin: 0px auto 35px auto;
+    text-align: center;
+    font-size: 24px;
+}
+
+.loginRemember {
+    text-align: left;
+    margin: 0px 0px 15px 0px;
+}
+
+.bg {
+    width: 100%;
+    height: 100%;
+    background-image: url("../assets/pageBg.png");
+    background-size: cover;
+    background-position: center center;
+}
+
+/*body{
         background-image: url("../assets/pageBg.png");
         background-size:100%;
     }*/
 </style>
-

+ 11 - 14
src/views/quality/index.vue

@@ -19,16 +19,15 @@
         <!-- 第二行 -->
         <div class="d-flex jc-between px-2">
           <div class="d-flex aside-width">
-            <div
-              style="width: 50%;height: 50px;background-color: #a5d8ff;display: flex;align-items: center;padding-left: 20px; padding-right: 20px;">
-              <img src="../../assets/awlogo.png" alt="Logo" style="display: block; height: 90%;" />
-            </div>
-            <!-- <div style="width: 50px;background-color: #fff;"></div> -->
-            <!-- <div class="react-left ml-4 react-l-s bg-color-blue">
+            <div class="react-left ml-4 react-l-s" style="background-color: #a5d8ff;">
               <span class="react-left"></span>
-              <span class="text fw-b" style="font-size:24px;">奥维精密电子有限公司</span>
-            </div> -->
-            <div class="react-left left-after">
+              <div style="width: 50%;height: 50px;display: flex;align-items: center;padding-left: 20px; padding-right: 20px;
+              transform: skewX(-45deg);">
+                <img src="../../assets/awlogo.png" alt="Logo" style="display: block; height: 90%;" />
+              </div>
+              <!-- <span class="text fw-b" style="font-size:24px;">奥维精密电子有限公司</span> -->
+            </div>
+            <div class="react-left ml-3">
               <span class="text">生产实况分析</span>
             </div>
           </div>
@@ -40,14 +39,12 @@
             <div class="react-right mr-4 react-l-s" style="width: 900px">
               <span class="react-after"></span>
               <el-dropdown class="dropdown">
-                <span class="el-dropdown-link" ref="echarType">
-                  品质IQC<i class="el-icon-arrow-down el-icon&#45;&#45;right"></i>&nbsp;&nbsp;&nbsp;&nbsp;
+                <span class="el-dropdown-link" ref="echarType">品质IQC<i
+                    class="el-icon-arrow-down el-icon&#45;&#45;right"></i>&nbsp;&nbsp;&nbsp;&nbsp;
                 </span>
                 <el-dropdown-menu slot="dropdown">
-                  <el-dropdown-item><router-link to="assembly"> 组装车间 </router-link></el-dropdown-item>
-                  <el-dropdown-item><router-link to="dpl"> 测试车间 </router-link></el-dropdown-item>
-                  <el-dropdown-item><router-link to="package"> 包装车间 </router-link></el-dropdown-item>
                   <el-dropdown-item><router-link to="smt"> SMT </router-link></el-dropdown-item>
+                  <el-dropdown-item><router-link to="dip"> DIP </router-link></el-dropdown-item>
                 </el-dropdown-menu>
               </el-dropdown>
               <span class="text">&nbsp;&nbsp;&nbsp;&nbsp;</span>

+ 10 - 20
src/views/smt/index.vue

@@ -19,16 +19,15 @@
         <!-- 第二行 -->
         <div class="d-flex jc-between px-2">
           <div class="d-flex aside-width">
-            <div
-              style="width: 50%;height: 50px;background-color: #a5d8ff;display: flex;align-items: center;padding-left: 20px; padding-right: 20px;">
-              <img src="../../assets/awlogo.png" alt="Logo" style="display: block; height: 90%;" />
-            </div>
-            <!-- <div style="width: 50px;background-color: #fff;"></div> -->
-            <!-- <div class="react-left ml-4 react-l-s bg-color-blue">
+            <div class="react-left ml-4 react-l-s" style="background-color: #a5d8ff;">
               <span class="react-left"></span>
-              <span class="text fw-b" style="font-size:24px;">奥维精密电子有限公司</span>
-            </div> -->
-            <div class="react-left left-after">
+              <div style="width: 50%;height: 50px;display: flex;align-items: center;padding-left: 20px; padding-right: 20px;
+              transform: skewX(-45deg);">
+                <img src="../../assets/awlogo.png" alt="Logo" style="display: block; height: 90%;" />
+              </div>
+              <!-- <span class="text fw-b" style="font-size:24px;">奥维精密电子有限公司</span> -->
+            </div>
+            <div class="react-left ml-3">
               <span class="text">生产实况分析</span>
             </div>
           </div>
@@ -57,17 +56,8 @@
                   SMT车间<i class="el-icon-arrow-down el-icon--right"></i>&nbsp;&nbsp;&nbsp;&nbsp;
                 </span>
                 <el-dropdown-menu slot="dropdown">
-                  <el-dropdown-item class="dropdownitem"><router-link to="dj">点胶车间</router-link></el-dropdown-item>
-                  <el-dropdown-item class="dropdownitem"><router-link to="dip">笔电组装车间</router-link></el-dropdown-item>
-                  <el-dropdown-item class="dropdownitem"><router-link to="dpl">笔电包装车间</router-link></el-dropdown-item>
-                  <el-dropdown-item class="dropdownitem"><router-link
-                      to="assembly">组装车间</router-link></el-dropdown-item>
-                  <el-dropdown-item class="dropdownitem"><router-link to="package">
-                      包装车间</router-link></el-dropdown-item>
-                  <el-dropdown-item class="dropdownitem"><router-link
-                      to="smttest">SMT测试车间</router-link></el-dropdown-item>
-                  <el-dropdown-item class="dropdownitem"><router-link to="total">
-                      各车间总看板</router-link></el-dropdown-item>
+                  <el-dropdown-item class="dropdownitem"><router-link to="smt"> SMT </router-link></el-dropdown-item>
+                  <el-dropdown-item class="dropdownitem"><router-link to="iqc"> 品质IQC </router-link></el-dropdown-item>
                 </el-dropdown-menu>
               </el-dropdown>