ll

liukangdong

2024-10-12 7685298b2f772851d8537945fa3bb5a4b2ffbb1b

ll

 admin/src/api/workbench/index.js

@@ -23,4 +23,10 @@
// 任务中心头部
export function getWorkbenchTaskHead (data) {
  return request.post('/visitsAdmin/cloudService/business/staging/taskCenterHeadPC', data)
}
// pc工作台
export function getWorkbenchData (data) {
  return request.get('/visitsAdmin/cloudService/business/staging/pCWorkPlatformData', {
    params: {...data  }
  })
}

 admin/src/views/index.vue

@@ -226,8 +226,7 @@
import * as echarts from 'echarts'
import { weeks } from '@/utils/config'
import {
  getWorkbenchBody,
  getWorkbenchHead,
  getWorkbenchData,
  getAppHeaderNav
} from '@/api'
const colors = ['#52a4f7', '#7678f7', '#5fc6d5']
@@ -283,10 +282,10 @@
      this.initEchart4()
    },
    getWorkBody() {
      getWorkbenchBody()
      getWorkbenchData({queryType: 2})
    },
    getWorkHead() {
      getWorkbenchHead()
      getWorkbenchData({queryType: 1})
    },
    initEchart1() {
      const myChart = echarts.init(document.getElementById('echart1'))
@@ -458,9 +457,9 @@
            symbol: 'circle',
            symbolSize: 10,
            itemStyle: {
              normal: {
                color: '#207FF7' // 折线点的颜色
              }
              borderWidth: 1,
              borderColor: '#fff',
              color: '#207FF7'
            },
            smooth: false
          }
@@ -557,9 +556,9 @@
            symbol: 'circle',
            symbolSize: 10,
            itemStyle: {
              normal: {
                color: '#42D49D' // 折线点的颜色
              }
              borderWidth: 1,
              borderColor: '#fff',
              color: '#42D49D' // 折线点的颜色
            },
            smooth: false
          }

 admin/src/views/platform/components/PlatformSign.vue

@@ -45,8 +45,8 @@
            </div>
          </div>
          <div class="footer df_sb">
            <div @click="handleDetail(item)" v-if="item.type != 4" class="detail">运单详情</div>
            <div v-else></div>
            <div @click="handleDetail(item)" v-if="item.billCode" class="detail">运单详情</div>
            <div @click="subDetail(item)" v-else class="detail">预约详情</div>
            <el-button type="primary" @click="handleCall(item)">签到</el-button>
          </div>
        </div>
@@ -55,6 +55,7 @@
      </pagination>
    </div>
    <WaybillDetailRef v-if="isShowDetail" ref="WaybillDetailRef" />
    <DriverDetail v-if="isShowDriver" ref="DriverDetailRef" />
  </GlobalWindow>
</template>

@@ -62,6 +63,7 @@
import GlobalWindow from '@/components/common/GlobalWindow'
import Pagination from '@/components/common/Pagination'
import WaybillDetailRef from "./WaybillDetail.vue"
import DriverDetail from "@/views/task/driverDetail.vue"
import { platformJobPage, platformJobSign } from '@/api'
import { statusMap } from '../config'
import { Message } from 'element-ui'
@@ -69,13 +71,15 @@
  components: {
    GlobalWindow,
    Pagination,
    WaybillDetailRef
    WaybillDetailRef,
    DriverDetail
  },
  data() {
    return {
      statusMap,
      isShowModal: false,
      isShowDetail: false,
      isShowDriver: false,
      subLoading: false,
      pagination: {
        total: 0,
@@ -108,6 +112,15 @@
        this.pagination.total = res.total
      })
    },
    subDetail(row) {
      this.isShowDriver = true
      this.$nextTick(() => {
        this.$refs.DriverDetailRef.id = row.bookId
        this.$refs.DriverDetailRef.type = row.objType
        this.$refs.DriverDetailRef.getDetail()
        this.$refs.DriverDetailRef.isShowModal = true
      })
    },
    handleDetail(row) {
      this.isShowDetail = true
      this.$nextTick(() => {

 admin/src/views/platform/queueUp.vue

@@ -44,7 +44,9 @@
      <el-table-column prop="signDate" label="签到时间" min-width="150" />
      <el-table-column label="操作" align="center" width="100" fixed="right">
        <template slot-scope="{ row }">
          <el-button v-if="activeGroup.type == 2" type="text" @click="subDetail(row)">预约详情</el-button>
          <el-button v-if="row.billCode" type="text" @click="handleDetail(row)"
            v-permissions="['business:company:update']">运单详情</el-button>
          <el-button v-else type="text" @click="subDetail(row)">预约详情</el-button>
        </template>
      </el-table-column>
    </el-table>
@@ -71,8 +73,9 @@
      <el-table-column prop="signDate" label="签到时间" min-width="150" />
      <el-table-column label="操作" align="center" width="100" fixed="right">
        <template slot-scope="{ row }">
          <el-button type="text" @click="handleDetail(row)"
          <el-button v-if="row.billCode" type="text" @click="handleDetail(row)"
            v-permissions="['business:company:update']">运单详情</el-button>
          <el-button v-else type="text" @click="subDetail(row)">预约详情</el-button>
        </template>
      </el-table-column>
    </el-table>

 admin/src/views/task/driverDetail.vue

@@ -69,7 +69,7 @@
            <div class="content">
              <div class="head">
                <div class="event">{{ item.title }}</div>
                <div class="time">{{ item.createDate }}</div>
                <div class="time">{{ item.checkDate }}</div>
              </div>
              <div class="name_wrap">
                <span>{{ item.memberName }}<span v-if="item.statusInfo" class="status">({{ item.statusInfo
@@ -134,7 +134,7 @@
      id: '',
      type: '',

      title: '访客预约详情',
      title: '物流车预约详情',
      isShowModal: false,
      info: {},
      isShowAppr: false,

 admin/src/views/task/visSubDetail.vue

@@ -115,7 +115,7 @@
                  <div class="company">
                    {{ item.memberName }}
                    <div style="display: inline" v-if="item.statusInfo != null && item.statusInfo != ''">
                      （<span class="status" :class="{ padding: item.statusInfo == '处理中' || item.status == '1' }">{{
                      （<span :class="{ padding: item.statusInfo == '处理中' || item.status == '1' }">{{
                        item.statusInfo || ""
                        }}</span>）
                    </div>
@@ -130,7 +130,7 @@
            " class="remark">
              {{ item.checkInfo || "" }}
            </div>
            <div v-if="item.approveType == 1 || item.approveType == 0" class="childList">
            <div v-if="item.approveType == 1" class="childList">
              <div class="m_content company" v-for="item1 in item.approveList" :key="item1.id">
                <img v-if="item1.faceImg != null && item1.faceImg != ''" :src="item1.faceImg" class="avatar" alt="" />
                <img v-if="item1.faceImg == null || item1.faceImg == ''" src="@/assets/avatar/man.png" class="avatar"

 h5/utils/config.js

@@ -1,5 +1,7 @@

export const baseUrl = 'admin_interface/'
// export const baseUrl = 'admin_interface/'
export const baseUrl = 'http://192.168.0.173/gateway_interface/'

export const uploadAvatar = `${baseUrl}visitsAdmin/cloudService/web/public/uploadFtp.do`
export const uploadUrl = `${baseUrl}visitsAdmin/cloudService/public/uploadBatch`