Merge remote-tracking branch 'origin/master'

jiangping

2024-09-30 af7344df96145370c9b919e6beb8f819f190f781

Merge remote-tracking branch 'origin/master'

 admin/src/views/platform/LogisticsRecord/leaveAuth.vue

@@ -16,7 +16,11 @@
    </div>
    <el-table class="mb20" v-loading="loading" :data="list" stripe>
      <el-table-column type="index" label="序号" width="70" show-overflow-tooltip />
      <el-table-column prop="billCode" label="运单号" min-width="100" show-overflow-tooltip />
      <el-table-column prop="billCode" label="运单号/合同号" min-width="100" show-overflow-tooltip>
        <template v-slot="scope">
          <span>{{ scope.row.billCode || scope.row.contractNum }}</span>
        </template>
      </el-table-column>
      <!-- <el-table-column prop="totalNum" label="总作业量(万支)" min-width="100" show-overflow-tooltip /> -->
      <el-table-column prop="carCodeFront" label="车牌号" min-width="100" show-overflow-tooltip />
      <el-table-column prop="carCodeBack" label="电子锁状态" min-width="100" show-overflow-tooltip>
@@ -100,7 +104,7 @@
            label: '合同号'
          },
          {
            filed: 'code',
            filed: 'billCode',
            type: 'input',
            label: '运单号'
          },

 admin/src/views/platform/LogisticsRecord/waybill.vue

@@ -90,7 +90,7 @@
      queryFormConfig: {
        formItems: [
          {
            filed: 'code',
            filed: 'billCode',
            type: 'input',
            label: '运单号'
          },

 admin/src/views/platform/queueUp.vue

@@ -233,7 +233,7 @@

.plate_id {
  display: flex;
  width: 110px;
  width: 120px;
  font-weight: 600;
  height: 30px;
  line-height: 30px;

 screen/src/router/index.js

@@ -2,12 +2,11 @@
import HomeView from '../views/PlatformCall.vue'

const router = createRouter({
  history: createWebHashHistory(import.meta.env.BASE_URL),
  history: createWebHashHistory(),
  routes: [
    {
      path: '/',
      // name: 'EnergyConsum',
      component: () => import('../views/EnergyConsum.vue')
      component: () => import('../views/PlatformCall.vue')
    },
    {
      path: '/PlatformCall',

 screen/src/views/PlatformCall.vue

@@ -172,8 +172,11 @@
              padding: item.status == 2 || item.status == 3,
            }" class="status">{{ statusMap[item.status] }}</div>
          </div>
          <div class="item">{{ item.platformName }}</div>
          <div class="item">{{ item.optTimeTemp }}</div>
          <div class="item">{{ item.platformName || '-' }}</div>
          <div class="item">
            <div class="time_place">预计完成时间</div>
            <div>{{ item.optTimeTemp || '-' }}</div>
          </div>
        </div>
      </div>
      <div class="current">
@@ -300,10 +303,14 @@
          display: flex;
          justify-content: center;
          align-items: center;
          flex-direction: column;
          font-weight: 500;
          font-size: 36px;
          flex: 10;

          .time_place{
            font-weight: 500;
            font-size: 24px;
          }
          .status {
            width: 174px;
            height: 76px;

 screen/vite.config.js

@@ -10,6 +10,7 @@
    vue(),
    VueDevTools(),
  ],
  base: './',
  resolve: {
    alias: {
      '@': fileURLToPath(new URL('./src', import.meta.url))
@@ -18,8 +19,8 @@
  server: {
    proxy: {
      "/gateway_interface": {
        target: "http://192.168.0.103:10010",
        // target: "https://xiaoxianlianqi.cn/gateway_interface",
        // target: "http://192.168.0.103:10010",
        target: "http://10.50.250.253:8088/gateway_interface",
        changeOrigin: true,
        rewrite: (path) => path.replace(/^\/gateway_interface/, ""),
      },