Merge remote-tracking branch 'origin/master'

jiangping

2024-11-05 abc14c4f8a402e4c41b0645bfa0e1c797f0210a1

 admin/src/views/index.vue

@@ -3,7 +3,7 @@
    <div class="home_header">
      <div class="mb10 fs17">下午好，{{ userInfo.realname }}</div>
      <div class="fs13">
        今天是 {{ nowDate }} {{ nowWeek }}，欢迎回到智慧物流园区安消一体化系统
        今天是 {{ nowDate }} {{ nowWeek }}，欢迎访问智慧物流园区安消一体化系统
      </div>
    </div>
    <div class="main">
@@ -149,7 +149,7 @@
              <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_nodata.png" alt="">
              <img src="@/assets/images/default_homeimg.png" alt="">
            </div>
          </div>
        </div>
@@ -167,9 +167,7 @@
            <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" v-if="item.memberType == 0">劳务访客</div>
                <div class="identity" v-if="item.memberType == 1">普通访客</div>
                <div class="identity" v-if="item.memberType == 2">内部人员</div>
                <div class="identity">访客</div>
              </div>
              <div class="line">联系电话：{{ item.phone }}</div>
              <div class="line">访客公司：{{ item.companyName }}</div>
@@ -180,7 +178,7 @@
            </div>
          </div>
          <div v-if="warningList.length == 0" class="empty">
            <img src="@/assets/images/default_nodata.png" alt="">
            <img src="@/assets/images/default_homeimg.png" alt="">
          </div>
        </div>
      </div>
@@ -479,7 +477,7 @@
          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>${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>
@@ -579,11 +577,11 @@
          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>${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>
            </div>
          </div>
        `