1ef38f7b420900816f27bdea509017cab11a96d2..029a6d4f2739cee27c7857af060b119eb461878f
2023-10-30 zhuzhuanzhuan
Merge remote-tracking branch 'origin/master'
029a6d 对比 | 目录
2023-10-30 zhuzhuanzhuan
优化首页布局
6e85d4 对比 | 目录
2023-10-30 zhuzhuanzhuan
优化首页布局
becfd8 对比 | 目录
已修改2个文件
118 ■■■■■ 文件已修改
src/views/dashboard/Analysis.vue 115 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/views/system/modules/WorkshopModal.vue 3 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/views/dashboard/Analysis.vue
@@ -1,41 +1,90 @@
<template>
  <div>
    <index-chart v-if="indexStyle==1"></index-chart>
    <index-bdc v-if="indexStyle==2"></index-bdc>
    <index-task v-if="indexStyle==3"></index-task>
    <div style="width: 100%;text-align: right;margin-top: 20px">
      请选择首页样式:
      <a-radio-group v-model="indexStyle">
        <a-radio :value="1">统计图表</a-radio>
        <a-radio :value="2">统计图表2</a-radio>
        <a-radio :value="3">任务表格</a-radio>
      </a-radio-group>
    </div>
  <div class="page-container" style="width: 100%">
    <!--<index-chart v-if="indexStyle==1"></index-chart>-->
    <!--<index-bdc v-if="indexStyle==2"></index-bdc>-->
    <!--<index-task v-if="indexStyle==3"></index-task>-->
    <!--<div style="width: 100%;text-align: right;margin-top: 20px">-->
    <!--请选择首页样式:-->
    <!--&lt;!&ndash;<a-radio-group v-model="indexStyle">&ndash;&gt;-->
    <!--&lt;!&ndash;<a-radio :value="1">统计图表</a-radio>&ndash;&gt;-->
    <!--&lt;!&ndash;<a-radio :value="2">统计图表2</a-radio>&ndash;&gt;-->
    <!--&lt;!&ndash;<a-radio :value="3">任务表格</a-radio>&ndash;&gt;-->
    <!--&lt;!&ndash;</a-radio-group>&ndash;&gt;-->
    <!--</div>-->
    <!--<a-button type="primary" size="large" v-for="item in workshopList" :key="item.workshopId"-->
    <!--@click="navigateToWorkshopSignage(item.id)">{{item.workshopName}}-->
    <!--</a-button>-->
    <a-card v-for="item in workshopList" :key="item.workshopId"
            @click="navigateToWorkshopSignage(item.id)" class="workshop-entrance">
      {{item.workshopName}}
    </a-card>
  </div>
</template>
<script>
import IndexChart from './IndexChart'
import IndexTask from "./IndexTask"
import IndexBdc from './IndexBdc'
  import IndexChart from './IndexChart'
  import IndexTask from './IndexTask'
  import IndexBdc from './IndexBdc'
  import api from '@/api/mdc'
export default {
  name: "Analysis",
  components: {
    IndexChart,
    IndexTask,
    IndexBdc
  },
  data() {
    return {
      indexStyle: 1
  export default {
    name: 'Analysis',
    components: {
      IndexChart,
      IndexTask,
      IndexBdc
    },
    data() {
      return {
        indexStyle: 1,
        workshopList: []
      }
    },
    created() {
      this.getWorkshopListByApi()
    },
    methods: {
      /**
       * 通过车间Id跳转至相应车间大屏看板
       * @param id 车间Id
       */
      navigateToWorkshopSignage(id) {
        const url = this.$router.resolve(`/workshopSignage/${id}`).href
        window.open(url, '_blank')
      },
      /**
       * 获取车间列表
       */
      getWorkshopListByApi() {
        api.getWorkshopListInHomePageApi().then(res => {
          console.log('res', res)
          if (res.result && res.result.length > 0) {
            this.workshopList = res.result
          }
        })
      }
    }
  },
  created() {
  },
  methods: {
  }
}
</script>
</script>
<style lang="less" scoped>
  .page-container {
    width: 100%;
    display: flex;
    flex-wrap: wrap;
    .workshop-entrance {
      font-size: 30px;
      background-color: #fff;
      width: 300px;
      height: 140px;
      display: flex;
      justify-content: center;
      align-items: center;
      margin: 30px 38px;
      cursor: pointer;
      border-radius: 20px;
    }
  }
</style>
src/views/system/modules/WorkshopModal.vue
@@ -12,9 +12,6 @@
    <a-spin :spinning="confirmLoading">
      <a-form-model ref="form" v-bind="layout" :model="model" :rules="validatorRules">
        <a-form-model-item label="车间编号" required prop="id">
          <a-input v-model="model.id" :disabled="isEdit" placeholder="请输入车间编号"/>
        </a-form-model-item>
        <a-form-model-item label="车间名称" required prop="workshopName">
          <a-input v-model="model.workshopName" placeholder="请输入车间名称"/>
        </a-form-model-item>