瑞梓看板修改

src/components/hjechart/bottom/bottomLeft2Chart/chart.vue

@@ -196,7 +196,7 @@ export default {
     },
     async getdata() {
       //20220211 -+formatDate(new Date()
-      var caller = 'HJ!WCDAYTURNOUT';
+      var caller = 'BZ!WCDAYTURNOUT';
       await this.$http.get("kanban/datalist.action?caller="+caller+"&_noc=1&page=1&pageSize=100",{
         params: {
           condition: "1=1",

src/components/hjechart/bottom/bottomRightChart/index.vue

@@ -61,7 +61,7 @@ export default {
               +(dateBase.getDate() < 10 ? "0" + (dateBase.getDate() ) : dateBase.getDate() );
 
       //良率直通图
-      var caller1 = 'HJ!DAYTURNOUT';
+      var caller1 = 'BZ!DAYTURNOUT';
       await this.$http.get("kanban/datalist.action?caller="+caller1+"&_noc=1&page=1&pageSize=100",{
         params: {
           condition: "1=1",

src/components/hjechart/centerLeft/centerLeft1Chart/index.vue

@@ -44,7 +44,7 @@ export default {
     },
     async getdata() {
       //20220211 -+formatDate(new Date()
-      var caller = 'HJ!NGREASONF';
+      var caller = 'BZ!NGREASONF';
       await this.$http.get("kanban/datalist.action?caller="+caller+"&_noc=1&page=1&pageSize=100",
               {
                 params: {

src/views/assembly/index.vue

@@ -48,9 +48,7 @@
                  组装车间<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="hj"> 焊接车间 </router-link></el-dropdown-item>
-                 <el-dropdown-item ><router-link to="smt">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="hj"> 包装车间 </router-link></el-dropdown-item>
                </el-dropdown-menu>
              </el-dropdown>
 

src/views/hj/center.vue

@@ -114,7 +114,7 @@ export default {
                           console.error(result)
                         }
                 );*/
-      var caller = 'HJ!KeyStepRate';
+      var caller = 'BZ!KeyStepRate';
       //关键工序直通率
       await this.$http.get("kanban/datalist.action?caller="+caller+"&_noc=1&page=1&pageSize=100",{
         params: {

src/views/hj/centerLeft_two.vue

@@ -156,7 +156,7 @@ export default {
       // 设备类别维保执行情况
       this.config.data = [];
       this.config = { ...this.config };
-      await this.$http.get("kanban/datalist.action?caller=HJ!DeviceMaintainData&_noc=1&page=1&pageSize=100&condition=1=1")
+      await this.$http.get("kanban/datalist.action?caller=BZ!DeviceMaintainData&_noc=1&page=1&pageSize=100&condition=1=1")
           .then((result)=>{
                 let dataList = JSON.parse(result.data.data);
                 let titleitems = new Array();
@@ -191,7 +191,7 @@ export default {
           );
 
       //饼图pie，设备保养执行率
-      await this.$http.get("kanban/datalist.action?caller=HJ!DeviceMaintainRate&_noc=1&page=1&pageSize=100&condition=1=1")
+      await this.$http.get("kanban/datalist.action?caller=BZ!DeviceMaintainRate&_noc=1&page=1&pageSize=100&condition=1=1")
           .then((result)=>{
                 let dataList = JSON.parse(result.data.data);
                 for (let index = 0; index < dataList.length; index++) {

src/views/hj/centerRight1.vue

@@ -55,7 +55,7 @@ export default {
       }, 30000);
     },
     async getdata() {
-      var caller = 'HJ!DPLANTOUTPUT';
+      var caller = 'BZ!DPLANTOUTPUT';
       await this.$http.get("kanban/datalist.action?caller="+caller+"&_noc=1&page=1&pageSize=100",{
         params: {
           condition: "1=1",

src/views/hj/centerRight2Old.vue

@@ -62,7 +62,7 @@ export default {
     },
     async setData () {
       // 设备类别维保执行情况
-      await this.$http.get("kanban/datalist.action?caller=HJ!DeviceMaintainData&_noc=1&page=1&pageSize=100",{
+      await this.$http.get("kanban/datalist.action?caller=BZ!DeviceMaintainData&_noc=1&page=1&pageSize=100",{
         params: {
           condition: "1=1",
         }
@@ -84,7 +84,7 @@ export default {
               );
 
       //饼图pie，设备保养执行率
-      await this.$http.get("kanban/datalist.action?caller=HJ!DeviceMaintainRate&_noc=1&page=1&pageSize=100",{
+      await this.$http.get("kanban/datalist.action?caller=BZ!DeviceMaintainRate&_noc=1&page=1&pageSize=100",{
         params: {
           condition: "1=1",
         }

src/views/hj/index.vue

@@ -45,12 +45,10 @@
               <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;
+                  包装车间<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="smt">SMT车间</router-link></el-dropdown-item>
-                    <el-dropdown-item class="dropdownitem"><router-link to="total"> 各车间总看板</router-link></el-dropdown-item>
                   </el-dropdown-menu>
             </el-dropdown>
               <el-select v-model="linecode" class="dropdown" @change ="handleBlur" style="width: 150px">

src/views/login.vue

@@ -50,7 +50,7 @@
                     sob:"",
                     username:"",
                     password:"",
-                    workshop:"SMT"
+                    workshop:"组装"
                 },
                 checked: true,
                 rules:{
@@ -61,12 +61,9 @@
                 },
                 options: [],
                 workshopoptions:[
-                    {label: 'SMT', value: 'SMT'},
-                    {label: '焊接', value: '焊接'},
-                    {label: '组装车间', value: '组装'},
-                    {label: '各车间总看板', value: '所有'},
+                    {label: '组装', value: '组装'},
+                    {label: '包装', value: '包装'},
                 ]
-
             }
         },
         created() {
@@ -140,12 +137,10 @@
                                     this.setCookieData();
                                     if(this.loginForm.workshop =='SMT'){
                                         this.$router.push({path: this.redirect || '/smt'});
-                                    }else if(this.loginForm.workshop =='焊接'){
+                                    }else if(this.loginForm.workshop =='包装'){
                                         this.$router.push({path: this.redirect || '/hj'});
                                     }else if(this.loginForm.workshop =='组装'){
                                         this.$router.push({path: this.redirect || '/assembly'});
-                                    }else if(this.loginForm.workshop =='所有'){
-                                      this.$router.push({path: this.redirect || '/total'});
                                     }
                                 }else{
                                     this.$message.error(res.reason);

src/views/smt/index.vue

@@ -49,7 +49,7 @@
                 </span>
                   <el-dropdown-menu slot="dropdown">
                     <el-dropdown-item ><router-link to="assembly"> 组装车间 </router-link></el-dropdown-item>
-                    <el-dropdown-item ><router-link to="hj">焊接车间</router-link></el-dropdown-item>
+                    <el-dropdown-item ><router-link to="hj">包装车间</router-link></el-dropdown-item>
                     <el-dropdown-item class="dropdownitem"><router-link to="total"> 各车间总看板</router-link></el-dropdown-item>
                   </el-dropdown-menu>
             </el-dropdown>

vue.config.js

@@ -11,8 +11,8 @@ module.exports = {
   devServer: {
     proxy: {
       "/mes":{           // /proxy_url 这个用来和根路径 baseURL 进行匹配
-        //target:'http://192.168.0.9:8099/mes',
-        target: 'http://erp.ubtob.net:11779/mes', // 'http://localhost:8099/uas/' ,这个是填写跨域的请求域名+端口号，也就是要请求的URL(不包含URL路径)
+        //target:'http://168.0.9:8099/mes',
+        target: 'http://erp.ubtob.net:11781/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