ll
liukangdong
2024-08-30 fbc625dea6117cb8724301d3a07d9071419f9715
ll
已添加3个文件
已修改14个文件
已重命名2个文件
940 ■■■■ 文件已修改
admin/.env.development 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
admin/src/api/platform/index.js 41 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
admin/src/assets/icons/shengyin.png 补丁 | 查看 | 原始文档 | blame | 历史
admin/src/assets/images/default_nodata.png 补丁 | 查看 | 原始文档 | blame | 历史
admin/src/assets/style/style.scss 5 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
admin/src/components/common/CommonHeader.vue 29 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
admin/src/components/common/GlobalWindow.vue 6 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
admin/src/components/common/Pagination.vue 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
admin/src/components/common/QueryForm/queryForm.vue 4 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
admin/src/components/system/operation/HiddenDangerParam.vue 补丁 | 查看 | 原始文档 | blame | 历史
admin/src/components/system/operation/OperCarUseBookParamWindow.vue 补丁 | 查看 | 原始文档 | blame | 历史
admin/src/layouts/TableLayout.vue 4 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
admin/src/layouts/TableLayout1.vue 1 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
admin/src/views/platform/components/PlatformQueuing.vue 124 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
admin/src/views/platform/config.js 14 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
admin/src/views/platform/index.vue 564 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
admin/src/views/platform/queueUp.vue 140 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
h5/pages/driver/index.vue 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
pda/pages/index/center.vue 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
admin/.env.development
@@ -2,4 +2,4 @@
NODE_ENV = 'development'
VUE_APP_API_URL  = 'http://localhost:10010'
VUE_APP_API_URL  = 'http://192.168.0.136:10010'
VUE_APP_API_URL  = 'http://192.168.0.139:10010'
admin/src/api/platform/index.js
@@ -1,8 +1,45 @@
import request from '@/utils/request'
// æœˆå°åˆ—表
// èŽ·å–æœˆå°ç»„ä¿¡æ¯
export function getPlatformGroupList (data) {
  return request.post('/visitsAdmin/cloudService/business/platformGroup/getPlatformGroupList', data)
  return request.post('/visitsAdmin/cloudService/business/platform/getPlatformGroupList', data)
}
// å«å·åˆ—表
export function platformCallList (data) {
  return request.post('/visitsAdmin/cloudService/business/platform/platformCallList', data)
}
// å«å·
export function platformCallNumber (data) {
  return request.post('/visitsAdmin/cloudService/business/platform/platformCallNumber', data)
}
// å¼€å§‹ä½œä¸š
export function platformBeginWork (data) {
  return request.post('/visitsAdmin/cloudService/business/platform/beginWork', data)
}
// å®Œæˆä½œä¸š
export function platformFinishWork (data) {
  return request.post('/visitsAdmin/cloudService/business/platform/finishWork', data)
}
// è¿‡å·
export function platformOverNumber (data) {
  return request.post('/visitsAdmin/cloudService/business/platform/platformOverNumber', data)
}
// å¼‚常挂起
export function platformErr (data) {
  return request.post('/visitsAdmin/cloudService/business/platform/platformErr', data)
}
// å¼‚常挂起
export function platformMove (data) {
  return request.post('/visitsAdmin/cloudService/business/platform/platformMove', data)
}
// æœˆå°é…ç½®
export function updUserPlatformConfig (data) {
  return request.get('/visitsAdmin/cloudService/business/platform/updUserPlatformConfig?ids=' + data)
}
// æ ¹æ®æœˆå°ç»„获取月台列表信息
export function listByGroupId (id) {
  return request.get('/visitsAdmin/cloudService/business/platform/listByGroupId?groupId=' + id)
}
// æœˆå°åˆ—表 ç¼–辑
export function PlatformEdit (data) {
admin/src/assets/icons/shengyin.png
admin/src/assets/images/default_nodata.png
admin/src/assets/style/style.scss
@@ -138,8 +138,9 @@
.main_app {
  background-color: #fff;
  padding: 30px;
  margin: 0 16px;
  margin-top: 10px;
  margin-left: 16px;
  padding: 20px;
}
.fs12{
  font-size: 12px;
admin/src/components/common/CommonHeader.vue
@@ -4,7 +4,10 @@
      <div class="logo">
        <div>{{ title }}</div>
        <div class="list">
          <div class="item">服务中心</div>
          <div class="item active">
            <div>服务中心</div>
            <div class="linellae"></div>
          </div>
          <div class="item">安防中心</div>
          <div class="item">消防中心</div>
          <div class="item">能管中心</div>
@@ -204,6 +207,30 @@
.common-header {
  background-color: #2080f7;
}
.list{
  display: flex;
  align-items: center;
  margin-left: 60px;
  .item{
    margin-right: 40px;
    font-size: 16px;
    font-weight: 400;
    display: flex;
    flex-direction: column;
    align-items: center;
    justify-content: flex-start;
    height: 40px;
    cursor: pointer;
    .linellae{
      width: 64px;
      height: 2px;
      background: #FFFFFF;
    }
  }
  .active{
    font-weight: 500;
  }
}
.header {
  overflow: hidden;
  // background: #fff;
admin/src/components/common/GlobalWindow.vue
@@ -20,7 +20,7 @@
    </div>
    <div v-if="withFooter" class="window__footer">
      <slot name="footer">
        <el-button @click="confirm" :loading="confirmWorking" type="primary">{{text}}</el-button>
        <el-button v-if="showConfirm" @click="confirm" :loading="confirmWorking" type="primary">{{text}}</el-button>
        <slot name="btns" />
        <el-button @click="close">{{ backText }}</el-button>
      </slot>
@@ -55,6 +55,10 @@
      type: Boolean,
      default: false
    },
    showConfirm: {
      type: Boolean,
      default: true
    },
    // æ ‡é¢˜
    title: {
      type: String,
admin/src/components/common/Pagination.vue
@@ -1,7 +1,7 @@
<template>
  <div class="table-pagination">
    <el-pagination
      :current-page="pagination.pageIndex"
      :current-page="pagination.pageIndex || pagination.page"
      :page-sizes="pagination.pageSizes||[10, 20, 30, 40]"
      :page-size="pagination.pageSize"
      layout="total, sizes, prev, pager, next, jumper"
admin/src/components/common/QueryForm/queryForm.vue
@@ -191,8 +191,8 @@
  align-items: center;
  background-color: #fff;
  border-bottom: 10px solid #f7f8f9;
  margin: 0 -30px;
  padding: 0 0 0 30px;
  margin: 0 -20px;
  padding: 0 0 0 20px;
  .el-input,
  .el-select {
admin/src/components/system/operation/HiddenDangerParam.vue
admin/src/components/system/operation/OperCarUseBookParamWindow.vue
admin/src/layouts/TableLayout.vue
@@ -6,7 +6,7 @@
        <el-breadcrumb-item v-for="path in paths" :key="path">{{path}}</el-breadcrumb-item>
      </el-breadcrumb>
    </div>-->
    <div style="height:10px;"></div>
    <!-- <div style="height:10px;"></div> -->
    <Profile :roles="roles" :permissions="permissions">
      <!-- æœç´¢è¡¨å•部分 -->
      <div class="table-search-form">
@@ -60,6 +60,7 @@
  height: 100%;
  display: flex;
  flex-direction: column;
  margin-top: 10px;
  .not-allow-wrap {
    padding-top: 0;
  }
@@ -104,7 +105,6 @@
}
// åˆ—表和分页
.table-content {
  margin-top: 10px;
  padding: 0 16px;
  .table-wrap {
    padding: 16px 16px 0 16px;
admin/src/layouts/TableLayout1.vue
@@ -110,7 +110,6 @@
    }
    // åˆ—表和分页
    .table-content {
        margin-top: 10px;
        /*padding: 0 16px;*/
        .table-wrap {
            padding: 16px 16px 0 16px;
admin/src/views/platform/components/PlatformQueuing.vue
@@ -2,75 +2,135 @@
  <GlobalWindow
    title="月台叫号-xx号月台"
    :visible.sync="isShowModal"
    :showConfirm="false"
    width="800px"
    :confirm-working="subLoading"
    @confirm="handleSub"
  >
    <div class="queuing_modal">
      <div class="df_ac mb20">
        <span>搜索车辆:</span>
        <el-input
          class="flex1 mr20"
          v-model="param.aa"
          v-model="carCodeFront"
          placeholder="请输入车牌号"
        ></el-input>
        <el-button type="primary">查找</el-button>
        <el-button>重置</el-button>
        <el-button type="primary" @click="getList">查找</el-button>
        <el-button @click="reset">重置</el-button>
      </div>
      <div class="list">
        <div class="item">
        <div class="item" v-for="item in dataList" :key="item.id">
          <div class="head df_sb">
            <div class="plate">皖A12122</div>
            <div class="status">已签到</div>
            <div v-if="item.carCodeFront" class="code">
              <span>{{ item.carCodeFront.slice(0, 1) }}</span>
              <span>{{ item.carCodeFront.slice(1, 2) }}</span>
              <span>·</span>
              <span>{{ item.carCodeFront.slice(2) }}</span>
            </div>
            <div class="status">{{ statusMap[item.status] }}</div>
          </div>
          <div class="info">
            <div class="ite">
            <div v-if="item.type == 4" class="ite">
              <span>合同单号:</span>
              <span>{{ item.contractNum }}</span>
            </div>
            <div v-else class="ite">
              <span>运输单号:</span>
              <span>12312</span>
              <span>{{ item.code }}</span>
            </div>
            <div class="ite">
              <span>驾驶员:</span>
              <span>12312</span>
              <span>{{ item.driverName }}</span>
            </div>
            <div class="ite">
              <span>手机号:</span>
              <span>12312</span>
              <span>{{ item.drivierPhone }}</span>
            </div>
            <div class="ite">
              <span>总运输量:</span>
              <span>12312</span>
              <span>{{ item.totalNum }}万支</span>
            </div>
            <div class="ite" style="width: 66%">
            <div v-if="item.type != 4" class="ite" style="width: 66%">
              <span>运输公司:</span>
              <span>12312</span>
              <span>{{ item.carrierName }}</span>
            </div>
          </div>
          <div class="footer df_sb">
            <div class="detail">运单详情</div>
            <el-button type="primary">叫号</el-button>
            <div v-if="item.type != 4" class="detail">运单详情</div>
            <div v-else></div>
            <el-button type="primary" @click="handleCall(item)">叫号</el-button>
          </div>
        </div>
      </div>
      <pagination
        @size-change="handleSizeChange"
        @current-change="handlePageChange"
        :pagination="pagination"
      >
      </pagination>
    </div>
  </GlobalWindow>
</template>
<script>
import GlobalWindow from '@/components/common/GlobalWindow'
import { getPlatform, PlatformEdit, PlatformDel } from '@/api'
import Pagination from '@/components/common/Pagination'
import { platformCallList, platformCallNumber } from '@/api'
import { statusMap } from '../config'
import { Message } from 'element-ui'
export default {
  components: {
    GlobalWindow
    GlobalWindow,
    Pagination
  },
  data () {
    return {
      statusMap,
      isShowModal: false,
      subLoading: false,
      param: {}
      pagination: {
        total: 0,
        pageSize: 10,
        page: 1
      },
      carCodeFront: '',
      activePlat: {},
      dataList: []
    }
  },
  methods: {
    handleCall (item) {
      const activePlatform = this.activePlat
      platformCallNumber({ platformId: activePlatform.id, jobId: item.id }).then(res => {
        Message.success('叫号成功')
        this.$emit('success')
        this.getList()
      })
    },
    getList () {
      const { activePlat, pagination, carCodeFront } = this
      platformCallList({
        model: { callType: '2', platformId: activePlat.id, carCodeFront },
        page: pagination.page,
        capacity: pagination.pageSize
      }).then(res => {
        this.dataList = res.records
        this.pagination.total = res.total
      })
    },
    reset () {
      this.carCodeFront = ''
      this.pagination.page = 1
      this.pagination.pageSize = 10
      this.getList()
    },
    handleSizeChange (e) {
      this.pagination.pageSize = e
      this.getList()
    },
    handlePageChange (e) {
      this.pagination.page = e
      this.getList()
    },
    handleSub () {
      const { param } = this
      this.subLoading = true
@@ -84,7 +144,7 @@
      }, () => {
        this.subLoading = false
      })
    },
    }
  }
}
@@ -116,6 +176,28 @@
        .status {
          color: $primaryColor;
        }
        .code {
          display: flex;
          font-weight: 600;
          height: 30px;
          line-height: 30px;
          font-size: 15px;
          color: #111111;
          background-color: #fff;
          border-radius: 4px;
          border: 1px solid $primaryColor;
          padding-right: 4px;
          span {
            &:nth-of-type(1) {
              background: $primaryColor;
              padding: 0 8px;
              color: #fff;
            }
            &:nth-of-type(2) {
              padding-left: 4px;
            }
          }
        }
      }
      .info {
        display: flex;
admin/src/views/platform/config.js
¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,14 @@
export const statusMap = {
  0: '待确认',
  1: '待签到',
  2: '等待叫号',
  3: '入园等待',
  4: '月台等待', // å·²å«å·
  5: '作业中',
  6: '作业完成',
  7: '转移中',
  8: '异常挂起',
  9: '已授权离园',
  10: '已离园',
  11: '已过号'
}
admin/src/views/platform/index.vue
@@ -1,155 +1,394 @@
<template>
  <div class="main_app">
    <div class="mb20">
      <el-select v-model="platformId" @change="getList()">
        <el-option v-for="item in PlatformList" :key="item.id" :value="item.id" :label="item.name" />
      </el-select>
    <div class="mb20 main_header">
      <div class="platgroup_tabs">
        <div
          class="tab"
          :class="{ active: activeGroup.id === item.id }"
          @click="platgroupClick(item)"
          v-for="(item, i) in PlatGroupList"
          :key="i"
        >
          {{ item.name }}
        </div>
        <!-- <el-tabs v-model="activeGroup.id" @tab-click="platgroupClick">
          <el-tab-pane
            v-for="item,i in PlatGroupList"
            :key="i"
            :label="item.name"
            :name="String(item.id)"
          />
        </el-tabs> -->
      </div>
      <el-button type="primary" class="ml20" @click="handleSet"
        >配置月台</el-button
      >
    </div>
    <!--  -->
    <div class="platform_list">
      <div class="item" v-for="i in 2">
    <div v-if="activeGroup.platformList" class="platform_list">
      <div class="item" :class="{ emyty: item.workStatus == 0 }" v-for="(item, i) in activeGroup.platformList" :key="i">
        <div class="head">
          <div class="left">
            <div class="status mr10">作业中</div>
            <div class="name">6号月台</div>
            <div class="status mr10">
              {{ item.workStatus == "0" ? "空闲" : "作业中" }}
            </div>
            <div class="name">{{ item.name }}</div>
            <div class="ite">
              <span class="placeholder9">作业:</span><span>1</span>
              <span class="placeholder9">作业:</span
              ><span>{{ item.platformWorkVO.workNum }}</span>
            </div>
            <div class="ite">
              <span class="placeholder9">作业:</span><span>1</span>
              <span class="placeholder9">已叫:</span
              ><span>{{ item.platformWorkVO.callNum }}</span>
            </div>
            <div class="ite">
              <span class="placeholder9">作业:</span><span class="red">1</span>
              <span class="placeholder9">等待:</span
              ><span>{{ item.platformWorkVO.waitNum }}</span>
            </div>
            <div class="ite">
              <span class="placeholder9">异常:</span
              ><span class="red">{{ item.platformWorkVO.exceptionNum }}</span>
            </div>
          </div>
          <el-button type="primary" @click="handleQueuing()">叫号</el-button>
          <el-button type="primary" @click="handleQueuing(item)">
            <div class="df_ac">
              <img class="shengyin" src="@/assets/icons/shengyin.png" alt="">
              <span>叫号</span>
            </div>
          </el-button>
        </div>
        <div class="list">
          <div class="info" v-for="j in 3">
        <div
          class="list"
          v-if="item.platformWorkVO && item.platformWorkVO.platformJobList"
        >
          <div
            class="info"
            v-for="task in item.platformWorkVO.platformJobList"
            :key="task.id"
          >
            <div class="line">
              <div class="left">
                <span class="plate">皖A12122</span>
                <div v-if="task.carCodeFront" class="code">
                  <span>{{ task.carCodeFront.slice(0, 1) }}</span>
                  <span>{{ task.carCodeFront.slice(1, 2) }}</span>
                  <span>·</span>
                  <span>{{ task.carCodeFront.slice(2) }}</span>
                </div>
              </div>
              <div class="right">
                <span class="green">作业中</span>
                <span class="green ml20">23分钟26秒</span>
                <div
                  class="status"
                  v-if="task.status != 4 && task.status != 5"
                  :class="{ red: task.status == 8 }"
                >
                  <span class="lab">{{ statusMap[task.status] }}</span>
                </div>
                <div class="status" v-if="task.status == 4">
                  <span class="lab">叫号中</span> {{ task.callDateTemp }}
                </div>
                <div class="status scs" v-if="task.status == 5">
                  <span class="lab">已作业</span> {{ task.startDateTemp }}
                </div>
              </div>
            </div>
            <div class="line">
              <div class="ite">
              <div v-if="task.type == 4" class="ite">
                <span>合同单号:</span>
                <span>{{ task.contractNum }}</span>
              </div>
              <div v-else class="ite">
                <span>运输单号:</span>
                <span>202020</span>
                <span>{{ task.code }}</span>
              </div>
              <div class="ite">
                <span>驾驶员:</span>
                <span>202020</span>
                <span>{{ task.driverName }}</span>
              </div>
              <div class="ite">
                <span>手机号:</span>
                <span>202020</span>
                <span>{{ task.drivierPhone }}</span>
              </div>
              <div class="ite">
                <span>总运输量:</span>
                <span>202020</span>
                <span>{{ task.totalNum }}万支</span>
              </div>
              <div class="ite" style="width: 66.6%">
              <div v-if="task.type != 4" class="ite" style="width: 66.6%">
                <span>运输公司:</span>
                <span>20202dasd玩儿玩儿玩儿额外 é¢å¤–0</span>
                <span>{{ task.carrierName }}</span>
              </div>
              <div class="ite"></div>
            </div>
            <div class="line">
              <div class="left">
              <div v-if="task.type != 4" class="left">
                <span class="primaryColor pointer" @click="handleDetail"
                  >运单详情</span
                >
              </div>
              <div v-else></div>
              <div class="right">
                <el-button type="primary" @click="handleFinish()"
                <el-button
                  v-if="task.status == 5"
                  plain
                  @click="handleErr(task)"
                  >异常挂起</el-button
                >
                <el-button
                  v-if="task.status == 5 || task.status == 8"
                  plain
                  @click="handleTransform(item, task)"
                  >转移月台</el-button
                >
                <el-button
                  v-if="task.status == 4"
                  plain
                  @click="handlePass(task)"
                  >过号</el-button
                >
                <el-button
                  v-if="task.status == 5 || task.status == 8"
                  type="primary"
                  @click="handleFinish(task)"
                  >作业完成</el-button
                >
                <el-button plain>转移月台</el-button>
                <el-button plain>异常挂起</el-button>
                <el-button
                  v-if="task.status == 4"
                  type="primary"
                  @click="handleWork(task)"
                  >开始作业</el-button
                >
              </div>
            </div>
          </div>
        </div>
        <div v-if="!item.platformWorkVO.platformJobList || item.platformWorkVO.platformJobList.length == 0" class="empty_plat">
          <img src="@/assets/images/default_nodata.png" alt="">
          <div>暂无车辆</div>
        </div>
      </div>
    </div>
    <!-- é…ç½®æ˜¾ç¤ºæœˆå° -->
    <el-dialog
    <GlobalWindow
      title="配置显示月台"
      :visible.sync="isShowSet"
      center
      width="420px"
      :confirm-working="setLoading"
      @confirm="handleSetSub"
      width="560px"
    >
      <div class="set_modal">
        <div class="mb20">
          <div class="title">入库月台组</div>
        <div class="mb10" v-for="group in PlatGroupList" :key="group.id">
          <div class="title">{{group.name}}</div>
          <div class="list">
            <div class="item active">1号月台</div>
            <div class="item">2号月台</div>
            <div class="item">1号月台</div>
            <div class="item">2号月台</div>
          </div>
        </div>
        <div>
          <div class="title">入库月台组</div>
          <div class="list">
            <div class="item">1号月台</div>
            <div class="item">2号月台</div>
            <div class="item">1号月台</div>
            <div class="item">2号月台</div>
            <div class="item" @click="platformSetClick(item.id)" :class="{ active: item.showConfig }" v-for="item in group.platformList" :key="item.id">
              <div>{{item.name}}</div>
              <div v-if="item.showConfig" class="bg"></div>
              <i v-if="item.showConfig" class="el-icon-check scs"></i>
            </div>
          </div>
        </div>
      </div>
      <span slot="footer" class="dialog-footer">
        <el-button @click="setReset">重置</el-button>
        <el-button type="primary" @click="setSub">确定</el-button>
      </span>
    </el-dialog>
    </GlobalWindow>
    <!-- è¿å•详情 -->
    <!--  -->
    <!-- å«å· -->
    <PlatformQueuing ref="PlatformQueuingRef" v-if="isShowQueuing" @success="getList" @close="isShowQueuing = false" />
    <WaybillDetail ref="WaybillDetailRef" v-if="isShowDetail" @success="getList" @close="isShowDetail = false" />
    <PlatformQueuing
      ref="PlatformQueuingRef"
      v-if="isShowQueuing"
      @success="getPlatGroupList"
      @close="isShowQueuing = false"
    />
    <WaybillDetail
      ref="WaybillDetailRef"
      v-if="isShowDetail"
      @success="getList"
      @close="isShowDetail = false"
    />
    <el-dialog
      title="转移月台"
      :visible.sync="isShowTransform"
      width="500px"
      style="margin-top: 12vh"
    >
      <div class="df_ac">
        <span>选择转移到的月台:</span>
        <el-select v-model="activePlatId">
          <el-option
            v-for="item in activeGroup.platformList"
            :key="item.id"
            :label="item.name"
            :value="item.id"
          >
          </el-option>
        </el-select>
      </div>
      <span slot="footer" class="dialog-footer">
        <el-button @click="isShowTransform = false">取消</el-button>
        <el-button type="primary" @click="transformSub">确定</el-button>
      </span>
    </el-dialog>
  </div>
</template>
<script>
import { getPlatform, getPlatformJob } from '@/api'
import {
  getPlatformGroupList,
  platformBeginWork,
  platformFinishWork,
  platformOverNumber,
  platformErr,
  platformMove,
  updUserPlatformConfig,
  listByGroupId
} from '@/api'
import PlatformQueuing from './components/PlatformQueuing.vue'
import WaybillDetail from './components/WaybillDetail.vue'
import GlobalWindow from '@/components/common/GlobalWindow'
import dayjs from 'dayjs'
import duration from 'dayjs/plugin/duration'
import { Message } from 'element-ui'
import { statusMap } from './config'
dayjs.extend(duration)
export default {
  components: {
    PlatformQueuing,
    WaybillDetail
    WaybillDetail,
    GlobalWindow
  },
  data () {
    return {
      platformId: '',
      PlatformList: [],
      dataList: [],
      statusMap,
      activeGroup: {},
      PlatGroupList: [],
      platList: [],
      platCallList: [],
      isShowTransform: false,
      activePlatId: '', // è½¬ç§»æœˆå°
      activetaskId: '',
      isShowSet: false, // æœˆå°é…ç½®
      setLoading: false,
      setParam: {},
      isShowDetail: false, // è¿å•详情
      detail: {},
      isShowQueuing: false
      isShowQueuing: false,
      timer: null
    }
  },
  created () {
    this.getPlatList()
    this.getList()
    this.getPlatGroupList()
    // this.getList()
  },
  methods: {
    handleQueuing (row) {
    handleWork (item) {
      platformBeginWork({ jobId: item.id }).then(res => {
        Message.success('已开始作业')
        this.getPlatGroupList()
      })
    },
    handleFinish (item) {
      platformFinishWork({ jobId: item.id }).then(res => {
        Message.success('完成作业')
        this.getPlatGroupList()
      })
    },
    handleTransform (item, task) {
      this.activePlatId = item.id
      this.activetaskId = task.id
      this.isShowTransform = true
    },
    transformSub () {
      const { activePlatId, activetaskId } = this
      platformMove({ platformId: activePlatId, jobId: activetaskId }).then(res => {
        Message.success('转移月台成功')
        this.isShowTransform = false
        this.getPlatGroupList()
      })
    },
    handlePass (item) {
      this.$confirm('您确认要对该任务进行过号吗', '温馨提示', {
        confirmButtonText: '确定',
        cancelButtonText: '取消',
        type: 'warning'
      }).then(() => {
        platformOverNumber({ jobId: item.id }).then(ress => {
          Message.success('过号成功')
          this.getPlatGroupList()
        })
      })
    },
    handleErr (item) {
      this.$confirm('您确认要对该任务进行异常挂起吗', '温馨提示', {
        confirmButtonText: '确定',
        cancelButtonText: '取消',
        type: 'warning'
      }).then(() => {
        platformErr({ jobId: item.id }).then(ress => {
          Message.success('异常挂起成功')
          this.getPlatGroupList()
        })
      })
    },
    platgroupClick (item) {
      this.activeGroup = { ...item }
      this.circulInitTaskList()
      this.timer = setInterval(() => {
        this.circulInitTaskList()
      }, 1000)
    },
    getPlatGroupList () {
      getPlatformGroupList({
        queryData: 1,
        queryType: 1
      }).then(res => {
        this.PlatGroupList = res || []
        if (res.length > 0) {
          if (this.activeGroup && this.activeGroup.id) {
            this.activeGroup = res.find(item => item.id === this.activeGroup.id)
          } else {
            this.activeGroup = res[0]
          }
          this.circulInitTaskList()
          this.timer = setInterval(() => {
            this.circulInitTaskList()
          }, 1000)
        }
      })
    },
    circulInitTaskList () {
      if (this.activeGroup && this.activeGroup.platformList && this.activeGroup.platformList.length > 0) {
        const time = new Date()
        this.activeGroup.platformList.forEach(plat => {
          if (plat.platformWorkVO.platformJobList && plat.platformWorkVO.platformJobList.length > 0) {
            plat.platformWorkVO.platformJobList.forEach(item => {
              if (item.callDate) {
                const timeNum = time.getTime() - new Date(item.callDate).getTime()
                if (timeNum > 3600000) {
                  item.callDateTemp = dayjs.duration(timeNum).format('H小时m分s秒')
                } else {
                  item.callDateTemp = dayjs.duration(timeNum).format('m分s秒')
                }
              }
              if (item.startDate) {
                const timeNum = time.getTime() - new Date(item.startDate).getTime()
                if (timeNum > 3600000) {
                  item.startDateTemp = dayjs.duration(timeNum).format('H小时m分ss秒')
                } else {
                  item.startDateTemp = dayjs.duration(timeNum).format('m分s秒')
                }
              }
            })
          }
        })
        this.$forceUpdate()
      }
    },
    handleQueuing (item) {
      this.isShowQueuing = true
      this.$nextTick(() => {
        this.$refs.PlatformQueuingRef.isShowModal = true
        this.$refs.PlatformQueuingRef.activePlat = { ...item }
        this.$refs.PlatformQueuingRef.getList()
      })
    },
    handleDetail () {
@@ -159,32 +398,44 @@
      })
    },
    getList () {
      const { platformId } = this
      getPlatformJob({
        model: { platformId }
      }).then(res => {
        this.dataList = res.records
      })
    },
    handleFinish (item) {
      this.$confirm('高架库6号月台 çš–A12345 ä½œä¸šç»“束', '温馨提示', {
        confirmButtonText: '确定',
        cancelButtonText: '取消',
        type: 'warning'
      })
    },
    getPlatList () {
      getPlatform({
        model: {}
      }).then(res => {
        this.PlatformList = res.records
      const { groupId } = this
      listByGroupId(groupId).then(res => {
        this.platList = res
      })
    },
    handleSet () {
      this.isShowSet = true
    },
    setReset () { },
    setSub () { }
    handleSetSub () {
      const { PlatGroupList } = this
      const ids = []
      PlatGroupList.forEach(item => {
        item.platformList.forEach(platform => {
          if (platform.showConfig) {
            ids.push(platform.id)
          }
        })
      })
      this.setLoading = true
      updUserPlatformConfig(ids).then(res => {
        this.setLoading = false
        Message.success('更新成功')
        this.isShowSet = false
        this.getPlatGroupList()
      }, () => {
        this.setLoading = false
      })
    },
    platformSetClick (id) {
      const { PlatGroupList } = this
      PlatGroupList.forEach(item => {
        item.platformList.forEach(platform => {
          if (platform.id === id) {
            platform.showConfig = !platform.showConfig
          }
        })
      })
    }
  }
}
</script>
@@ -192,20 +443,27 @@
<style lang="scss" scoped>
@import "@/assets/style/variables.scss";
.platform_list {
  width: 100%;
  .item {
    /* padding: 16px 24px; */
    background: #ffffff;
    border-radius: 2px;
    border: 1px solid #dfe2e8;
    margin-bottom: 12px;
    width: 100%;
    .head {
      display: flex;
      justify-content: space-between;
      align-items: center;
      height: 50px;
      background: linear-gradient(270deg, #ffffff 0%, #ebf6f7 100%);
      background: linear-gradient( 270deg, #FFFFFF 0%, #EBF6F7 100%);
      border-radius: 2px 2px 0px 0px;
      padding: 0 28px;
      padding: 0 20px;
      .shengyin{
        width: 12px;
        height: 12px;
        margin-right: 3px;
      }
      .left {
        flex: 1;
        display: flex;
@@ -217,10 +475,10 @@
        .status {
          line-height: 25px;
          height: 25px;
          padding: 0 4px;
          background: #00ba67;
          border-radius: 2px;
          color: #ffffff;
          padding: 0 6px;
        }
        .ite {
          margin-right: 30px;
@@ -233,37 +491,53 @@
      justify-content: space-between;
      margin-top: 10px;
      padding: 16px;
      width: calc( 100% - 48px );
      .info {
        background: #effbf5;
        background: #f4fafb;
        border-radius: 2px;
        border: 1px solid #dfe2e8;
        padding: 16px;
        border-radius: 2px;
        margin-bottom: 10px;
        width: 30%;
        width: calc( 31.6% - 16px );
        .status {
          .lab {
            font-weight: 500;
          }
          color: #00ba67;
        }
        .line {
          display: flex;
          align-items: center;
          justify-content: space-between;
          flex-wrap: wrap;
          margin-bottom: 6px;
          span {
            &:nth-child(1) {
              color: #999999;
            }
          }
          .ite {
            width: 33.3%;
            margin-top: 8px;
          }
          .left {
            .plate {
            .code {
              display: flex;
              font-weight: 600;
              height: 30px;
              line-height: 30px;
              font-size: 15px;
              color: #111111;
              padding: 4px 5px;
              font-weight: 700;
              border: 1px solid #279baa;
              background-color: #fff;
              border-radius: 4px;
              border: 1px solid $primaryColor;
              padding-right: 4px;
              span {
                &:nth-of-type(1) {
                  background: $primaryColor;
                  padding: 0 8px;
                  color: #fff;
                }
                &:nth-of-type(2) {
                  padding-left: 4px;
                }
              }
            }
          }
          .right {
@@ -272,16 +546,69 @@
          }
        }
      }
      .jobing {
        background: #effbf5;
        .status {
          color: #00ba67;
        }
      }
      .err {
        background: #fef6f6;
        .status {
          color: #ed4545;
        }
      }
    }
    .empty_plat{
      width: 100%;
      height: 170px;
      display: flex;
      flex-direction: column;
      justify-content: center;
      align-items: center;
      font-size: 12px;
      color: #B2B2B2;
      img{
        width: 110px;
      }
    }
  }
  .emyty{
    .head{
      background: linear-gradient( 270deg, #FFFFFF 0%, #F7F7F7 100%) !important;
    }
    .status{
      background: #CCCCCC !important;
    }
  }
}
.main_head {
.main_header {
  display: flex;
  justify-content: space-between;
  align-items: center;
  .tabs {
  position: relative;
  .platgroup_tabs {
    flex: 1;
    display: flex;
    border-bottom: 1px solid #dfe2e8;
    .tab {
      color: #666666;
      margin-right: 40px;
      cursor: pointer;
      padding-bottom: 18px;
      border-bottom: 2px solid #fff;
    }
    .active {
      font-weight: 500;
      font-size: 15px;
      color: #222222;
      border-bottom: 2px solid $primary-color;
    }
  }
  .ml20 {
    position: absolute;
    width: 120px;
    height: 36px;
    right: 0;
    top: -4px;
  }
}
/*  */
@@ -293,23 +620,42 @@
  }
  .list {
    display: flex;
    justify-content: space-between;
    flex-wrap: wrap;
    .item {
      cursor: pointer;
      width: 30%;
      height: 32px;
      padding: 0 36px;
      height: 36px;
      border: 1px solid #dfe2e8;
      display: flex;
      justify-content: center;
      align-items: center;
      border-radius: 2px;
      margin-bottom: 12px;
      margin-bottom: 10px;
      margin-right: 13px;
      position: relative;
      overflow: hidden;
      .bg{
        position: absolute;
        right: -12px;
        bottom: -12px;
        width: 24px;
        height: 24px;
        background: $primaryColor;
        transform: rotate(45deg);
      }
      .scs{
        position: absolute;
        right: -1px;
        bottom: -1px;
        color: #fff;
        z-index: 99999;
        transform:scale(.8)
      }
    }
    .active {
      background: rgba(39, 155, 170, 0.06);
      border: 1px solid #279baa;
      color: #279baa;
      background: rgba(39,155,170,0.06);
      border: 1px solid $primaryColor;
      color: $primaryColor;
    }
  }
}
admin/src/views/platform/queueUp.vue
@@ -1,129 +1,30 @@
<template>
  <div class="main_app">
    <div class="df_ac mb20">
      <el-select v-model="filters.currentPlatform" class="w300">
        <el-option v-for="item in platformList" :key="item.id"></el-option>
      </el-select>
      <el-input v-model="filters.id" placeholder="车牌号" class="ml20 w200" />
      <el-button type="primary" class="ml20" @click="getList()">查询</el-button>
      <el-button class="ml20" @click="clear">重置</el-button>
    <div class="mb20 main_header">
      <div class="platgroup_tabs">
        <div
          class="tab"
          :class="{ active: activeGroup.id === item.id }"
          @click="platgroupClick(item)"
          v-for="(item, i) in PlatGroupList"
          :key="i"
        >
          {{ item.name }}
        </div>
    </div>
    <!--  -->
    <div class="platform_list">
      <div class="item" v-for="i in 2">
        <div class="head">
          <div class="name">6号月台</div>
          <div class="status">
            <span class="green">作业中</span>
            <span class="">作业:1</span>
            <span>叫号:1</span>
            <span>等待:1</span>
            <span class="red">异常:1</span>
          </div>
          <!-- <el-button type="primary">叫号</el-button> -->
        </div>
        <div class="info" v-for="j in 3">
          <div class="line">
            <div class="left">
              <span class="plate mr20">皖A12122</span>
              <span class="placeholder9">驾驶员</span>
              <span>王某某</span>
              <span>18888888888</span>
            </div>
            <div class="right">
              <span class="green">作业中</span>
              <span class="placeholder9 ml20">作业时长:23分钟26秒</span>
            </div>
          </div>
          <div class="line">
            <div class="left">
              <div>
                <span>运输单号</span
                ><span class="ml10 placeholder9">1231231</span>
              </div>
              <div>
                <span>总运输量</span
                ><span class="ml10 placeholder9">3000万支</span
                ><span class="primaryColor ml10 pointer">运单详情</span>
              </div>
            </div>
          </div>
        </div>
      </div>
    </div>
    <!-- é…ç½®æ˜¾ç¤ºæœˆå° -->
    <el-dialog
      title="配置显示月台"
      :visible.sync="isShowSet"
      center
      width="420px"
    >
      <div class="set_modal">
        <div class="mb20">
          <div class="title">入库月台组</div>
          <div class="list">
            <div class="item">1号月台</div>
            <div class="item">2号月台</div>
            <div class="item">1号月台</div>
            <div class="item">2号月台</div>
          </div>
        </div>
        <div>
          <div class="title">入库月台组</div>
          <div class="list">
            <div class="item">1号月台</div>
            <div class="item">2号月台</div>
            <div class="item">1号月台</div>
            <div class="item">2号月台</div>
          </div>
        </div>
      </div>
      <span slot="footer" class="dialog-footer">
        <el-button @click="setReset">重置</el-button>
        <el-button type="primary" @click="setSub">确定</el-button>
      </span>
    </el-dialog>
    <!-- è¿å•详情 -->
    <el-dialog
      title="配置显示月台"
      :visible.sync="isShowSet"
      center
      width="420px"
    >
      <div class="set_modal">
        <div class="mb20">
          <div class="title">入库月台组</div>
          <div class="list">
            <div class="item">1号月台</div>
            <div class="item">2号月台</div>
            <div class="item">1号月台</div>
            <div class="item">2号月台</div>
          </div>
        </div>
        <div>
          <div class="title">入库月台组</div>
          <div class="list">
            <div class="item">1号月台</div>
            <div class="item">2号月台</div>
            <div class="item">1号月台</div>
            <div class="item">2号月台</div>
          </div>
        </div>
      </div>
      <span slot="footer" class="dialog-footer">
        <el-button @click="setReset">重置</el-button>
        <el-button type="primary" @click="setSub">确定</el-button>
      </span>
    </el-dialog>
  </div>
</template>
<script>
import {
  getPlatformGroupList
} from '@/api'
export default {
  data () {
    return {
      filters: {},
      platformList: [],
      PlatGroupList: [],
      isShowSet: false, // æœˆå°é…ç½®
      setParam: {},
@@ -131,7 +32,18 @@
      detail: {}
    }
  },
  created () {
    this.getPlatGroupList()
  },
  methods: {
    getPlatGroupList () {
      getPlatformGroupList({
        queryData: 1,
        queryType: 1
      }).then(res => {
        this.PlatGroupList = res || []
      })
    },
    getList () { },
    clear () { }
  }
h5/pages/driver/index.vue
@@ -11,7 +11,7 @@
            <image class="banner" src="../../static/driver/wuliuche_banner@2x.png" mode="widthFix"></image>
        </view>
        <!--  -->
        <view class="task_list">
        <view v-if="taskList && taskList.length > 0" class="task_list">
            <swiper circular class="task_swiper">
                <swiper-item v-for="item in taskList" :key="item.id" @click="taskClick(item)">
                    <view class="item">
pda/pages/index/center.vue
@@ -109,7 +109,7 @@
            v-if="item.status == 5 || item.status == 8"
            class="btn active"
            @click="handleFinish(item)"
            >完成作业</view
            >作业完成</view
          >
        </view>
      </view>