From 5dca7f6dbd402f3c7e550753d44d9fa23804847a Mon Sep 17 00:00:00 2001
From: ww664853070 <wei.wei@free-sun.com.cn>
Date: Thu, 24 Nov 2022 09:33:40 +0800
Subject: [PATCH 1/2] =?UTF-8?q?=EF=BC=88+=EF=BC=89=E5=82=A8=E5=A4=87?=
 =?UTF-8?q?=E9=A1=B9=E7=9B=AE=E6=8A=A5=E5=A4=87=E8=A1=A8=E9=9D=99=E6=80=81?=
 =?UTF-8?q?=E9=A1=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../containers/reserveItemsReporting.jsx      | 83 ++++++++++++++++---
 1 file changed, 72 insertions(+), 11 deletions(-)

diff --git a/web/client/src/sections/business/containers/reserveItemsReporting.jsx b/web/client/src/sections/business/containers/reserveItemsReporting.jsx
index 40903fe..2e2009e 100644
--- a/web/client/src/sections/business/containers/reserveItemsReporting.jsx
+++ b/web/client/src/sections/business/containers/reserveItemsReporting.jsx
@@ -1,12 +1,76 @@
 import React, { useEffect, useState } from 'react';
 import { connect } from 'react-redux';
-import { Select, Input, Button, RadioGroup, Radio, Tooltip } from '@douyinfe/semi-ui';
+import { Select, Input, Button, RadioGroup, Radio, Tooltip, Table } from '@douyinfe/semi-ui';
 import { IconSearch } from '@douyinfe/semi-icons';
 import '../style.less'
 import moment from 'moment'
 
 const ReserveItemsReporting = (props) => {
+    const columns = [
+        {
+            title: '序号',
+            dataIndex: 'index',
+            render: (text, record, index) => index + 1
+        },
+        {
+            title: '部门',
+            dataIndex: 'updateTime',
+        },
+        {
+            title: '销售经理',
+            dataIndex: 'name',
+        },
+        {
+            title: '项目名称',
+            dataIndex: 'updateTime',
+        },
+        {
+            title: '客户名称',
+            dataIndex: 'name',
+        },
+        {
+            title: '项目类型',
+            dataIndex: 'updateTime',
+        },
+        {
+            title: '项目状态',
+            dataIndex: 'name',
+        },
+        {
+            title: '项目描述',
+            dataIndex: 'updateTime',
+        },
+        {
+            title: '初次提交时间',
+            dataIndex: 'name',
+        },
+        {
+            title: '储备项目周期',
+            dataIndex: 'updateTime',
+        },
+        {
+            title: '最新更新时间',
+            dataIndex: 'name',
+        },
+        {
+            title: '最近拜访时间',
+            dataIndex: 'updateTime',
+        },
+        {
+            title: '拜访间隔周期（天）',
+            dataIndex: 'name',
+        },
+        {
+            title: '操作',
+            dataIndex: 'action',
+            render: (text, record, indexe) => (<Button theme='solid' type='secondary'>导出</Button>)
+        },
+    ];
+    const data = [];
 
+    const exportAll = () => {
+        alert(123)
+    }
     return (
         <>
             <div style={{ padding: '0px 12px' }}>
@@ -26,7 +90,7 @@ const ReserveItemsReporting = (props) => {
                         </div>
                     </div>
                     <div style={{ display: 'flex', marginTop: 16, marginBottom: 17 }}>
-                        <div style={{ marginLeft: 12, marginRight: 18 }}>
+                        {/* <div style={{ marginLeft: 12, marginRight: 18 }}>
                             <Input suffix={<IconSearch />}
                                 showClear
                                 placeholder='请输入或选择关键词'
@@ -42,16 +106,13 @@ const ReserveItemsReporting = (props) => {
                                 //         setArchivesList(res.payload.data.rows)
                                 //     }
                                 // })
-                            }}>查询</Button>
-                    </div>
-                    <div style={{ borderBottom: '1px solid #F2F3F5', marginLeft: '-20px', marginBottom: 16 }}></div>
-                    <div style={{ display: 'flex', justifyContent: 'space-between', marginBottom: 22 }}>
-                        <div style={{ display: 'flex', }}>
-                            <div style={{ color: '#646566', fontSize: 14 }}>
-                                当前显示
-                            </div>
-                        </div>
+                            }}>查询</Button> */}
+                        <Button theme='solid' type='secondary' style={{ width: 80, borderRadius: 2, marginLeft: 15 }}
+                            onClick={exportAll}>导出全部</Button>
                     </div>
+                    <div style={{ borderBottom: '1px solid #F2F3F5', marginBottom: 16 }}></div>
+
+                    <Table columns={columns} dataSource={data} pagination={false} />
                 </div>
             </div>
         </>

From e7cc216d7d5973c7dcaa396f42b0b9fbde28879c Mon Sep 17 00:00:00 2001
From: zhouxin <zhou.xin@free-sun.com.cn>
Date: Thu, 24 Nov 2022 10:13:49 +0800
Subject: [PATCH 2/2] =?UTF-8?q?(-=EF=BC=89=E5=8E=BB=E6=8E=89=E5=BA=9F?=
 =?UTF-8?q?=E4=BB=A3=E7=A0=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 README.md                      | 23 ++++++++++++++++++++++-
 web/client/src/utils/webapi.js |  1 -
 web/routes/attachment/index.js | 23 -----------------------
 3 files changed, 22 insertions(+), 25 deletions(-)

diff --git a/README.md b/README.md
index 5b07b6a..0790a88 100644
--- a/README.md
+++ b/README.md
@@ -1,3 +1,24 @@
 # ReportCenter
 
-项企-报表中心
\ No newline at end of file
+项企-报表中心
+api启动环境变量
+
+//Redis
+IOTA_REDIS_SERVER_HOST
+IOTA_REDIS_SERVER_PORT
+IOTA_REDIS_SERVER_PWD
+
+API_EMIS_URL //企业管理api
+
+//七牛
+ANXINCLOUD_QINIU_DOMAIN_QNDMN_RESOURCE
+ANXINCLOUD_QINIU_BUCKET_RESOURCE
+ANXINCLOUD_QINIU_ACCESSKEY
+ANXINCLOUD_QINIU_SECRETKEY
+
+//clickHouse
+CLICKHOUST_URL
+CLICKHOUST_PORT
+CLICKHOUST_USER
+CLICKHOUST_PASSWORD
+CLICKHOUST_PEP_EMIS  //clickhouse的emis库名
\ No newline at end of file
diff --git a/web/client/src/utils/webapi.js b/web/client/src/utils/webapi.js
index 8a33b8d..1a1b3c4 100644
--- a/web/client/src/utils/webapi.js
+++ b/web/client/src/utils/webapi.js
@@ -25,5 +25,4 @@ export const RouteTable = {
    fileUpload: "/_upload/new",
    cleanUpUploadTrash: "/_upload/cleanup",
    getWeeklyService: '/_service/weekly',
-   qnDownload:'/file/qiniu/download'
 };
diff --git a/web/routes/attachment/index.js b/web/routes/attachment/index.js
index 8cf9aa8..b289c62 100644
--- a/web/routes/attachment/index.js
+++ b/web/routes/attachment/index.js
@@ -82,28 +82,6 @@ module.exports = {
             }
          }
       }
-      let qnDownload = async function (ctx, next) {
-         try {
-            const { src, filename } = ctx.query;
-            const fkey = src.replace(/\.json$/, '.js');
-            console.log("qnDownload->fkey: ", fkey);
-            const publicDownloadUrl = await ctx.app.fs.attachment.download(fkey);
-            if (filename) {
-               // download
-               ctx.attachment(filename);
-            } else {
-               // display
-               if (/\.(png)|(jpg)|(jpeg)|(gif)$/g.test(src.toLowerCase())) ctx.type = 'image/png';
-            }
-            ctx.status = 200;
-            ctx.body = request.get(publicDownloadUrl);
-         } catch (err) {
-            ctx.fs.logger.error(`path: ${ctx.path}, error: ${err}`);
-            ctx.status = 400;
-            ctx.body = { name: 'FindError', message: '附件下载失败' };
-         }
-      }
-
       let remove = async function (ctx, next) {
          try {
             const { token } = ctx.request.query
@@ -130,7 +108,6 @@ module.exports = {
       router.use(download);
       router.get('/api/root', getApiRoot);
       router.post('/file/qiniu/upload', upload);
-      router.get('/file/qiniu/download', qnDownload);
       router.post('/file/qiniu/remove', remove);
    }
 };