Mr.Zhang
2023-08-22 ae2fad05393d2bbb94ec46712a1a717c85e766f0
大萨达撒
已修改4个文件
27 ■■■■■ 文件已修改
screen_standard/src/components/AppLayout.vue 12 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
screen_standard/src/router/index.js 7 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
screen_standard/src/views/index.vue 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
screen_standard/src/views/process.vue 6 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
screen_standard/src/components/AppLayout.vue
@@ -16,10 +16,10 @@
          </template>
        </el-dropdown>
        <img v-else src="@/assets/img/btn_back@2x.png" style="width: 108px;height: 34px; margin-top: 14px;" @click="router.go(-1)">
        <img v-else src="@/assets/img/btn_back@2x.png" style="width: 108px;height: 34px; margin-top: 14px;" @click="back">
      </div>
      
      <div class="title">{{ route.name=='home' ? 'DM云工厂车间大屏' : `${enterprise.procedureName}工序数据看板` }}</div>
      <div class="title">{{ title }}</div>
      <div class="header-item right">
        <img v-if="!isFull" src="@/assets/img/ic_fullscreen@2x.png" class="full-ic" @click="fullChange">
@@ -84,7 +84,9 @@
const unqualifiedRate = computed(() => {
    return enterprise.unqualifiedRate
})
const title = computed(() => {
    return enterprise.procedureName ? 'DM云工厂车间大屏' : `${enterprise.procedureName}工序数据看板`
})
const data = reactive({
  tempCom: { name: '豆米科技' },
  isFull: false,
@@ -160,6 +162,10 @@
  // console.log(date.getDay());
 
})
const back = () => {
  enterprise.setProcedureName('')
  router.go(-1)
}
</script>
<style lang="scss" scoped>
screen_standard/src/router/index.js
@@ -1,11 +1,12 @@
import { createRouter, createWebHistory } from 'vue-router'
import { createRouter, createWebHashHistory } from 'vue-router'
import HomeView from '../views/HomeView.vue'
import indexView from '../views/index.vue'
import processView from '../views/process.vue'
console.log(import.meta.env.VITE_BASE_CONTEXT);
// console.log(import.meta.env.VITE_BASE_CONTEXT);
const router = createRouter({
  
  history: createWebHistory(import.meta.env.VITE_BASE_CONTEXT),
  history: createWebHashHistory(import.meta.env.VITE_BASE_CONTEXT),
  // history: createWebHistory(import.meta.env.VITE_BASE_CONTEXT),
  routes: [
    {
      path: '/',
screen_standard/src/views/index.vue
@@ -15,7 +15,7 @@
                        <div class="content_left_item1_content_row_line">
                            <el-progress
                                :show-text="false"
                                :percentage="item.doneNum / baseNum * 100">
                                :percentage="item.doneNum / baseNum">
                            </el-progress>
                        </div>
                        <div class="content_left_item1_content_row_num">{{ item.doneNum }}</div>
screen_standard/src/views/process.vue
@@ -86,7 +86,7 @@
                <div class="scroll_item_row">{{ item.userName }}</div>
                <div class="scroll_item_row">{{ item.materialName }}</div>
                <div class="scroll_item_row">{{ item.materialCode }}</div>
                <div class="scroll_item_row">{{ item.createTime }}</div>
                <div class="scroll_item_row" style="flex: 1.5;">{{ item.createTime }}</div>
                <div class="scroll_item_row">{{ item.qualifiedNum }}</div>
                <div class="scroll_item_row">{{ item.unqualifiedNum }}</div>
                <div class="scroll_item_row">{{ item.unqualifiedRate }}%</div>
@@ -142,7 +142,7 @@
  ]
})
let { listData, top1, top2, baseNum, allBad } = toRefs(data)
let { listData, top1, top2, baseNum, allBad, reportListData } = toRefs(data)
// start()
onBeforeUnmount(() => {
@@ -154,7 +154,7 @@
  initData()
  mainTimer.value = setInterval(() => {
    initData()
  }, 6000)
  }, 60000)
})