加两侧数据点击显示

2025-12-04 17:14:53 +08:00
parent bb5297bace
commit 671dd53505
8 changed files with 1206 additions and 189 deletions
--- a/README.md
+++ b/README.md
@@ -21,4 +21,5 @@ npm run build --report
 For a detailed explanation on how things work, check out the [guide](http://vuejs-templates.github.io/webpack/) and [docs for vue-loader](http://vuejs.github.io/vue-loader).

 # 注意事项
-+ 华祥大屏分辨率都为 1920 * 1080
+ 华祥大屏分辨率都为 1920 * 1080
+ 用到iconfont2-x:用电量，用气量
--- a/src/config/mork2.js
+++ b/src/config/mork2.js
@@ -486,7 +486,43 @@ export const deviceCondition = () => {
 */
 export const screenTableData = () => {
  let res = {
-    "mixingList": [],
+    "devicekwhList": [
+        {
+            "device_code": "设备名称1",
+            "today_kwh": "12",
+            "month_kwh": "300"
+        }
+    ],
+    "devicekqiList": [
+        {
+            "device_code": "设备名称1",
+            "today_qi": "15",
+            "month_qi": "450"
+        }
+    ],
+    "todayproductList": [
+        {
+            "customer": "收货单位1",
+            "material_name": "产品名称1",
+            "material_model": "规格型号",
+            "material_qty": "1000",
+            "product_time": "2025-11-27"
+        }
+    ],
+    "mixingList": [
+        {
+            "start_point_code": "混碾机1",
+            "material_code": "配方号1",
+            "finish_point_code": "压机1",
+            "weight": "1000"
+        },
+        {
+            "start_point_code": "混碾机2",
+            "material_code": "配方号2",
+            "finish_point_code": "压机2",
+            "weight": "1500"
+        }
+    ],
    "historyList": [
        {
            "produceDate": "09-21",
@@ -524,47 +560,206 @@ export const screenTableData = () => {
            "finishedNum": "16.4"
        }
    ],
+    "historymonthList": [
+        {
+            "produceDate": "09-21",
+            "suppressedNum": "8.4",
+            "finishedNum": "7.9"
+        },
+        {
+            "produceDate": "09-22",
+            "suppressedNum": "8.9",
+            "finishedNum": "9.9"
+        },
+        {
+            "produceDate": "09-23",
+            "suppressedNum": "10.4",
+            "finishedNum": "11"
+        },
+        {
+            "produceDate": "09-24",
+            "suppressedNum": "9.5",
+            "finishedNum": "12.3"
+        },
+        {
+            "produceDate": "09-25",
+            "suppressedNum": "13.4",
+            "finishedNum": "11.9"
+        },
+        {
+            "produceDate": "09-26",
+            "suppressedNum": "10.2",
+            "finishedNum": "14.6"
+        },
+        {
+            "produceDate": "09-27",
+            "suppressedNum": "18.4",
+            "finishedNum": "16.4"
+        },
+        {
+            "produceDate": "09-28",
+            "suppressedNum": "8.4",
+            "finishedNum": "7.9"
+        },
+        {
+            "produceDate": "09-29",
+            "suppressedNum": "8.9",
+            "finishedNum": "9.9"
+        },
+        {
+            "produceDate": "09-30",
+            "suppressedNum": "10.4",
+            "finishedNum": "11"
+        },
+        {
+            "produceDate": "10-01",
+            "suppressedNum": "9.5",
+            "finishedNum": "12.3"
+        },
+        {
+            "produceDate": "10-02",
+            "suppressedNum": "13.4",
+            "finishedNum": "11.9"
+        },
+        {
+            "produceDate": "10-03",
+            "suppressedNum": "10.2",
+            "finishedNum": "14.6"
+        },
+        {
+            "produceDate": "10-04",
+            "suppressedNum": "18.4",
+            "finishedNum": "16.4"
+        },
+        {
+            "produceDate": "10-05",
+            "suppressedNum": "8.4",
+            "finishedNum": "7.9"
+        },
+        {
+            "produceDate": "10-06",
+            "suppressedNum": "8.9",
+            "finishedNum": "9.9"
+        },
+        {
+            "produceDate": "10-07",
+            "suppressedNum": "10.4",
+            "finishedNum": "11"
+        },
+        {
+            "produceDate": "10-08",
+            "suppressedNum": "9.5",
+            "finishedNum": "12.3"
+        },
+        {
+            "produceDate": "10-09",
+            "suppressedNum": "13.4",
+            "finishedNum": "11.9"
+        },
+        {
+            "produceDate": "10-10",
+            "suppressedNum": "10.2",
+            "finishedNum": "14.6"
+        },
+        {
+            "produceDate": "10-11",
+            "suppressedNum": "18.4",
+            "finishedNum": "16.4"
+        },
+        {
+            "produceDate": "10-12",
+            "suppressedNum": "8.4",
+            "finishedNum": "7.9"
+        },
+        {
+            "produceDate": "10-13",
+            "suppressedNum": "8.9",
+            "finishedNum": "9.9"
+        },
+        {
+            "produceDate": "10-14",
+            "suppressedNum": "10.4",
+            "finishedNum": "11"
+        },
+        {
+            "produceDate": "10-15",
+            "suppressedNum": "9.5",
+            "finishedNum": "12.3"
+        },
+        {
+            "produceDate": "10-16",
+            "suppressedNum": "13.4",
+            "finishedNum": "11.9"
+        },
+        {
+            "produceDate": "10-17",
+            "suppressedNum": "10.2",
+            "finishedNum": "14.6"
+        },
+        {
+            "produceDate": "10-18",
+            "suppressedNum": "18.4",
+            "finishedNum": "16.4"
+        },
+        {
+            "produceDate": "10-19",
+            "suppressedNum": "10.2",
+            "finishedNum": "14.6"
+        },
+        {
+            "produceDate": "10-20",
+            "suppressedNum": "18.4",
+            "finishedNum": "16.4"
+        }
+    ],
    "pressdayList": [
        {
            "devicecode": "YJ09",
            "planqty": "0",
-            "realqty": "851",
+            "qualified_qty": "100",
+            "unqualified_qty": "5",
            "materialCode": "ML-60BT"
        },
        {
            "devicecode": "YJ07",
            "planqty": "0",
-            "realqty": "120",
+            "qualified_qty": "140",
+            "unqualified_qty": "10",
            "materialCode": "MT-14AT"
        },
        {
            "devicecode": "YJ08",
            "planqty": "0",
-            "realqty": "2",
+            "qualified_qty": "103",
+            "unqualified_qty": "2",
            "materialCode": "ML-60BT"
        },
        {
            "devicecode": "YJ06",
            "planqty": "0",
-            "realqty": "60",
+            "qualified_qty": "160",
+            "unqualified_qty": "5",
            "materialCode": "MT-14AT"
        },
        {
            "devicecode": "YJ05",
            "planqty": "0",
-            "realqty": "14",
+            "qualified_qty": "180",
+            "unqualified_qty": "5",
            "materialCode": "ML-60BT"
        },
        {
            "devicecode": "YJ02",
            "planqty": "0",
-            "realqty": "0",
+            "qualified_qty": "100",
+            "unqualified_qty": "7",
            "materialCode": "AP-70A"
        },
        {
            "devicecode": "YJ01",
            "planqty": "0",
-            "realqty": "0",
+            "qualified_qty": "120",
+            "unqualified_qty": "8",
            "materialCode": "MT-14AT"
        }
    ],
--- a/src/pages/Setup2.vue
+++ b/src/pages/Setup2.vue
@@ -0,0 +1,166 @@
+<template>
+  <div class="login-container">
+    <div class="body-container">
+      <div class="login_wrap">
+        <div class="login_cnt">
+          <div class="title-name">系统配置</div>
+          <div class="login_card">
+            <div class="card_wrap">
+              <div class="inputOuter">
+                <label>域名地址</label>
+                <input type="text" class="inputStyle" v-model="baseUrl">
+              </div>
+              <div class="inputOuter">
+                <label>刷新时间（秒）</label>
+                <input type="number" class="inputStyle" v-model="setTime">
+              </div>
+            </div>
+            <button class="btn" @click="_config">配置</button>
+            <!-- <button class="btn" @click="getCc">获取尺寸</button> -->
+          </div>
+        </div>
+      </div>
+    </div>
+  </div>
+</template>
+
+<script>
+import SelectOpt from '@components/select.vue'
+export default {
+  components: {
+    SelectOpt
+  },
+  data () {
+    return {
+      loginname: '',
+      password: '',
+      baseUrl: this.$store.getters.baseUrl,
+      setTime: this.$store.getters.setTime / 1000
+    }
+  },
+  methods: {
+    getCc () {
+      const screenWidth = window.screen.width
+      const screenHeight = window.screen.height
+      alert('宽：' + screenWidth + ';' + '高：' + screenHeight + ';')
+    },
+    _config () {
+      if (this.setTime > 10800) {
+        this.$message({
+          message: '刷新时间设置过长',
+          type: 'warning'
+        })
+        return
+      }
+      let obj = {
+        baseUrl: this.baseUrl,
+        setTime: this.setTime * 1000
+      }
+      this.$store.dispatch('setConfig', obj)
+      this.$router.push('/home')
+      let element = document.documentElement
+      if (!(document.fullscreenElement || document.mozFullscreenElement || document.webkitFullscreenElement || document.msFullscreenElement)) {
+        if (element.requestFullscreen) {
+          element.requestFullscreen()
+        } else if (element.webkitRequestFullScreen) {
+          element.webkitRequestFullScreen()
+        } else if (element.mozRequestFullScreen) {
+          element.mozRequestFullScreen()
+        } else if (element.msRequestFullscreen) {
+          // IE11
+          element.msRequestFullscreen()
+        }
+      }
+    }
+  }
+}
+</script>
+
+<style lang="stylus" scoped>
+@import '~@style/mixin'
+.login-container
+  position relative
+  _wh(100%, 100%)
+  z-index 1
+.body-container
+  position relative
+  z-index 3
+  _wh(100%, 100%)
+  _fj(row, center)
+  margin 0 auto
+.login_wrap
+  width 500px
+  background-color rgba(255, 255, 255, 0.8)
+  border-radius 5px
+.login_tab
+  position relative
+  height 50px
+  font-size 0
+  background-color rgba(255, 255, 255, 0.9)
+  border-radius 5px 5px 0 0
+.login_tab_item
+  float left
+  width 50%
+  font-size 16px
+  line-height 50px
+  color #333333
+  text-align center
+  cursor pointer
+.login_tab_line
+  position absolute
+  width 50%
+  height 2px
+  background-color #2778f3
+  left 0
+  bottom 0
+.login_cnt
+  width 100%
+  padding 15px
+.title-name
+  _font(16px, 28px, #000,,center)
+  margin-bottom 10px
+.login_card
+  width 100%
+.inputOuter
+  _fj(row)
+  height 40px
+  line-height 40px
+  width 100%
+  margin-bottom 12px
+.inputStyle
+  _wh(calc(100% - 116px), 40px)
+  font-size 14px
+  background none
+  line-height 40px
+  color #606266
+  padding 0 15px
+  border none
+  box-sizing border-box
+  background-color #ffffff
+.select-wraper
+  _wh(calc(100% - 116px), 40px)
+.submit
+  width 100%
+  background-color #2778f3
+  border-radius 3px
+  margin-top 5px
+.btn
+  background-color #2778f3
+  border-radius 3px
+  margin-top 5px
+  height 40px
+  font-size 18px
+  color #fff
+  line-height 39px
+  width 100%
+  outline none
+  border none
+  font-weight normal
+label
+  width 115px
+  font-size 15px
+  line-height 40px
+  color #333333
+.el-select
+  width 100%
+</style>
--- a/src/pages/modules/home/index.vue
+++ b/src/pages/modules/home/index.vue
--- a/src/style/iconfont.styl
+++ b/src/style/iconfont.styl
@@ -4,6 +4,12 @@
       url('iconfont/iconfont.woff') format('woff'),
       url('iconfont/iconfont.ttf') format('truetype');
 }
+@font-face {
+  font-family: 'iconfont2';
+  src: url('iconfont2/iconfont.woff2') format('woff2'),
+       url('iconfont2/iconfont.woff') format('woff'),
+       url('iconfont2/iconfont.ttf') format('truetype');
+}
@font-face {
  font-family: "YouSheBiaoTiHei";
  src: url('font/YouSheBiaoTiHei.ttf') format('truetype');
@@ -27,7 +33,20 @@
  -webkit-font-smoothing: antialiased;
  -moz-osx-font-smoothing: grayscale;
 }
-
+.iconfont2 {
+  font-family: "iconfont2" !important;
+  font-size: 16px;
+  font-style: normal;
+  -webkit-font-smoothing: antialiased;
+  -moz-osx-font-smoothing: grayscale;
+}
 .icon-guanbi:before {
  content: "\e60f";
+}
+.icon-elec:before {
+  content: "\e600";
+}
+.icon-qi:before {
+  content: "\e805";
+  color: "#f4ea2a";
 }
--- a/src/style/iconfont2/iconfont.ttf
+++ b/src/style/iconfont2/iconfont.ttf
--- a/src/style/iconfont2/iconfont.woff
+++ b/src/style/iconfont2/iconfont.woff
--- a/src/style/iconfont2/iconfont.woff2
+++ b/src/style/iconfont2/iconfont.woff2