排队详情修改

src/api/queueManagementApi.js

@@ -112,6 +112,10 @@ const queueManagementApi = {
     getAlarmMessageLog(params, config) {
     getAlarmMessageLog(params, config) {
         return req('PUT', `/d-cashier-alarm-message-log/${params.id}`, params, config)
         return req('PUT', `/d-cashier-alarm-message-log/${params.id}`, params, config)
     },
     },
+    // 排队详情
+    getQueueDetailNew(params, config) {
+        return req('get', `/queuing/queuing/detail`, params, config)
+    },
     
     
 }
 }
 
 

src/views/queueManagement/queueDetail/index.vue

@@ -45,11 +45,11 @@
                         <el-option v-for="item in channelListData" :key="item.id" :label="item.name" :value="item.id" />
                         <el-option v-for="item in channelListData" :key="item.id" :label="item.name" :value="item.id" />
                     </el-select> -->
                     </el-select> -->
                 </el-form-item>
                 </el-form-item>
-                <!-- <el-form-item :label="$t('table.granularity')" class="granularity">
+                <el-form-item :label="$t('table.granularity')" class="granularity">
                     <el-select v-model="searchForm.granularityMinute" class="laneType" filterable :placeholder="$t('pholder.select')">
                     <el-select v-model="searchForm.granularityMinute" class="laneType" filterable :placeholder="$t('pholder.select')">
                         <el-option v-for="item in granularityListData" :key="item.value" :label="item.label" :value="item.value" />
                         <el-option v-for="item in granularityListData" :key="item.value" :label="item.label" :value="item.value" />
                     </el-select>
                     </el-select>
-                </el-form-item> -->
+                </el-form-item>
                 <el-form-item :label="$t('table.date')">
                 <el-form-item :label="$t('table.date')">
                   <el-date-picker
                   <el-date-picker
                         v-model="searchForm.countDate"
                         v-model="searchForm.countDate"
@@ -88,7 +88,8 @@
                     <span>{{row.counttime.substring(11)}}</span>
                     <span>{{row.counttime.substring(11)}}</span>
                   </template>
                   </template>
                 </el-table-column>
                 </el-table-column>
-                <el-table-column label="Lane" align="center" prop="cashierChannelId" show-overflow-tooltip :formatter="landFormat"></el-table-column>
+                <!-- <el-table-column label="Lane" align="center" prop="cashierChannelId" show-overflow-tooltip :formatter="landFormat"></el-table-column> -->
+                <el-table-column label="Lane" align="center" prop="cashierChannelName" show-overflow-tooltip></el-table-column>
                 <el-table-column label="Lane Type" align="center" prop="counterType" width="100" show-overflow-tooltip :formatter="counterTypeFormat"></el-table-column>
                 <el-table-column label="Lane Type" align="center" prop="counterType" width="100" show-overflow-tooltip :formatter="counterTypeFormat"></el-table-column>
                 <el-table-column label="Average Customers in Queue" align="center" prop="queueLength" width="170">
                 <el-table-column label="Average Customers in Queue" align="center" prop="queueLength" width="170">
                   <template slot="header">
                   <template slot="header">
@@ -129,7 +130,7 @@
                     <span>{{timeFormat(row.queueTime)}}</span>
                     <span>{{timeFormat(row.queueTime)}}</span>
                   </template>
                   </template>
                 </el-table-column>
                 </el-table-column>
-                <el-table-column label="Estimated Waiting Time" align="center" prop="predictedWaitingTime" width="120">
+                <!-- <el-table-column label="Estimated Waiting Time" align="center" prop="predictedWaitingTime" width="120">
                   <template slot="header">
                   <template slot="header">
                     <p class="cell_title">Estimated</p>
                     <p class="cell_title">Estimated</p>
                     <p class="cell_title">Waiting Time</p>
                     <p class="cell_title">Waiting Time</p>
@@ -137,7 +138,7 @@
                   <template slot-scope="{row}">
                   <template slot-scope="{row}">
                     <span>{{timeFormat(row.predictedWaitingTime)}}</span>
                     <span>{{timeFormat(row.predictedWaitingTime)}}</span>
                   </template>
                   </template>
-                </el-table-column>
+                </el-table-column> -->
                 <el-table-column label="Customers Served" align="center" prop="customersServed" width="120">
                 <el-table-column label="Customers Served" align="center" prop="customersServed" width="120">
                   <template slot="header">
                   <template slot="header">
                     <p class="cell_title">Customers</p>
                     <p class="cell_title">Customers</p>
@@ -385,7 +386,7 @@
             getTableData() {
             getTableData() {
                 this.loading = true;
                 this.loading = true;
                 this.tableData = [];
                 this.tableData = [];
-                this.$api.queueManagementApi.getqueueDetailList({
+                this.$api.queueManagementApi.getQueueDetailNew({
                     mallId: this.searchForm.mallId,
                     mallId: this.searchForm.mallId,
                     cashierAreaId: this.searchForm.cashierAreaId,
                     cashierAreaId: this.searchForm.cashierAreaId,
                     channelIds: this.searchForm.channelIds.toString(),
                     channelIds: this.searchForm.channelIds.toString(),