productDev/lianhelihua_sh.git

jiangping

2025-04-17 6fd54e9bfb42e8b75758d7cb061b7bbd5c1aa4f7

代码初始化

已添加1个文件

已删除3个文件

已修改12个文件

	admin/lianhelihua_admin/index.html	2 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	admin/lianhelihua_admin/static/css/app.2fe7134a.css	1 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	admin/lianhelihua_admin/static/js/app.3a1839c5.js	2 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	admin/lianhelihua_admin/static/js/app.3a1839c5.js.map	1 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	admin/src/api/business/workorder.js	6 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	admin/src/assets/style/variables.scss	2 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	admin/src/views/index.vue	551 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	server/pom.xml	1 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	server/src/main/java/com/doumee/api/business/WorkorderController.java	17 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	server/src/main/java/com/doumee/core/utils/DateUtil.java	15 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	server/src/main/java/com/doumee/dao/business/model/Workorder.java	3 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	server/src/main/java/com/doumee/dao/business/vo/WorkorderIndexNumVO.java	33 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	server/src/main/java/com/doumee/dao/web/dto/OrderDataDTO.java	1 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	server/src/main/java/com/doumee/service/business/WorkorderService.java	5 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	server/src/main/java/com/doumee/service/business/impl/WorkorderServiceImpl.java	69 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	server/src/main/resources/application.yml	2 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史

 admin/lianhelihua_admin/index.html

@@ -1 +1 @@
<!DOCTYPE html><html lang=""><head><meta charset="utf-8"><meta http-equiv="X-UA-Compatible" content="IE=edge"><meta name="viewport" content="width=device-width,initial-scale=1"><link rel="icon" href="/lianhelihua_admin/icon.png"><title>èåå©åäºä»¶ä¸æ¥ç³»ç»</title><link href="/lianhelihua_admin/static/css/app.2fe7134a.css" rel="preload" as="style"><link href="/lianhelihua_admin/static/css/chunk-vendors.d9e68312.css" rel="preload" as="style"><link href="/lianhelihua_admin/static/js/app.3a1839c5.js" rel="preload" as="script"><link href="/lianhelihua_admin/static/js/chunk-vendors.f4ff0439.js" rel="preload" as="script"><link href="/lianhelihua_admin/static/css/chunk-vendors.d9e68312.css" rel="stylesheet"><link href="/lianhelihua_admin/static/css/app.2fe7134a.css" rel="stylesheet"></head><body><div id="app"></div><script src="/lianhelihua_admin/static/js/chunk-vendors.f4ff0439.js"></script><script src="/lianhelihua_admin/static/js/app.3a1839c5.js"></script></body></html>
<!DOCTYPE html><html lang=""><head><meta charset="utf-8"><meta http-equiv="X-UA-Compatible" content="IE=edge"><meta name="viewport" content="width=device-width,initial-scale=1"><link rel="icon" href="/lianhelihua_admin/icon.png"><title>èåå©åäºä»¶ä¸æ¥ç³»ç»</title><link href="/lianhelihua_admin/static/css/app.1a42a0af.css" rel="preload" as="style"><link href="/lianhelihua_admin/static/css/chunk-vendors.d9e68312.css" rel="preload" as="style"><link href="/lianhelihua_admin/static/js/app.09df0529.js" rel="preload" as="script"><link href="/lianhelihua_admin/static/js/chunk-vendors.f4ff0439.js" rel="preload" as="script"><link href="/lianhelihua_admin/static/css/chunk-vendors.d9e68312.css" rel="stylesheet"><link href="/lianhelihua_admin/static/css/app.1a42a0af.css" rel="stylesheet"></head><body><div id="app"></div><script src="/lianhelihua_admin/static/js/chunk-vendors.f4ff0439.js"></script><script src="/lianhelihua_admin/static/js/app.09df0529.js"></script></body></html>

 admin/lianhelihua_admin/static/css/app.2fe7134a.css

ÎÄ¼þÒÑÉ¾³ý

 admin/lianhelihua_admin/static/js/app.3a1839c5.js

ÎÄ¼þÒÑÉ¾³ý

 admin/lianhelihua_admin/static/js/app.3a1839c5.js.map

ÎÄ¼þÒÑÉ¾³ý

 admin/src/api/business/workorder.js

@@ -24,6 +24,12 @@
export function updateById (data) {
  return request.post('/business/workorder/updateById', data)
}
export function getIndexData (data) {
  return request.post('/business/workorder/getIndexData', data)
}
export function getWorkOrderData (data) {
  return request.post('/business/workorder/getWorkOrderData', data)
}

// å é¤
export function getById (id) {

 admin/src/assets/style/variables.scss

@@ -3,7 +3,7 @@
// å¤´é¨é«åº¦
$header-height: 60px;
// èåå®½åº¦
$menu-width: 208px;
$menu-width: 250px;
// é¡µé¢æå°å®½åº¦
$page-min-width: 1000px;


 admin/src/views/index.vue

@@ -1,74 +1,66 @@
<template>
  <div class="main_home">
    <!-- <div style="position: fixed;z-index: 99999"><video  style="height: 100px;width: 500px" src="rtsp://10.50.250.253:554/openUrl/K2y2vE4" controls></video></div> -->
    <div class="home_header" style="text-align: center">
    <div class="home_header">
      <div class="mb10 fs17">ä¸åå¥½ï¼{{ userInfo.realname }}</div>
      <div class="fs13">
        ä»å¤©æ¯ {{ nowDate }} {{ nowWeek }}ï¼æ¬¢è¿è®¿é®èåå©åäºä»¶ä¸æ¥ç³»ç»ç®¡çå¹³å°
      </div>
    </div>
<!--    <div class="main">
     <div class="main">
      <div class="app_content">
        <div class="static_card">
          <div class="card">
            <div class="header">
              <div class="left">
                <div class="fs15">ä»æ¥å¨åäººæ°(äºº)</div>
                <div class="num">{{ headerData.todayInParkUserNum }}</div>
                <div class="fs15">SHEä»æ¥ææ¥æ°é</div>
                <div class="num">{{ headerData.todaySheNum ||0 }}</div>
              </div>
              <img src="@/assets/icons/home_icon1.png" alt="" />
            </div>
            <div class="content">
              <div>å¥åäººæ¬¡(äºº)ï¼{{ headerData.todayInUserNum }}</div>
              <div>åºåäººæ¬¡(äºº)ï¼{{ headerData.todayOutUserNum }}</div>
              <div>æªè§£å³ï¼{{ headerData.sheNum || 0}}</div>
              <div>å·²è§£å³ï¼{{ headerData.sheNum || 0}}</div>
              <div>æ»å·¥åéï¼{{ headerData.sheNum || 0}}</div>
            </div>
          </div>
          <div class="card">
            <div class="header">
              <div class="left">
                <div class="fs15">å¨åè®¿å®¢æ°(äºº)</div>
                <div class="num">{{ headerData.inParkVisitUserNum }}</div>
                <div class="fs15">è·ç»æ»ä»æ¥å·¥åæ°é</div>
                <div class="num">{{ headerData.todayDbhNum ||0 }}</div>
              </div>
              <img src="@/assets/icons/home_icon2.png" alt="" />
            </div>
            <div class="content">
              <div>è®¿å®¢äººæ¬¡(äºº)ï¼{{ headerData.visitUserNum }}</div>
              <div>ç¾ç¦»äººæ¬¡(äºº)ï¼{{ headerData.signLevelNum }}</div>
              <div>æªè§£å³ï¼{{ headerData.dbhNum || 0}}</div>
              <div>å·²è§£å³ï¼{{ headerData.dbhNum || 0}}</div>
               <div>æ»å·¥åéï¼{{ headerData.dbhNum || 0}}</div>
            </div>
          </div>
          <div class="card">
            <div class="header">
              <div class="left">
                <div class="fs15">å¨åé¿æç¸å³æ¹æ°(äºº)</div>
                <div class="num">{{ headerData.inParkLwUserNum }}</div>
                <div class="fs15">DCAä»æ¥æäº¤æ°é</div>
                <div class="num">{{ headerData.todayDcaNum ||0 }}</div>
              </div>
              <img src="@/assets/icons/home_icon3.png" alt="" />
            </div>
            <div class="content">
              <div>å¥åäººæ¬¡(äºº)ï¼{{ headerData.lwUserInNum }}</div>
              <div>åºåäººæ¬¡(äºº)ï¼{{ headerData.lwUserOutNum }}</div>
              <div>æ»æäº¤éï¼{{ headerData.dcaNum || 0}}</div>
            </div>
          </div>
          <div class="card">
            <div class="header">
              <div class="left">
                <div class="fs15">ä»æ¥å¨åè½¦è¾(è¾)</div>
                <div class="num">{{ headerData.todayInParkCarNum }}</div>
                <div class="fs15">DCAä»æ¥å·¥åæ°é</div>
                <div class="num">{{ headerData.todayDcaChildNum ||0 }}</div>
              </div>
              <img src="@/assets/icons/home_icon4.png" alt="" />
              <img src="@/assets/icons/home_icon3.png" alt="" />
            </div>
            <div class="content">
              <div>å¥åè½¦æ¬¡(è¾)ï¼{{ headerData.todayInCarNum }}</div>
              <div>åºåè½¦æ¬¡(è¾)ï¼{{ headerData.todayOutCarNum }}</div>
            </div>
          </div>
        </div>
        <div class="funcs">
          <div class="home_title">å¸¸ç¨åè½</div>
          <div class="list">
            <div v-for="item in funcList" @click="funcClick(item)" :key="item.name" class="item">
              <img class="mb10" :src="item.url" alt="" />
              <div>{{ item.name }}</div>
              <div>æªè§£å³ï¼{{ headerData.dcaChildNum || 0}}</div>
              <div>å·²è§£å³ï¼{{ headerData.dcaChildNum || 0}}</div>
              <div>æ»å·¥åéï¼{{ headerData.dcaChildNum || 0}}</div>
            </div>
          </div>
        </div>
@@ -76,114 +68,46 @@
          <div class="df mb10">
            <div class="wrap static1">
              <div class="header">
                <div class="home_title">å¨åºäººåå æ¯</div>
                &lt;!&ndash; <div class="df_ac more">
                  æ´å¤<i class="el-icon-arrow-right"></i>
                </div> &ndash;&gt;
                <div class="home_title">1.SHEäºä»¶ä¸æ¥</div>
              </div>
              <div class="content">
                <div class="echart_wrap">
                  <div class="pie_text">
                    <div class="fs13">æ»æ°</div>
                    <div class="fs15"><strong>{{ headerData.todayInParkUserNum }}</strong></div>
                  </div>
                  <div class="echart" id="echart1"></div>
                </div>
                <div class="list">
                  <div class="item" v-for="item, i in manningRatio" :key="i">
                    <div :style="{ background: colors[i] }" class="icon"></div>
                    <div class="text">{{ item.name }}</div>
                    <div class="num">{{ item.value }}</div>
                  </div>
                </div>
              <div class="echart" >
                <div  id="echart0"></div>
                <div  id="echart01"></div>
              </div>
            </div>
            <div class="wrap static2">
              <div class="header">
                <div class="home_title">é¿æç¸å³æ¹åå¸</div>
                &lt;!&ndash; <div class="df_ac more">
                  æ´å¤<i class="el-icon-arrow-right"></i>
                </div> &ndash;&gt;
                <div class="home_title">2.æ·±åº¦ç¬¦åæ§å®¡æ¥DCAä¸æ¥è®°å½</div>
              </div>
              <div class="echart" id="echart2"></div>
              <div class="echart" >
                <div  id="echart1">  </div>
                <div  id="echart11">   </div>
              </div>
            </div>
          </div>
          <div class="df">
            <div class="wrap static3">
              <div class="header">
                <div class="home_title">7æ¥è®¿å®¢ç»è®¡</div>
                &lt;!&ndash; <div class="df_ac more">
                  æ´å¤<i class="el-icon-arrow-right"></i>
                </div> &ndash;&gt;
                <div class="home_title">3.æ·±åº¦ç¬¦åæ§å®¡æ¥DCAäºä»¶å·¥å</div>
              </div>
              <div class="echart" id="echart3"></div>
              <div class="echart" >
                <div  id="echart2">  </div>
                <div  id="echart21">   </div>
              </div>
            </div>
            <div class="wrap static4">
              <div class="header">
                <div class="home_title">7æ¥è½¦è¾ç»è®¡</div>
                &lt;!&ndash; <div class="df_ac more">
                  æ´å¤<i class="el-icon-arrow-right"></i>
                </div> &ndash;&gt;
                <div class="home_title">4.è·ç»æ»é£é©ä¸æ¥</div>
              </div>
              <div class="echart" id="echart4"></div>
              <div class="echart" >
                <div  id="echart3">  </div>
                <div  id="echart31">   </div>
              </div>
            </div>
          </div>
        </div>
      </div>
      <div class="app_side">
        <div class="task">
          <div class="header df_sb">
            <div class="home_title df">
              <span >å¾åäºé¡¹</span>
              <span class="num" v-if="taskTotal">{{ taskTotal }}</span>
            </div>
            <div class="df_ac more" @click="jumpPage('/task/index')">
              æ´å¤<i class="el-icon-arrow-right"></i>
            </div>
          </div>
          <div class="list">
            <div class="item" v-for="item in taskList" :key="item.id">
              <div class="content">
                <div class="title">{{ item.title }}</div>
                <div class="time">{{ item.createDate }}</div>
              </div>
              <div class="btn" v-permissions="['business:staging:query']" @click="handleDetail(item)">å¤ç</div>
            </div>
            <div v-if="taskList.length == 0" class="empty">
              <img src="@/assets/images/default_homeimg.png" alt="">
            </div>
          </div>
        </div>
        <div class="warnning">
          <div class="header df_sb">
            <div class="home_title df">
              <span>è¶æ¶é¢è¦</span>
              <span class="num" v-if="warningTotal">{{ warningTotal }}</span>
            </div>
            <div class="df_ac more" @click="jumpPage('/business/strandedPersonnel')">
              æ´å¤<i class="el-icon-arrow-right"></i>
            </div>
          </div>
          <div class="list">
            <div class="item" v-for="item in warningList" :key="item.id">
              <div class="name_wrap df_sb">
                <div class="name">{{ item.name }}</div>
                <div class="identity">è®¿å®¢</div>
              </div>
              <div class="line">èç³»çµè¯ï¼{{ item.phone }}</div>
              <div class="line">è®¿å®¢å¬å¸ï¼{{ item.companyName }}</div>
              <div class="auth df_sb">
                <div class="time">æææéï¼{{ item.endtime }}</div>
                <div class="btn" @click="departure(item.id)">ç¦»åº</div>
              </div>
            </div>
          </div>
          <div v-if="warningList.length == 0" class="empty">
            <img src="@/assets/images/default_homeimg.png" alt="">
          </div>
        </div>
      </div>
    </div>-->
    </div>
  </div>
</template>

@@ -191,6 +115,7 @@
import dayjs from 'dayjs'
import * as echarts from 'echarts'
import { weeks } from '@/utils/config'
import { getIndexData, getWorkOrderData } from '@/api/business/workorder'
const colors = ['#52a4f7', '#7678f7', '#5fc6d5']
export default {
  components: {
@@ -201,22 +126,13 @@
      nowDate: '',
      nowWeek: '',
      headerData: {},
      staticData: {},
      manningRatio: [],
      taskList: [],
      taskTotal: 0,
      warningList: [],
      warningTotal: 0,
      funcList: [
        { name: 'è®¿å®¢æ¥å¤', path: '', url: require('@/assets/icons/home_func1.png'), path: '/business/reportRecord' },
        { name: 'éæ£éææ', path: '', url: require('@/assets/icons/home_func2.png'), path: '/operation/danger/record' },
        { name: 'é¢çº¦ä¼è®®å®¤', path: '', url: require('@/assets/icons/home_func3.png'), path: '/meeting/bookings' },
        { name: 'èå¤å·¥ä½å°', path: '', url: require('@/assets/icons/home_func4.png') }
      ],
      isShowDetail: false,
      isShowReport: false,
      isShowDanger: false,
      isShowDriver: false
      staticData0: {},
      staticData01: {},
      staticData1: {},
      staticData2: {},
      staticData3: {},
      staticData4: {},
      manningRatio: []
    }
  },
  computed: {
@@ -225,223 +141,97 @@
    }
  },
  created () {

    this.initData()
  },
  mounted () {
    this.updateDate()
    // this.initData()
  },
  methods: {
    SubSuccess (str) {
      this[str] = false
      this.getTaskList()
    },
    funcClick (item) {
      if (item.name == 'èå¤å·¥ä½å°') {
        getAppHeaderNav(4).then(res => {
          window.open(res, '_blank')
        })
      }
      this.$router.push(item.path)
    },
    updateDate () {
      this.nowWeek = weeks[new Date().getDay()]
      this.nowDate = dayjs().format('YYYYå¹´MæDæ¥')

    },
    initData () {
      this.updateDate()
      this.getWorkHead()
      this.getWorkBody()
      this.getTaskList()
      this.getWarningList()
      this.getWorkBody0()
      this.getWorkBody1()
      this.getWorkBody2()
      this.getWorkBody3()
      // this.getWorkBody()
    },
    getWarningList () {
      getWorkbenchData({ queryType: 4 }).then(res => {
        this.warningList = res.timeOutVisitList || []
        this.warningTotal = res.timeOutVisitNum || 0
    getWorkBody0 () {
      getWorkOrderData({ queryType: 0, orderType: 0 }).then(res => {
        this.staticData0 = res || []
        this.initEchart0()
      })
      getWorkOrderData({ queryType: 1, orderType: 0 }).then(res => {
        this.staticData01 = res || []
        this.initEchart01()
      })
    },
    getTaskList () {
      getWorkbenchData({ queryType: 3 }).then(res => {
        this.taskList = res.noticesList || []
        this.taskTotal = res.noticesNum || 0
    getWorkBody1 () {
      getWorkOrderData({ queryType: 0, orderType: 1 }).then(res => {
        this.staticData1 = res || []
        this.initEchart1()
      })
      getWorkOrderData({ queryType: 1, orderType: 1 }).then(res => {
        this.staticData11 = res || []
        this.initEchart11()
      })
    },
    getWorkBody () {
      getWorkbenchData({ queryType: 2 }).then(res => {
        this.staticData = res || {}
    getWorkBody2 () {
      getWorkOrderData({ queryType: 0, orderType: 2 }).then(res => {
        this.staticData2 = res || []
        this.initEchart2()
      })
      getWorkOrderData({ queryType: 1, orderType: 2 }).then(res => {
        this.staticData21 = res || []
        this.initEchart21()
      })
    },
    getWorkBody3 () {
      getWorkOrderData({ queryType: 0, orderType: 3 }).then(res => {
        this.staticData3 = res || []
        this.initEchart3()
        this.initEchart4()
      })
      getWorkOrderData({ queryType: 1, orderType: 3 }).then(res => {
        this.staticData31 = res || []
        this.initEchart31()
      })
    },
    getWorkHead () {
      getWorkbenchData({ queryType: 1 }).then(res => {
      getIndexData({ }).then(res => {
        this.headerData = res || {}
        const arr = []
        arr.push({ name: 'è®¿å®¢', value: this.headerData.inParkVisitUserNum })
        arr.push({ name: 'åé¨åå·¥', value: this.headerData.todayInParkUserNum - this.headerData.inParkLwUserNum - this.headerData.inParkVisitUserNum })
        arr.push({ name: 'é¿æç¸å³æ¹', value: this.headerData.inParkLwUserNum })
        arr.sort((a, b) => b.value - a.value)
        this.manningRatio = arr
        this.initEchart1()
      })
    },
    jumpPage (page) {
      this.$router.push(page)
    updateDate () {
      this.nowDate = dayjs().format('YYYYå¹´MæDæ¥')
      this.nowWeek = weeks[new Date().getDay()]
    },
    departure (id) {
      this.$confirm('ç¡®å®ç¦»åå, æ¯å¦ç»§ç»?', 'æç¤º', {
        confirmButtonText: 'ç¡®å®',
        cancelButtonText: 'åæ¶',
        type: 'warning'
      }).then(() => {
        level(id)
            .then(res => {
              this.getWarningList()
            })
      }).catch(() => {

      })
    initEchart0 () {
      this.initEchartDataDo('echart0', this.staticData0.map(i => i.dateStr), this.staticData0.map(i => i.total),'å')
    },
    handleDetail (row) {
      if (row.type === 7) {
        this.handleTest(row);
        return
      }
      if (row.objType === 2) {
        this.$refs.OperaDetailsWindow.open('å¬å¡è½¦ç³è¯·è¯¦æ', { ...row, id: row.objId })
        return
      }
      if (row.objType === 1) {
        this.isShowReport = true
        this.$nextTick(() => {
          this.$refs.VisReportDetailRef.id = row.objId
          this.$refs.VisReportDetailRef.type = row.objType
          this.$refs.VisReportDetailRef.getDetail()
          this.$refs.VisReportDetailRef.isShowModal = true
        })
        return
      }
      if (row.objType === 3) {
        const obj = { ...row, id: row.objId }
        this.$refs.OperaHiddenDangerWindow.open('éæ£éææè¯¦æ', obj)
        return
      }
      if (row.objType === 6) {
        const obj = { ...row, id: row.objId }
        this.isShowDriver = true
        this.$nextTick(() => {
          this.$refs.DriverDetailRef.id = row.objId
          this.$refs.DriverDetailRef.type = row.objType
          this.$refs.DriverDetailRef.getDetail()
          this.$refs.DriverDetailRef.isShowModal = true
        })
        return
      }
      if (row.objType === 0) {
        this.isShowDetail = true
        this.$nextTick(() => {
          this.$refs.DetailRef.id = row.objId
          this.$refs.DetailRef.type = row.objType
          this.$refs.DetailRef.getDetail()
          this.$refs.DetailRef.isShowModal = true
        })
      }
    initEchart01 () {
      this.initEchartDataDo('echart01', this.staticData01.map(i => i.dateStr), this.staticData01.map(i => i.total),'å')
    },
    initEchart1 () {
      const myChart = echarts.init(document.getElementById('echart1'))
      const that = this

      const option = {
        tooltip: {
          trigger: 'item'
        },
        series: [
          {
            type: 'pie',
            radius: ['42%', '90%'],
            label: {
              show: false,
              position: 'center'
            },
            color: colors,
            labelLine: {
              show: false
            },
            data: that.manningRatio
            // data: [
            //   { value: that.headerData.inParkVisitUserNum, name: 'è®¿å®¢' },
            //   { value: that.headerData.todayInParkUserNum - that.headerData.inParkVisitUserNum - that.headerData.inParkLwUserNum, name: 'åé¨åå·¥' },
            //   { value: that.headerData.inParkLwUserNum, name: 'é¿æç¸å³æ¹' }
            // ]
          }
        ]
      }
      myChart.setOption(option)
      window.addEventListener('resize', function () { // æ§è¡
        myChart.resize()
      })
      this.initEchartDataDo('echart1', this.staticData1.map(i => i.dateStr), this.staticData1.map(i => i.total),'æ¬¡')
    },
    initEchart11 () {
      this.initEchartDataDo('echart11', this.staticData11.map(i => i.dateStr), this.staticData11.map(i => i.total),'æ¬¡')
    },
    initEchart2 () {
      const myChart = echarts.init(document.getElementById('echart2'))
      const that = this
      myChart.setOption({
        grid: {
          top: '4%',
          left: '2%',
          right: '6%',
          bottom: '2%',
          containLabel: true
        },
        tooltip: {
          trigger: 'axis',
          axisPointer: {
            type: 'line'
          }
        },
        xAxis: {
          type: 'value',
          position: 'bottom',
          splitLine: {
            show: true,
            lineStyle: {
              // è¿éè¾å¥çº¿æ¡çæ ·å¼
              color: 'rgba(255,255,255,0.14)'
            }
          }
        },
        yAxis: {
          type: 'category',
          data: that.staticData.lwList.map(i => i.name)
        },
        series: [
          {
            data: that.staticData.lwList.map(i => i.num),
            type: 'bar',
            barWidth: 10,
            itemStyle: {
              normal: {
                color: new echarts.graphic.LinearGradient(
                    1, 0, 0, 0,
                    [
                      { offset: 0, color: '#56abf8' },
                      { offset: 1, color: '#407ff0' }
                    ]
                )
                // barBorderRadius: [0, 10, 10, 0]
              }
            }
          }
        ]
      })
      window.addEventListener('resize', function () { // æ§è¡
        myChart.resize()
      })
      this.initEchartDataDo('echart2', this.staticData2.map(i => i.dateStr), this.staticData2.map(i => i.total),'å')
    },
    initEchart21 () {
      this.initEchartDataDo('echart21', this.staticData21.map(i => i.dateStr), this.staticData21.map(i => i.total),'å')
    },
    initEchart3 () {
      const myChart = echarts.init(document.getElementById('echart3'))
      const that = this
      this.initEchartDataDo('echart3', this.staticData3.map(i => i.dateStr), this.staticData3.map(i => i.total),'å')
    },
    initEchart31 () {
      this.initEchartDataDo('echart31',this.staticData31.map(i => i.dateStr), this.staticData31.map(i => i.total),'å')
    },
    initEchartDataDo (id, xdata,ydata,unit) {
      const myChart = echarts.init(document.getElementById(id))
      myChart.setOption({
        tooltip: {
          trigger: 'axis',
@@ -455,7 +245,7 @@
            <div style="display: flex;align-items: center;">
              <div style="width: 10px;height: 10px;border-radius: 50%;background-color: #6feef0;"></div>
              <span style="margin-left: 6px;">${params[0].value}</span>
              <div>äºº</div>
              <div>${unit}</div>
            </div>
          </div>
        `
@@ -464,11 +254,11 @@
        xAxis: {
          type: 'category',
          boundaryGap: false,
          data: that.staticData.weekVisitList.map(i => i.name)
          data: xdata
        },
        yAxis: {
          type: 'value',
          name: 'äººæ°',
          name: '',
          nameTextStyle: {
            padding: [0, 0, 4, -30] // åä¸ªæ°ååå«ä¸ºä¸å³ä¸å·¦ä¸åä½ç½®è·ç¦»
          },
@@ -489,7 +279,7 @@
        },
        series: [
          {
            data: that.staticData.weekVisitList.map(i => i.num),
            data: ydata,
            type: 'line',
            areaStyle: {
              normal: {
@@ -539,106 +329,6 @@
        myChart.resize()
      })
    },
    initEchart4 () {
      const myChart = echarts.init(document.getElementById('echart4'))
      const that = this
      myChart.setOption({
        tooltip: {
          trigger: 'axis',
          axisPointer: {
            type: 'line'
          },
          formatter: function (params) {
            return `
          <div style="background-color: #15323f;margin: -12px;padding: 14px;border: 2px solid rgba(1,217,254,0.5);color: #fff;">
            <div>${params[0].name}</div>
            <div style="display: flex;align-items: center;">
              <div style="width: 10px;height: 10px;border-radius: 50%;background-color: #6feef0;"></div>
              <span style="margin-left: 6px;">${params[0].value}</span>
              <div>è¾</div>
            </div>
          </div>
        `
          }
        },
        xAxis: {
          type: 'category',
          boundaryGap: false,
          data: that.staticData.weekCarList.map(i => i.name)
        },
        yAxis: {
          type: 'value',
          name: 'è½¦è¾æ°',
          nameTextStyle: {
            padding: [0, 0, 4, -30] // åä¸ªæ°ååå«ä¸ºä¸å³ä¸å·¦ä¸åä½ç½®è·ç¦»
          },
          splitLine: {
            show: true,
            lineStyle: {
              // è¿éè¾å¥çº¿æ¡çæ ·å¼
              color: 'rgba(255,255,255,0.14)'
            }
          }
        },
        grid: {
          top: '16%',
          left: '2%',
          right: '8%',
          bottom: '4%',
          containLabel: true
        },
        series: [
          {
            data: that.staticData.weekCarList.map(i => i.num),
            type: 'line',
            areaStyle: {
              normal: {
                color: {
                  x: 0,
                  y: 0,
                  x2: 0,
                  y2: 1,
                  colorStops: [{
                    offset: 0,
                    color: '#42D49D' // 0% å¤çé¢è²
                  }, {
                    offset: 1,
                    color: 'rgba(255,255,255,.5)' // 100% å¤çé¢è²
                  }],
                  globalCoord: false // ç¼ºçä¸º false
                }
              }
            },
            lineStyle: { // çº¿æ¡æ ·å¼
              color: {
                type: 'linear',
                x: 0,
                y: 0,
                x2: 0,
                y2: 1,
                colorStops: [{
                  offset: 0, color: '#42D49D' // 0% å¤çé¢è²
                }, {
                  offset: 1, color: '#42D49D' // 100% å¤çé¢è²
                }]
              },
              width: 2 // çº¿æ¡ç²ç»
            },
            symbol: 'circle',
            symbolSize: 10,
            itemStyle: {
              borderWidth: 1,
              borderColor: '#fff',
              color: '#42D49D' // æçº¿ç¹çé¢è²
            },
            smooth: false
          }
        ]
      })
      window.addEventListener('resize', function () { // æ§è¡
        myChart.resize()
      })
    }
  }
}
</script>
@@ -930,10 +620,15 @@
      &:nth-of-type(2n) {
        margin-left: 10px;
      }

      .echart {
        width: 100%;
        height: 190px;
        position: relative;
        display: flex;
        div{
          flex: 1;
          height: 190px;
        }
      }

      .header {
@@ -1012,8 +707,8 @@
    width: 100%;
    height: 200px;
    padding: 20px;
/*    color: #fff;
    background: linear-gradient(180deg, #0c6ce3 0%, rgba(32, 127, 247, 0) 100%);*/
    color: #fff;
    background: linear-gradient(180deg, #076ae5 0%, rgba(32, 127, 247, 0) 100%);
  }
}
</style>

 server/pom.xml

@@ -192,6 +192,7 @@
  </dependencies>

  <build>
    <finalName>lianhelihua</finalName>
    <resources>
      <resource>
        <directory>src/main/resources</directory>

 server/src/main/java/com/doumee/api/business/WorkorderController.java

@@ -11,10 +11,9 @@
import com.doumee.core.model.PageData;
import com.doumee.core.utils.DateUtil;
import com.doumee.dao.business.model.Workorder;
import com.doumee.dao.business.vo.WorkorderDbhDto;
import com.doumee.dao.business.vo.WorkorderDcaChildDto;
import com.doumee.dao.business.vo.WorkorderDcaDto;
import com.doumee.dao.business.vo.WorkorderSheDto;
import com.doumee.dao.business.vo.*;
import com.doumee.dao.web.dto.OrderDataDTO;
import com.doumee.dao.web.vo.WorkOrderDataVO;
import com.doumee.service.business.WorkorderService;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
@@ -72,6 +71,16 @@
        workorderService.updateById(workorder);
        return ApiResponse.success(null);
    }
    @ApiOperation("å·¥ä½å°ç»è®¡æ°æ®")
    @PostMapping("/getIndexData")
    public ApiResponse<WorkorderIndexNumVO> getIndexData(@RequestBody Workorder workorder) {
        return ApiResponse.success( workorderService.getIndexData(workorder));
    }
    @ApiOperation("å·¥ä½å°ç»è®¡æ¥è¡¨æ°æ®")
    @PostMapping("/getWorkOrderData")
    public ApiResponse<List<WorkOrderDataVO>> getWorkOrderData(@RequestBody OrderDataDTO workorder) {
        return ApiResponse.success( workorderService.getWorkOrderData(workorder));
    }

    @ApiOperation("åé¡µæ¥è¯¢")
    @PostMapping("/page")

 server/src/main/java/com/doumee/core/utils/DateUtil.java

@@ -577,15 +577,16 @@
     * @return String
     * @throws Exception
     */
    public static String getNowYear() throws Exception {
    public static String getNowYear() {
        String nowYear = "";
        try {
            String strTemp = getNowLongTime();
            nowYear = strTemp.substring(0, 4);
            return nowYear;
        } catch (Exception e) {
            throw e;
          e.printStackTrace();
        }
        return nowYear;
    }

    /**
@@ -594,15 +595,16 @@
     * @return String
     * @throws Exception
     */
    public static Integer getNowMonth() throws Exception {
    public static Integer getNowMonth()   {
        String nowMonth = "";
        try {
            String strTemp = getNowLongTime();
            nowMonth = strTemp.substring(4, 6);
            return Integer.valueOf(nowMonth);
        } catch (Exception e) {
            throw e;
            e.printStackTrace();
        }
        return null;
    }

    /**
@@ -611,15 +613,16 @@
     * @return String
     * @throws Exception
     */
    public static String getNowDay() throws Exception {
    public static String getNowDay()  {
        String nowDay = "";
        try {
            String strTemp = getNowLongTime();
            nowDay = strTemp.substring(6, 8);
            return nowDay;
        } catch (Exception e) {
            throw e;
            e.printStackTrace();
        }
        return  nowDay;
    }

    /**

 server/src/main/java/com/doumee/dao/business/model/Workorder.java

@@ -217,6 +217,9 @@
    @ApiModelProperty(value = "è§£å³æåµï¼æ¥è¯¢ä½¿ç¨ï¼ï¼0=å¦ï¼1=æ¯ï¼",hidden = true)
    @TableField(exist = false)
    private Integer dealStatus;
    @ApiModelProperty(value = "ç»è®¡æ°ï¼",hidden = true)
    @TableField(exist = false)
    private Long num;


    @ApiModelProperty("æä»¶è·¯å¾åç¼")

 server/src/main/java/com/doumee/dao/business/vo/WorkorderIndexNumVO.java

¶Ô±ÈÐÂÎÄ¼þ
@@ -0,0 +1,33 @@
package com.doumee.dao.business.vo;

import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;

/**
 * Created by IntelliJ IDEA.
 *
 * @Author : Rk
 * @create 2023/7/13 10:40
 */
@Data
@ApiModel("ä¼ä¸å¾®ä¿¡è·åjsç¾åè¿ååæ°")
public class WorkorderIndexNumVO {
    @ApiModelProperty(value = "SHEä»æ¥ææ¥æ°é")
    private Long todaySheNum;
    @ApiModelProperty(value = "SHEæ»å·¥åé")
    private Long sheNum;
    @ApiModelProperty(value = "DCAä»æ¥ææ¥æ°é")
    private Long todayDcaNum;
    @ApiModelProperty(value = "DCAæ»ææ¥é")
    private Long dcaNum;
    @ApiModelProperty(value = "DCAä»æ¥å·¥åæ°é")
    private Long todayDcaChildNum;
    @ApiModelProperty(value = "DCAæ»å·¥åé")
    private Long dcaChildNum;
    @ApiModelProperty(value = "è·ç»æ»ä»æ¥ææ¥æ°é")
    private Long todayDbhNum;
    @ApiModelProperty(value = "è·ç»æ»æ»å·¥åé")
    private Long dbhNum;

}

 server/src/main/java/com/doumee/dao/web/dto/OrderDataDTO.java

@@ -27,5 +27,4 @@
    @ApiModelProperty(value = "å°ç¹ä¸»é®")
    private Integer locationId;


}

 server/src/main/java/com/doumee/service/business/WorkorderService.java

@@ -4,6 +4,7 @@
import com.doumee.core.model.PageWrap;
import com.doumee.dao.business.model.Member;
import com.doumee.dao.business.model.Workorder;
import com.doumee.dao.business.vo.WorkorderIndexNumVO;
import com.doumee.dao.web.dto.CloseDTO;
import com.doumee.dao.web.dto.OrderDataDTO;
import com.doumee.dao.web.dto.PassOnDTO;
@@ -141,7 +142,7 @@
     */
    void jobUrge();

    List<WorkOrderDataVO> getWorkOrderData(OrderDataDTO orderDataDTO) throws Exception;
    List<WorkOrderDataVO> getWorkOrderData(OrderDataDTO orderDataDTO) ;

    /**
     * å·¥åæé
@@ -150,4 +151,6 @@
    void sendCopy(SendCopyDTO sendCopyDTO);

    void sendSheEmail();

    WorkorderIndexNumVO getIndexData(Workorder workorder);
}

 server/src/main/java/com/doumee/service/business/impl/WorkorderServiceImpl.java

@@ -14,6 +14,7 @@
import com.doumee.core.utils.qiyeweixin.model.request.QywxTextCardMsgRequest;
import com.doumee.dao.business.*;
import com.doumee.dao.business.model.*;
import com.doumee.dao.business.vo.WorkorderIndexNumVO;
import com.doumee.dao.web.dto.*;
import com.doumee.dao.web.vo.WorkOrderDataVO;
import com.doumee.service.business.WorkorderService;
@@ -1188,13 +1189,15 @@
     * @throws Exception
     */
    @Override
    public List<WorkOrderDataVO> getWorkOrderData(OrderDataDTO orderDataDTO) throws Exception {
    public List<WorkOrderDataVO> getWorkOrderData(OrderDataDTO orderDataDTO)  {
        if (Objects.isNull(orderDataDTO.getQueryType())||Objects.isNull(orderDataDTO.getOrderType())) {
            throw new BusinessException(ResponseStatus.BAD_REQUEST);
        }
        String year = DateUtil.getNowYear();
        Integer nowMonth = DateUtil.getNowMonth();
        Integer quarter  = (nowMonth - 1) / 3 + 1;
//        Integer nowMonth = DateUtil.getNowMonth();
        Integer nowMonth = 12;
//        Integer quarter  = (nowMonth - 1) / 3 + 1;
        Integer quarter  =4;
        List<WorkOrderDataVO> workOrderDataVOList = new ArrayList<>();
        //æ¥è¯¢ä»å¹´ææçæ°æ®
        List<Workorder> workorderList = workorderMapper.selectJoinList(Workorder.class,new MPJLambdaWrapper<Workorder>()
@@ -1209,10 +1212,10 @@
        if(Constants.equalsInteger(orderDataDTO.getQueryType(),Constants.ZERO)){
            for (int i = 1 ; i <= nowMonth; i++) {
                WorkOrderDataVO workOrderDataVO = new WorkOrderDataVO();
                String monthDay = year + "-" + org.apache.commons.lang3.StringUtils.leftPad(nowMonth.toString(),2,"0");
                String monthDay = year + "-" + org.apache.commons.lang3.StringUtils.leftPad(i+"",2,"0");
                List<Workorder> dataList = workorderList.stream().filter(j->DateUtil.formatDate(j.getCreateDate(),"yyyy-MM").equals(monthDay))
                        .collect(Collectors.toList());
                workOrderDataVO.setDateStr(monthDay);
                workOrderDataVO.setDateStr(i+"æ");
                workOrderDataVO.setGcsTotal(Constants.ZERO);
                workOrderDataVO.setWtsTotal(Constants.ZERO);
                workOrderDataVO.setSheTotal(Constants.ZERO);
@@ -1259,11 +1262,65 @@
                    workOrderDataVO.setUnCloseTotal(workOrderDataVO.getTotal() - workOrderDataVO.getSheTotal() - workOrderDataVO.getWtsTotal() - workOrderDataVO.getGcsTotal());
                }
                workOrderDataVOList.add(workOrderDataVO);
                
            }
        }
        return workOrderDataVOList;
    }
    /**
     * SHE / è·ç»æ»æ¥è¡¨
     * @return
     * @throws Exception
     */
    @Override
    public WorkorderIndexNumVO getIndexData(Workorder workorder) {
        WorkorderIndexNumVO model = new WorkorderIndexNumVO();
        List<WorkOrderDataVO> workOrderDataVOList = new ArrayList<>();
        //æ¥è¯¢ä»å¹´ææçæ°æ®
        List<Workorder> list = workorderMapper.selectJoinList(Workorder.class,new MPJLambdaWrapper<Workorder>()
                        .select("type,count(id) as num")
                        .eq(Workorder::getIsdeleted,Constants.ZERO)
                        .groupBy(Workorder::getType  ));
        if(list !=null){
            for(Workorder w : list){
                if(Constants.equalsInteger(w.getType(),Constants.ZERO)){
                    //SHE
                    model.setSheNum(Constants.formatLongNum(w.getNum()));
                }else  if(Constants.equalsInteger(w.getType(),Constants.ONE)){
                    //DCAæäº¤æ°
                    model.setDcaNum(Constants.formatLongNum(w.getNum()));
                }else   if(Constants.equalsInteger(w.getType(),Constants.TWO)){
                    //DCAåå·¥å
                    model.setDcaChildNum(Constants.formatLongNum(w.getNum()));
                }else   if(Constants.equalsInteger(w.getType(),Constants.THREE)){
                    //è·ç»æ»
                    model.setDbhNum(Constants.formatLongNum(w.getNum()));
                }
            }
        }
        List<Workorder> todays = workorderMapper.selectJoinList(Workorder.class,new MPJLambdaWrapper<Workorder>()
                        .select("type,count(id) as num")
                        .eq(Workorder::getIsdeleted,Constants.ZERO)
                        .apply("to_days(create_date)=to_days(now())")
                        .groupBy(Workorder::getType  ));
        if(todays !=null){
            for(Workorder w : todays){
                if(Constants.equalsInteger(w.getType(),Constants.ZERO)){
                    //SHE
                    model.setTodaySheNum(Constants.formatLongNum(w.getNum()));
                }else  if(Constants.equalsInteger(w.getType(),Constants.ONE)){
                    //DCAæäº¤æ°
                    model.setTodayDcaNum(Constants.formatLongNum(w.getNum()));
                }else   if(Constants.equalsInteger(w.getType(),Constants.TWO)){
                    //DCAåå·¥å
                    model.setTodayDcaChildNum(Constants.formatLongNum(w.getNum()));
                }else   if(Constants.equalsInteger(w.getType(),Constants.THREE)){
                    //è·ç»æ»
                    model.setTodayDbhNum(Constants.formatLongNum(w.getNum()));
                }
            }
        }
        return model;
    }




 server/src/main/resources/application.yml

@@ -9,7 +9,7 @@

spring:
  profiles:
    active: test
    active: dev
  # JSONè¿åéç½®
  jackson:
    # é»è®¤æ¶åº

			@@ -1 +1 @@
			<!DOCTYPE html><html lang=""><head><meta charset="utf-8"><meta http-equiv="X-UA-Compatible" content="IE=edge"><meta name="viewport" content="width=device-width,initial-scale=1"><link rel="icon" href="/lianhelihua_admin/icon.png"><title>èåå©åäºä»¶ä¸æ¥ç³»ç»</title><link href="/lianhelihua_admin/static/css/app.2fe7134a.css" rel="preload" as="style"><link href="/lianhelihua_admin/static/css/chunk-vendors.d9e68312.css" rel="preload" as="style"><link href="/lianhelihua_admin/static/js/app.3a1839c5.js" rel="preload" as="script"><link href="/lianhelihua_admin/static/js/chunk-vendors.f4ff0439.js" rel="preload" as="script"><link href="/lianhelihua_admin/static/css/chunk-vendors.d9e68312.css" rel="stylesheet"><link href="/lianhelihua_admin/static/css/app.2fe7134a.css" rel="stylesheet"></head><body><div id="app"></div><script src="/lianhelihua_admin/static/js/chunk-vendors.f4ff0439.js"></script><script src="/lianhelihua_admin/static/js/app.3a1839c5.js"></script></body></html>
			<!DOCTYPE html><html lang=""><head><meta charset="utf-8"><meta http-equiv="X-UA-Compatible" content="IE=edge"><meta name="viewport" content="width=device-width,initial-scale=1"><link rel="icon" href="/lianhelihua_admin/icon.png"><title>èåå©åäºä»¶ä¸æ¥ç³»ç»</title><link href="/lianhelihua_admin/static/css/app.1a42a0af.css" rel="preload" as="style"><link href="/lianhelihua_admin/static/css/chunk-vendors.d9e68312.css" rel="preload" as="style"><link href="/lianhelihua_admin/static/js/app.09df0529.js" rel="preload" as="script"><link href="/lianhelihua_admin/static/js/chunk-vendors.f4ff0439.js" rel="preload" as="script"><link href="/lianhelihua_admin/static/css/chunk-vendors.d9e68312.css" rel="stylesheet"><link href="/lianhelihua_admin/static/css/app.1a42a0af.css" rel="stylesheet"></head><body><div id="app"></div><script src="/lianhelihua_admin/static/js/chunk-vendors.f4ff0439.js"></script><script src="/lianhelihua_admin/static/js/app.09df0529.js"></script></body></html>

			@@ -24,6 +24,12 @@
			export function updateById (data) {
			return request.post('/business/workorder/updateById', data)
			}
			export function getIndexData (data) {
			return request.post('/business/workorder/getIndexData', data)
			}
			export function getWorkOrderData (data) {
			return request.post('/business/workorder/getWorkOrderData', data)
			}

			// å é¤
			export function getById (id) {

			@@ -3,7 +3,7 @@
			// å¤´é¨é«åº¦
			$header-height: 60px;
			// èåå®½åº¦
			$menu-width: 208px;
			$menu-width: 250px;
			// é¡µé¢æå°å®½åº¦
			$page-min-width: 1000px;

			@@ -1,74 +1,66 @@
			<template>
			<div class="main_home">
			<!-- <div style="position: fixed;z-index: 99999"><video style="height: 100px;width: 500px" src="rtsp://10.50.250.253:554/openUrl/K2y2vE4" controls></video></div> -->
			<div class="home_header" style="text-align: center">
			<div class="home_header">
			<div class="mb10 fs17">ä¸åå¥½ï¼{{ userInfo.realname }}</div>
			<div class="fs13">
			ä»å¤©æ¯ {{ nowDate }} {{ nowWeek }}ï¼æ¬¢è¿è®¿é®èåå©åäºä»¶ä¸æ¥ç³»ç»ç®¡çå¹³å°
			</div>
			</div>
			<!-- <div class="main">
			<div class="main">
			<div class="app_content">
			<div class="static_card">
			<div class="card">
			<div class="header">
			<div class="left">
			<div class="fs15">ä»æ¥å¨åäººæ°(äºº)</div>
			<div class="num">{{ headerData.todayInParkUserNum }}</div>
			<div class="fs15">SHEä»æ¥ææ¥æ°é</div>
			<div class="num">{{ headerData.todaySheNum \|\|0 }}</div>
			</div>
			<img src="@/assets/icons/home_icon1.png" alt="" />
			</div>
			<div class="content">
			<div>å¥åäººæ¬¡(äºº)ï¼{{ headerData.todayInUserNum }}</div>
			<div>åºåäººæ¬¡(äºº)ï¼{{ headerData.todayOutUserNum }}</div>
			<div>æªè§£å³ï¼{{ headerData.sheNum \|\| 0}}</div>
			<div>å·²è§£å³ï¼{{ headerData.sheNum \|\| 0}}</div>
			<div>æ»å·¥åéï¼{{ headerData.sheNum \|\| 0}}</div>
			</div>
			</div>
			<div class="card">
			<div class="header">
			<div class="left">
			<div class="fs15">å¨åè®¿å®¢æ°(äºº)</div>
			<div class="num">{{ headerData.inParkVisitUserNum }}</div>
			<div class="fs15">è·ç»æ»ä»æ¥å·¥åæ°é</div>
			<div class="num">{{ headerData.todayDbhNum \|\|0 }}</div>
			</div>
			<img src="@/assets/icons/home_icon2.png" alt="" />
			</div>
			<div class="content">
			<div>è®¿å®¢äººæ¬¡(äºº)ï¼{{ headerData.visitUserNum }}</div>
			<div>ç¾ç¦»äººæ¬¡(äºº)ï¼{{ headerData.signLevelNum }}</div>
			<div>æªè§£å³ï¼{{ headerData.dbhNum \|\| 0}}</div>
			<div>å·²è§£å³ï¼{{ headerData.dbhNum \|\| 0}}</div>
			<div>æ»å·¥åéï¼{{ headerData.dbhNum \|\| 0}}</div>
			</div>
			</div>
			<div class="card">
			<div class="header">
			<div class="left">
			<div class="fs15">å¨åé¿æç¸å³æ¹æ°(äºº)</div>
			<div class="num">{{ headerData.inParkLwUserNum }}</div>
			<div class="fs15">DCAä»æ¥æäº¤æ°é</div>
			<div class="num">{{ headerData.todayDcaNum \|\|0 }}</div>
			</div>
			<img src="@/assets/icons/home_icon3.png" alt="" />
			</div>
			<div class="content">
			<div>å¥åäººæ¬¡(äºº)ï¼{{ headerData.lwUserInNum }}</div>
			<div>åºåäººæ¬¡(äºº)ï¼{{ headerData.lwUserOutNum }}</div>
			<div>æ»æäº¤éï¼{{ headerData.dcaNum \|\| 0}}</div>
			</div>
			</div>
			<div class="card">
			<div class="header">
			<div class="left">
			<div class="fs15">ä»æ¥å¨åè½¦è¾(è¾)</div>
			<div class="num">{{ headerData.todayInParkCarNum }}</div>
			<div class="fs15">DCAä»æ¥å·¥åæ°é</div>
			<div class="num">{{ headerData.todayDcaChildNum \|\|0 }}</div>
			</div>
			<img src="@/assets/icons/home_icon4.png" alt="" />
			<img src="@/assets/icons/home_icon3.png" alt="" />
			</div>
			<div class="content">
			<div>å¥åè½¦æ¬¡(è¾)ï¼{{ headerData.todayInCarNum }}</div>
			<div>åºåè½¦æ¬¡(è¾)ï¼{{ headerData.todayOutCarNum }}</div>
			</div>
			</div>
			</div>
			<div class="funcs">
			<div class="home_title">å¸¸ç¨åè½</div>
			<div class="list">
			<div v-for="item in funcList" @click="funcClick(item)" :key="item.name" class="item">
			<img class="mb10" :src="item.url" alt="" />
			<div>{{ item.name }}</div>
			<div>æªè§£å³ï¼{{ headerData.dcaChildNum \|\| 0}}</div>
			<div>å·²è§£å³ï¼{{ headerData.dcaChildNum \|\| 0}}</div>
			<div>æ»å·¥åéï¼{{ headerData.dcaChildNum \|\| 0}}</div>
			</div>
			</div>
			</div>
			@@ -76,114 +68,46 @@
			<div class="df mb10">
			<div class="wrap static1">
			<div class="header">
			<div class="home_title">å¨åºäººåå æ¯</div>
			<!– <div class="df_ac more">
			æ´å¤<i class="el-icon-arrow-right"></i>
			</div> –>
			<div class="home_title">1.SHEäºä»¶ä¸æ¥</div>
			</div>
			<div class="content">
			<div class="echart_wrap">
			<div class="pie_text">
			<div class="fs13">æ»æ°</div>
			<div class="fs15"><strong>{{ headerData.todayInParkUserNum }}</strong></div>
			</div>
			<div class="echart" id="echart1"></div>
			</div>
			<div class="list">
			<div class="item" v-for="item, i in manningRatio" :key="i">
			<div :style="{ background: colors[i] }" class="icon"></div>
			<div class="text">{{ item.name }}</div>
			<div class="num">{{ item.value }}</div>
			</div>
			</div>
			<div class="echart" >
			<div id="echart0"></div>
			<div id="echart01"></div>
			</div>
			</div>
			<div class="wrap static2">
			<div class="header">
			<div class="home_title">é¿æç¸å³æ¹åå¸</div>
			<!– <div class="df_ac more">
			æ´å¤<i class="el-icon-arrow-right"></i>
			</div> –>
			<div class="home_title">2.æ·±åº¦ç¬¦åæ§å®¡æ¥DCAä¸æ¥è®°å½</div>
			</div>
			<div class="echart" id="echart2"></div>
			<div class="echart" >
			<div id="echart1"> </div>
			<div id="echart11"> </div>
			</div>
			</div>
			</div>
			<div class="df">
			<div class="wrap static3">
			<div class="header">
			<div class="home_title">7æ¥è®¿å®¢ç»è®¡</div>
			<!– <div class="df_ac more">
			æ´å¤<i class="el-icon-arrow-right"></i>
			</div> –>
			<div class="home_title">3.æ·±åº¦ç¬¦åæ§å®¡æ¥DCAäºä»¶å·¥å</div>
			</div>
			<div class="echart" id="echart3"></div>
			<div class="echart" >
			<div id="echart2"> </div>
			<div id="echart21"> </div>
			</div>
			</div>
			<div class="wrap static4">
			<div class="header">
			<div class="home_title">7æ¥è½¦è¾ç»è®¡</div>
			<!– <div class="df_ac more">
			æ´å¤<i class="el-icon-arrow-right"></i>
			</div> –>
			<div class="home_title">4.è·ç»æ»é£é©ä¸æ¥</div>
			</div>
			<div class="echart" id="echart4"></div>
			<div class="echart" >
			<div id="echart3"> </div>
			<div id="echart31"> </div>
			</div>
			</div>
			</div>
			</div>
			</div>
			<div class="app_side">
			<div class="task">
			<div class="header df_sb">
			<div class="home_title df">
			<span >å¾åäºé¡¹</span>
			<span class="num" v-if="taskTotal">{{ taskTotal }}</span>
			</div>
			<div class="df_ac more" @click="jumpPage('/task/index')">
			æ´å¤<i class="el-icon-arrow-right"></i>
			</div>
			</div>
			<div class="list">
			<div class="item" v-for="item in taskList" :key="item.id">
			<div class="content">
			<div class="title">{{ item.title }}</div>
			<div class="time">{{ item.createDate }}</div>
			</div>
			<div class="btn" v-permissions="['business:staging:query']" @click="handleDetail(item)">å¤ç</div>
			</div>
			<div v-if="taskList.length == 0" class="empty">
			<img src="@/assets/images/default_homeimg.png" alt="">
			</div>
			</div>
			</div>
			<div class="warnning">
			<div class="header df_sb">
			<div class="home_title df">
			<span>è¶æ¶é¢è¦</span>
			<span class="num" v-if="warningTotal">{{ warningTotal }}</span>
			</div>
			<div class="df_ac more" @click="jumpPage('/business/strandedPersonnel')">
			æ´å¤<i class="el-icon-arrow-right"></i>
			</div>
			</div>
			<div class="list">
			<div class="item" v-for="item in warningList" :key="item.id">
			<div class="name_wrap df_sb">
			<div class="name">{{ item.name }}</div>
			<div class="identity">è®¿å®¢</div>
			</div>
			<div class="line">èç³»çµè¯ï¼{{ item.phone }}</div>
			<div class="line">è®¿å®¢å¬å¸ï¼{{ item.companyName }}</div>
			<div class="auth df_sb">
			<div class="time">æææéï¼{{ item.endtime }}</div>
			<div class="btn" @click="departure(item.id)">ç¦»åº</div>
			</div>
			</div>
			</div>
			<div v-if="warningList.length == 0" class="empty">
			<img src="@/assets/images/default_homeimg.png" alt="">
			</div>
			</div>
			</div>
			</div>-->
			</div>
			</div>
			</template>

			@@ -191,6 +115,7 @@
			import dayjs from 'dayjs'
			import * as echarts from 'echarts'
			import { weeks } from '@/utils/config'
			import { getIndexData, getWorkOrderData } from '@/api/business/workorder'
			const colors = ['#52a4f7', '#7678f7', '#5fc6d5']
			export default {
			components: {
			@@ -201,22 +126,13 @@
			nowDate: '',
			nowWeek: '',
			headerData: {},
			staticData: {},
			manningRatio: [],
			taskList: [],
			taskTotal: 0,
			warningList: [],
			warningTotal: 0,
			funcList: [
			{ name: 'è®¿å®¢æ¥å¤', path: '', url: require('@/assets/icons/home_func1.png'), path: '/business/reportRecord' },
			{ name: 'éæ£éææ', path: '', url: require('@/assets/icons/home_func2.png'), path: '/operation/danger/record' },
			{ name: 'é¢çº¦ä¼è®®å®¤', path: '', url: require('@/assets/icons/home_func3.png'), path: '/meeting/bookings' },
			{ name: 'èå¤å·¥ä½å°', path: '', url: require('@/assets/icons/home_func4.png') }
			],
			isShowDetail: false,
			isShowReport: false,
			isShowDanger: false,
			isShowDriver: false
			staticData0: {},
			staticData01: {},
			staticData1: {},
			staticData2: {},
			staticData3: {},
			staticData4: {},
			manningRatio: []
			}
			},
			computed: {
			@@ -225,223 +141,97 @@
			}
			},
			created () {

			this.initData()
			},
			mounted () {
			this.updateDate()
			// this.initData()
			},
			methods: {
			SubSuccess (str) {
			this[str] = false
			this.getTaskList()
			},
			funcClick (item) {
			if (item.name == 'èå¤å·¥ä½å°') {
			getAppHeaderNav(4).then(res => {
			window.open(res, '_blank')
			})
			}
			this.$router.push(item.path)
			},
			updateDate () {
			this.nowWeek = weeks[new Date().getDay()]
			this.nowDate = dayjs().format('YYYYå¹´MæDæ¥')

			},
			initData () {
			this.updateDate()
			this.getWorkHead()
			this.getWorkBody()
			this.getTaskList()
			this.getWarningList()
			this.getWorkBody0()
			this.getWorkBody1()
			this.getWorkBody2()
			this.getWorkBody3()
			// this.getWorkBody()
			},
			getWarningList () {
			getWorkbenchData({ queryType: 4 }).then(res => {
			this.warningList = res.timeOutVisitList \|\| []
			this.warningTotal = res.timeOutVisitNum \|\| 0
			getWorkBody0 () {
			getWorkOrderData({ queryType: 0, orderType: 0 }).then(res => {
			this.staticData0 = res \|\| []
			this.initEchart0()
			})
			getWorkOrderData({ queryType: 1, orderType: 0 }).then(res => {
			this.staticData01 = res \|\| []
			this.initEchart01()
			})
			},
			getTaskList () {
			getWorkbenchData({ queryType: 3 }).then(res => {
			this.taskList = res.noticesList \|\| []
			this.taskTotal = res.noticesNum \|\| 0
			getWorkBody1 () {
			getWorkOrderData({ queryType: 0, orderType: 1 }).then(res => {
			this.staticData1 = res \|\| []
			this.initEchart1()
			})
			getWorkOrderData({ queryType: 1, orderType: 1 }).then(res => {
			this.staticData11 = res \|\| []
			this.initEchart11()
			})
			},
			getWorkBody () {
			getWorkbenchData({ queryType: 2 }).then(res => {
			this.staticData = res \|\| {}
			getWorkBody2 () {
			getWorkOrderData({ queryType: 0, orderType: 2 }).then(res => {
			this.staticData2 = res \|\| []
			this.initEchart2()
			})
			getWorkOrderData({ queryType: 1, orderType: 2 }).then(res => {
			this.staticData21 = res \|\| []
			this.initEchart21()
			})
			},
			getWorkBody3 () {
			getWorkOrderData({ queryType: 0, orderType: 3 }).then(res => {
			this.staticData3 = res \|\| []
			this.initEchart3()
			this.initEchart4()
			})
			getWorkOrderData({ queryType: 1, orderType: 3 }).then(res => {
			this.staticData31 = res \|\| []
			this.initEchart31()
			})
			},
			getWorkHead () {
			getWorkbenchData({ queryType: 1 }).then(res => {
			getIndexData({ }).then(res => {
			this.headerData = res \|\| {}
			const arr = []
			arr.push({ name: 'è®¿å®¢', value: this.headerData.inParkVisitUserNum })
			arr.push({ name: 'åé¨åå·¥', value: this.headerData.todayInParkUserNum - this.headerData.inParkLwUserNum - this.headerData.inParkVisitUserNum })
			arr.push({ name: 'é¿æç¸å³æ¹', value: this.headerData.inParkLwUserNum })
			arr.sort((a, b) => b.value - a.value)
			this.manningRatio = arr
			this.initEchart1()
			})
			},
			jumpPage (page) {
			this.$router.push(page)
			updateDate () {
			this.nowDate = dayjs().format('YYYYå¹´MæDæ¥')
			this.nowWeek = weeks[new Date().getDay()]
			},
			departure (id) {
			this.$confirm('ç¡®å®ç¦»åå, æ¯å¦ç»§ç»?', 'æç¤º', {
			confirmButtonText: 'ç¡®å®',
			cancelButtonText: 'åæ¶',
			type: 'warning'
			}).then(() => {
			level(id)
			.then(res => {
			this.getWarningList()
			})
			}).catch(() => {

			})
			initEchart0 () {
			this.initEchartDataDo('echart0', this.staticData0.map(i => i.dateStr), this.staticData0.map(i => i.total),'å')
			},
			handleDetail (row) {
			if (row.type === 7) {
			this.handleTest(row);
			return
			}
			if (row.objType === 2) {
			this.$refs.OperaDetailsWindow.open('å¬å¡è½¦ç³è¯·è¯¦æ', { ...row, id: row.objId })
			return
			}
			if (row.objType === 1) {
			this.isShowReport = true
			this.$nextTick(() => {
			this.$refs.VisReportDetailRef.id = row.objId
			this.$refs.VisReportDetailRef.type = row.objType
			this.$refs.VisReportDetailRef.getDetail()
			this.$refs.VisReportDetailRef.isShowModal = true
			})
			return
			}
			if (row.objType === 3) {
			const obj = { ...row, id: row.objId }
			this.$refs.OperaHiddenDangerWindow.open('éæ£éææè¯¦æ', obj)
			return
			}
			if (row.objType === 6) {
			const obj = { ...row, id: row.objId }
			this.isShowDriver = true
			this.$nextTick(() => {
			this.$refs.DriverDetailRef.id = row.objId
			this.$refs.DriverDetailRef.type = row.objType
			this.$refs.DriverDetailRef.getDetail()
			this.$refs.DriverDetailRef.isShowModal = true
			})
			return
			}
			if (row.objType === 0) {
			this.isShowDetail = true
			this.$nextTick(() => {
			this.$refs.DetailRef.id = row.objId
			this.$refs.DetailRef.type = row.objType
			this.$refs.DetailRef.getDetail()
			this.$refs.DetailRef.isShowModal = true
			})
			}
			initEchart01 () {
			this.initEchartDataDo('echart01', this.staticData01.map(i => i.dateStr), this.staticData01.map(i => i.total),'å')
			},
			initEchart1 () {
			const myChart = echarts.init(document.getElementById('echart1'))
			const that = this

			const option = {
			tooltip: {
			trigger: 'item'
			},
			series: [
			{
			type: 'pie',
			radius: ['42%', '90%'],
			label: {
			show: false,
			position: 'center'
			},
			color: colors,
			labelLine: {
			show: false
			},
			data: that.manningRatio
			// data: [
			// { value: that.headerData.inParkVisitUserNum, name: 'è®¿å®¢' },
			// { value: that.headerData.todayInParkUserNum - that.headerData.inParkVisitUserNum - that.headerData.inParkLwUserNum, name: 'åé¨åå·¥' },
			// { value: that.headerData.inParkLwUserNum, name: 'é¿æç¸å³æ¹' }
			// ]
			}
			]
			}
			myChart.setOption(option)
			window.addEventListener('resize', function () { // æ§è¡
			myChart.resize()
			})
			this.initEchartDataDo('echart1', this.staticData1.map(i => i.dateStr), this.staticData1.map(i => i.total),'æ¬¡')
			},
			initEchart11 () {
			this.initEchartDataDo('echart11', this.staticData11.map(i => i.dateStr), this.staticData11.map(i => i.total),'æ¬¡')
			},
			initEchart2 () {
			const myChart = echarts.init(document.getElementById('echart2'))
			const that = this
			myChart.setOption({
			grid: {
			top: '4%',
			left: '2%',
			right: '6%',
			bottom: '2%',
			containLabel: true
			},
			tooltip: {
			trigger: 'axis',
			axisPointer: {
			type: 'line'
			}
			},
			xAxis: {
			type: 'value',
			position: 'bottom',
			splitLine: {
			show: true,
			lineStyle: {
			// è¿éè¾å¥çº¿æ¡çæ ·å¼
			color: 'rgba(255,255,255,0.14)'
			}
			}
			},
			yAxis: {
			type: 'category',
			data: that.staticData.lwList.map(i => i.name)
			},
			series: [
			{
			data: that.staticData.lwList.map(i => i.num),
			type: 'bar',
			barWidth: 10,
			itemStyle: {
			normal: {
			color: new echarts.graphic.LinearGradient(
			1, 0, 0, 0,
			[
			{ offset: 0, color: '#56abf8' },
			{ offset: 1, color: '#407ff0' }
			]
			)
			// barBorderRadius: [0, 10, 10, 0]
			}
			}
			}
			]
			})
			window.addEventListener('resize', function () { // æ§è¡
			myChart.resize()
			})
			this.initEchartDataDo('echart2', this.staticData2.map(i => i.dateStr), this.staticData2.map(i => i.total),'å')
			},
			initEchart21 () {
			this.initEchartDataDo('echart21', this.staticData21.map(i => i.dateStr), this.staticData21.map(i => i.total),'å')
			},
			initEchart3 () {
			const myChart = echarts.init(document.getElementById('echart3'))
			const that = this
			this.initEchartDataDo('echart3', this.staticData3.map(i => i.dateStr), this.staticData3.map(i => i.total),'å')
			},
			initEchart31 () {
			this.initEchartDataDo('echart31',this.staticData31.map(i => i.dateStr), this.staticData31.map(i => i.total),'å')
			},
			initEchartDataDo (id, xdata,ydata,unit) {
			const myChart = echarts.init(document.getElementById(id))
			myChart.setOption({
			tooltip: {
			trigger: 'axis',
			@@ -455,7 +245,7 @@
			<div style="display: flex;align-items: center;">
			<div style="width: 10px;height: 10px;border-radius: 50%;background-color: #6feef0;"></div>
			<span style="margin-left: 6px;">${params[0].value}</span>
			<div>äºº</div>
			<div>${unit}</div>
			</div>
			</div>
			`
			@@ -464,11 +254,11 @@
			xAxis: {
			type: 'category',
			boundaryGap: false,
			data: that.staticData.weekVisitList.map(i => i.name)
			data: xdata
			},
			yAxis: {
			type: 'value',
			name: 'äººæ°',
			name: '',
			nameTextStyle: {
			padding: [0, 0, 4, -30] // åä¸ªæ°ååå«ä¸ºä¸å³ä¸å·¦ä¸åä½ç½®è·ç¦»
			},
			@@ -489,7 +279,7 @@
			},
			series: [
			{
			data: that.staticData.weekVisitList.map(i => i.num),
			data: ydata,
			type: 'line',
			areaStyle: {
			normal: {
			@@ -539,106 +329,6 @@
			myChart.resize()
			})
			},
			initEchart4 () {
			const myChart = echarts.init(document.getElementById('echart4'))
			const that = this
			myChart.setOption({
			tooltip: {
			trigger: 'axis',
			axisPointer: {
			type: 'line'
			},
			formatter: function (params) {
			return `
			<div style="background-color: #15323f;margin: -12px;padding: 14px;border: 2px solid rgba(1,217,254,0.5);color: #fff;">
			<div>${params[0].name}</div>
			<div style="display: flex;align-items: center;">
			<div style="width: 10px;height: 10px;border-radius: 50%;background-color: #6feef0;"></div>
			<span style="margin-left: 6px;">${params[0].value}</span>
			<div>è¾</div>
			</div>
			</div>
			`
			}
			},
			xAxis: {
			type: 'category',
			boundaryGap: false,
			data: that.staticData.weekCarList.map(i => i.name)
			},
			yAxis: {
			type: 'value',
			name: 'è½¦è¾æ°',
			nameTextStyle: {
			padding: [0, 0, 4, -30] // åä¸ªæ°ååå«ä¸ºä¸å³ä¸å·¦ä¸åä½ç½®è·ç¦»
			},
			splitLine: {
			show: true,
			lineStyle: {
			// è¿éè¾å¥çº¿æ¡çæ ·å¼
			color: 'rgba(255,255,255,0.14)'
			}
			}
			},
			grid: {
			top: '16%',
			left: '2%',
			right: '8%',
			bottom: '4%',
			containLabel: true
			},
			series: [
			{
			data: that.staticData.weekCarList.map(i => i.num),
			type: 'line',
			areaStyle: {
			normal: {
			color: {
			x: 0,
			y: 0,
			x2: 0,
			y2: 1,
			colorStops: [{
			offset: 0,
			color: '#42D49D' // 0% å¤çé¢è²
			}, {
			offset: 1,
			color: 'rgba(255,255,255,.5)' // 100% å¤çé¢è²
			}],
			globalCoord: false // ç¼ºçä¸º false
			}
			}
			},
			lineStyle: { // çº¿æ¡æ ·å¼
			color: {
			type: 'linear',
			x: 0,
			y: 0,
			x2: 0,
			y2: 1,
			colorStops: [{
			offset: 0, color: '#42D49D' // 0% å¤çé¢è²
			}, {
			offset: 1, color: '#42D49D' // 100% å¤çé¢è²
			}]
			},
			width: 2 // çº¿æ¡ç²ç»
			},
			symbol: 'circle',
			symbolSize: 10,
			itemStyle: {
			borderWidth: 1,
			borderColor: '#fff',
			color: '#42D49D' // æçº¿ç¹çé¢è²
			},
			smooth: false
			}
			]
			})
			window.addEventListener('resize', function () { // æ§è¡
			myChart.resize()
			})
			}
			}
			}
			</script>
			@@ -930,10 +620,15 @@
			&:nth-of-type(2n) {
			margin-left: 10px;
			}

			.echart {
			width: 100%;
			height: 190px;
			position: relative;
			display: flex;
			div{
			flex: 1;
			height: 190px;
			}
			}

			.header {
			@@ -1012,8 +707,8 @@
			width: 100%;
			height: 200px;
			padding: 20px;
			/* color: #fff;
			background: linear-gradient(180deg, #0c6ce3 0%, rgba(32, 127, 247, 0) 100%);*/
			color: #fff;
			background: linear-gradient(180deg, #076ae5 0%, rgba(32, 127, 247, 0) 100%);
			}
			}
			</style>

			@@ -192,6 +192,7 @@
			</dependencies>

			<build>
			<finalName>lianhelihua</finalName>
			<resources>
			<resource>
			<directory>src/main/resources</directory>

			@@ -11,10 +11,9 @@
			import com.doumee.core.model.PageData;
			import com.doumee.core.utils.DateUtil;
			import com.doumee.dao.business.model.Workorder;
			import com.doumee.dao.business.vo.WorkorderDbhDto;
			import com.doumee.dao.business.vo.WorkorderDcaChildDto;
			import com.doumee.dao.business.vo.WorkorderDcaDto;
			import com.doumee.dao.business.vo.WorkorderSheDto;
			import com.doumee.dao.business.vo.*;
			import com.doumee.dao.web.dto.OrderDataDTO;
			import com.doumee.dao.web.vo.WorkOrderDataVO;
			import com.doumee.service.business.WorkorderService;
			import io.swagger.annotations.Api;
			import io.swagger.annotations.ApiOperation;
			@@ -72,6 +71,16 @@
			workorderService.updateById(workorder);
			return ApiResponse.success(null);
			}
			@ApiOperation("å·¥ä½å°ç»è®¡æ°æ®")
			@PostMapping("/getIndexData")
			public ApiResponse<WorkorderIndexNumVO> getIndexData(@RequestBody Workorder workorder) {
			return ApiResponse.success( workorderService.getIndexData(workorder));
			}
			@ApiOperation("å·¥ä½å°ç»è®¡æ¥è¡¨æ°æ®")
			@PostMapping("/getWorkOrderData")
			public ApiResponse<List<WorkOrderDataVO>> getWorkOrderData(@RequestBody OrderDataDTO workorder) {
			return ApiResponse.success( workorderService.getWorkOrderData(workorder));
			}

			@ApiOperation("åé¡µæ¥è¯¢")
			@PostMapping("/page")

			@@ -577,15 +577,16 @@
			* @return String
			* @throws Exception
			*/
			public static String getNowYear() throws Exception {
			public static String getNowYear() {
			String nowYear = "";
			try {
			String strTemp = getNowLongTime();
			nowYear = strTemp.substring(0, 4);
			return nowYear;
			} catch (Exception e) {
			throw e;
			e.printStackTrace();
			}
			return nowYear;
			}

			/**
			@@ -594,15 +595,16 @@
			* @return String
			* @throws Exception
			*/
			public static Integer getNowMonth() throws Exception {
			public static Integer getNowMonth() {
			String nowMonth = "";
			try {
			String strTemp = getNowLongTime();
			nowMonth = strTemp.substring(4, 6);
			return Integer.valueOf(nowMonth);
			} catch (Exception e) {
			throw e;
			e.printStackTrace();
			}
			return null;
			}

			/**
			@@ -611,15 +613,16 @@
			* @return String
			* @throws Exception
			*/
			public static String getNowDay() throws Exception {
			public static String getNowDay() {
			String nowDay = "";
			try {
			String strTemp = getNowLongTime();
			nowDay = strTemp.substring(6, 8);
			return nowDay;
			} catch (Exception e) {
			throw e;
			e.printStackTrace();
			}
			return nowDay;
			}

			/**

			@@ -217,6 +217,9 @@
			@ApiModelProperty(value = "è§£å³æåµï¼æ¥è¯¢ä½¿ç¨ï¼ï¼0=å¦ï¼1=æ¯ï¼",hidden = true)
			@TableField(exist = false)
			private Integer dealStatus;
			@ApiModelProperty(value = "ç»è®¡æ°ï¼",hidden = true)
			@TableField(exist = false)
			private Long num;


			@ApiModelProperty("æä»¶è·¯å¾åç¼")

¶Ô±ÈÐÂÎÄ¼þ
			@@ -0,0 +1,33 @@
			package com.doumee.dao.business.vo;

			import io.swagger.annotations.ApiModel;
			import io.swagger.annotations.ApiModelProperty;
			import lombok.Data;

			/**
			* Created by IntelliJ IDEA.
			*
			* @Author : Rk
			* @create 2023/7/13 10:40
			*/
			@Data
			@ApiModel("ä¼ä¸å¾®ä¿¡è·åjsç¾åè¿ååæ°")
			public class WorkorderIndexNumVO {
			@ApiModelProperty(value = "SHEä»æ¥ææ¥æ°é")
			private Long todaySheNum;
			@ApiModelProperty(value = "SHEæ»å·¥åé")
			private Long sheNum;
			@ApiModelProperty(value = "DCAä»æ¥ææ¥æ°é")
			private Long todayDcaNum;
			@ApiModelProperty(value = "DCAæ»ææ¥é")
			private Long dcaNum;
			@ApiModelProperty(value = "DCAä»æ¥å·¥åæ°é")
			private Long todayDcaChildNum;
			@ApiModelProperty(value = "DCAæ»å·¥åé")
			private Long dcaChildNum;
			@ApiModelProperty(value = "è·ç»æ»ä»æ¥ææ¥æ°é")
			private Long todayDbhNum;
			@ApiModelProperty(value = "è·ç»æ»æ»å·¥åé")
			private Long dbhNum;

			}

			@@ -27,5 +27,4 @@
			@ApiModelProperty(value = "å°ç¹ä¸»é®")
			private Integer locationId;


			}

			@@ -4,6 +4,7 @@
			import com.doumee.core.model.PageWrap;
			import com.doumee.dao.business.model.Member;
			import com.doumee.dao.business.model.Workorder;
			import com.doumee.dao.business.vo.WorkorderIndexNumVO;
			import com.doumee.dao.web.dto.CloseDTO;
			import com.doumee.dao.web.dto.OrderDataDTO;
			import com.doumee.dao.web.dto.PassOnDTO;
			@@ -141,7 +142,7 @@
			*/
			void jobUrge();

			List<WorkOrderDataVO> getWorkOrderData(OrderDataDTO orderDataDTO) throws Exception;
			List<WorkOrderDataVO> getWorkOrderData(OrderDataDTO orderDataDTO) ;

			/**
			* å·¥åæé
			@@ -150,4 +151,6 @@
			void sendCopy(SendCopyDTO sendCopyDTO);

			void sendSheEmail();

			WorkorderIndexNumVO getIndexData(Workorder workorder);
			}

			@@ -14,6 +14,7 @@
			import com.doumee.core.utils.qiyeweixin.model.request.QywxTextCardMsgRequest;
			import com.doumee.dao.business.*;
			import com.doumee.dao.business.model.*;
			import com.doumee.dao.business.vo.WorkorderIndexNumVO;
			import com.doumee.dao.web.dto.*;
			import com.doumee.dao.web.vo.WorkOrderDataVO;
			import com.doumee.service.business.WorkorderService;
			@@ -1188,13 +1189,15 @@
			* @throws Exception
			*/
			@Override
			public List<WorkOrderDataVO> getWorkOrderData(OrderDataDTO orderDataDTO) throws Exception {
			public List<WorkOrderDataVO> getWorkOrderData(OrderDataDTO orderDataDTO) {
			if (Objects.isNull(orderDataDTO.getQueryType())\|\|Objects.isNull(orderDataDTO.getOrderType())) {
			throw new BusinessException(ResponseStatus.BAD_REQUEST);
			}
			String year = DateUtil.getNowYear();
			Integer nowMonth = DateUtil.getNowMonth();
			Integer quarter = (nowMonth - 1) / 3 + 1;
			// Integer nowMonth = DateUtil.getNowMonth();
			Integer nowMonth = 12;
			// Integer quarter = (nowMonth - 1) / 3 + 1;
			Integer quarter =4;
			List<WorkOrderDataVO> workOrderDataVOList = new ArrayList<>();
			//æ¥è¯¢ä»å¹´ææçæ°æ®
			List<Workorder> workorderList = workorderMapper.selectJoinList(Workorder.class,new MPJLambdaWrapper<Workorder>()
			@@ -1209,10 +1212,10 @@
			if(Constants.equalsInteger(orderDataDTO.getQueryType(),Constants.ZERO)){
			for (int i = 1 ; i <= nowMonth; i++) {
			WorkOrderDataVO workOrderDataVO = new WorkOrderDataVO();
			String monthDay = year + "-" + org.apache.commons.lang3.StringUtils.leftPad(nowMonth.toString(),2,"0");
			String monthDay = year + "-" + org.apache.commons.lang3.StringUtils.leftPad(i+"",2,"0");
			List<Workorder> dataList = workorderList.stream().filter(j->DateUtil.formatDate(j.getCreateDate(),"yyyy-MM").equals(monthDay))
			.collect(Collectors.toList());
			workOrderDataVO.setDateStr(monthDay);
			workOrderDataVO.setDateStr(i+"æ");
			workOrderDataVO.setGcsTotal(Constants.ZERO);
			workOrderDataVO.setWtsTotal(Constants.ZERO);
			workOrderDataVO.setSheTotal(Constants.ZERO);
			@@ -1259,11 +1262,65 @@
			workOrderDataVO.setUnCloseTotal(workOrderDataVO.getTotal() - workOrderDataVO.getSheTotal() - workOrderDataVO.getWtsTotal() - workOrderDataVO.getGcsTotal());
			}
			workOrderDataVOList.add(workOrderDataVO);

			}
			}
			return workOrderDataVOList;
			}
			/**
			* SHE / è·ç»æ»æ¥è¡¨
			* @return
			* @throws Exception
			*/
			@Override
			public WorkorderIndexNumVO getIndexData(Workorder workorder) {
			WorkorderIndexNumVO model = new WorkorderIndexNumVO();
			List<WorkOrderDataVO> workOrderDataVOList = new ArrayList<>();
			//æ¥è¯¢ä»å¹´ææçæ°æ®
			List<Workorder> list = workorderMapper.selectJoinList(Workorder.class,new MPJLambdaWrapper<Workorder>()
			.select("type,count(id) as num")
			.eq(Workorder::getIsdeleted,Constants.ZERO)
			.groupBy(Workorder::getType ));
			if(list !=null){
			for(Workorder w : list){
			if(Constants.equalsInteger(w.getType(),Constants.ZERO)){
			//SHE
			model.setSheNum(Constants.formatLongNum(w.getNum()));
			}else if(Constants.equalsInteger(w.getType(),Constants.ONE)){
			//DCAæäº¤æ°
			model.setDcaNum(Constants.formatLongNum(w.getNum()));
			}else if(Constants.equalsInteger(w.getType(),Constants.TWO)){
			//DCAåå·¥å
			model.setDcaChildNum(Constants.formatLongNum(w.getNum()));
			}else if(Constants.equalsInteger(w.getType(),Constants.THREE)){
			//è·ç»æ»
			model.setDbhNum(Constants.formatLongNum(w.getNum()));
			}
			}
			}
			List<Workorder> todays = workorderMapper.selectJoinList(Workorder.class,new MPJLambdaWrapper<Workorder>()
			.select("type,count(id) as num")
			.eq(Workorder::getIsdeleted,Constants.ZERO)
			.apply("to_days(create_date)=to_days(now())")
			.groupBy(Workorder::getType ));
			if(todays !=null){
			for(Workorder w : todays){
			if(Constants.equalsInteger(w.getType(),Constants.ZERO)){
			//SHE
			model.setTodaySheNum(Constants.formatLongNum(w.getNum()));
			}else if(Constants.equalsInteger(w.getType(),Constants.ONE)){
			//DCAæäº¤æ°
			model.setTodayDcaNum(Constants.formatLongNum(w.getNum()));
			}else if(Constants.equalsInteger(w.getType(),Constants.TWO)){
			//DCAåå·¥å
			model.setTodayDcaChildNum(Constants.formatLongNum(w.getNum()));
			}else if(Constants.equalsInteger(w.getType(),Constants.THREE)){
			//è·ç»æ»
			model.setTodayDbhNum(Constants.formatLongNum(w.getNum()));
			}
			}
			}
			return model;
			}

			@@ -9,7 +9,7 @@

			spring:
			profiles:
			active: test
			active: dev
			# JSONè¿åéç½®
			jackson:
			# é»è®¤æ¶åº