优化

components.d.ts

@@ -25,6 +25,7 @@ declare module 'vue' {
     ElFormItem: typeof import('element-plus/es')['ElFormItem']
     ElHeader: typeof import('element-plus/es')['ElHeader']
     ElIcon: typeof import('element-plus/es')['ElIcon']
+    ElImage: typeof import('element-plus/es')['ElImage']
     ElInput: typeof import('element-plus/es')['ElInput']
     ElMain: typeof import('element-plus/es')['ElMain']
     ElMenu: typeof import('element-plus/es')['ElMenu']
@@ -37,6 +38,8 @@ declare module 'vue' {
     ElSwitch: typeof import('element-plus/es')['ElSwitch']
     ElTable: typeof import('element-plus/es')['ElTable']
     ElTableColumn: typeof import('element-plus/es')['ElTableColumn']
+    ElTabPane: typeof import('element-plus/es')['ElTabPane']
+    ElTabs: typeof import('element-plus/es')['ElTabs']
     ElTimePicker: typeof import('element-plus/es')['ElTimePicker']
     ElUpload: typeof import('element-plus/es')['ElUpload']
     HelloWorld: typeof import('./src/components/HelloWorld.vue')['default']

src/views/areaman/index.vue

@@ -235,12 +235,13 @@ onMounted(()=>{
                         <el-table-column prop="name" label="区域名称">
                           
                         </el-table-column>
-                        <el-table-column prop="latlon" label="中心经纬度" />
-                        <el-table-column prop="num" label="包含站点数">
+                        <el-table-column prop="location" label="中心经纬度" />
+                        <el-table-column prop="addr" label="地址">
                         
                         </el-table-column>
                        
                         <el-table-column prop="kyzName" label="所属客运站" />
+                        <el-table-column prop="remark" label="备注" />
                         <el-table-column fixed="right" label="操作" min-width="120">
                           <template #default="scope">
                             <el-button link type="primary" @click="addItem(scope.row)" size="small">
@@ -303,11 +304,7 @@ onMounted(()=>{
               </el-form-item>
             </el-col>
            
-            <el-col :span="12">
-              <el-form-item label="位置">
-                <el-input placeholder="位置" v-model="ruleForm.location" />
-              </el-form-item>
-            </el-col>
+           
             <el-col :span="12">
               <el-form-item label="所属客运站">
                 <el-select
@@ -326,9 +323,14 @@ onMounted(()=>{
                
               </el-form-item>
             </el-col>
-            <el-col :span="12">
+            <el-col :span="24">
+              <el-form-item label="经纬度">
+                <el-input placeholder="经纬度" v-model="ruleForm.location" />
+              </el-form-item>
+            </el-col>
+            <el-col :span="24">
               <el-form-item label="备注">
-                <el-input placeholder="备注" v-model="ruleForm.remark" />
+                <el-input placeholder="备注" type="textarea" v-model="ruleForm.remark" />
               </el-form-item>
             </el-col>
           

src/views/bannerman/index.vue

@@ -34,7 +34,19 @@ const rules = reactive<FormRules<RuleForm>>({
     { required: true, message: '必填项', trigger: 'blur' }
   ]
 })
-
+const statusChange=item=>{
+  apisystemdzbcBannerUpdate(item).then((res:any)=>{
+    getTableData()
+    ElMessage({
+          message: '操作成功',
+          type: 'success',
+          duration: 3 * 1000
+    });
+    
+  }).catch((err:any)=>{
+    console.log(err)
+  })
+}
 const submitForm = async (formEl: FormInstance | undefined) => {
   if (!formEl) {
     ElMessage({
@@ -244,12 +256,26 @@ 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="addr" label="宣传图">
+                      <el-table-column prop="addr" label="宣传图">
                           <template #default="scope">
-                            <img style="height:150px;width:auto" :src="scope.row.addr" alt="">
+                            
+                            <el-image
+                            :z-index="999799999"
+                              style="width: 60px; height: 60px"
+                              :src="scope.row.addr"
+                              :zoom-rate="1.2"
+                              preview-teleported
+                              :max-scale="7"
+                              :min-scale="0.2"
+                              :preview-src-list="[scope.row.addr]"
+                              show-progress
+                              
+                              fit="cover"
+                            />
                           </template>
                         </el-table-column>
+                        <el-table-column prop="name" label="文件名" />
+                       
                        
                        
                         <el-table-column prop="status" label="状态">
@@ -258,7 +284,7 @@ onMounted(()=>{
                            <el-switch
                            :active-value="1"
                            :inactive-value="2"
-                            disabled
+                            @change="statusChange(scope.row)"
                             v-model="scope.row.status"
                             inline-prompt
                             active-text="正常"
@@ -270,7 +296,7 @@ onMounted(()=>{
                        
                        
                       
-                        <el-table-column fixed="right" label="操作" min-width="120">
+                        <el-table-column  label="操作" min-width="120">
                           <template #default="scope">
                             <el-button link type="primary" @click="addItem(scope.row)" size="small">
                               编辑

src/views/carman/index.vue

@@ -265,6 +265,9 @@ onMounted(()=>{
                         <el-table-column prop="gps" label="GPS设备">
                         
                         </el-table-column>
+                        <el-table-column prop="remark" label="备注">
+                        
+                      </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">
@@ -352,9 +355,9 @@ onMounted(()=>{
                 </el-select>
               </el-form-item>
             </el-col>
-            <el-col :span="12">
+            <el-col :span="24">
               <el-form-item label="备注">
-                <el-input placeholder="备注" v-model="ruleForm.remark" />
+                <el-input placeholder="备注" type="textarea" v-model="ruleForm.remark" />
               </el-form-item>
             </el-col>
            

src/views/carplanman/index.vue

@@ -129,9 +129,10 @@ const addItem=data=>{
       ruleForm[key]=initData[key]
     }
     ruleForm.isauto=isauto.value?'1':'0'
-    ruleForm.mdate=data.mdate+' 00:00:00'
+    ruleForm.mdate=data.mdate
     logtitle.value='新增定制班车-路线排班'
   }
+  ruleForm.pathId=nowselRoute.value.id
   dialogVisible.value=true
 }
 const downExcell=()=>{
@@ -178,6 +179,7 @@ const getTableData=()=>{
       total.value=res.total
       tableData.value=res.rows.map(item=>{
         item.mdate=item.mdate?item.mdate:''
+        item.ftime=nowselRoute.value.mtime
         return item
       })
 
@@ -257,8 +259,9 @@ let carList=ref([])
 let routeList=ref([])
 let stationList=ref([])
 let pathId=ref('')
+let nowselRoute=ref({})
 const clickRoute=item=>{
-  console.log(item)
+  nowselRoute.value=item
   pathId.value=item.id
   searchClick()
 }
@@ -294,6 +297,8 @@ onMounted(()=>{
         
           routeList.value=res.rows
           routeListLeft.value=res.rows
+          pathId.value=res.rows[0].id
+          nowselRoute.value=res.rows[0]
           apisystemdzbcSitelist({
     
           }).then(res=>{
@@ -349,7 +354,7 @@ onMounted(()=>{
                     </template>
                     </el-input>
                     <div class="common-chart-wrap" id="order-wrap">
-                        <div class="lefttop-card-wrap" v-for="item in routeListLeft" :key="item.id" @click="clickRoute(item)">
+                        <div class="lefttop-card-wrap" :class="{'select-route':item.id==pathId}" v-for="item in routeListLeft" :key="item.id" @click="clickRoute(item)">
                             <div class="left-part">
                                 <div class="title">{{item.name}}</div>
                                 <div class="time">发车时间: {{item.mtime}}</div>
@@ -370,7 +375,7 @@ onMounted(()=>{
                 <el-card style="width: 100%">
                     <div class="common-title">
                         <div class="title-left">
-                            <div>深圳湾线 - 排班表</div>
+                            <div>{{ nowselRoute.name }} - 排班表</div>
                             <el-switch style="margin:0 6px" @change="isautoChange" v-model="isauto" />
                             <div style="color: #4B5563;font-size:14px;font-weight: 400;">自动续排</div>
                             <el-button size="mini" v-if="viewType==2" style="margin-left:6px;padding:0 2px;" type="primary"  @click="addItem({})">添加排班 </el-button>
@@ -464,17 +469,15 @@ onMounted(()=>{
                         </el-table-column>
                         <el-table-column prop="carName" label="车辆" />
                         <el-table-column prop="mdate" label="排班日期">
-                        
+                          <template #default="scope">
+                           
+                            {{ scope.row.mdate.substring(0,10) }}
+                          </template>
                         </el-table-column>
-                        <el-table-column prop="mtime" label="开始时间">
-                        
-                    </el-table-column>
-                    <el-table-column prop="startSitesName" label="开始站点">
-                        
-                    </el-table-column>
-                    <el-table-column prop="endSitesName" label="结束站点">
+                        <el-table-column prop="ftime" label="发车时间">
                         
                     </el-table-column>
+                   
                     <el-table-column prop="isauto" label="自动排班">
                         
                     </el-table-column>
@@ -602,7 +605,7 @@ onMounted(()=>{
                 <el-select
                   v-model="ruleForm.pathId"
                   placeholder="路线"
-                  
+                  disabled
                   style="width: 100%"
                 >
                   <el-option
@@ -638,57 +641,16 @@ onMounted(()=>{
                 <el-date-picker
                 style="width:100%"
                   v-model="ruleForm.mdate"
-                  type="datetime"
-                  value-format="YYYY-MM-DD HH:mm:ss"
+                  type="date"
+                  value-format="YYYY-MM-DD"
                   placeholder="排班日期"
                 />
               </el-form-item>
             </el-col>
            
-            <el-col :span="12">
-              <el-form-item label="开始时间">
-               
-                <el-time-picker style="width:100%" value-format="HH:mm:ss" placeholder="开始时间" v-model="ruleForm.mtime" />
-              </el-form-item>
-            </el-col>
-            <el-col :span="12">
-              <el-form-item label="开始站点">
-                
-              
-                <el-select
-                  v-model="ruleForm.startSites"
-                  placeholder="开始站点"
-                  
-                  style="width: 100%"
-                >
-                  <el-option
-                    v-for="item in stationList"
-                    :key="item.value"
-                    :label="item.name"
-                    :value="item.id"
-                  />
-                </el-select>
-              </el-form-item>
-            </el-col>
-            <el-col :span="12">
-              <el-form-item label="结束站点">
-                
-               
-                <el-select
-                  v-model="ruleForm.endSites"
-                  placeholder="结束站点"
-                  
-                  style="width: 100%"
-                >
-                  <el-option
-                    v-for="item in stationList"
-                    :key="item.value"
-                    :label="item.name"
-                    :value="item.id"
-                  />
-                </el-select>
-              </el-form-item>
-            </el-col>
+           
+            
+           
             <el-col :span="12">
               <el-form-item label="自动排班">
                
@@ -744,6 +706,9 @@ onMounted(()=>{
 </template>
 
 <style lang="scss" scoped>
+.select-route{
+  background:#dcdfe6;
+}
  .common-search-box{
           padding:10px 10px 10px 10px;
           display:flex;

src/views/orderman/index.vue

@@ -153,6 +153,22 @@ const getTableData=()=>{
     if(res.code==200){
       total.value=res.total
       tableData.value=res.rows.map(item=>{
+        if(item.ext1){
+          item.ext1=JSON.parse(item.ext1)
+          if(item.ext1.userInfo){
+            item.chengke=item.ext1.userInfo.map(items=>{
+              return items.name
+            }).join(',')
+          }
+        }
+        
+        if(item.ext2){
+          item.ext2=JSON.parse(item.ext2)
+          
+         
+        }
+       
+        
         item.startInfo=JSON.parse(item.startInfo)
         item.endInfo=JSON.parse(item.endInfo)
         console.log(item)
@@ -224,10 +240,20 @@ 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="id" label="订单编号">
                          
                         </el-table-column>
-                        <el-table-column prop="id" label="订单编号">
+                        <el-table-column prop="name" label="订单名称">
+                         
+                        </el-table-column>
+                        <el-table-column prop="createTime" label="订单日期">
+                         
+                        </el-table-column>
+                        <el-table-column prop="chengke" label="乘客名称">
+                         
+                        </el-table-column>
+                        <el-table-column prop="createTime" label="发车时间">
                          
                         </el-table-column>
                        
@@ -236,12 +262,25 @@ onMounted(()=>{
                   
                         <el-table-column prop="status" label="支付状态">
                           <template #default="scope">
-                           <div v-if="scope.row.status==1" style="background:#DCFCE7;width:64px;height:20px;border-radius:9999px;display:flex;align-items: center;justify-content: center;">
+                           <div v-if="scope.row.status==0" style="background:#FEF9C3;width:94px;height:32px;border-radius:9999px;display:flex;align-items: center;justify-content: center;">
+                           待支付
+                           </div>
+                           <div v-if="scope.row.status==1" style="background:#DCFCE7;width:94px;height:32px;border-radius:9999px;display:flex;align-items: center;justify-content: center;">
                            已支付
                            </div>
-                           <div v-else style="background:#f5f5f5;width:64px;height:20px;border-radius:9999px;display:flex;align-items: center;justify-content: center;">
-                           未支付
+                           <div v-if="scope.row.status==2" style="color:#854D0E;background:#FEE2E2;width:94px;height:32px;border-radius:9999px;display:flex;align-items: center;justify-content: center;">
+                           取消待退款
+                           </div>
+                           <div v-if="scope.row.status==3" style="background:#8DFD4C;width:94px;height:32px;border-radius:9999px;display:flex;align-items: center;justify-content: center;">
+                           已转商户
+                           </div>
+                           <div v-if="scope.row.status==4" style="background:#f5f5f5;width:94px;height:32px;border-radius:9999px;display:flex;align-items: center;justify-content: center;">
+                           已退款
                            </div>
+                           <div v-if="scope.row.status==5" style="background:red;width:94px;height:32px;border-radius:9999px;display:flex;align-items: center;justify-content: center;">
+                           已关闭
+                           </div>
+                          
                           </template>
                         </el-table-column>
                   
@@ -265,19 +304,7 @@ onMounted(()=>{
                         <el-table-column prop="totalPrice" label="总价">
                          
                         </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">
-                              编辑
-                            </el-button>
-                            <el-popconfirm @confirm="deleteItem(scope.row.id)" title="确定删除?">
-                              <template #reference>
-                                <el-button  link type="danger" size="small">删除</el-button>
-                              </template>
-                            </el-popconfirm>
-                            
-                          </template>
-                        </el-table-column>
+                        
                     </el-table>
 
                    <div class="common-page-wrap">

src/views/stationman/index.vue

@@ -238,11 +238,14 @@ onMounted(()=>{
                         <el-table-column prop="name" label="站点名称">
                         
                         </el-table-column>
-                        <el-table-column prop="latlon" label="经纬度" />
+                        <el-table-column prop="location" label="经纬度" />
                         <el-table-column prop="areaName" label="所属区域">
                           
                         </el-table-column>
-                        <el-table-column prop="desc" label="描述">
+                        <el-table-column prop="addr" label="地址">
+                          
+                        </el-table-column>
+                        <el-table-column prop="remark" label="备注">
                          
                         </el-table-column>
                        
@@ -309,11 +312,7 @@ onMounted(()=>{
               </el-form-item>
             </el-col>
            
-            <el-col :span="12">
-              <el-form-item label="经纬度">
-                <el-input placeholder="经纬度" v-model="ruleForm.location" />
-              </el-form-item>
-            </el-col>
+            
             <el-col :span="12">
               <el-form-item label="区域">
                 <el-select
@@ -333,9 +332,14 @@ onMounted(()=>{
                
               </el-form-item>
             </el-col>
-            <el-col :span="12">
+            <el-col :span="24">
+              <el-form-item label="经纬度">
+                <el-input placeholder="经纬度" v-model="ruleForm.location" />
+              </el-form-item>
+            </el-col>
+            <el-col :span="24">
               <el-form-item label="备注">
-                <el-input placeholder="备注" v-model="ruleForm.remark" />
+                <el-input placeholder="备注" type="textarea" v-model="ruleForm.remark" />
               </el-form-item>
             </el-col>
           

src/views/userman/index.vue

@@ -19,7 +19,7 @@ const initData={
   userId: '',
   userName: '',
   nickName: '',
-  userType: '',
+  userType: 'sys_user',
   email: '',
   phonenumber: '',
   sex: '',
@@ -57,7 +57,7 @@ const rules = reactive<FormRules<RuleForm>>({
   ]
 })
 
-const submitForm = async (formEl: FormInstance | undefined) => {,
+const submitForm = async (formEl: FormInstance | undefined) => {
   if (!formEl) {
     ElMessage({
           message: '缺少必填项',
@@ -118,7 +118,7 @@ let loading=ref(true)
 let excellloading=ref(false)
 const tableData = ref([])
 //v-loading="excellloading" @click="downExcell"
-let activeName=ref('first')
+let activeName=ref('1')
 
 const addItem=data=>{
   if(data.userId){
@@ -132,6 +132,12 @@ const addItem=data=>{
     
     logtitle.value='编辑用户信息'
   }else{
+    
+    if(activeName.value==1){
+      initData.roleIds=['1889878742120472578']
+    }else{
+      initData.roleIds=['1889878542601625601']
+    }
     for(let key in initData){
       ruleForm[key]=initData[key]
     }
@@ -161,8 +167,10 @@ const searchClick=()=>{
 }
 
 const getTableData=()=>{
+  console.log(activeName.value)
   apisystemuserlist({
-    juese.value,
+    
+    'params[roleNames]':activeName.value==1?'定制班车-司机':'定制班车用户',
     nickName:nickName.value,
     pageSize:10,
     pageNum:pageNum.value
@@ -229,15 +237,11 @@ const deleteItem=(userId)=>{
 }
 let juese=ref('')
 let roleList=[{
-  roleId:'1763484881548447746',
+  roleId:'1889878742120472578',
   roleName: "司机"
 },{
   roleId: "1889878542601625601",
-   roleName: "定制班车用户"
-},{
-  roleId: "1889878845577175041", roleName: "定制班车-管理员"
-},{
-  roleId: "1889878957246324738", roleName: "定制班车客运站"
+   roleName: "普通用户"
 }]
 onMounted(()=>{
   getTableData()
@@ -278,20 +282,7 @@ onMounted(()=>{
                         
                          
                         </el-input>
-                        <el-select
-                          
-                              v-model="juese" placeholder="角色"
-                                style="width: 100%"
-
-                                
-                              >
-                                <el-option
-                                  v-for="item in roleList"
-                                  :key="item.roleId"
-                                  :label="item.roleName"
-                                  :value="item.roleId"
-                                />
-                              </el-select>
+                       
                         <el-button @click="searchClick"  style="margin-left:10px">筛选</el-button>
                       </div>
                       <div class="right-part">
@@ -300,6 +291,11 @@ onMounted(()=>{
                         <el-button :icon="Tools">设置</el-button> -->
                       </div>
                     </div>
+                    <el-tabs style="margin:0 6px" v-model="activeName" @tab-change="searchClick" >
+                      <el-tab-pane label="司机" name="1"></el-tab-pane>
+                      <el-tab-pane label="普通用户" name="2"></el-tab-pane>
+                    
+                    </el-tabs>
                     <el-table element-loading-text='加载中' header-row-class-name="reset-gray-head" :data="tableData"  style="width: 100%" v-loading="loading">
                         <el-table-column prop="info" label="用户信息">
                           <template #default="scope">
@@ -316,7 +312,7 @@ onMounted(()=>{
                           
                         </el-table-column>
                         <el-table-column prop="phonenumber" label="联系方式" />
-                        <el-table-column prop="roleNames" min-width="160" label="角色">
+                        <el-table-column prop="roleNames"  label="角色">
                           <template #default="scope">
                             <el-select
                             @change="roleChange(scope.row)"