解决冲突

doum

2026-03-06 34fe52caba63e6a6337cb9c3e6bd0d4707fd6a99

 admin/src/views/index.vue

@@ -2,7 +2,7 @@
  <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">
      <div class="mb10 fs17">{{timeInfo}}好，{{ userInfo.realname }}</div>
      <div class="mb10 fs17">下午好，{{ userInfo.realname }}</div>
      <div class="fs13">
        今天是 {{ nowDate }} {{ nowWeek }}，欢迎访问{{sysConfig.subtitle || title}}
      </div>
@@ -100,7 +100,7 @@
            </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>
@@ -235,10 +235,10 @@
      title: process.env.VUE_APP_TITLE,
      tabPosition: 'right',
      colors,
      timeInfo: '上午',
      nowDate: '',
      nowWeek: '',
      headerData: {},
      timeInfo:'上午',
      staticData: {},
      manningRatio: [],
      taskList: [],
@@ -249,7 +249,7 @@
        { 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_func5.png'), path: '/operation/serviceCar/apprRecord' }
        { name: '公务车预约', path: '', url: require('@/assets/icons/home_func5.png'), path: '/operation/serviceCar/apprRecord' },
        // { name: '考勤工作台', path: '', url: require('@/assets/icons/home_func4.png') },
        // { name: '食堂消费', path: '', url: require('@/assets/icons/8.png') }
      ],
@@ -377,9 +377,9 @@
      this.$router.push(item.path)
    },
    updateDate () {
      this.timeInfo = new Date().getHours()<12?'上午':'下午'
      this.nowDate = dayjs().format('YYYY年M月D日')
      this.nowWeek = weeks[new Date().getDay()]
      this.timeInfo = new Date().getHours() < 12 ? '上午' : '下午'
    },
    initData () {
      this.getWorkHead()
@@ -432,9 +432,9 @@
        type: 'warning'
      }).then(() => {
        level(id)
            .then(res => {
              this.getWarningList()
            })
          .then(res => {
            this.getWarningList()
          })
      }).catch(() => {

      })
@@ -611,11 +611,11 @@
            itemStyle: {
              normal: {
                color: new echarts.graphic.LinearGradient(
                    1, 0, 0, 0,
                    [
                      { offset: 0, color: '#56abf8' },
                      { offset: 1, color: '#407ff0' }
                    ]
                  1, 0, 0, 0,
                  [
                    { offset: 0, color: '#56abf8' },
                    { offset: 1, color: '#407ff0' }
                  ]
                )
                // barBorderRadius: [0, 10, 10, 0]
              }
@@ -628,7 +628,7 @@
      })
    },
    initEchart21 () {
      console.log('initEchart21', this.staticData.lwList)
      console.log('initEchart21',this.staticData.lwList)
      if (!document.getElementById('echart21')) {
        return
      }
@@ -637,7 +637,7 @@
      const that = this
      var le1 = that.staticData.internalList.length
      var le2 = that.staticData.lwList.length
      const end = Math.round(40 * ((le1 > 0 && le2 > 0 ? le1 : 1) / (le1 > 0 && le2 > 0 ? le2 : 1))) + 10
      const end = Math.round(40 * ((le1>0&& le2>0?le1:1) / (le1>0&& le2>0?le2:1)))+10
      myChart.setOption({
        dataZoom: [
          {
@@ -705,7 +705,7 @@
        yAxis: {
          type: 'category',
          inverse: true,
          data: that.staticData.lwList.map(i => i.name),
          data:  that.staticData.lwList.map(i => i.name),
          axisLabel: {
            interval: 0
          }
@@ -718,11 +718,11 @@
            itemStyle: {
              normal: {
                color: new echarts.graphic.LinearGradient(
                    1, 0, 0, 0,
                    [
                      { offset: 0, color: '#56abf8' },
                      { offset: 1, color: '#407ff0' }
                    ]
                  1, 0, 0, 0,
                  [
                    { offset: 0, color: '#56abf8' },
                    { offset: 1, color: '#407ff0' }
                  ]
                )
                // barBorderRadius: [0, 10, 10, 0]
              }