Explorar el Código

fix-化油记录导出

LAPTOP-U5GOA5HA\zz hace 1 año
padre
commit
ee74591592

+ 2 - 2
src/components/GlobalHeader/AvatarDropdown.vue

@@ -6,10 +6,10 @@
     </span>
     <template v-slot:overlay>
       <a-menu class="ant-pro-drop-down menu" :selected-keys="[]">
-        <a-menu-item v-if="menu" key="center" @click="handleToCenter">
+        <!-- <a-menu-item v-if="menu" key="center" @click="handleToCenter">
           <a-icon type="user" />
           个人中心
-        </a-menu-item>
+        </a-menu-item> -->
         <a-menu-item v-if="menu" key="settings" @click="handleToSettings">
           <a-icon type="setting" />
           个人设置

+ 7 - 7
src/config/router.config.js

@@ -23,13 +23,13 @@ export const indexRouterMap = [
   //   component: 'Index',
   //   meta: { title: '首页', noCache: false, hidden: true, icon: 'dashboard', hiddenHeaderContent: true }
   // },
-  {
-    path: '/account/center',
-    name: 'Center',
-    component: 'AccountCenter',
-    meta: { title: '个人中心', noCache: true },
-    hidden: true
-  },
+  // {
+  //   path: '/account/center',
+  //   name: 'Center',
+  //   component: 'AccountCenter',
+  //   meta: { title: '个人中心', noCache: true },
+  //   hidden: true
+  // },
   {
     path: '/account/settings',
     name: 'Settings',

+ 12 - 5
src/views/clw/oilSkimmingLog/index.vue

@@ -48,7 +48,7 @@
         <a-button type="danger" :disabled="multiple" @click="handleDelete" v-hasPermi="['clw:oilSkimmingLog:remove']">
           <a-icon type="delete" />删除
         </a-button> -->
-        <a-button type="primary" @click="handleExport" v-hasPermi="['clw:oilSkimmingLog:export']">
+        <a-button :disabled="selectedRowKeys.length==0" type="primary" @click="handleExport" v-hasPermi="['clw:oilSkimmingLog:export']">
           <a-icon type="download" />导出
         </a-button>
         <table-setting
@@ -66,6 +66,7 @@
         :loading="loading"
         :size="tableSize"
         rowKey="id"
+        :row-selection="{ selectedRowKeys: selectedRowKeys, onChange: onSelectChange }"
         :columns="columns"
         :data-source="list"
         :pagination="false"
@@ -298,14 +299,20 @@ export default {
     },
     /** 导出按钮操作 */
     handleExport() {
-      this.$message.success('请稍等,正在导出')
+      if(this.selectedRowKeys.length==0){
+        return this.$message.error('请先选择需要导出的数据')
+      }else{
+        let id=this.selectedRowKeys.join(',')
+        this.$message.success('请稍等,正在导出')
       this.download(
-        'clw/oilSkimmingLog/export',
+        `clw/oilSkimmingLog/export/${id}`,
         {
-          ...this.queryParam,
+         
         },
-        `oilSkimmingLog_${new Date().getTime()}.xlsx`
+        `化油记录${new Date().getTime()}.zip`
       )
+      }
+      
     },
   },
 }

+ 1 - 1
vue.config.js

@@ -111,7 +111,7 @@ const vueConfig = {
       [process.env.VUE_APP_BASE_API]: {
         // target: `https://ruoyi.setworld.net`,
         // target: `http://113.249.153.164:7618/api`,
-        target:`http://172.20.16.92:8080/`,
+        target:`http://172.20.16.92:8081/`,
         changeOrigin: true,
         pathRewrite: {
           ['^' + process.env.VUE_APP_BASE_API]: ''