优化搜索

src/request/api.js

@@ -165,7 +165,7 @@ export const  apisystemdzbcPathlist = query => {
     return service({
         url: '/api/system/dzbcPath/list',
         method: 'GET',
-		data:query
+		params:query
     });
 };
 
@@ -250,7 +250,7 @@ export const  apisystemdzbcKyzlist = query => {
     return service({
         url: '/api/system/dzbcKyz/list',
         method: 'GET',
-		data:query
+		params:query
     });
 };
 
@@ -298,7 +298,7 @@ export const  apisystemdzbcBannerlist = query => {
     return service({
         url: '/api/system/dzbcBanner/list',
         method: 'GET',
-		data:query
+		params:query
     });
 };
 

src/request/index.ts

@@ -49,6 +49,7 @@ service.interceptors.response.use(
         break;
         case 401:
         ElMessage({
+          grouping: true,
           message: '登录失效,请重新登陆',
           type: 'error',
           duration: 5 * 1000

src/views/HomeView.vue

@@ -192,7 +192,7 @@ watch(() => route, (newRoute, oldRoute) => {
             <el-icon><ArrowRightBold /></el-icon>
           </div>
         </el-menu-item>
-        <el-menu-item index="roleman">
+        <!-- <el-menu-item index="roleman">
           <div class="ima-icon">
             <img style="width:12px;height:auto" src="../../public/imgs/orderman.png" alt="">
           </div>
@@ -200,7 +200,7 @@ watch(() => route, (newRoute, oldRoute) => {
           <div class="next-img">
             <el-icon><ArrowRightBold /></el-icon>
           </div>
-        </el-menu-item>
+        </el-menu-item> -->
         <el-menu-item index="bannerman">
           <div class="ima-icon">
             <img style="width:12px;height:auto" src="../../public/imgs/orderman.png" alt="">

src/views/bannerman/index.vue

@@ -95,7 +95,7 @@ let headers={
   clientid:'e5cd7e4891bf95d1d19206ce24a7b32e'
 }
 let fileList=ref([])
-let searchWord=ref('')
+let name=ref('')
 let total=ref(0)
 let pageNum=ref(1)
 let dialogVisible=ref(false)
@@ -165,7 +165,8 @@ const searchClick=()=>{
 const getTableData=()=>{
   apisystemdzbcBannerlist({
     pageSize:5,
-    pageNum:pageNum.value
+    pageNum:pageNum.value,
+    name:name.value
   }).then(res=>{
     if(res.code==200){
       total.value=res.total
@@ -218,17 +219,17 @@ onMounted(()=>{
                     <div class="common-search-box">
                       <div class="left-part">
                         <el-input
-                          v-model="searchWord"
+                          v-model="name"
                          
                           placeholder="搜索宣传图..."
                           style="width:260px"
                         >
                         
-                          <template #append>
+                          <!-- <template #append>
                             <el-button :icon="Search" />
-                          </template>
+                          </template> -->
                         </el-input>
-                       
+                        <el-button @click="searchClick" style="margin-left:10px">筛选</el-button>
                       </div>
                       <!-- <div class="right-part">
                       
@@ -241,7 +242,7 @@ onMounted(()=>{
                         <el-table-column prop="name" label="文件名" />
                         <el-table-column prop="addr" label="宣传图">
                           <template #default="scope">
-                            <img :src="scope.row.addr" alt="">
+                            <img style="height:150px;width:auto" :src="scope.row.addr" alt="">
                           </template>
                         </el-table-column>
                        

src/views/carman/index.vue

@@ -232,28 +232,22 @@ onMounted(()=>{
                           style="width:260px"
                         >
                         
-                          <template #append>
+                          <!-- <template #append>
                             <el-button :icon="Search" />
-                          </template>
+                          </template> -->
                         </el-input>
+                        <el-button @click="searchClick" style="margin-left:10px">筛选</el-button>
                        
                       </div>
                       <div class="right-part">
-                        <!-- <el-button :icon="Tools">筛选</el-button> -->
+                       
                         <el-button :loading="excellloading" @click="downExcell" :icon="Download">{{ excellloading?'正在导出':'导出' }}</el-button>
                       </div>
                     </div>
                     <el-table element-loading-text='加载中' header-row-class-name="reset-gray-head" :data="tableData"  style="width: 100%" v-loading="loading">
                         <el-table-column prop="carNum" label="车牌号" />
                         <el-table-column prop="carZw" label="座位数" />
-                        <el-table-column prop="info" label="默认路线">
-                          <!-- <template #default>
-                           <div>
-                            <div>朝阳区 → 海淀区</div>
-                            <div>08:00</div>
-                           </div>
-                          </template> -->
-                        </el-table-column>
+                       
                         <el-table-column prop="driverId" label="司机">
                           <template #default="scope">
                           <div class="table-user-wrap">

src/views/orderman/index.vue

@@ -90,7 +90,7 @@ const submitForm = async (formEl: FormInstance | undefined) => {
 
 import { ref,onMounted,reactive } from 'vue'
 import { Search,Download,Tools,Plus,Check,Close } from "@element-plus/icons-vue";
-let searchWord=ref('')
+let name=ref('')
 let total=ref(0)
 let pageNum=ref(1)
 let dialogVisible=ref(false)
@@ -146,12 +146,18 @@ const searchClick=()=>{
 }
 const getTableData=()=>{
   apisystemdzbcOrderlist({
+    name:name.value,
     pageSize:10,
     pageNum:pageNum.value
   }).then(res=>{
     if(res.code==200){
       total.value=res.total
-      tableData.value=res.rows
+      tableData.value=res.rows.map(item=>{
+        item.startInfo=JSON.parse(item.startInfo)
+        item.endInfo=JSON.parse(item.endInfo)
+        console.log(item)
+        return item
+      })
     }
     loading.value=false
     
@@ -199,17 +205,17 @@ onMounted(()=>{
                 <div class="common-search-box">
                     <div class="left-part">
                     <el-input
-                        v-model="searchWord"
+                        v-model="name"
                         
-                        placeholder="搜索订单..."
+                        placeholder="订单名称"
                         style="width:260px"
                     >
                     
-                        <template #append>
+                        <!-- <template #append>
                         <el-button :icon="Search" />
-                        </template>
+                        </template> -->
                     </el-input>
-                    <el-button style="margin-left:10px">筛选</el-button>
+                    <el-button @click="searchClick" style="margin-left:10px">筛选</el-button>
                     </div>
                     <div class="right-part">
                     
@@ -218,19 +224,17 @@ onMounted(()=>{
                     </div>
                 </div>
                     <el-table element-loading-text='加载中' header-row-class-name="reset-gray-head" :data="tableData"  style="width: 100%" v-loading="loading">
-                        <el-table-column prop="id" label="订单编号">
+                      <el-table-column prop="name" label="订单名称">
                          
                         </el-table-column>
-                        <el-table-column prop="cfqy" label="订单日期" />
-                        <el-table-column prop="mdqy" label="路线">
-                        
+                        <el-table-column prop="id" label="订单编号">
+                         
                         </el-table-column>
+                       
                         <el-table-column prop="role" label="发车时间">
                         
                     </el-table-column>
-                    <el-table-column prop="role" label="乘客名称">
-                        
-                    </el-table-column>
+                   
                   
                         <el-table-column prop="status" label="支付状态">
                           <template #default>
@@ -239,11 +243,21 @@ onMounted(()=>{
                            </div>
                           </template>
                         </el-table-column>
-                        <el-table-column prop="ypl" label="支付时间" />
-                        <el-table-column prop="ypl" label="座位号" />
-                        <el-table-column prop="ypl" label="车牌号" />
-                        <el-table-column prop="startInfo" label="出发站点" />
-                        <el-table-column prop="endInfo" label="目的站点" />
+                  
+                        <el-table-column prop="startInfo" label="出发站点">
+                          <template #default="scope">
+                            <div>
+                              {{ scope.row.startInfo.siteInfo.name }}
+                            </div>
+                          </template>
+                        </el-table-column>
+                        <el-table-column prop="endInfo" label="目的站点">
+                          <template #default="scope">
+                            <div>
+                              {{ scope.row.endInfo.siteInfo.name }}
+                            </div>
+                          </template>
+                        </el-table-column>
                         <el-table-column fixed="right" label="操作" min-width="120">
                           <template #default="scope">
                             <el-button link type="primary" @click="addItem(scope.row)" size="small">

src/views/passengerstation/index.vue

@@ -93,7 +93,7 @@ const submitForm = async (formEl: FormInstance | undefined) => {
 
 import { ref,onMounted,reactive } from 'vue'
 import { Search,Download,Tools,Plus,Check,Close } from "@element-plus/icons-vue";
-let searchWord=ref('')
+let name=ref('')
 let total=ref(0)
 let pageNum=ref(1)
 let dialogVisible=ref(false)
@@ -150,6 +150,7 @@ const searchClick=()=>{
 }
 const getTableData=()=>{
   apisystemdzbcKyzlist({
+    name:name.value,
     pageSize:10,
     pageNum:pageNum.value
   }).then(res=>{
@@ -204,22 +205,23 @@ onMounted(()=>{
                     <div class="common-search-box">
                       <div class="left-part">
                         <el-input
-                          v-model="searchWord"
+                          v-model="name"
                          
                           placeholder="搜索客运站..."
                           style="width:260px"
                         >
                         
-                          <template #append>
+                          <!-- <template #append>
                             <el-button :icon="Search" />
-                          </template>
+                          </template> -->
                         </el-input>
+                        <el-button @click="searchClick" style="margin-left:10px">筛选</el-button>
                        
                       </div>
                       <div class="right-part">
                       
                         
-                        <el-button :icon="Tools">筛选</el-button>
+                       
                         <el-button :loading="excellloading" @click="downExcell" :icon="Download">{{ excellloading?'正在导出':'导出' }}</el-button>
                       </div>
                     </div>
@@ -230,9 +232,15 @@ onMounted(()=>{
                         <el-table-column prop="contactName" label="联系人">
                         
                     </el-table-column>
+                    <el-table-column prop="contactPhone" label="联系号码">
+                        
+                      </el-table-column>
                         <el-table-column prop="mid" label="商户号">
                           
                         </el-table-column>
+                        <el-table-column prop="mname" label="商户名">
+                          
+                        </el-table-column>
                         
                        
                        

src/views/routeman/index.vue

@@ -90,7 +90,7 @@ const submitForm = async (formEl: FormInstance | undefined) => {
 
 import { ref,onMounted,reactive } from 'vue'
 import { Search,Download,Tools,Plus,Check,Close } from "@element-plus/icons-vue";
-let searchWord=ref('')
+let name=ref('')
 let total=ref(0)
 let pageNum=ref(1)
 let dialogVisible=ref(false)
@@ -146,6 +146,7 @@ const searchClick=()=>{
 }
 const getTableData=()=>{
   apisystemdzbcPathlist({
+    name:name.value,
     pageSize:10,
     pageNum:pageNum.value
   }).then(res=>{
@@ -229,17 +230,17 @@ onMounted(()=>{
                 <div class="common-search-box">
                     <div class="left-part">
                     <el-input
-                        v-model="searchWord"
+                        v-model="name"
                         
-                        placeholder="搜索用户"
+                        placeholder="路线名称"
                         style="width:260px"
                     >
                     
-                        <template #append>
+                        <!-- <template #append>
                         <el-button :icon="Search" />
-                        </template>
+                        </template> -->
                     </el-input>
-                    <el-button style="margin-left:10px">筛选</el-button>
+                    <el-button @click="searchClick" style="margin-left:10px">筛选</el-button>
                     </div>
                     <div class="right-part">
                     
@@ -248,7 +249,7 @@ onMounted(()=>{
                     </div>
                 </div>
                     <el-table element-loading-text='加载中' header-row-class-name="reset-gray-head" :data="tableData"  style="width: 100%" v-loading="loading">
-                        <el-table-column prop="name" label="路线编号">
+                        <el-table-column prop="name" label="路线名称">
                          
                         </el-table-column>
                         <el-table-column prop="startAreaName" label="出发区域" />
@@ -258,7 +259,7 @@ onMounted(()=>{
                         <el-table-column prop="mtime" label="出发时间">
                         
                     </el-table-column>
-                    <el-table-column prop="role" label="基础票价(元)">
+                    <!-- <el-table-column prop="role" label="基础票价(元)">
                         
                     </el-table-column>
                     <el-table-column prop="role" label="浮动范围">
@@ -266,12 +267,10 @@ onMounted(()=>{
                     </el-table-column>
                         <el-table-column prop="status" label="排班状态">
                           <template #default>
-                           <!-- <div style="background:#DCFCE7;width:64px;height:20px;border-radius:9999px;display:flex;align-items: center;justify-content: center;">
-                            已排班
-                           </div> -->
+                          
                           </template>
                         </el-table-column>
-                        <el-table-column prop="ypl" label="余票量" />
+                        <el-table-column prop="ypl" label="余票量" /> -->
                         <el-table-column fixed="right" label="操作" min-width="120">
                           <template #default="scope">
                             <el-button link type="primary" @click="addItem(scope.row)" size="small">