Merge remote-tracking branch 'origin/master'

k94314517

2025-05-07 94fdc01dacf7a3bc185ca99e98d0864594d34ef1

 admin/src/views/index.vue

@@ -32,8 +32,8 @@
              <img src="@/assets/icons/home_icon2.png" alt="" />
            </div>
            <div class="content">
              <div>访客人次(人)：{{ headerData.visitUserNum }}</div>
              <div>签离人次(人)：{{ headerData.signLevelNum }}</div>
              <div>入园人次(人)：{{ headerData.visitUserNum }}</div>
              <div>出园人次(人)：{{ headerData.signLevelNum }}</div>
            </div>
          </div>
          <div class="card">
@@ -100,7 +100,11 @@
            </div>
            <div class="wrap static2">
              <div class="header">
                <div class="home_title">长期相关方分布</div>
<!--                <div class="home_title">长期相关方分布</div>-->
                <el-radio-group v-model="tabPosition" @change="changeType">
                  <el-radio-button label="right">内部人员分布</el-radio-button>
                  <el-radio-button label="top">长期相关方分布</el-radio-button>
                </el-radio-group>
                <!-- <div class="df_ac more">
                  更多<i class="el-icon-arrow-right"></i>
                </div> -->
@@ -226,6 +230,7 @@
  },
  data () {
    return {
      tabPosition: 'right',
      colors,
      nowDate: '',
      nowWeek: '',
@@ -241,7 +246,7 @@
        { 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') },
        { name: '食堂消费入口', path: '', url: require('@/assets/icons/8.png') }
        { name: '食堂消费', path: '', url: require('@/assets/icons/8.png') }
      ],
      isShowDetail: false,
      isShowReport: false,
@@ -264,6 +269,10 @@
    this.initData()
  },
  methods: {
    changeType(e) {
      console.log(e)
      this.initEchart2()
    },
    getNoticeList(){
      syncHkNotice().then(res => {

@@ -393,8 +402,9 @@
        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.todayInParkUserNum - this.headerData.inParkLwUserNum - this.headerData.inParkVisitUserNum - this.headerData.inParkDriverUserNum })
        arr.push({ name: '长期相关方', value: this.headerData.inParkLwUserNum })
        arr.push({ name: '货运司机', value: this.headerData.inParkDriverUserNum })
        arr.sort((a, b) => b.value - a.value)
        this.manningRatio = arr
        this.initEchart1()
@@ -497,6 +507,7 @@
      })
    },
    initEchart2 () {
      console.log('initEchart2')
      const myChart = echarts.init(document.getElementById('echart2'))
      const that = this
      myChart.setOption({
@@ -526,11 +537,11 @@
        },
        yAxis: {
          type: 'category',
          data: that.staticData.lwList.map(i => i.name)
          data: that.tabPosition === 'top' ? that.staticData.lwList.map(i => i.name) : that.staticData.internalList.map(i => i.name)
        },
        series: [
          {
            data: that.staticData.lwList.map(i => i.num),
            data: that.tabPosition === 'top' ? that.staticData.lwList.map(i => i.num) : that.staticData.internalList.map(i => i.num),
            type: 'bar',
            barWidth: 10,
            itemStyle: {