diff --git a/src/views/bigScreen/drivingCabin/center2.vue b/src/views/bigScreen/drivingCabin/center2.vue index c715998..02335b1 100644 --- a/src/views/bigScreen/drivingCabin/center2.vue +++ b/src/views/bigScreen/drivingCabin/center2.vue @@ -4,7 +4,7 @@ - +
  • - 今日收入 + 今日收入 1234万
  • - 今日支出 + 今日支出 1234万
  • - 今日新签合同 + 今日新签合同 1234份
  • - 今日安全问题 + 今日安全问题 1234个
  • - 今日质量问题 + 今日质量问题 1234个
  • - 今日设备数 + 今日设备数 123台 运行率:88%
  • - 今日职工数 + 今日职工数 890人 出勤率:73%
  • - 今日生产任务 + 今日生产任务 890个 完成率:66% @@ -65,39 +85,32 @@ - diff --git a/src/views/bigScreen/scientific/tab1/right1.vue b/src/views/bigScreen/scientific/tab1/right1.vue index 06de4bf..ead3e8c 100644 --- a/src/views/bigScreen/scientific/tab1/right1.vue +++ b/src/views/bigScreen/scientific/tab1/right1.vue @@ -1,302 +1,326 @@ diff --git a/src/views/bigScreen/scientific/tab2/center3.vue b/src/views/bigScreen/scientific/tab2/center3.vue index 9ca44c0..b8fa1c7 100644 --- a/src/views/bigScreen/scientific/tab2/center3.vue +++ b/src/views/bigScreen/scientific/tab2/center3.vue @@ -3,29 +3,54 @@
    - + 序号 物资名称 现有库存 - 是否开始备货采购 + 是否开始备货采购 采购数量 入库时间 - +
    • - {{item.id}} - {{item.materialName}} - {{item.stock}} + {{ + item.id + }} + {{ item.materialName }} + {{ + item.stock + }} - {{item.startPurchase}} + {{ item.startPurchase }} - {{item.purchaseNumber}} - {{item.createTime}} - + {{ + item.purchaseNumber + }} + {{ + item.createTime + }}
    @@ -33,49 +58,48 @@
    - diff --git a/src/views/chartList/page2/one/index.vue b/src/views/chartList/page2/one/index.vue index 665ab15..d171803 100644 --- a/src/views/chartList/page2/one/index.vue +++ b/src/views/chartList/page2/one/index.vue @@ -1,53 +1,69 @@ diff --git a/src/views/chartList/page2/one/right3.vue b/src/views/chartList/page2/one/right3.vue index cea97df..2e64773 100644 --- a/src/views/chartList/page2/one/right3.vue +++ b/src/views/chartList/page2/one/right3.vue @@ -1,174 +1,198 @@ diff --git a/vue.config.js b/vue.config.js index b4b08b5..b673fe9 100644 --- a/vue.config.js +++ b/vue.config.js @@ -35,7 +35,7 @@ module.exports = { [process.env.VUE_APP_BASE_API]: { // target: `http://localhost:1818`, // target: `http://120.26.107.74:1818`, - target: `http://192.168.0.115:1818`, + target: `http://192.168.0.154:1818`, // target: `http://124.70.138.50:1818`, changeOrigin: true, pathRewrite: {