修改看板配置内容

src/views/assembly/index.vue

@@ -29,7 +29,7 @@
           <div class="d-flex aside-width">
             <div class="react-left ml-4 react-l-s bg-color-blue">
               <span class="react-left"></span>
-              <span class="text fw-b" style="font-size:24px;">联创电子应用终端产业</span>
+              <span class="text fw-b" style="font-size:24px;">普耐尔MES数据看板</span>
             </div>
             <div class="react-left ml-3">
               <span class="text">生产实况分析</span>
@@ -38,8 +38,9 @@
           <div class="d-flex aside-width">
             <div class="react-right bg-color-r mr-3">
              <!-- <span class="text ">设备运行分析</span>-->
-              <span class="text" @click="fullScreen" ref="fullScreen">全屏</span>
-              <span class="text" @click="exitFullScreen" ref="exitFullScreen"  style="display: none">退出全屏</span>
+              <el-button type="text" class="text" style="width:50% ;font-size: 21px;" @click="fullScreen" ref="fullScreen"
+                         v-show=!isFullScreen >全屏</el-button>
+              <el-button type="text" class="text" style="width:50% ;font-size: 21px;" @click="exitFullScreen" ref="exitFullScreen" v-show=isFullScreen>退出全屏</el-button>
             </div>
             <div class="react-right mr-4 react-l-s" style="width: 900px">
               <span class="react-after"></span>
@@ -177,7 +178,22 @@ export default {
     cancelLoading() {
       setTimeout(() => {
         this.loading = false
-      }, 5000)
+      }, 3000)
+    },
+    autoFullScreen(){
+      if (!this.isFullScreen) {
+        setTimeout(() => {
+          this.$showMsgBox({
+            caption: "提示",
+            msg: '是否全屏展示？',
+            callback: (data) => {
+              if (data == "yes") {
+                this.fullScreen();
+              }
+            }
+          })
+        }, 3000)
+      }
     },
     handleBlur (val){
       sessionStorage.setItem('li_code',val);

src/views/dip/index.vue

@@ -29,7 +29,7 @@
           <div class="d-flex aside-width">
             <div class="react-left ml-4 react-l-s bg-color-blue">
               <span class="react-left"></span>
-              <span class="text fw-b" style="font-size:24px;">联创电子应用终端产业</span>
+              <span class="text fw-b" style="font-size:24px;">普耐尔MES数据看板</span>
             </div>
             <div class="react-left ml-3">
               <span class="text">生产实况分析</span>

src/views/dj/index.vue

@@ -29,7 +29,7 @@
           <div class="d-flex aside-width">
             <div class="react-left ml-4 react-l-s bg-color-blue">
               <span class="react-left"></span>
-              <span class="text fw-b" style="font-size:24px;">联创电子应用终端产业</span>
+              <span class="text fw-b" style="font-size:24px;">普耐尔MES数据看板</span>
             </div>
             <div class="react-left ml-3">
               <span class="text">生产实况分析</span>

src/views/dpl/index.vue

@@ -29,7 +29,7 @@
           <div class="d-flex aside-width">
             <div class="react-left ml-4 react-l-s bg-color-blue">
               <span class="react-left"></span>
-              <span class="text fw-b" style="font-size:24px;">联创电子应用终端产业</span>
+              <span class="text fw-b" style="font-size:24px;">普耐尔MES数据看板</span>
             </div>
             <div class="react-left ml-3">
               <span class="text">生产实况分析</span>

src/views/login.vue

@@ -61,9 +61,7 @@
                 },
                 options: [],
                 workshopoptions:[
-                    {label: 'SMT', value: 'SMT'},
                     {label: '组装', value: '组装'},
-                    {label: '包装', value: '包装'}
                 ]
 
             }
@@ -137,11 +135,8 @@
                                     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 =='组装'){
+
+                                   if(this.loginForm.workshop =='组装'){
                                         this.$router.push({path: this.redirect || '/assembly'});
                                     }
                                 }else{

src/views/package/index.vue

@@ -29,7 +29,7 @@
           <div class="d-flex aside-width">
             <div class="react-left ml-4 react-l-s bg-color-blue">
               <span class="react-left"></span>
-              <span class="text fw-b" style="font-size:24px;">联创电子应用终端产业</span>
+              <span class="text fw-b" style="font-size:24px;">普耐尔MES数据看板</span>
             </div>
             <div class="react-left ml-3">
               <span class="text">生产实况分析</span>

src/views/smt/index.vue

@@ -29,7 +29,7 @@
           <div class="d-flex aside-width">
             <div class="react-left ml-4 react-l-s bg-color-blue">
               <span class="react-left"></span>
-              <span class="text fw-b" style="font-size:24px;">联创电子应用终端产业</span>
+              <span class="text fw-b" style="font-size:24px;">普耐尔MES数据看板</span>
             </div>
             <div class="react-left ml-3">
               <span class="text">生产实况分析</span>

src/views/smttest/index.vue

@@ -29,7 +29,7 @@
           <div class="d-flex aside-width">
             <div class="react-left ml-4 react-l-s bg-color-blue">
               <span class="react-left"></span>
-              <span class="text fw-b" style="font-size:24px;">联创电子应用终端产业</span>
+              <span class="text fw-b" style="font-size:24px;">普耐尔MES数据看板</span>
             </div>
             <div class="react-left ml-3">
               <span class="text">生产实况分析</span>

src/views/total/index.vue

@@ -29,7 +29,7 @@
           <div class="d-flex aside-width">
             <div class="react-left ml-4 react-l-s bg-color-blue">
               <span class="react-left"></span>
-              <span class="text fw-b" style="font-size:24px;">联创电子应用终端产业</span>
+              <span class="text fw-b" style="font-size:24px;">普耐尔MES数据看板</span>
             </div>
             <div class="react-left ml-3">
               <span class="text">生产实况分析</span>

vue.config.js

@@ -11,7 +11,7 @@ module.exports = {
   devServer: {
     proxy: {
       "/mes":{           // /proxy_url 这个用来和根路径 baseURL 进行匹配
-        target:'http://172.16.30.253:8099/mes/',   // target: 'http://mes.ubtob.net:8099/mes/', http://218.64.89.153:8099/mes/， 'http://localhost:8099/uas/' ,这个是填写跨域的请求域名+端口号，也就是要请求的URL(不包含URL路径)
+        target:'http://192.168.15.168:8099/mes/',   // target: 'http://mes.ubtob.net:8099/mes/', http://218.64.89.153:8099/mes/， 'http://localhost:8099/uas/' ,这个是填写跨域的请求域名+端口号，也就是要请求的URL(不包含URL路径)
         changeOrigin: true,  // 是否允许跨域请求，在本地会创建一个虚拟服务端，然后发送请求的数据，并同时接收请求的数据，这样服务端和服务端进行数据的交互就不会有跨域问题
         pathRewrite: {   // 路径重写
           '^/mes': '' // 替换target中的请求地址，原请求为 http://127.0.0.1:8000/kuayu 实际请求为 http://127.0.0.1:8000/proxy_url/kuayu