111

src/App.jsx

@@ -1,14 +1,14 @@
-import React from 'react';
-import 'dayjs/locale/zh-cn';
-import locale from 'antd/locale/zh_CN';
-import { ConfigProvider, App as Antd } from 'antd';
-import Router from './routes/Router'
-import { useModel } from './store';
+import React from "react";
+import "dayjs/locale/zh-cn";
+import locale from "antd/es/locale/zh_CN";
+import { ConfigProvider, App as Antd } from "antd";
 
-function App() {
+import Router from "./routes/Router";
+import { useModel } from "./store";
 
-  const { antThemeData } = useModel('system');
-  const theme = React.useMemo(() => ({token: antThemeData}), [antThemeData]);
+function App() {
+  const { antThemeData } = useModel("system");
+  const theme = React.useMemo(() => ({ token: antThemeData }), [antThemeData]);
 
   return (
     <ConfigProvider locale={locale} theme={theme}>
@@ -19,4 +19,4 @@ function App() {
   );
 }
 
-export default App
+export default App;

src/pages/issue/index.jsx

@@ -8,6 +8,8 @@ import {
   exportTaIssue,
   exportTaOrgIssue,
 } from "@/service/taissue";
+import { getTdIssueType } from "@/service/tdissuetype";
+
 import { getTdLocType } from "@/service/tdloctype";
 import { getSysOrg } from "@/service/sysorg";
 import { queryDict } from "@/utils/request";
@@ -21,10 +23,15 @@ const queryLocType = queryDict(getTdLocType, {
   labelKey: "name",
   valueKey: "typeId",
 });
+const getTdList = queryDict(getTdIssueType, {
+  labelKey: "name",
+  valueKey: "typeId",
+});
 
 const yestoday = dayjs().subtract(1, "day").format("YYYY-MM-DD");
 export default (props) => {
   const [loading, startLoading, stopLoading] = useBool();
+  const [loading1, startLoading1, stopLoading1] = useBool();
   const navigate = useNavigate();
   const paramsRef = React.useRef();
 
@@ -42,6 +49,15 @@ export default (props) => {
       title: "问题单号",
       dataIndex: "issueId",
     },
+    {
+      title: "问题类别",
+      dataIndex: "typeId",
+      valueType: "select",
+      request: getTdList,
+      render: (_, row) => {
+        return <span>{row.typeName}</span>;
+      },
+    },
     {
       title: "创建时间",
       dataIndex: "createdAt",
@@ -58,7 +74,7 @@ export default (props) => {
     },
     {
       title: "办结时间",
-      dataIndex: "createdAts",
+      dataIndex: "endDateEnd",
       valueType: "dateRange",
       hideInTable: true,
       search: {
@@ -108,7 +124,7 @@ export default (props) => {
       render: (_, row) => {
         if (row.processNode != "03" && yestoday > row.expireDate) {
           return <Badge status="error" text="已逾期" />;
-        } else if(row.processNode=="03"&& yestoday > row.expireDate){
+        } else if (row.processNode == "03" && yestoday > row.expireDate) {
           return <Badge status="warning" text="延期办结" />;
         } else {
           const st = processStatus.filter((x) => x.value == row.processNode)[0];
@@ -124,12 +140,23 @@ export default (props) => {
     {
       title: "上报人",
       dataIndex: "userName",
-      hideInSearch: true,
+      // hideInSearch: true,
+    },
+    {
+      title: "办结时间",
+      dataIndex: "endDate",
+      valueType: "date",
+      search: false,
+      ellipsis: true,
+      render: (_, row) => {
+        if (row.endDate) return row.endDate.replace("T", "-");
+        return row.endDate;
+      },
     },
   ];
-
+  // 带图导出
   const onExport = () => {
-    console.log(paramsRef)
+    paramsRef.current.withImage = true;
     startLoading();
     exportFn(paramsRef.current)
       .then(() => {
@@ -139,7 +166,18 @@ export default (props) => {
         stopLoading();
       });
   };
-
+  // 不带图导出
+  const onExportImg = () => {
+    paramsRef.current.withImage = false;
+    startLoading1();
+    exportFn(paramsRef.current)
+      .then(() => {
+        stopLoading1();
+      })
+      .catch(() => {
+        stopLoading1();
+      });
+  };
   const beforeSearchSubmit = (params) => {
     paramsRef.current = {
       ...(params || {}),
@@ -166,7 +204,10 @@ export default (props) => {
       ]}
       toolBarRender={() => [
         <Button key="1" type="primary" loading={loading} onClick={onExport}>
-          导出
+          带图导出
+        </Button>,
+        <Button key="2" type="primary" loading={loading1} onClick={onExportImg}>
+          不带图导出
         </Button>,
       ]}
     />

src/utils/request.js

@@ -1,88 +1,99 @@
 import axios from "axios";
-import React from 'react';
-import { message } from 'antd';
+import React from "react";
+import { message } from "antd";
 
 const instance = axios.create({
-  baseURL: import.meta.env.VITE_SERVER_BASE || '',
+  baseURL: import.meta.env.VITE_SERVER_BASE || "",
   timeout: 10000,
   withCredentials: false, // 跨域
 });
 
-
 // 添加请求拦截器
-instance.interceptors.request.use(function (config) {
-  const { headers = {}, method = 'get', responseType = 'json', download = false, silent } = config;
-  const token = localStorage.getItem('token') || '';
+instance.interceptors.request.use(
+  function (config) {
+    const {
+      headers = {},
+      method = "get",
+      responseType = "json",
+      download = false,
+      silent,
+    } = config;
+    const token = localStorage.getItem("token") || "";
+
+    let noTip = silent;
+    if (noTip === undefined) {
+      noTip = method.toLocaleLowerCase() === "get" ? true : false;
+    }
 
-  let noTip = silent;
-  if (noTip === undefined) {
-    noTip = method.toLocaleLowerCase() === 'get' ? true : false;
+    // 在发送请求之前做些什么
+    return {
+      ...config,
+      silent: noTip,
+      timeout: download ? 600000 : 10000,
+      headers: {
+        "Content-Type": "application/json;charset=utf-8", // charset 防止乱码
+        ...headers,
+        Authorization: token,
+      },
+      responseType: download ? "blob" : responseType,
+    };
+  },
+  function (error) {
+    // 对请求错误做些什么
+    return Promise.reject(error);
   }
-
-  // 在发送请求之前做些什么
-  return {
-    ...config,
-    silent: noTip,
-    timeout: download ? 600000 : 10000,
-    headers: {
-      'Content-Type': 'application/json;charset=utf-8', // charset 防止乱码
-      ...headers,
-      Authorization: token,
-    },
-    responseType: download ? 'blob' : responseType,
-  };
-}, function (error) {
-  // 对请求错误做些什么
-  return Promise.reject(error);
-});
+);
 
 // 添加响应拦截器
-instance.interceptors.response.use(function (response) {
-  // 2xx 范围内的状态码都会触发该函数。
-  // 对响应数据做点什么
-
-  const { data, config } = response;
+instance.interceptors.response.use(
+  function (response) {
+    // 2xx 范围内的状态码都会触发该函数。
+    // 对响应数据做点什么
 
-  if (config.download && !data.code) {
-    return downloadBlob(response, '下载文件');
-  }
+    const { data, config } = response;
 
-  if (data.code === 1000) {
-    if (data.data?.token) {
-      localStorage.setItem('token', data.data.token);
+    if (config.download && !data.code) {
+      return downloadBlob(response, "下载文件");
     }
 
-    if (!config.silent) {
-      message.success('操作成功');
+    if (data.code === 1000) {
+      if (data.data?.token) {
+        localStorage.setItem("token", data.data.token);
+      }
+
+      if (!config.silent) {
+        message.success("操作成功");
+      }
+
+      return data.data;
+    } else if (data.code === 1001) {
+      if (!config.silent) {
+        message.error("未登录或者超时, 请重新登录");
+      }
+    } else {
+      console.log(config);
+      if (!config.silent) {
+        const errMsg = data.message || "系统错误";
+        message.error(errMsg.indexOf("exception") > -1 ? "服务异常" : errMsg);
+      }
     }
 
-    return data.data;
-  } else if (data.code === 1001) {
-    if (!config.silent) {
-      message.error('未登录或者超时, 请重新登录');
-    }
-  } else {
-    console.log(config)
-    if (!config.silent) {
-      const errMsg = data.message || '系统错误';
-      message.error(errMsg.indexOf('exception') > -1 ? '服务异常' : errMsg);
-    }
-  }
+    return Promise.reject(response);
+  },
+  function (error) {
+    // 超出 2xx 范围的状态码都会触发该函数。
+    // 对响应错误做点什么
 
-  return Promise.reject(response);
-}, function (error) {
-  // 超出 2xx 范围的状态码都会触发该函数。
-  // 对响应错误做点什么
+    console.error(error);
 
-  console.error(error);
-
-  message.error('网络超时或异常...')
-  return Promise.reject("网络异常, 请重试...");
-});
+    message.error("网络超时或异常...");
+    return Promise.reject("网络异常, 请重试...");
+  }
+);
 
 export default instance;
 
-export function queryTable (apiRequest) {
+export function queryTable(apiRequest) {
   return function (params) {
     const { pageSize } = params;
     return apiRequest({
@@ -105,7 +116,10 @@ export function queryTable (apiRequest) {
   };
 }
 
-export function queryDict (apiRequest, {labelKey = 'name', valueKey = 'id'} = {}) {
+export function queryDict(
+  apiRequest,
+  { labelKey = "name", valueKey = "id" } = {}
+) {
   return function (params) {
     const { current, pageSize, ...leftParams } = params || {};
     return apiRequest({
@@ -128,48 +142,53 @@ export function queryDict (apiRequest, {labelKey = 'name', valueKey = 'id'} = {}
   };
 }
 
-export function restful (url) {
-  const list = params => instance.get(url, { params });
-  const get = id => instance.get(`${url}/${id}`);
-  const add = data => instance.post(url, data);
+export function restful(url) {
+  const list = (params) => instance.get(url, { params });
+  const get = (id) => instance.get(`${url}/${id}`);
+  const add = (data) => instance.post(url, data);
   const update = (id, data) => instance.put(`${url}/${id}`, data);
-  const del = id => instance.delete(`${url}/${id}`);
+  const del = (id) => instance.delete(`${url}/${id}`);
 
   return [list, get, add, update, del];
 }
 
-export function useRequest (fn) {
+export function useRequest(fn) {
   const [loading, setLoading] = React.useState(false);
 
-  const p = (...args) => new Promise((resolve, reject) => {
-    setLoading(true);
-    fn(...args).then(res => {
-      setLoading(false);
-      resolve(res);
-    }).catch(e => {
-      setLoading(false);
-      reject(e);
+  const p = (...args) =>
+    new Promise((resolve, reject) => {
+      setLoading(true);
+      fn(...args)
+        .then((res) => {
+          setLoading(false);
+          resolve(res);
+        })
+        .catch((e) => {
+          setLoading(false);
+          reject(e);
+        });
     });
-  });
 
-  return [loading, p]
+  return [loading, p];
 }
 
-function downloadBlob (response) {
-  let fileName = '未知文件';
-  const contentType = response.headers['content-type'];
-  const contentDisposition = response.headers['content-disposition'];
+function downloadBlob(response) {
+  let fileName = "未知文件";
+  const contentType = response.headers["content-type"];
+  const contentDisposition = response.headers["content-disposition"];
   if (contentDisposition) {
-    const parts = contentDisposition.split(';filename=');
+    const parts = contentDisposition.split(";filename=");
     if (parts[1]) {
       fileName = decodeURIComponent(parts[1]);
     }
   }
 
-  const url = window.URL.createObjectURL(new Blob([response.data], { type: contentType }));
-  const link = document.createElement('a');
+  const url = window.URL.createObjectURL(
+    new Blob([response.data], { type: contentType })
+  );
+  const link = document.createElement("a");
   link.href = url;
-  link.setAttribute('download', fileName);
+  link.setAttribute("download", fileName);
   link.click();
   window.URL.revokeObjectURL(url);
 }