添加首页功能

hyingbo

2 天以前 5575dcb361ae7aff8095223db61ba40d6b64616a

添加首页功能

 src/api/signage.js

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,6 @@
import { getAction, deleteAction, putAction, postAction, httpAction } from '@/api/manage'

export default {
  // æ ¹æ®ç”¨æˆ·ID获取用户信息
  getUserByIdApi: id => getAction('sys/api/getUserById', { id }),
}

 src/components/layouts/TabLayout.vue

@@ -5,7 +5,7 @@
    <!-- update-end- author:sunjianlei --- date:20191009 --- for: æå‡å³é”®èœå•çš„层级 -->
    <a-tabs
      @contextmenu.native="e => onContextmenu(e)"
      v-if="multipage"
      v-if="$route.meta.title!=='首页'&&multipage"
      :active-key="activePage"
      class="tab-layout-tabs"
      style="height:52px"
@@ -14,11 +14,12 @@
      @change="changePage"
      @tabClick="tabCallBack"
      @edit="editPage">
      <a-tab-pane :id="page.fullPath" :key="page.fullPath" v-for="page in pageList" :closable="!(page.meta.title=='首页')">
        <span slot="tab" :pagekey="page.fullPath">{{ page.meta.title }}</span>
      <a-tab-pane :id="page.path" :key="page.path" v-for="page in pageList"
                  :closable="!(page.meta.title=='首页')">
        <span slot="tab" :pagekey="page.path">{{ page.meta.title }}</span>
      </a-tab-pane>
    </a-tabs>
    <div style="margin: 12px 12px 0;">
    <div :style="{padding: $route.meta.title=='首页'?'0':'12px 12px 0'}">
      <!-- update-begin-author:taoyan date:20201221 for:此处删掉transition标签 ä¸çŸ¥é“为什么加上后 é¡µé¢è·¯ç”±åˆ‡æ¢çš„时候即1及菜单切到2及菜单的时候 ä¸¤ä¸ªèœå•é¡µé¢ä¼šåŒæ—¶å‡ºçŽ°300-500秒左右 -->
      <keep-alive v-if="multipage">
        <router-view v-if="reloadFlag"/>
@@ -28,9 +29,6 @@
      </template>
      <!-- update-end-author:taoyan date:20201221 for:此处删掉transition标签 ä¸çŸ¥é“为什么加上后 é¡µé¢è·¯ç”±åˆ‡æ¢çš„时候即1及菜单切到2及菜单的时候 ä¸¤ä¸ªèœå•é¡µé¢ä¼šåŒæ—¶å‡ºçŽ°300-500秒左右 -->
    </div>
    <!-- update-begin-author:zyf date:20211129 for:qiankun æŒ‚载子应用盒子 -->
    <div id="content" class="app-view-box"></div>
    <!-- update-end-author:zyf date:20211129 for: qiankun æŒ‚载子应用盒子-->
  </global-layout>
</template>

@@ -41,7 +39,6 @@
  import { triggerWindowResizeEvent } from '@/utils/util'
  import Vue from 'vue'
  import { CACHE_INCLUDED_ROUTES } from '@/store/mutation-types'
  import registerApps from "@/qiankun";

  const indexKey = '/dashboard/analysis'

@@ -70,9 +67,7 @@
    /* update_begin author:wuxianquan date:20190828 for: å…³é—­å½“前tab页，供子页面调用 ->望菜单能配置外链，直接弹出新页面而不是嵌入iframe #428 */
    provide(){
      return{
        closeCurrent:this.closeCurrent,
        changeTitle: this.changeTitle,
        changeTabTitle: this.changeTabTitle,
      closeCurrent: this.closeCurrent
      }
    },
    /* update_end author:wuxianquan date:20190828 for: å…³é—­å½“前tab页，供子页面调用->望菜单能配置外链，直接弹出新页面而不是嵌入iframe #428 */
@@ -96,16 +91,9 @@
      this.pageList.push(currentRoute)
      this.linkList.push(currentRoute.fullPath)
      this.activePage = currentRoute.fullPath
    this.$bus.$on('clickMenuTitleSelected', this.clickMenuTitleSelected)
    },
    mounted() {
      if (process.env.VUE_APP_QIANKUN == 'true') {
        //update-begin-author:zyf date:20211129 for:qiankun æ³¨å†Œå­åº”用
        if (!window.qiankunStarted) {
          window.qiankunStarted = true;
          registerApps();
        }
        //update-end-author:zyf date:20211129 for:qiankun æ³¨å†Œå­åº”用
      }
    },
    watch: {
      '$route': function(newRoute) {
@@ -139,7 +127,7 @@
        let index = this.linkList.lastIndexOf(key)
        let waitRouter = this.pageList[index]
        // ã€TESTA-523】修复：不允许重复跳转路由异常
        if (waitRouter.fullPath !== this.$route.fullPath) {
      if (waitRouter.path !== this.$route.fullPath) {
          this.$router.push(Object.assign({}, waitRouter))
        }
        this.changeTitle(waitRouter.meta.title)
@@ -157,7 +145,7 @@
        if (this.multipage && this.linkList.indexOf(indexKey) === -1) {
          this.addIndexToFirst()
        }
      },
    }
      // update-end-author:sunjianlei date:20191223 for: ä¿®å¤ä»Žå•é¡µæ¨¡å¼åˆ‡æ¢å›žå¤šé¡µæ¨¡å¼åŽé¦–页不居第一位的 BUG
    },
    methods: {
@@ -178,30 +166,13 @@
      // update-end-author:sunjianlei date:20191223 for: ä¿®å¤ä»Žå•é¡µæ¨¡å¼åˆ‡æ¢å›žå¤šé¡µæ¨¡å¼åŽé¦–页不居第一位的 BUG

      // update-begin-author:sunjianlei date:20200120 for: åŠ¨æ€æ›´æ”¹é¡µé¢æ ‡é¢˜
      /**
       * ä¿®æ”¹å½“前页面的窗口标题
       * @param title è¦ä¿®æ”¹çš„新标题
       */
      changeTitle(title) {
        let projectTitle = "MDC智慧车间"
      let projectTitle = 'MDC智慧车间'
        // é¦–页特殊处理
        if (this.$route.path === indexKey) {
          document.title = projectTitle
        } else {
          document.title = title + ' Â· ' + projectTitle
        }
      },
      /**
       * ä¿®æ”¹tab标签的标题
       * @param title è¦ä¿®æ”¹çš„新标题
       * @param fullPath è¦ä¿®æ”¹çš„路由全路径，如果不填就是修改当前路由
       */
      changeTabTitle(title, fullPath = '') {
        if (title) {
          let currentRoute = this.pageList.find((r) => r.fullPath === (fullPath ? fullPath : this.$route.fullPath))
          if (currentRoute != null) {
            currentRoute.meta = {...currentRoute.meta, title}
          }
        }
      },
      // update-end-author:sunjianlei date:20200120 for: åŠ¨æ€æ›´æ”¹é¡µé¢æ ‡é¢˜
@@ -231,9 +202,8 @@
          this.$message.warning('这是最后一页，不能再关闭了啦')
          return
        }
        console.log("this.pageList ",this.pageList );
        let removeRoute = this.pageList.filter(item => item.fullPath == key)
        this.pageList = this.pageList.filter(item => item.fullPath !== key)
      let removeRoute = this.pageList.filter(item => item.path == key)
      this.pageList = this.pageList.filter(item => item.path !== key)
        let index = this.linkList.indexOf(key)
        this.linkList = this.linkList.filter(item => item !== key)
        index = index >= this.linkList.length ? this.linkList.length - 1 : index
@@ -244,8 +214,6 @@
        let cacheRouterArray = Vue.ls.get(CACHE_INCLUDED_ROUTES) || []
        if (removeRoute && removeRoute[0]) {
          let componentName = removeRoute[0].meta.componentName
          console.log("key: ", key);
          console.log("componentName: ", componentName);
          if(cacheRouterArray.includes(componentName)){
            cacheRouterArray.splice(cacheRouterArray.findIndex(item => item === componentName), 1)
            Vue.ls.set(CACHE_INCLUDED_ROUTES, cacheRouterArray)
@@ -253,7 +221,7 @@
          this.emitPageClosed(removeRoute[0])
        }
        //update-end--Author:scott  Date:20201015 for：路由缓存问题，关闭了tab页时再打开就不刷新 #842

      this.tabCallBack()
      },
      // è§¦å‘ page-closed ï¼ˆé¡µé¢å…³é—­ï¼‰å…¨å±€äº‹ä»¶
      emitPageClosed(closedRoute) {
@@ -301,7 +269,7 @@
      },
      /* update_begin author:wuxianquan date:20190828 for: å…³é—­å½“前tab页，供子页面调用->望菜单能配置外链，直接弹出新页面而不是嵌入iframe #428 */
      closeCurrent(){
        this.remove(this.activePage);
      this.remove(this.activePage)
      },
      /* update_end author:wuxianquan date:20190828 for: å…³é—­å½“前tab页，供子页面调用->望菜单能配置外链，直接弹出新页面而不是嵌入iframe #428 */
      closeOthers(pageKey) {
@@ -314,7 +282,7 @@
          let indexContent = this.pageList.slice(0, 1)[0]
          this.linkList = this.linkList.slice(index, index + 1)
          this.pageList = this.pageList.slice(index, index + 1)
          this.linkList.unshift(indexContent.fullPath)
        this.linkList.unshift(indexContent.path)
          this.pageList.unshift(indexContent)
          this.activePage = this.linkList[1]
        }
@@ -328,17 +296,19 @@
        let index = this.linkList.indexOf(pageKey)
        this.linkList = this.linkList.slice(index)
        this.pageList = this.pageList.slice(index)
        this.linkList.unshift(indexContent.fullPath)
      this.linkList.unshift(indexContent.path)
        this.pageList.unshift(indexContent)
      // è‹¥å°†æ¿€æ´»é¡µä¸€å¹¶å…³é—­åˆ™æ˜¾ç¤ºå¯¼èˆªæ é™¤é¦–页第一个页面
        if (this.linkList.indexOf(this.activePage) < 0) {
          this.activePage = this.linkList[0]
        this.activePage = this.linkList[1]
        }
      },
      closeRight(pageKey) {
        let index = this.linkList.indexOf(pageKey)
        this.linkList = this.linkList.slice(0, index + 1)
        this.pageList = this.pageList.slice(0, index + 1)
        if (this.linkList.indexOf(this.activePage < 0)) {
      // è‹¥å°†æ¿€æ´»é¡µä¸€å¹¶å…³é—­åˆ™æ˜¾ç¤ºå¯¼èˆªæ æœ€åŽä¸€ä¸ªé¡µé¢
      if (this.linkList.indexOf(this.activePage) < 0) {
          this.activePage = this.linkList[this.linkList.length - 1]
        }
      },
@@ -359,7 +329,7 @@
      //update-begin-author:taoyan date:20191008 for:路由刷新
      routeReload(){
        this.reloadFlag = false
        let ToggleMultipage = "ToggleMultipage"
      let ToggleMultipage = 'ToggleMultipage'
        this.$store.dispatch(ToggleMultipage,false)
        this.$nextTick(()=>{
          this.$store.dispatch(ToggleMultipage,true)
@@ -371,6 +341,38 @@
      excuteCallback(callback){
        callback()
      },

    clickMenuTitleSelected(selectedMenus) {
      //console.log("新的路由",newRoute)
      this.activePage = selectedMenus[0].path
      if (!this.multipage) {
        this.linkList = [this.linkList[0], selectedMenus[0].path]
        this.pageList = [this.pageList[0], Object.assign({}, selectedMenus[0])]
        // update-begin-author:taoyan date:20200211 for: TASK #3368 ã€è·¯ç”±ç¼“存】首页的缓存设置有问题，需要根据后台的路由配置来实现是否缓存
      } else if (indexKey == selectedMenus[0].path) {
        //首页时 åˆ¤æ–­æ˜¯å¦ç¼“å­˜ æ²¡æœ‰ç¼“å­˜ åˆ·æ–°ä¹‹
        if (selectedMenus[0].meta.keepAlive === false) {
          this.routeReload()
        }
        // update-end-author:taoyan date:20200211 for: TASK #3368 ã€è·¯ç”±ç¼“存】首页的缓存设置有问题，需要根据后台的路由配置来实现是否缓存
      } else {
        // selectedMenus.forEach(menuItem => {
        //   if (!this.linkList.includes(menuItem.path)) {
        //     console.log('触发增加')
        //     this.linkList.push(menuItem.path)
        //     this.pageList.push(menuItem)
        //   } else {
        //     console.log('触发没有增加')
        //     let oldIndex = this.linkList.indexOf(menuItem.path)
        //     let oldPositionRoute = this.pageList[oldIndex]
        //     this.pageList.splice(oldIndex, 1, Object.assign({}, menuItem, { meta: oldPositionRoute.meta }))
        //   }
        // })
        // ç‚¹å‡»æ ‡é¢˜åŽåœ¨å¯¼èˆªæ è¦†ç›–前一个标题所展开的下级菜单
        this.linkList = [this.linkList[0], ...selectedMenus.map(item => item.path)]
        this.pageList = [this.pageList[0], ...selectedMenus]
      }
    }
    }
  }
</script>
@@ -423,9 +425,9 @@

    &.ant-tabs-card .ant-tabs-tab {

      padding: 0 24px !important;
    padding: 0 20px 0 2px !important;
      background-color: white !important;
      margin-right: 10px !important;
    /*margin-right: 10px !important;*/

      .ant-tabs-close-x {
        width: 12px !important;

 src/components/page/GlobalFooter.vue

@@ -1,6 +1,7 @@
<template>
  <div class="footer">
    <div class="copyright">
    <div class="copyright"
         :style="{background:$route.meta.title==='首页'?'#151548':'',color:$route.meta.title==='首页'?'#fff':''}">
      Copyright
      <a-icon type="copyright"/>
      2024 <span>2015-2025 çµç§€æ™ºèƒ½</span>

 src/components/page/GlobalLayout.vue

@@ -69,7 +69,8 @@
      />

      <!-- layout content -->
      <a-layout-content :style="{ height: '100%', paddingTop: fixedHeader ? '59px' : '0' }">
      <a-layout-content
        :style="{ height: '100%', paddingTop: fixedHeader ? '59px' : '0' ,background: $route.meta.title=='首页'?'#151548':''}">
        <slot></slot>
      </a-layout-content>


 src/views/dashboard/Analysis.vue

@@ -1,25 +1,75 @@
<template>
  <div>

  </div>
  <Component :is="currentSignage" :userType="userType" :productionCode="productionCode"
             :workshopSectionProductionCode="workshopSectionProductionCode"
             >
  </Component>
</template>

<script>
  import signageApi from '@/api/signage'
  import DncManagerSignage from './DncManagerSignage.vue'

  export default {
    name: "Analysis",
    components: {

      DncManagerSignage
    },
    data() {
      return {

        currentSignage: '',
        productionCode: '',
        branchFactoryProductionCode: '',
        workshopSectionProductionCode: '',
        userType: ''
      }
    },
    created() {

      this.showModuleByUserInfo()
    },
    methods: {
      showModuleByUserInfo() {
        const id = JSON.parse(localStorage.getItem('pro__Login_Userinfo')).value.id
        signageApi.getUserByIdApi(id)
          .then(res => {
            console.log("res", res.userType)
            this.userType = res.userType
            switch (this.userType) {
              // case 1:
              //   //刀具管理
              //   this.currentSignage = 'EquipmentSignage'
              //   break
              // case 2:
              //   //mdc
              //   this.currentSignage = 'WorkshopSectionSignage'
              //   break
              case 3:
                //dnc
                this.currentSignage = 'DncManagerSignage'
                break
              // case 4:
              //   //设备管理
              //   this.currentSignage = 'IndexSignage'
              //   break
              default:
                this.currentSignage = ''
                break
            }
          })
      }
    }
  }

    }
  }

</script>
<style lang="less" scoped>
/deep/ .back-nav {
  width: 100px;
  height: 30px;
  color: #fff;
  position: absolute;
  top: 15px;
  left: 10px;
  cursor: pointer;
  z-index: 9999
}
</style>

 src/views/dashboard/DncManagerSignage.vue

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,168 @@
<template>
  <div class="page-container">
    <div class="content-container">
      <div style="width: 50%" class="left-col">
        <dv-border-box-9 style="padding: 30px 20px 0">
          <div id="running_state_chart" style="width:100%;height: 300px"></div>
          <div id="efficiency_chart" style="width: 100%;height: 465px"></div>
        </dv-border-box-9>
      </div>

      <div style="width: 50%" class="middle-col">
        <dv-border-box-9 style="padding: 10px 10px 0">
          <!-- æ·»åŠ "我的待办"标题 -->
          <div class="flow-todo-title">我的待办</div>

          <!-- åµŒå…¥FlowTodo组件并设置默认分类 -->
          <flow-todo
            ref="flowTodo"
            class="embedded-flow-todo"
            :defaultCategories="['drApproval','ggApproval','programConfirmApproval']"
          ></flow-todo>
        </dv-border-box-9>
      </div>
    </div>
  </div>
</template>

<script>
import signageApi from '@/api/signage'
import moment from 'moment'
import FlowTodo from '@/views/flowable/workflow/FlowTodo.vue'

export default {
  name: 'DncManagerSignage',
  components: {
    FlowTodo
  },
  data() {
    return {
    }
  },
  mounted() {
    // ç¡®ä¿ç»„件加载后使用默认分类查询数据
    this.$nextTick(() => {
      if (this.$refs.flowTodo) {
        // è§¦å‘查询，使用默认的category条件[1,2]
        this.$refs.flowTodo.searchQuery()
      }
    })
  },
  methods: {

  }
}
</script>

<style lang="less" scoped>
.page-container {
  background-color: #000b29;
  min-height: 100vh;
  padding: 15px;

  .content-container {
    padding-top: 5px;
    display: flex;
    justify-content: space-between;
    gap: 15px;

    .left-col, .middle-col {
      display: flex;
      flex-direction: column;
    }

    .middle-col {
      .dv-border-box-9 {
        background-color: #000b29;
        flex-grow: 1;
      }

      .flow-todo-title {
        color: #fff;
        font-size: 18px;
        font-weight: bold;
        margin-bottom: 15px;
        text-align: center;
      }

      .embedded-flow-todo {
        width: 100%;
        height: 340px; /* æŽ§åˆ¶é«˜åº¦ä¸ºå³ä¾§ä¸€åŠåŒºåŸŸ */
        overflow: auto;
        background-color: inherit;
      }
    }
  }
}

// åµŒå…¥ç»„件样式调整
.embedded-flow-todo {
  // éšè—æŸ¥è¯¢åŒºåŸŸã€æ“ä½œæŒ‰é’®å’Œé€‰æ‹©æç¤º
  /deep/ .table-page-search-wrapper,
  /deep/ .table-operator,
  /deep/ .ant-alert {
    display: none !important;
  }

  // éšè—å¤šé€‰æ¡†åˆ—
  /deep/ .ant-table-selection-column {
    display: none !important;
  }

  // è¡¨æ ¼è¾¹æ¡†æ ·å¼
  /deep/ .ant-table {
    border: 1px solid rgba(9, 9, 9, 0.1) !important;
    border-collapse: collapse !important;
  }
  /deep/ .ant-table-thead > tr > th {
    border: 1px solid rgba(9, 9, 9, 0.1) !important;
  }
  /deep/ .ant-table-tbody > tr > td {
    border: 1px solid rgba(9, 9, 9, 0.1) !important;
  }

  // è¡¨æ ¼æ ·å¼è°ƒæ•´
  /deep/ .ant-table,
  /deep/ .ant-table-tbody > tr > td,
  /deep/ .ant-table-thead > tr > th,
  /deep/ .ant-table-thead > tr > th span {
    background-color: transparent !important;
    color: #000000 !important;
  }

  // åˆ†é¡µæŽ§ä»¶æ ·å¼
  /deep/ .ant-pagination-item,
  /deep/ .ant-pagination-prev,
  /deep/ .ant-pagination-next {
    background-color: rgb(255, 255, 255) !important;
    border-color: rgb(255, 255, 255) !important;
  }

  /deep/ .ant-pagination-item a,
  /deep/ .ant-pagination-prev a,
  /deep/ .ant-pagination-next a {
    color: #000000 !important;
  }

  /deep/ .ant-pagination-item-active {
    background-color: rgba(33, 186, 198, 0.6) !important;
    border-color: rgba(33, 186, 198, 0.8) !important;
  }

  /deep/ .ant-card {
    background-color: transparent !important;
    border: none !important;
  }

  // æ“ä½œåˆ—链接样式
  /deep/ .ant-table-tbody > tr > td a {
    color: #40a9ff !important;
  }
}

// è¾¹æ¡†ç»„件样式
/deep/ .dv-border-box-9 {
  --color: rgba(33, 186, 198, 0.6) !important;
  background-color: #000b29 !important;
}
</style>

 src/views/flowable/workflow/FlowTodo.vue

@@ -352,6 +352,13 @@
    GuideCardBatchHandle,
    AssignEquipmentFileStreamHandle
  },
  props: {
    // æ·»åŠ é»˜è®¤åˆ†ç±»å±žæ€§
    defaultCategories: {
      type: Array,
      default: () => []
    }
  },
  data() {
    return {
      description: '工作流-我的待办',
@@ -465,6 +472,7 @@
      if (arg === 1) {
        this.ipagination.current = 1
      }
      this.queryParam.categoryList = this.defaultCategories;
      var params = this.getQueryParams()//查询条件
      if (!params) {
        return false