wsp 1 rok temu
rodzic
commit
b7df58e618

+ 2 - 2
components.d.ts

@@ -26,6 +26,7 @@ declare module 'vue' {
     ElHeader: typeof import('element-plus/es')['ElHeader']
     ElIcon: typeof import('element-plus/es')['ElIcon']
     ElInput: typeof import('element-plus/es')['ElInput']
+    ElInputb: typeof import('element-plus/es')['ElInputb']
     ElMain: typeof import('element-plus/es')['ElMain']
     ElMenu: typeof import('element-plus/es')['ElMenu']
     ElMenuItem: typeof import('element-plus/es')['ElMenuItem']
@@ -37,9 +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']
     IconCommunity: typeof import('./src/components/icons/IconCommunity.vue')['default']
     IconDocumentation: typeof import('./src/components/icons/IconDocumentation.vue')['default']

+ 1 - 1
src/request/index.ts

@@ -5,7 +5,7 @@ import { ElMessage } from 'element-plus'
 // 创建axios实例
 const service = axios.create({
   baseURL: window.baseUrl, // api的base_url
-  timeout: 5000 // 请求超时时间
+  timeout: 5000*3 // 请求超时时间
 });
  
 // 请求拦截器

+ 45 - 11
src/views/bannerman/index.vue

@@ -6,14 +6,14 @@ interface RuleForm {
       id: string,
       name: string,
       addr: string,
-      status: string,
+      status: any,
       remark: string
 }
 const initData={
   id:'',
   name: '',
   addr: '',
-  status: '',
+  status: 1,
 
   remark: ''
 }
@@ -23,7 +23,7 @@ const ruleForm = reactive<RuleForm>({
     id:'',
   name: '',
   addr: '',
-  status: '',
+  status: 1,
 
   remark: ''
 })
@@ -84,13 +84,21 @@ const submitForm = async (formEl: FormInstance | undefined) => {
 }
 
 
+let Authorization=localStorage.getItem('access_token')
+
+
 import { ref,onMounted,reactive } from 'vue'
 import { Search,Download,Tools,Plus,Check,Close } from "@element-plus/icons-vue";
+let upUrl=window.baseUrl+'/api/resource/oss/upload'
+let headers={
+  Authorization:'Bearer'+` ${Authorization}`
+}
+let fileList=ref([])
 let searchWord=ref('')
 let total=ref(0)
 let pageNum=ref(1)
 let dialogVisible=ref(false)
-let logtitle=ref('新增定制班车-站点')
+let logtitle=ref('新增小程序宣传图')
 let loading=ref(true)
 let excellloading=ref(false)
 const tableData = ref([])
@@ -102,13 +110,13 @@ const addItem=data=>{
     for(let key in data){
       ruleForm[key]=data[key]
     }
-    logtitle.value='编辑定制班车-站点'
+    logtitle.value='编辑小程序宣传图'
   }else{
     
     for(let key in initData){
       ruleForm[key]=initData[key]
     }
-    logtitle.value='新增定制班车-站点'
+    logtitle.value='新增小程序宣传图'
   }
   dialogVisible.value=true
 }
@@ -203,12 +211,12 @@ onMounted(()=>{
                         </el-input>
                        
                       </div>
-                      <div class="right-part">
+                      <!-- <div class="right-part">
                       
                         
                         <el-button :icon="Tools">筛选</el-button>
                         <el-button :loading="excellloading" @click="downExcell" :icon="Download">{{ excellloading?'正在导出':'导出' }}</el-button>
-                      </div>
+                      </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="宣传图" />
@@ -282,13 +290,39 @@ onMounted(()=>{
               </el-form-item>
             </el-col>
             <el-col :span="12">
-              <el-form-item label="地址">
-                <el-input placeholder="地址" v-model="ruleForm.addr" />
+              <el-form-item label="图片上传">
+                <el-upload
+                
+                :action="upUrl"
+                :headers="headers"
+                :limit="1"
+                :show-file-list="false"
+                :on-exceed="handleExceed"
+                :file-list="fileList">
+                <el-button size="small" type="primary">点击上传</el-button>
+               
+              </el-upload>
               </el-form-item>
             </el-col>
             <el-col :span="12">
               <el-form-item label="状态">
-                <el-input placeholder="状态" v-model="ruleForm.status" />
+                <el-select
+                 v-model="ruleForm.status" placeholder="状态"
+                  style="width: 100%"
+                  
+                >
+                  <el-option
+                   
+                    label="启用"
+                    :value="1"
+                  />
+                  <el-option
+                   
+                   label="不启用"
+                   :value="2"
+                 />
+                 
+                </el-select>
               </el-form-item>
             </el-col>
            

+ 9 - 67
src/views/carplanman/index.vue

@@ -266,78 +266,20 @@ onMounted(()=>{
                     </template>
                     </el-input>
                     <div class="common-chart-wrap" id="order-wrap">
-                        <div class="lefttop-card-wrap">
+                        <div class="lefttop-card-wrap" v-for="item in routeList" :key="item.id">
                             <div class="left-part">
-                                <div class="title">深圳-佛山</div>
-                                <div class="time">发车时间: 13:00</div>
-                            </div>
-                            <div class="right-part">
-
-                            </div>
-                        </div>
-                        <div class="lefttop-card-wrap">
-                            <div class="left-part">
-                                <div class="title">深圳-佛山</div>
-                                <div class="time">发车时间: 13:00</div>
-                            </div>
-                            <div class="right-part">
-
-                            </div>
-                        </div>
-                        <div class="lefttop-card-wrap">
-                            <div class="left-part">
-                                <div class="title">深圳-佛山</div>
-                                <div class="time">发车时间: 13:00</div>
-                            </div>
-                            <div class="right-part">
-
-                            </div>
-                        </div>
-                        <div class="lefttop-card-wrap">
-                            <div class="left-part">
-                                <div class="title">深圳-佛山</div>
-                                <div class="time">发车时间: 13:00</div>
-                            </div>
-                            <div class="right-part">
-
-                            </div>
-                        </div>
-                        <div class="lefttop-card-wrap">
-                            <div class="left-part">
-                                <div class="title">深圳-佛山</div>
-                                <div class="time">发车时间: 13:00</div>
-                            </div>
-                            <div class="right-part">
-
-                            </div>
-                        </div>
-                        <div class="lefttop-card-wrap">
-                            <div class="left-part">
-                                <div class="title">深圳-佛山</div>
-                                <div class="time">发车时间: 13:00</div>
-                            </div>
-                            <div class="right-part">
-
-                            </div>
-                        </div>
-                        <div class="lefttop-card-wrap">
-                            <div class="left-part">
-                                <div class="title">深圳-佛山</div>
-                                <div class="time">发车时间: 13:00</div>
-                            </div>
-                            <div class="right-part">
-
-                            </div>
-                        </div>
-                        <div class="lefttop-card-wrap">
-                            <div class="left-part">
-                                <div class="title">深圳-佛山</div>
-                                <div class="time">发车时间: 13:00</div>
+                                <div class="title">{{item.name}}</div>
+                                <div class="time">发车时间: {{item.mtime}}</div>
                             </div>
                             <div class="right-part">
 
                             </div>
                         </div>
+                       
+                        
+                        
+                        
+                        
                     </div>
                 </el-card>
             </div>
@@ -348,7 +290,7 @@ onMounted(()=>{
                             <div>深圳湾线 - 排班表</div>
                             <el-switch style="margin:0 6px" v-model="isauto" />
                             <div style="color: #4B5563;font-size:14px;font-weight: 400;">自动续排</div>
-                            <el-button v-if="viewType==2" style="margin-left:6px" type="primary" :icon="Plus" @click="addItem({})">添加排班 </el-button>
+                            <el-button size="mini" v-if="viewType==2" style="margin-left:6px;padding:0 2px;" type="primary"  @click="addItem({})">添加排班 </el-button>
                         </div>
                         <div class="title-right">
                             <el-button @click="viewType=1">月视图 </el-button>

+ 3 - 3
src/views/login/index.vue

@@ -35,7 +35,7 @@ const submitForm = async (formEl: FormInstance | undefined) => {
         loading.value=false
         return
     }
-    
+    //g350488F
     login({
     "clientId": "e5cd7e4891bf95d1d19206ce24a7b32e",
     "grantType": "password",
@@ -114,11 +114,11 @@ onMounted(()=>{
                 status-icon
             >
                 <el-form-item label="账号" prop="name">
-                    <el-input :prefix-icon="User" v-model="ruleForm.username" />
+                    <el-input placeholder="账号" :prefix-icon="User" v-model="ruleForm.username" />
                 </el-form-item>
                
                 <el-form-item label="密码" prop="name">
-                    <el-input  type="password" :prefix-icon="Lock"  show-password  v-model="ruleForm.password" />
+                    <el-input placeholder="密码"  type="password" :prefix-icon="Lock"  show-password  v-model="ruleForm.password" />
                 </el-form-item>