zhaowei
2 天以前 98672e42b9ddad9046a1d2b25c3fedbe1d8be662
DNC首页调整样式
已重命名4个文件
已添加1个文件
已修改1个文件
已删除1个文件
332 ■■■■■ 文件已修改
src/views/dashboard/Analysis.vue 6 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/views/dashboard/dncIndex/DncManagerSignage.vue 176 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/views/dashboard/modules/DncManagerSignage.vue 119 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/views/dashboard/modules/EamManagerSignage.vue 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/views/dashboard/modules/MdcManagerSignage.vue 1 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/views/dashboard/modules/SyncProcessList.vue 14 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/views/dashboard/modules/TodoList.vue 14 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/views/dashboard/Analysis.vue
@@ -12,9 +12,9 @@
<script>
  import signageApi from '@/api/signage'
  import MdcManagerSignage from './mdcIndex/MdcManagerSignage.vue'
  import DncManagerSignage from './dncIndex/DncManagerSignage.vue'
  import EamManagerSignage from './eamIndex/EamManagerSignage.vue'
  import MdcManagerSignage from './modules/MdcManagerSignage.vue'
  import DncManagerSignage from './modules/DncManagerSignage.vue'
  import EamManagerSignage from './modules/EamManagerSignage.vue'
  export default {
    name: 'Analysis',
src/views/dashboard/dncIndex/DncManagerSignage.vue
ÎļþÒÑɾ³ý
src/views/dashboard/modules/DncManagerSignage.vue
¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,119 @@
<template>
  <div class="home-container">
    <a-card title="我的待办" class="left-container">
      <a slot="extra" href="#" @click="$router.push('/flowable/workflow/FlowTodo')">更多</a>
      <!-- åµŒå…¥todoList组件并设置默认分类 -->
      <todo-list
        ref="todoList"
        class="embedded-flow-todo"
        :defaultCategories="['drApproval','ggApproval','programConfirmApproval','ncFileSettingProcessApproval']"/>
    </a-card>
    <!-- å³ä¾§ä¸¤ä¸ªå°å¡ç‰‡ -->
    <div class="right-container">
      <a-card title="三位工艺生成产品结构树" class="right-top-container">
        <a slot="extra" href="#" @click="$router.push('/dnc/base/SyncProcessSpecificationInfoList')">更多</a>
        <syncProcessList
          ref="syncProcessList"/>
      </a-card>
      <!--<div class="card top-card">-->
      <!--<h2 class="card-title">三维工艺生成产品结构树</h2>-->
      <!--<h2 class="more-btns" @click="gotoSyncProcessList">更多</h2>-->
      <!--<div class="card-content">-->
      <!--<syncProcessList-->
      <!--ref="syncProcessList"/>-->
      <!--</div>-->
      <!--</div>-->
      <a-card title="派工任务领取">
      </a-card>
      <!--<div class="card bottom-card">-->
      <!--<h2 class="card-title">派工任务领取</h2>-->
      <!--<div class="card-content">-->
      <!--</div>-->
      <!--</div>-->
    </div>
  </div>
</template>
<script>
  import TodoList from '@views/dashboard/modules/TodoList.vue'
  import SyncProcessList from '@views/dashboard/modules/SyncProcessList.vue'
  export default {
    name: 'DncManagerSignage',
    components: {
      TodoList,
      SyncProcessList
    },
    data() {
      return {}
    },
    mounted() {
      this.$nextTick(() => {
        if (this.$refs.todoList) {
          this.$refs.todoList.loadData(1)
        }
      })
    },
    methods: {}
  }
</script>
<style scoped lang="less">
  @container-margin: 10px;
  .home-container {
    display: flex;
    height: 100vh;
    gap: @container-margin;
    /deep/ .ant-card {
      display: flex;
      flex-direction: column;
      & ::-webkit-scrollbar {
        width: 6px; /* æ»šåŠ¨æ¡å®½åº¦ */
      }
      .ant-card-body {
        flex: 1;
        overflow: auto;
      }
    }
    .left-container {
      width: 45%;
      height: 100%;
      /deep/ .ant-card-body {
        padding: 6px 24px 12px;
      }
    }
    .right-container {
      flex: 1;
      display: flex;
      flex-direction: column;
      gap: @container-margin;
      > div {
        flex: 1;
      }
    }
  }
  @media (max-width: 992px) {
    .home-container {
      flex-direction: column;
      > .left-container {
        width: 100%;
      }
    }
  }
</style>
src/views/dashboard/modules/EamManagerSignage.vue
ÎļþÃû´Ó src/views/dashboard/eamIndex/EamManagerSignage.vue ÐÞ¸Ä
@@ -53,7 +53,7 @@
</template>
<script>
  import TodoList from '../TodoList'
  import TodoList from './TodoList'
  import signageApi from '@/api/signage'
  export default {
src/views/dashboard/modules/MdcManagerSignage.vue
ÎļþÃû´Ó src/views/dashboard/mdcIndex/MdcManagerSignage.vue ÐÞ¸Ä
@@ -126,6 +126,7 @@
        this.getDoubleBarChartDataByApi(currentFactoryId)
      },
      // é”€æ¯å›¾è¡¨ç»„ä»¶
      destroyChartsInstances() {
        const charts = [
          this.runningStateChart,
src/views/dashboard/modules/SyncProcessList.vue
ÎļþÃû´Ó src/views/dashboard/SyncProcessList.vue ÐÞ¸Ä
@@ -1,5 +1,5 @@
<template>
  <div class="sync-process-container">
  <div>
    <a-spin :spinning="loading">
      <a-table
        :columns="columns"
@@ -25,7 +25,7 @@
<script>
import '@/assets/less/TableExpand.less'
import SyncProcessSpecificationInfoModal from '../dnc/base/modules/SyncProcessSpecificationInfo/SyncProcessSpecificationInfoModal.vue'
import SyncProcessSpecificationInfoModal from '../../dnc/base/modules/SyncProcessSpecificationInfo/SyncProcessSpecificationInfoModal.vue'
import { JeecgListMixin } from '@/mixins/JeecgListMixin'
import { getAction } from '@api/manage'
@@ -156,16 +156,6 @@
<style scoped>
@import '~@assets/less/common.less';
.sync-process-container {
  padding: 16px;
  background-color: #fff;
  border-radius: 8px;
  box-shadow: 0 2px 8px rgba(0, 0, 0, 0.09);
  height: 500px;
  display: flex;
  flex-direction: column;
}
.table-header {
  display: flex;
src/views/dashboard/modules/TodoList.vue
ÎļþÃû´Ó src/views/dashboard/TodoList.vue ÐÞ¸Ä
@@ -189,13 +189,6 @@
      GuideCardBatchHandle,
      AssignEquipmentFileStreamHandle
    },
    props: {
      // æ·»åŠ é»˜è®¤åˆ†ç±»å±žæ€§
      defaultCategories: {
        type: Array,
        default: () => []
      }
    },
    data() {
      return {
        todoList: [],
@@ -564,8 +557,13 @@
<style scoped lang="less">
  .list-container {
    height: 100%;
    /deep/ .ant-spin-nested-loading, /deep/ .ant-spin-container {
    /deep/ .ant-spin-nested-loading, /deep/ .ant-spin-container, /deep/ .ant-spin-spinning {
      height: 100%;
      max-height: 100%;
    }
    /deep/ .ant-list-item-meta-description {
      width: 98%;
    }
  }
</style>