ホーム エクスプローラ ヘルプ
登録 サインイン
wenhongquan
/
khy_dzbc_ui
1
0
フォーク 0
ファイル 課題 0 プルリクエスト 0 Wiki
ソースを参照

接口优化

wsp 1 年間 前
親
8aab185946
コミット
d8131baf2f
6 ファイル変更、95 行追加、30 行削除
一括表示 差分情報を表示
  1. 0 15
      components.d.ts
  2. 1 0
      index.html
  3. 14 0
      public/js/global.js
  4. 21 4
      src/request/api.js
  5. 11 1
      src/request/index.ts
  6. 48 10
      src/views/areaman/index.vue

+ 0 - 15
components.d.ts
ファイルの表示 

@@ -11,43 +11,28 @@ declare module 'vue' {
 
     ElBreadcrumb: typeof import('element-plus/es')['ElBreadcrumb']
 
     ElBreadcrumb: typeof import('element-plus/es')['ElBreadcrumb']
 
     ElBreadcrumbItem: typeof import('element-plus/es')['ElBreadcrumbItem']
 
     ElBreadcrumbItem: typeof import('element-plus/es')['ElBreadcrumbItem']
 
     ElButton: typeof import('element-plus/es')['ElButton']
 
     ElButton: typeof import('element-plus/es')['ElButton']
 
-    ElCalendar: typeof import('element-plus/es')['ElCalendar']
 
     ElCard: typeof import('element-plus/es')['ElCard']
 
     ElCard: typeof import('element-plus/es')['ElCard']
 
     ElCheckbox: typeof import('element-plus/es')['ElCheckbox']
 
     ElCheckbox: typeof import('element-plus/es')['ElCheckbox']
 
-    ElCheckboxGroup: typeof import('element-plus/es')['ElCheckboxGroup']
 
     ElCol: typeof import('element-plus/es')['ElCol']
 
     ElCol: typeof import('element-plus/es')['ElCol']
 
     ElContainer: typeof import('element-plus/es')['ElContainer']
 
     ElContainer: typeof import('element-plus/es')['ElContainer']
 
-    ElDatePicker: typeof import('element-plus/es')['ElDatePicker']
 
     ElDialog: typeof import('element-plus/es')['ElDialog']
 
     ElDialog: typeof import('element-plus/es')['ElDialog']
 
     ElDropdown: typeof import('element-plus/es')['ElDropdown']
 
     ElDropdown: typeof import('element-plus/es')['ElDropdown']
 
     ElDropdownItem: typeof import('element-plus/es')['ElDropdownItem']
 
     ElDropdownItem: typeof import('element-plus/es')['ElDropdownItem']
 
     ElDropdownMenu: typeof import('element-plus/es')['ElDropdownMenu']
 
     ElDropdownMenu: typeof import('element-plus/es')['ElDropdownMenu']
 
     ElForm: typeof import('element-plus/es')['ElForm']
 
     ElForm: typeof import('element-plus/es')['ElForm']
 
     ElFormItem: typeof import('element-plus/es')['ElFormItem']
 
     ElFormItem: typeof import('element-plus/es')['ElFormItem']
 
-    ElHeade: typeof import('element-plus/es')['ElHeade']
 
     ElHeader: typeof import('element-plus/es')['ElHeader']
 
     ElHeader: typeof import('element-plus/es')['ElHeader']
 
     ElIcon: typeof import('element-plus/es')['ElIcon']
 
     ElIcon: typeof import('element-plus/es')['ElIcon']
 
     ElInput: typeof import('element-plus/es')['ElInput']
 
     ElInput: typeof import('element-plus/es')['ElInput']
 
     ElMain: typeof import('element-plus/es')['ElMain']
 
     ElMain: typeof import('element-plus/es')['ElMain']
 
     ElMenu: typeof import('element-plus/es')['ElMenu']
 
     ElMenu: typeof import('element-plus/es')['ElMenu']
 
     ElMenuItem: typeof import('element-plus/es')['ElMenuItem']
 
     ElMenuItem: typeof import('element-plus/es')['ElMenuItem']
 
-    ElMenuItemGroup: typeof import('element-plus/es')['ElMenuItemGroup']
 
-    ElOption: typeof import('element-plus/es')['ElOption']
 
     ElPagination: typeof import('element-plus/es')['ElPagination']
 
     ElPagination: typeof import('element-plus/es')['ElPagination']
 
-    ElRadio: typeof import('element-plus/es')['ElRadio']
 
-    ElRadioGroup: typeof import('element-plus/es')['ElRadioGroup']
 
     ElRow: typeof import('element-plus/es')['ElRow']
 
     ElRow: typeof import('element-plus/es')['ElRow']
 
-    ElSegmented: typeof import('element-plus/es')['ElSegmented']
 
-    ElSelect: typeof import('element-plus/es')['ElSelect']
 
-    ElSelectV2: typeof import('element-plus/es')['ElSelectV2']
 
-    ElSubmenu: typeof import('element-plus/es')['ElSubmenu']
 
-    ElSubMenu: typeof import('element-plus/es')['ElSubMenu']
 
-    ElSwitch: typeof import('element-plus/es')['ElSwitch']
 
     ElTable: typeof import('element-plus/es')['ElTable']
 
     ElTable: typeof import('element-plus/es')['ElTable']
 
     ElTableColumn: typeof import('element-plus/es')['ElTableColumn']
 
     ElTableColumn: typeof import('element-plus/es')['ElTableColumn']
 
     ElTabPane: typeof import('element-plus/es')['ElTabPane']
 
     ElTabPane: typeof import('element-plus/es')['ElTabPane']
 
     ElTabs: typeof import('element-plus/es')['ElTabs']
 
     ElTabs: typeof import('element-plus/es')['ElTabs']
 
-    ElTimePicker: typeof import('element-plus/es')['ElTimePicker']
 
     HelloWorld: typeof import('./src/components/HelloWorld.vue')['default']
 
     HelloWorld: typeof import('./src/components/HelloWorld.vue')['default']
 
     IconCommunity: typeof import('./src/components/icons/IconCommunity.vue')['default']
 
     IconCommunity: typeof import('./src/components/icons/IconCommunity.vue')['default']
 
     IconDocumentation: typeof import('./src/components/icons/IconDocumentation.vue')['default']
 
     IconDocumentation: typeof import('./src/components/icons/IconDocumentation.vue')['default']

+ 1 - 0
index.html
ファイルの表示 

@@ -8,6 +8,7 @@
 
   </head>
 
   </head>
 
   <body>
 
   <body>
 
     <div id="app"></div>
 
     <div id="app"></div>
 
+    <script  src="/js/global.js"></script>
 
     <script  src="/js/echarts.js"></script>
 
     <script  src="/js/echarts.js"></script>
 
     <script type="module" src="/src/main.ts"></script>
 
     <script type="module" src="/src/main.ts"></script>
 
   </body>
 
   </body>

+ 14 - 0
public/js/global.js
ファイルの表示 

@@ -0,0 +1,14 @@
 
+var baseUrl='https://khy.xiaole.vip'
 
+var loginPageUrl='http://localhost:5173/login'
 
+var systemType='测试环境'
 
+
 
+switch(systemType){
 
+    case '测试环境':
 
+        baseUrl='https://khy.xiaole.vip'
 
+        loginPageUrl='http://localhost:5173/login'
 
+        break;
 
+    case '线上环境':
 
+        baseUrl=''
 
+        loginPageUrl=''
 
+    break;
 
+}

+ 21 - 4
src/request/api.js
ファイルの表示 

@@ -27,10 +27,27 @@ export const  apisystemdzbcArealist = query => {
 
 };
 
 };
 
 
 
 //https://khy.xiaole.vip/api/system/dzbcArea/export导出定制班车-区域列表
 
 //https://khy.xiaole.vip/api/system/dzbcArea/export导出定制班车-区域列表
 
-export const  apisystemdzbcArealist = query => {
 
+export const  apisystemdzbcAreaexport = query => {
 
     return service({
 
     return service({
 
-        url: '/api/system/dzbcArea/list',
 
-        method: 'GET',
 
-		data:query
 
+        url: '/api/system/dzbcArea/export',
 
+        method: 'POST',
 
+		data:query,
 
+        responseType: 'blob'
 
+    });
 
+};
 
+
 
+///api/system/dzbcArea/{ids}删除定制班车-区域
 
+export const  apisystemdzbcAreaDel = query => {
 
+    return service({
 
+        url: `/api/system/dzbcArea/${query.id}`,
 
+        method: 'DELETE'
 
+    });
 
+};
 
+//新增定制班车-区域https://khy.xiaole.vip/api/system/dzbcArea
 
+export const  apisystemdzbcAreaAdd = query => {
 
+    return service({
 
+        url: `/api/system/dzbcArea`,
 
+        method: 'POST',
 
+        data:query
 
     });
 
     });
 
 };
 
 };

+ 11 - 1
src/request/index.ts
ファイルの表示 

@@ -1,9 +1,10 @@
 
 import axios from 'axios';
 
 import axios from 'axios';
 
 import NProgress from 'NProgress'
 
 import NProgress from 'NProgress'
 
 import { ElMessage } from 'element-plus'
 
 import { ElMessage } from 'element-plus'
 
+
 
 // 创建axios实例
 
 // 创建axios实例
 
 const service = axios.create({
 
 const service = axios.create({
 
-  baseURL: 'https://khy.xiaole.vip', // api的base_url
 
+  baseURL: window.baseUrl, // api的base_url
 
   timeout: 5000 // 请求超时时间
 
   timeout: 5000 // 请求超时时间
 
 });
 
 });
 
  
  
@@ -37,11 +38,14 @@ service.interceptors.request.use(
 
 // 响应拦截器
 
 // 响应拦截器
 
 service.interceptors.response.use(
 
 service.interceptors.response.use(
 
   response => {
 
   response => {
 
+    console.log(response)
 
     // 可以在这里对响应数据进行处理，例如：对返回的状态码进行判断
 
     // 可以在这里对响应数据进行处理，例如：对返回的状态码进行判断
 
     const res = response.data;
 
     const res = response.data;
 
+    
     NProgress.done(true);   // 强制完成
 
     NProgress.done(true);   // 强制完成
 
     switch(res.code){
 
     switch(res.code){
 
       case 200:
 
       case 200:
 
+        
         break;
 
         break;
 
         case 401:
 
         case 401:
 
         ElMessage({
 
         ElMessage({
 
@@ -49,6 +53,12 @@ service.interceptors.response.use(
 
           type: 'error',
 
           type: 'error',
 
           duration: 5 * 1000
 
           duration: 5 * 1000
 
         });
 
         });
 
+
 
+        setTimeout(function(){
 
+          window.location.replace(loginPageUrl)
 
+          //window.Location.href=loginPageUrl
 
+        },2000)
 
+       
         break;
 
         break;
 
       case 500:
 
       case 500:
 
         ElMessage({
 
         ElMessage({

+ 48 - 10
src/views/areaman/index.vue
ファイルの表示 

@@ -1,5 +1,5 @@
 
 <script setup lang="ts">
 
 <script setup lang="ts">
 
-import { apisystemdzbcArealist } from '../../request/api.js'
 
+import { apisystemdzbcArealist,apisystemdzbcAreaexport,apisystemdzbcAreaDel,apisystemdzbcAreaAdd } from '../../request/api.js'
 
 import type { ComponentSize, FormInstance, FormRules } from 'element-plus'
 
 import type { ComponentSize, FormInstance, FormRules } from 'element-plus'
 
 
 
 interface RuleForm {
 
 interface RuleForm {
 
@@ -97,7 +97,11 @@ const submitForm = async (formEl: FormInstance | undefined) => {
 
   if (!formEl) return
 
   if (!formEl) return
 
   await formEl.validate((valid, fields) => {
 
   await formEl.validate((valid, fields) => {
 
     if (valid) {
 
     if (valid) {
 
-      console.log('submit!')
 
+      apisystemdzbcAreaAdd(ruleForm).then((res:any)=>{
 
+
 
+      }).catch((err:any)=>{
 
+        console.log(err)
 
+      })
 
     } else {
 
     } else {
 
       console.log('error submit!', fields)
 
       console.log('error submit!', fields)
 
     }
 
     }
 
@@ -113,25 +117,59 @@ let pageNum=ref(1)
 
 let dialogVisible=ref(false)
 
 let dialogVisible=ref(false)
 
 let logtitle=ref('新增用户')
 
 let logtitle=ref('新增用户')
 
 let loading=ref(true)
 
 let loading=ref(true)
 
+let excellloading=ref(false)
 
 const tableData = ref([])
 
 const tableData = ref([])
 
-
 
+//v-loading="excellloading" @click="downExcell"
 
 let activeName=ref('first')
 
 let activeName=ref('first')
 
 
 
 const addUser=val=>{
 
 const addUser=val=>{
 
   dialogVisible.value=val
 
   dialogVisible.value=val
 
 }
 
 }
 
-
 
+const downExcell=()=>{
 
+  excellloading.value=true
 
+  apisystemdzbcAreaexport({}).then((res:any)=>{
 
+
 
+     // 这里 data 是返回来的二进制数据
 
+     let blob = new Blob([res], {
 
+        type: "application/x-msdownload;charset=UTF-8",
 
+    });
 
+    // 创建一个blob的对象链接
 
+    const url = window.URL.createObjectURL(blob);
 
+    const link = document.createElement('a');
 
+    link.href = url;
 
+    // 把获得的blob的对象链接赋值给新创建的这个 a 链接
 
+    link.setAttribute('download', '数据管理列表.xls'); // 设置下载文件名
 
+    document.body.appendChild(link);
 
+    // 使用js点击这个链接
 
+    link.click();
 
+    document.body.removeChild(link) // 下载完成移除元素
 
+    window.URL.revokeObjectURL(url) // 释放blob对象
 
+    excellloading.value=false
 
+  }).catch((err:any)=>{
 
+    console.log(err)
 
+  })
 
+}
 
 const getTableData=()=>{
 
 const getTableData=()=>{
 
   apisystemdzbcArealist({
 
   apisystemdzbcArealist({
 
     
     
   }).then(res=>{
 
   }).then(res=>{
 
+    if(res.code==200){
 
+      tableData.value=res.rows
 
+    }
 
     loading.value=false
 
     loading.value=false
 
-    tableData.value=res.data.rows
 
+    
   }).catch(err=>{
 
   }).catch(err=>{
 
     console.log(err)
 
     console.log(err)
 
   })
 
   })
 
 }
 
 }
 
+//
 
+const deleteItem=(id)=>{
 
+  apisystemdzbcAreaDel({id}).then((res:any)=>{
 
 
 
+  }).catch((err:any)=>{
 
+    console.log(err)
 
+  })
 
+}
 
 
 
 onMounted(()=>{
 
 onMounted(()=>{
 
   getTableData()
 
   getTableData()
 
@@ -173,8 +211,8 @@ onMounted(()=>{
 
                       </div>
 
                       </div>
 
                       <div class="right-part">
 
                       <div class="right-part">
 
                       
                       
-                        <!-- <el-button :icon="Download">导出</el-button>
 
-                        <el-button :icon="Tools">设置</el-button> -->
 
+                        <el-button :loading="excellloading" @click="downExcell" :icon="Download">{{ excellloading?'正在导出':'导出' }}</el-button>
 
+                        <!-- <el-button :icon="Tools">设置</el-button> -->
 
                       </div>
 
                       </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 element-loading-text='加载中' header-row-class-name="reset-gray-head" :data="tableData"  style="width: 100%" v-loading="loading">
 
@@ -190,11 +228,11 @@ onMounted(()=>{
 
                         </el-table-column>
 
                         </el-table-column>
 
                         <el-table-column prop="by" label="所属客运站" />
 
                         <el-table-column prop="by" label="所属客运站" />
 
                         <el-table-column fixed="right" label="操作" min-width="120">
 
                         <el-table-column fixed="right" label="操作" min-width="120">
 
-                          <template #default>
 
+                          <template #default="scope">
 
                             <el-button link type="primary" size="small">
 
                             <el-button link type="primary" size="small">
 
                               编辑
 
                               编辑
 
                             </el-button>
 
                             </el-button>
 
-                            <el-button link type="danger" size="small">删除</el-button>
 
+                            <el-button @click="deleteItem(scope.row.id)" link type="danger" size="small">删除</el-button>
 
                           </template>
 
                           </template>
 
                         </el-table-column>
 
                         </el-table-column>
 
                     </el-table>
 
                     </el-table>
 
@@ -280,7 +318,7 @@ onMounted(()=>{
 
           <template #footer>
 
           <template #footer>
 
             <div class="dialog-footer">
 
             <div class="dialog-footer">
 
               <el-button @click="dialogVisible = false" :icon="Close">取消</el-button>
 
               <el-button @click="dialogVisible = false" :icon="Close">取消</el-button>
 
-              <el-button type="primary" :icon="Check" @click="addUser(false)">
 
+              <el-button type="primary" :icon="Check" @click="submitForm(ruleFormRef)">
 
                 确认创建
 
                 确认创建
 
               </el-button>
 
               </el-button>
 
             </div>
 
             </div>