From 9332d9304a8175cb56f5d2d21fcc0d910a058fde Mon Sep 17 00:00:00 2001
From: caill <815519168@qq.com>
Date: Wed, 13 Jul 2022 14:21:40 +0800
Subject: [PATCH] =?UTF-8?q?=E6=8E=A5=E5=8F=A3=E6=A0=BC=E5=BC=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 index.html                | 15 +++++++
 src/assets/js/getData1.js |  5 +++
 src/assets/js/getData2.js | 10 +++++
 src/assets/js/http.js     | 78 ++++++++++++++++++++++++++++++++
 src/main.js               |  2 +-
 src/pages/Animation.vue   | 24 +++-------
 src/pages/Kanban.vue      | 64 ++++++++++++--------------
 src/pages/WorkShop.vue    | 94 ++++++++++++++++++---------------------
 8 files changed, 187 insertions(+), 105 deletions(-)
 create mode 100644 src/assets/js/getData1.js
 create mode 100644 src/assets/js/getData2.js
 create mode 100644 src/assets/js/http.js

diff --git a/index.html b/index.html
index 810d822..a8fdeda 100644
--- a/index.html
+++ b/index.html
@@ -8,3 +8,18 @@
     <div id="app"></div>
   </body>
 </html>
+
+<script>
+  (function (doc, win) {
+      var docEl = doc.documentElement,
+          resizeEvt = 'orientationchange' in window ? 'orientationchange' : 'resize',
+          recalc = function () {
+              var clientWidth = docEl.clientWidth;
+              if (!clientWidth) return;
+              docEl.style.fontSize = 100 * (clientWidth / 1920) + 'px';
+          };
+      if (!doc.addEventListener) return;
+      win.addEventListener(resizeEvt, recalc, false);
+      doc.addEventListener('DOMContentLoaded', recalc, false);
+  })(document, window);
+</script>
\ No newline at end of file
diff --git a/src/assets/js/getData1.js b/src/assets/js/getData1.js
new file mode 100644
index 0000000..8e3f01e
--- /dev/null
+++ b/src/assets/js/getData1.js
@@ -0,0 +1,5 @@
+import {post} from '@js/http.js'
+
+export const workScreen = (wflag) => post('api/bigScreenScreen/workScreen', {
+  web_flag: wflag
+})
diff --git a/src/assets/js/getData2.js b/src/assets/js/getData2.js
new file mode 100644
index 0000000..5a6345f
--- /dev/null
+++ b/src/assets/js/getData2.js
@@ -0,0 +1,10 @@
+import {post} from '@js/http.js'
+
+export const screenZK = (id, cid) => post('api/bigScreenScreen/zk', {
+  accountId: id,
+  center_id: cid
+})
+export const query3Dcartoon = (id, cid) => post('api/bigScreenScreen/query3Dcartoon', {
+  accountId: id,
+  center_id: cid
+})
diff --git a/src/assets/js/http.js b/src/assets/js/http.js
new file mode 100644
index 0000000..4960031
--- /dev/null
+++ b/src/assets/js/http.js
@@ -0,0 +1,78 @@
+import axios from 'axios'
+import { Dialog, toast } from './mUtils.js'
+import store from '../../vuex/store'
+import router from '@/router'
+
+axios.defaults.timeout = 50000
+axios.defaults.headers.post['Content-Type'] = 'application/json;charset=UTF-8'
+
+axios.interceptors.request.use(
+  config => {
+    if (config.method === 'post') {
+      if (!config.data.flag) {
+        config.data = config.data
+      } else {
+        config.data = config.data.formData
+      }
+    }
+    return config
+  },
+  error => {
+    Dialog('错误的传参')
+    return Promise.reject(error)
+  }
+)
+
+axios.interceptors.response.use(
+  response => {
+    if (response.status === 200) {
+      return Promise.resolve(response)
+    } else {
+      return Promise.reject(response)
+    }
+  },
+  error => {
+    if (error && error.response) {
+      switch (error.response.status) {
+        case 401:
+          toast(error.response.data.message)
+          store.dispatch('setSignOut')
+          router.push('/login')
+          break
+      }
+      return Promise.reject(error.response.data)
+    } else {
+      return Promise.reject(error)
+    }
+  }
+)
+
+export const post = (sevmethod, params) => {
+  return new Promise((resolve, reject) => {
+    axios.post(`${store.getters.baseUrl}/` + sevmethod, params)
+      .then(response => {
+        resolve(response.data)
+      }, error => {
+        Dialog(error.message)
+        reject(error.message)
+      })
+      .catch((error) => {
+        reject(error)
+      })
+  })
+}
+
+export const post1 = (sevmethod, params) => {
+  return new Promise((resolve, reject) => {
+    axios.post(sevmethod, params)
+      .then(response => {
+        resolve(response.data)
+      }, error => {
+        Dialog(error.message)
+        reject(error.message)
+      })
+      .catch((error) => {
+        reject(error)
+      })
+  })
+}
diff --git a/src/main.js b/src/main.js
index 1bb713c..0ab7a4b 100644
--- a/src/main.js
+++ b/src/main.js
@@ -6,7 +6,7 @@ import store from './vuex/store'
 import _ from 'lodash'
 import '@css/reset.css'
 import '@css/layout.styl'
-import '@js/rem.js'
+// import '@js/rem.js'
 import filter from '@js/filter.js'
 import { Dialog, toast } from '@js/mUtils.js'
 import {post} from '@fetch/api.js'
diff --git a/src/pages/Animation.vue b/src/pages/Animation.vue
index 5d5c016..5b0def6 100644
--- a/src/pages/Animation.vue
+++ b/src/pages/Animation.vue
@@ -44,6 +44,7 @@
 
 <script>
 import NavHeader from '@components/header.vue'
+import {query3Dcartoon} from '@js/getData2.js'
 export default {
   name: 'Animation',
   components: {
@@ -63,24 +64,13 @@ export default {
     this.getData()
   },
   methods: {
-    getData () {
-      let data = {
-        '_SRVNAME': 'server.app.screenAPI',
-        '_SRVMETHOD': 'query3Dcartoon',
-        '_DATA': JSON.stringify({
-          accountId: '',
-          form: {
-            center_id: ''
-          }
-        })
+    async getData () {
+      let res = await query3Dcartoon('', '')
+      if (res.code === '1') {
+        this.initInfo = res.result
+      } else {
+        this.Dialog(res.desc)
       }
-      this
-        .$post(data)
-        .then(res => {
-          if (res.code === '1') {
-            this.initInfo = res.result
-          }
-        })
     }
   }
 }
diff --git a/src/pages/Kanban.vue b/src/pages/Kanban.vue
index a09c3c3..3aac0e6 100644
--- a/src/pages/Kanban.vue
+++ b/src/pages/Kanban.vue
@@ -175,6 +175,7 @@
 import NavHeader from '@components/nav.vue'
 import NumberGrow from '@/components/NumberGrow'
 import * as echarts from 'echarts'
+import {workScreen} from '@js/getData1.js'
 export default {
   name: 'producedata',
   components: {
@@ -375,44 +376,35 @@ export default {
         this.getList()
       }, this.interTime)
     },
-    getList () {
-      let data = {
-        '_SRVNAME': 'server.app.LargeScreenAPI',
-        '_SRVMETHOD': 'queryLargeScreen',
-        '_DATA': JSON.stringify({
-          web_flag: this.$route.query.type || '1'
+    async getList () {
+      let type = this.$route.query.type || '1'
+      let res = await workScreen(type)
+      if (res.code === '1') {
+        this.xdata2 = []
+        this.ydata2 = []
+        this.initData = res.result
+        this.nav.title = res.result.screenname
+        this.arr1 = res.result.arr1
+        this.arr2 = res.result.arr2
+        this.jo3 = res.result.jo3
+        this.jo6 = res.result.jo6
+        this.arr4 = res.result.arr4
+        this.arr5 = res.result.arr5
+        this.data = [
+          {value: this.jo3.sumproduce_qty, name: '未开始数量'},
+          {value: this.jo3.sumproducing_qty, name: '生产中数量'},
+          {value: this.jo3.sumfinishproduce_qty, name: '已完成数量'}
+        ]
+        res.result.arr7.forEach((el) => {
+          this.xdata2.push(el.date)
+          this.ydata2.push(el.count)
         })
+        this._getEchart()
+        this._getEchart1()
+        this._getEchart2()
+      } else {
+        // this.toast(res.desc)
       }
-      this
-        .$post(data)
-        .then(res => {
-          if (res.code === '1') {
-            this.xdata2 = []
-            this.ydata2 = []
-            this.initData = res.result
-            this.nav.title = res.result.screenname
-            this.arr1 = res.result.arr1
-            this.arr2 = res.result.arr2
-            this.jo3 = res.result.jo3
-            this.jo6 = res.result.jo6
-            this.arr4 = res.result.arr4
-            this.arr5 = res.result.arr5
-            this.data = [
-              {value: this.jo3.sumproduce_qty, name: '未开始数量'},
-              {value: this.jo3.sumproducing_qty, name: '生产中数量'},
-              {value: this.jo3.sumfinishproduce_qty, name: '已完成数量'}
-            ]
-            res.result.arr7.forEach((el) => {
-              this.xdata2.push(el.date)
-              this.ydata2.push(el.count)
-            })
-            this._getEchart()
-            this._getEchart1()
-            this._getEchart2()
-          } else {
-            // this.toast(res.desc)
-          }
-        })
     },
     _getEchart () {
       let data = this.data
diff --git a/src/pages/WorkShop.vue b/src/pages/WorkShop.vue
index 789c13b..1d14967 100644
--- a/src/pages/WorkShop.vue
+++ b/src/pages/WorkShop.vue
@@ -88,6 +88,7 @@
 <script>
 import NavHeader from '@components/header.vue'
 import { maxArr } from '@js/mUtils.js'
+import {screenZK} from '@js/getData2.js'
 export default {
   name: 'WorkShop',
   components: {
@@ -562,59 +563,50 @@ export default {
       let myChart = this.$echarts.init(echart)
       myChart.setOption(option)
     },
-    _getDatas () {
-      let data = {
-        '_SRVNAME': 'server.app.screenAPI',
-        '_SRVMETHOD': 'queryWorkshop',
-        '_DATA': JSON.stringify({
-          accountId: '',
-          form: {
-            center_id: this.$store.getters.workshopId
-          }
-        })
+    async _getDatas () {
+      let cid = ''
+      if (this.$store.getters.workshopId) {
+        cid = this.$store.getters.equipId
       }
-      this
-        .$post(data)
-        .then(res => {
-          if (res.code === '1') {
-            this.nameToday = []
-            this.numToday = []
-            this.numPlan = []
-            this.dateBar1 = []
-            this.enoughBar1 = []
-            this.needNumBar1 = []
-            this.notEnoughBar1 = []
-            this.dateBar2 = []
-            this.enoughBar2 = []
-            this.needNumBar2 = []
-            this.notEnoughBar2 = []
-            this.debugging = res.result.shopData.production_today1
-            this.shopData = res.result.shopData
-            this.calculator()
-            res.result.production.map(el => {
-              this.nameToday.push(el.name_today)
-              this.numToday.push(el.num_today)
-              this.numPlan.push(el.num_plan)
-            })
-            res.result.data_bar1.xDate.map(el => {
-              this.dateBar1.push(el.date)
-              this.enoughBar1.push(el.enough)
-              this.needNumBar1.push(el.need_num)
-              this.notEnoughBar1.push(el.not_enough)
-            })
-            res.result.data_bar2.xDate.map(el => {
-              this.dateBar2.push(el.date)
-              this.enoughBar2.push(el.enough)
-              this.needNumBar2.push(el.repertory)
-              this.notEnoughBar2.push(el.not_enough)
-            })
-            this._getEchart1()
-            this._getEchart2()
-            this._getEchart3()
-          } else {
-            this.toast(res.desc)
-          }
+      let res = await screenZK('', cid)
+      if (res.code === '1') {
+        this.nameToday = []
+        this.numToday = []
+        this.numPlan = []
+        this.dateBar1 = []
+        this.enoughBar1 = []
+        this.needNumBar1 = []
+        this.notEnoughBar1 = []
+        this.dateBar2 = []
+        this.enoughBar2 = []
+        this.needNumBar2 = []
+        this.notEnoughBar2 = []
+        this.debugging = res.result.shopData.production_today1
+        this.shopData = res.result.shopData
+        this.calculator()
+        res.result.production.map(el => {
+          this.nameToday.push(el.name_today)
+          this.numToday.push(el.num_today)
+          this.numPlan.push(el.num_plan)
         })
+        res.result.data_bar1.xDate.map(el => {
+          this.dateBar1.push(el.date)
+          this.enoughBar1.push(el.enough)
+          this.needNumBar1.push(el.need_num)
+          this.notEnoughBar1.push(el.not_enough)
+        })
+        res.result.data_bar2.xDate.map(el => {
+          this.dateBar2.push(el.date)
+          this.enoughBar2.push(el.enough)
+          this.needNumBar2.push(el.repertory)
+          this.notEnoughBar2.push(el.not_enough)
+        })
+        this._getEchart1()
+        this._getEchart2()
+        this._getEchart3()
+      } else {
+        this.Dialog(res.desc)
+      }
     }
   },
   beforeDestroy () {