下载提交

src/main.js

@@ -12,25 +12,25 @@ import store from './store'
 import router from './router'
 import directive from './directive' // directive
 import plugins from './plugins' // plugins
-import { download } from '@/utils/request'
+import { download, downloadNew } from '@/utils/request'
 
 import './assets/icons' // icon
 import './permission' // permission control
-import { getDicts } from "@/api/system/dict/data";
+import { getDicts } from '@/api/system/dict/data'
-import { getConfigKey } from "@/api/system/config";
+import { getConfigKey } from '@/api/system/config'
-import { parseTime, resetForm, addDateRange, selectDictLabel, selectDictLabels, handleTree } from "@/utils/ruoyi";
+import { parseTime, resetForm, addDateRange, selectDictLabel, selectDictLabels, handleTree } from '@/utils/ruoyi'
 // 分页组件
-import Pagination from "@/components/Pagination";
+import Pagination from '@/components/Pagination'
 // 自定义表格工具组件
-import RightToolbar from "@/components/RightToolbar"
+import RightToolbar from '@/components/RightToolbar'
 // 富文本组件
-import Editor from "@/components/Editor"
+import Editor from '@/components/Editor'
 // 文件上传组件
-import FileUpload from "@/components/FileUpload"
+import FileUpload from '@/components/FileUpload'
 // 图片上传组件
-import ImageUpload from "@/components/ImageUpload"
+import ImageUpload from '@/components/ImageUpload'
 // 图片预览组件
-import ImagePreview from "@/components/ImagePreview"
+import ImagePreview from '@/components/ImagePreview'
 // 字典标签组件
 import DictTag from '@/components/DictTag'
 // 头部标签组件
@@ -47,6 +47,7 @@ Vue.prototype.addDateRange = addDateRange
 Vue.prototype.selectDictLabel = selectDictLabel
 Vue.prototype.selectDictLabels = selectDictLabels
 Vue.prototype.download = download
+Vue.prototype.downloadNew = downloadNew
 Vue.prototype.handleTree = handleTree
 
 // 全局组件挂载
@@ -73,14 +74,14 @@ DictData.install()
  */
 
 Vue.use(Element, {
-  size: Cookies.get('size') || 'medium' // set element-ui default size
+    size: Cookies.get('size') || 'medium', // set element-ui default size
 })
 
 Vue.config.productionTip = false
 
 new Vue({
-  el: '#app',
+    el: '#app',
-  router,
+    router,
-  store,
+    store,
-  render: h => h(App)
+    render: (h) => h(App),
 })

src/utils/request.js

@@ -3,150 +3,203 @@ import { Notification, MessageBox, Message, Loading } from 'element-ui'
 import store from '@/store'
 import { getToken } from '@/utils/auth'
 import errorCode from '@/utils/errorCode'
-import { tansParams, blobValidate } from "@/utils/ruoyi";
+import { tansParams, blobValidate } from '@/utils/ruoyi'
 import cache from '@/plugins/cache'
 import { saveAs } from 'file-saver'
 
-let downloadLoadingInstance;
+let downloadLoadingInstance
 // 是否显示重新登录
-export let isRelogin = { show: false };
+export let isRelogin = { show: false }
 
 axios.defaults.headers['Content-Type'] = 'application/json;charset=utf-8'
 // 创建axios实例
 const service = axios.create({
-  // axios中请求配置有baseURL选项，表示请求URL公共部分
+    // axios中请求配置有baseURL选项，表示请求URL公共部分
-  baseURL: process.env.VUE_APP_BASE_API,
+    baseURL: process.env.VUE_APP_BASE_API,
-  // 超时
+    // 超时
-  timeout: 10000
+    timeout: 10000,
 })
 
 // request拦截器
-service.interceptors.request.use(config => {
+service.interceptors.request.use(
-  // 是否需要设置 token
+    (config) => {
-  const isToken = (config.headers || {}).isToken === false
+        // 是否需要设置 token
-  // 是否需要防止数据重复提交
+        const isToken = (config.headers || {}).isToken === false
-  const isRepeatSubmit = (config.headers || {}).repeatSubmit === false
+        // 是否需要防止数据重复提交
-  if (getToken() && !isToken) {
+        const isRepeatSubmit = (config.headers || {}).repeatSubmit === false
-    config.headers['Authorization'] = 'Bearer ' + getToken() // 让每个请求携带自定义token 请根据实际情况自行修改
+        if (getToken() && !isToken) {
-  }
+            config.headers['Authorization'] = 'Bearer ' + getToken() // 让每个请求携带自定义token 请根据实际情况自行修改
-  // get请求映射params参数
+        }
-  if (config.method === 'get' && config.params) {
+        // get请求映射params参数
-    let url = config.url + '?' + tansParams(config.params);
+        if (config.method === 'get' && config.params) {
-    url = url.slice(0, -1);
+            let url = config.url + '?' + tansParams(config.params)
-    config.params = {};
+            url = url.slice(0, -1)
-    config.url = url;
+            config.params = {}
-  }
+            config.url = url
-  if (!isRepeatSubmit && (config.method === 'post' || config.method === 'put')) {
+        }
-    const requestObj = {
+        if (!isRepeatSubmit && (config.method === 'post' || config.method === 'put')) {
-      url: config.url,
+            const requestObj = {
-      data: typeof config.data === 'object' ? JSON.stringify(config.data) : config.data,
+                url: config.url,
-      time: new Date().getTime()
+                data: typeof config.data === 'object' ? JSON.stringify(config.data) : config.data,
-    }
+                time: new Date().getTime(),
-    const requestSize = Object.keys(JSON.stringify(requestObj)).length; // 请求数据大小
+            }
-    const limitSize = 5 * 1024 * 1024; // 限制存放数据5M
+            const requestSize = Object.keys(JSON.stringify(requestObj)).length // 请求数据大小
-    if (requestSize >= limitSize) {
+            const limitSize = 5 * 1024 * 1024 // 限制存放数据5M
-      console.warn(`[${config.url}]: ` + '请求数据大小超出允许的5M限制，无法进行防重复提交验证。')
+            if (requestSize >= limitSize) {
-      return config;
+                console.warn(`[${config.url}]: ` + '请求数据大小超出允许的5M限制，无法进行防重复提交验证。')
-    }
+                return config
-    const sessionObj = cache.session.getJSON('sessionObj')
+            }
-    if (sessionObj === undefined || sessionObj === null || sessionObj === '') {
+            const sessionObj = cache.session.getJSON('sessionObj')
-      cache.session.setJSON('sessionObj', requestObj)
+            if (sessionObj === undefined || sessionObj === null || sessionObj === '') {
-    } else {
+                cache.session.setJSON('sessionObj', requestObj)
-      const s_url = sessionObj.url;                  // 请求地址
+            } else {
-      const s_data = sessionObj.data;                // 请求数据
+                const s_url = sessionObj.url // 请求地址
-      const s_time = sessionObj.time;                // 请求时间
+                const s_data = sessionObj.data // 请求数据
-      const interval = 1000;                         // 间隔时间(ms)，小于此时间视为重复提交
+                const s_time = sessionObj.time // 请求时间
-      if (s_data === requestObj.data && requestObj.time - s_time < interval && s_url === requestObj.url) {
+                const interval = 1000 // 间隔时间(ms)，小于此时间视为重复提交
-        const message = '数据正在处理，请勿重复提交';
+                if (s_data === requestObj.data && requestObj.time - s_time < interval && s_url === requestObj.url) {
-        console.warn(`[${s_url}]: ` + message)
+                    const message = '数据正在处理，请勿重复提交'
-        return Promise.reject(new Error(message))
+                    console.warn(`[${s_url}]: ` + message)
-      } else {
+                    return Promise.reject(new Error(message))
-        cache.session.setJSON('sessionObj', requestObj)
+                } else {
-      }
+                    cache.session.setJSON('sessionObj', requestObj)
-    }
+                }
-  }
+            }
-  return config
+        }
-}, error => {
+        return config
-    console.log(error)
+    },
-    Promise.reject(error)
+    (error) => {
-})
+        console.log(error)
+        Promise.reject(error)
+    },
+)
 
 // 响应拦截器
-service.interceptors.response.use(res => {
+service.interceptors.response.use(
-    // 未设置状态码则默认成功状态
+    (res) => {
-    const code = res.data.code || 200;
+        // 未设置状态码则默认成功状态
-    // 获取错误信息
+        const code = res.data.code || 200
-    const msg = errorCode[code] || res.data.msg || errorCode['default']
+        // 获取错误信息
-    // 二进制数据则直接返回
+        const msg = errorCode[code] || res.data.msg || errorCode['default']
-    if (res.request.responseType ===  'blob' || res.request.responseType ===  'arraybuffer') {
+        // 二进制数据则直接返回
-      return res.data
+        if (res.request.responseType === 'blob' || res.request.responseType === 'arraybuffer') {
-    }
+            return res.data
-    if (code === 401) {
+        }
-      if (!isRelogin.show) {
+        if (code === 401) {
-        isRelogin.show = true;
+            if (!isRelogin.show) {
-        MessageBox.confirm('登录状态已过期，您可以继续留在该页面，或者重新登录', '系统提示', { confirmButtonText: '重新登录', cancelButtonText: '取消', type: 'warning' }).then(() => {
+                isRelogin.show = true
-          isRelogin.show = false;
+                MessageBox.confirm('登录状态已过期，您可以继续留在该页面，或者重新登录', '系统提示', {
-          store.dispatch('LogOut').then(() => {
+                    confirmButtonText: '重新登录',
-            location.href = '/index';
+                    cancelButtonText: '取消',
-          })
+                    type: 'warning',
-      }).catch(() => {
+                })
-        isRelogin.show = false;
+                    .then(() => {
-      });
+                        isRelogin.show = false
-    }
+                        store.dispatch('LogOut').then(() => {
-      return Promise.reject('无效的会话，或者会话已过期，请重新登录。')
+                            location.href = '/index'
-    } else if (code === 500) {
+                        })
-      Message({ message: msg, type: 'error' })
+                    })
-      return Promise.reject(new Error(msg))
+                    .catch(() => {
-    } else if (code === 601) {
+                        isRelogin.show = false
-      Message({ message: msg, type: 'warning' })
+                    })
-      return Promise.reject('error')
+            }
-    } else if (code !== 200) {
+            return Promise.reject('无效的会话，或者会话已过期，请重新登录。')
-      Notification.error({ title: msg })
+        } else if (code === 500) {
-      return Promise.reject('error')
+            Message({ message: msg, type: 'error' })
-    } else {
+            return Promise.reject(new Error(msg))
-      return res.data
+        } else if (code === 601) {
-    }
+            Message({ message: msg, type: 'warning' })
-  },
+            return Promise.reject('error')
-  error => {
+        } else if (code !== 200) {
-    console.log('err' + error)
+            Notification.error({ title: msg })
-    let { message } = error;
+            return Promise.reject('error')
-    if (message == "Network Error") {
+        } else {
-      message = "后端接口连接异常";
+            return res.data
-    } else if (message.includes("timeout")) {
+        }
-      message = "系统接口请求超时";
+    },
-    } else if (message.includes("Request failed with status code")) {
+    (error) => {
-      message = "系统接口" + message.substr(message.length - 3) + "异常";
+        console.log('err' + error)
-    }
+        let { message } = error
-    Message({ message: message, type: 'error', duration: 5 * 1000 })
+        if (message == 'Network Error') {
-    return Promise.reject(error)
+            message = '后端接口连接异常'
-  }
+        } else if (message.includes('timeout')) {
+            message = '系统接口请求超时'
+        } else if (message.includes('Request failed with status code')) {
+            message = '系统接口' + message.substr(message.length - 3) + '异常'
+        }
+        Message({ message: message, type: 'error', duration: 5 * 1000 })
+        return Promise.reject(error)
+    },
 )
 
 // 通用下载方法
 export function download(url, params, filename, config) {
-  downloadLoadingInstance = Loading.service({ text: "正在下载数据，请稍候", spinner: "el-icon-loading", background: "rgba(0, 0, 0, 0.7)", })
+    downloadLoadingInstance = Loading.service({
-  return service.post(url, params, {
+        text: '正在下载数据，请稍候',
-    transformRequest: [(params) => { return tansParams(params) }],
+        spinner: 'el-icon-loading',
-    headers: { 'Content-Type': 'application/x-www-form-urlencoded' },
+        background: 'rgba(0, 0, 0, 0.7)',
-    responseType: 'blob',
+    })
-    ...config
+    return service
-  }).then(async (data) => {
+        .post(url, params, {
-    const isBlob = blobValidate(data);
+            transformRequest: [
-    if (isBlob) {
+                (params) => {
-      const blob = new Blob([data])
+                    return tansParams(params)
-      saveAs(blob, filename)
+                },
-    } else {
+            ],
-      const resText = await data.text();
+            headers: { 'Content-Type': 'application/x-www-form-urlencoded' },
-      const rspObj = JSON.parse(resText);
+            responseType: 'blob',
-      const errMsg = errorCode[rspObj.code] || rspObj.msg || errorCode['default']
+            ...config,
-      Message.error(errMsg);
+        })
-    }
+        .then(async (data) => {
-    downloadLoadingInstance.close();
+            const isBlob = blobValidate(data)
-  }).catch((r) => {
+            if (isBlob) {
-    console.error(r)
+                const blob = new Blob([data])
-    Message.error('下载文件出现错误，请联系管理员！')
+                saveAs(blob, filename)
-    downloadLoadingInstance.close();
+            } else {
-  })
+                const resText = await data.text()
+                const rspObj = JSON.parse(resText)
+                const errMsg = errorCode[rspObj.code] || rspObj.msg || errorCode['default']
+                Message.error(errMsg)
+            }
+            downloadLoadingInstance.close()
+        })
+        .catch((r) => {
+            console.error(r)
+            Message.error('下载文件出现错误，请联系管理员！')
+            downloadLoadingInstance.close()
+        })
+}
+// 通用下载方法
+export function downloadNew(url, params, filename, config) {
+    downloadLoadingInstance = Loading.service({
+        text: '正在下载数据，请稍候',
+        spinner: 'el-icon-loading',
+        background: 'rgba(0, 0, 0, 0.7)',
+    })
+    return service
+        .post(url, params, {
+            headers: { 'Content-Type': 'application/json;charset=utf-8' },
+            responseType: 'blob',
+            ...config,
+        })
+        .then(async (data) => {
+            const isBlob = blobValidate(data)
+            if (isBlob) {
+                const blob = new Blob([data])
+                saveAs(blob, filename)
+            } else {
+                const resText = await data.text()
+                const rspObj = JSON.parse(resText)
+                const errMsg = errorCode[rspObj.code] || rspObj.msg || errorCode['default']
+                Message.error(errMsg)
+            }
+            downloadLoadingInstance.close()
+        })
+        .catch((r) => {
+            console.error(r)
+            Message.error('下载文件出现错误，请联系管理员！')
+            downloadLoadingInstance.close()
+        })
 }
 
 export default service

src/views/data-create/gw-template/index.vue

@@ -177,8 +177,16 @@ export default {
         // 下载
         async onHandleDownload(row) {
             // downloadStateGridTemp
-            const res = await downloadGwTemplateByIdAPI({ id: row.id })
+            // const res = await downloadGwTemplateByIdAPI({ id: row.id })
-            console.log(res, '下载结果')
+            // console.log(res, '下载结果')
+
+            this.downloadNew(
+                '/stateGrid/downloadStateGridTemp',
+                {
+                    id: row.id,
+                },
+                `国网模板_${row.name}.docx`,
+            )
         },
 
         // 获取国网模板列表列表