Jelajahi Sumber

Merge branch 'master' of https://git.steerinfo.com/DAL-DAZHOU/icore-pass

zyf 2 tahun lalu
induk
melakukan
9c0d7d9726
4 mengubah file dengan 45 tambahan dan 10 penghapusan
  1. 2 3
      build/utils.js
  2. 1 1
      config/index.js
  3. 1 1
      src/views/index/app.html
  4. 41 5
      src/views/index/components/printScan.vue

+ 2 - 3
build/utils.js

@@ -15,9 +15,8 @@ const devPathSrc = path.resolve(__dirname, '../../../src') // node_modules应用
 // ['index','appoint','configManager','homepage',''inward,'queue','RMS','sale','serviceManager','SporadicManage'
 //       统计报表       组织机构/系统管理 采购  仓储
 //  'statisticalReport','systemConfig','TMS','WMS','workFlow']
-//let devModules = ["index", "statisticalReport", "appoint", "sale","AMS","TMS"];
-let devModules=["all"]
-
+//let devModules = ["index", "statisticalReport", "appoint", "sale"];
+let devModules = ['all']
 
 if (pathSrc.indexOf('node_modules') > -1) {
   devModules = require('../../../cors.js').devModules

+ 1 - 1
config/index.js

@@ -66,7 +66,7 @@ let proxyTable = {
   // 所有数据的请求域名地址
   '/api/v1': {
     target: 'http://172.16.33.166:80',
-    //target: "http://localhost:8080",
+    // target: 'http://localhost:8080',
     // target: "http://192.168.1.101:8080",
     ws: true,
     pathRewrite: {

+ 1 - 1
src/views/index/app.html

@@ -3,7 +3,7 @@
   <head>
     <meta charset="utf-8">
     <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
-    <meta name="renderer" content="webkit">
+    <meta name="full-screen" content="webkit">
     <meta content="智慧物流平台" name="keywords">
     <meta content="智慧物流平台" name="description">
     <title>登录 - 智慧物流平台</title>

+ 41 - 5
src/views/index/components/printScan.vue

@@ -3,6 +3,7 @@
     <div class="background">
       <img :src="backgroundImgURL" width="100%" height="100%" />
     </div>
+    <el-button @click.native="fullScreen" id="full" v-show="false"></el-button>
     <div class="orderNumberData">
       <!--v-show="false" disabled="!isEdit"-->
       <el-input
@@ -39,14 +40,13 @@
     </div>
     <div class="tip">
       手机二维码对准下方摄像头<br />
-      <i
+      <div class="arrowDown">⇩</div>
+      <!-- <i
         class="el-icon-bottom"
         style="padding-left: 450px;font-size: 300px;color: red"
-      ></i>
-      <span style="width: 300px;height: 200px;color: red;margin-left: 50px"
-        >zyf:***</span
-      >
+      ></i> -->
     </div>
+    <div class="emg"><span style="">紧急联系人:曾16670077829</span></div>
   </div>
 </template>
 <script>
@@ -67,6 +67,27 @@ export default {
   //    data:"toSaleSelfMachine"
   // },
   methods: {
+    //全屏函数
+    fullScreen() {
+      // screenfull.request()
+      // console.log('wbei')
+      // // documentElement 属性以一个元素对象返回一个文档的文档元素
+      // // var el = document.documentElement
+      // // el.requestFullscreen ||
+      // // el.mozRequestFullScreen ||
+      // // el.webkitRequestFullscreen ||
+      // // el.msRequestFullScreen
+      // //   ? el.requestFullscreen() ||
+      // //     el.mozRequestFullScreen() ||
+      // //     el.webkitRequestFullscreen() ||
+      // //     el.msRequestFullscreen()
+      // //   : null
+      var wscript = new ActiveXObject('WScript.Shell') //创建ActiveX
+      if (wscript !== null) {
+        //创建成功
+        wscript.SendKeys('{F11}') //触发f11
+      }
+    },
     //输入框自动聚焦
     changfouce() {
       this.$nextTick(x => {
@@ -126,6 +147,7 @@ export default {
     // }
   },
   mounted() {
+    document.getElementById('full').click()
     console.log(screenfull.isFullscreen)
     // this.changfouce();
     const timer = setInterval(async () => {
@@ -195,6 +217,20 @@ export default {
     padding-left: 350px;
     padding-top: 500px;
     color: #4cc9e9;
+    .arrowDown {
+      margin-top: 150px;
+      padding-left: 450px;
+      font-size: 300px;
+      color: red;
+    }
+  }
+  .emg {
+    position: fixed;
+    right: 20px;
+    bottom: 20px;
+    font-size: 30px;
+    color: red;
+    font-weight: 500;
   }
 }
 </style>