diff --git a/src/pages/Setup.vue b/src/pages/Setup.vue index ac9524d..df8879f 100644 --- a/src/pages/Setup.vue +++ b/src/pages/Setup.vue @@ -68,7 +68,7 @@ export default { return { loginname: '', password: '', - options: [{value: '1', label: '称重'}, {value: '2', label: '入库'}, {value: '3', label: '生产'}], + options: [{value: '1', label: '称重'}, {value: '2', label: '晶棒库'}, {value: '3', label: '回温库'}], value: this.$store.getters.equipId, baseUrl: this.$store.getters.baseUrl, setTime: this.$store.getters.setTime / 1000, diff --git a/src/pages/modules/InStore.vue b/src/pages/modules/InStore.vue index 2fa663a..6fd9d1a 100644 --- a/src/pages/modules/InStore.vue +++ b/src/pages/modules/InStore.vue @@ -11,23 +11,25 @@
  • -
    {{e.supplierName}}
    -
    {{e.productDescription}}
    -
    {{e.count1}}
    -
    {{e.count2}}
    -
    {{e.count3}}
    -
    {{e.count4}}毫米
    +
    {{e.supplierName}}
    +
    {{e.productDescription}}
    +
    {{e.count1}}
    +
    {{e.count2}}
    +
    {{e.count3}}
    +
    {{e.count4}}
    +
    {{e.ingotBatch}}
@@ -167,7 +169,7 @@ export default { defaultOption1 () { return { step: 0.4, // 数值越大速度滚动越快 - limitMoveNum: 4, // 开始无缝滚动的数据量 this.dataList.length + limitMoveNum: 5, // 开始无缝滚动的数据量 this.dataList.length hoverStop: true, // 是否开启鼠标悬停stop direction: 1, // 0向下 1向上 2向左 3向右 openWatch: true, // 开启数据实时监控刷新dom @@ -254,9 +256,9 @@ export default { color #FF0000 !important .four_wrap height 100% - width 34% + width 32% .four_wrap_1 - width 65% + width 67% .scroll-ul_1 width 100% li @@ -339,9 +341,8 @@ export default { line-height: 13px; text-align: center; color: #fff; - padding 0 2px - word-wrap break-word - overflow-wrap break-word + padding 0 5px + word-break break-all .scroll_container_2 width 100% overflow hidden