.env.dev

@@ -1,7 +1,7 @@
 ###
  # @Author: Do not edit
  # @Date: 2023-08-29 09:40:39
- # @LastEditTime: 2023-11-15 09:09:12
+ # @LastEditTime: 2023-11-15 17:16:51
  # @LastEditors: zhp
  # @Description:
 ###
@@ -13,12 +13,12 @@ VUE_APP_TITLE = MES系统
 
 # 芋道管理系统/开发环境
 # VUE_APP_BASE_API = 'http://100.64.0.26:48082'
-# VUE_APP_BASE_API = 'http://192.168.0.33:48082'
+VUE_APP_BASE_API = 'http://192.168.0.33:48082'
 # VUE_APP_BASE_API = 'http://192.168.4.173:48080'
 # VUE_APP_BASE_API = 'http://192.168.2.173:48080'
 # VUE_APP_BASE_API = 'http://192.168.1.49:48080'
 # VUE_APP_BASE_API = 'http://192.168.1.8:48080'
-VUE_APP_BASE_API = 'http://192.168.4.159:48080'
+# VUE_APP_BASE_API = 'http://192.168.4.159:48080'
 # VUE_APP_BASE_API = 'http://192.168.1.56:48080'
 # VUE_APP_BASE_API = 'http://192.168.4.159:48080'
 # 路由懒加载

src/permission.js

@@ -9,7 +9,7 @@ import { isRelogin } from '@/utils/request'
 NProgress.configure({ showSpinner: false })
 
 // 增加三方登陆 update by 芋艿
-const whiteList = ['/login', '/social-login',  '/auth-redirect', '/bind', '/register', '/oauthLogin/gitee']
+const whiteList = ['/login', '/social-login', '/auth-redirect', '/bind', '/register', '/oauthLogin/gitee', '/AGVBoard', '/coldBoard', '/processingBoard']
 
 router.beforeEach((to, from, next) => {
   NProgress.start()
@@ -19,7 +19,12 @@ router.beforeEach((to, from, next) => {
     if (to.path === '/login') {
       next({ path: '/' })
       NProgress.done()
-    } else {
+    }
+    // else if (to.path === '/AGVBoard') {
+    //   next({ path: '/AGVBoard' })
+    //   NProgress.done()
+    // }
+    else {
       if (store.getters.roles.length === 0) {
         isRelogin.show = true
         // 获取字典数据 add by 芋艿

src/router/index.js

@@ -91,7 +91,7 @@ export const constantRoutes = [
   {
     path: '/AGVBoard',
     name: 'AGVBoard',
-    component: Layout,
+    // component: Layout,
     // route level code-splitting
     // this generates a separate chunk (about.[hash].js) for this route
     // which is lazy-loaded when the route is visited.

src/views/OperationalOverview/AGVBoard.vue

@@ -2,7 +2,7 @@
  * @Author: zwq
  * @Date: 2021-07-19 15:18:30
  * @LastEditors: zhp
- * @LastEditTime: 2023-11-14 10:46:52
+ * @LastEditTime: 2023-11-15 16:04:06
  * @Description:
 -->
 <template>
@@ -727,21 +727,21 @@ export default {
     }
   },
 
-  watch: {
+  // watch: {
-    clientWidth(val) {
+  //   clientWidth(val) {
-      if (!this.timer) {
+  //     if (!this.timer) {
-        this.clientWidth = val
+  //       this.clientWidth = val
-        this.beilv2 = this.clientWidth / 1920
+  //       this.beilv2 = this.clientWidth / 1920
-        this.timer = true
+  //       this.timer = true
-        let _this = this
+  //       let _this = this
-        setTimeout(function () {
+  //       setTimeout(function () {
-          _this.timer = false
+  //         _this.timer = false
-        }, 500)
+  //       }, 500)
-      }
+  //     }
-      // 这里可以添加修改时的方法
+  //     // 这里可以添加修改时的方法
-      this.windowWidth(val);
+  //     this.windowWidth(val);
-    }
+  //   }
-  },
+  // },
   created() {
     // this.fetchList('exception-alarm')
     // this.fetchList('inAndOutOfEachLine')

src/views/OperationalOverview/coldBoard.vue

@@ -1021,7 +1021,7 @@ export default {
    top: 2em;
  }
   .container-main {
-    // padding: 10px;
+    padding: 6px;
   }
 }
 

src/views/base/custom/index.vue

@@ -1,5 +1,5 @@
 <template>
-  <el-drawer :visible.sync="drawer" :append-to-body="true" size="80%">
+  <el-drawer :visible.sync="drawer" :append-to-body="true" size="80%" >
     <small-title slot="title" :no-padding="true">
       <!-- <template v-for="demo in demoList"> -->
       <!-- <el-button :key="demo.name" :type="demo.name === curDemo ? 'primary' : ' '" @click="curDemo = demo.name"> -->
@@ -29,24 +29,13 @@
         <el-col :span="20">
           <!-- 纸张设置 -->
           <el-button-group style="margin:0 10px">
-            <el-button
+            <el-button v-for="(value,type) in paperTypes" :key="type" :type="curPaperType === type ? 'primary' : ' '"
-              v-for="(value,type) in paperTypes"
+              @click="setPaper(type,value)">
-              :key="type"
-              :type="curPaperType === type ? 'primary' : ' '"
-              @click="setPaper(type,value)"
-            >
               {{ type }}
             </el-button>
           </el-button-group>
-          <el-input-number
+          <el-input-number style="margin:0 10px" :value="scaleValue " :precision="2" :step="0.1" :min="scaleMin"
-            style="margin:0 10px"
+            :max="scaleMax" @change="changeScale" />
-            :value="scaleValue "
-            :precision="2"
-            :step="0.1"
-            :min="scaleMin"
-            :max="scaleMax"
-            @change="changeScale"
-          />
           <el-popover v-model="paperPopVisible" placement="bottom" width="300" title="设置纸张宽高(mm)">
             <div style="display: flex;align-items: center;justify-content: space-between;margin-bottom: 10px">
               <el-input v-model="paperWidth" type="number" style=" width: 100px; text-align: center" place="宽（mm）" />~
@@ -212,7 +201,7 @@ export default {
       return type
     }
   },
-  mounted() {
+  created() {
     this.init()
     // console.log('aaaaaa')
     // this.otherPaper()
@@ -224,6 +213,9 @@ export default {
     // handleClose() {
     //   $('.hiprintEpContainer').empty()
     // },
+    closed() {
+      $('.hiprintEpContainer').empty()
+    },
     init(data) {
       this.drawer = true
       this.modelData = data
@@ -264,6 +256,7 @@ export default {
       // console.log(this.modelData)
       // console.log($('#hiprint-printTemplate').empty())
       if (this.modelData) {
+        // console.log(this.modelData);
         $('.hiprintEpContainer').empty()
         hiprint.PrintElementTypeManager.build('.hiprintEpContainer', provider.value)
         $('.hiprint-printTemplate').empty()
@@ -278,7 +271,7 @@ export default {
         $('.hiprint-printTemplate').empty()
         // const templates = this.$ls.get('KEY_TEMPLATES', {})
         const template = provider.value
-        console.log(template)
+        // console.log(template)
         hiprintTemplate = new hiprint.PrintTemplate({
           template: template,
           settingContainer: '#PrintElementOptionSetting',
@@ -287,6 +280,7 @@ export default {
       }
       // hiprintTemplate.design('#hiprint-printTemplate')
       // console.log(hiprintTemplate)
+      console.log(hiprintTemplate);
       hiprintTemplate.design('#hiprint-printTemplate', { grid: true })
       // 获取当前放大比例, 当zoom时传true 才会有
       this.scaleValue = hiprintTemplate.editingPanel.scale || 1