feat: before push clear build folder

.gitlab-ci.yml

@@ -36,18 +36,8 @@ package:
   only:
     - master
   when: manual
-push_test:
-  variables:
-    GIT_STRATEGY: none
-  stage: push
-  script:
-    - bash push.sh TARGET_REPO_2021 TARGET_REPO_2020 TARGET_REPO_2019 CI_PROJECT_DIR GIT_ACCESS_USER GIT_ACCESS_PASSWORD
-  #- 'git push origin map'
 
-  only:
-    - master
-  when: manual
-push_2021:
+push:
   variables:
     GIT_STRATEGY: none
   stage: push
@@ -57,49 +47,39 @@ push_2021:
     - 'git clean -fd'
     - 'git remote set-url origin "https://${GIT_ACCESS_USER}:${GIT_ACCESS_PASSWORD}@g.civnet.cn:8443/CivPublish/CivWebPublish2021.git"'
     - 'git pull origin map'
+    - 'git rm -rf "${TARGET_REPO_2021}/civmanage"'
+    - 'git commit -m "chore: clear folder civmanage"'
+    - 'git push origin map'
     - 'robocopy "${CI_PROJECT_DIR}/../CivWebPublish2021/civmanage" "${TARGET_REPO_2021}/civmanage" /S ;
         IF ((${LASTEXITCODE} -le 8)) {cmd /c "exit /b 0"}'
     - 'git add . ; git reset HEAD Web.config CityInterface/Web.config CityWebFW/Web.config ; git commit -m "auto package civmanage."'
-  #- 'git push origin map'
+    - 'git push origin map'
 
-  only:
-    - master
-  when: manual
-
-push_2020:
-  variables:
-    GIT_STRATEGY: none
-  stage: push
-  script:
     - 'cd "${TARGET_REPO_2020}"'
     - 'git reset --hard head'
     - 'git clean -fd'
     - 'git remote set-url origin "https://${GIT_ACCESS_USER}:${GIT_ACCESS_PASSWORD}@g.civnet.cn:8443/CivPublish/CivWebPublish2020.git"'
     - 'git pull origin map'
+    - 'git rm -rf "${TARGET_REPO_2020}/civmanage"'
+    - 'git commit -m "chore: clear folder civmanage"'
+    - 'git push origin map'
     - 'robocopy "${CI_PROJECT_DIR}/../CivWebPublish2021/civmanage" "${TARGET_REPO_2020}/civmanage" /S ;
-        IF ((${LASTEXITCODE} -le 8)) {cmd /c "exit /b 0"}'
+          IF ((${LASTEXITCODE} -le 8)) {cmd /c "exit /b 0"}'
     - 'git add . ; git reset HEAD Web.config CityInterface/Web.config CityWebFW/Web.config ; git commit -m "auto package civmanage."'
-  #- 'git push origin map'
-
-  only:
-    - master
-  when: manual
+    - 'git push origin map'
 
-push_2019:
-  variables:
-    GIT_STRATEGY: none
-  stage: push
-  script:
     - 'cd "${TARGET_REPO_2019}"'
     - 'git reset --hard head'
     - 'git clean -fd'
     - 'git remote set-url origin "https://${GIT_ACCESS_USER}:${GIT_ACCESS_PASSWORD}@g.civnet.cn:8443/CivPublish/CivWebPublish.git"'
     - 'git pull origin map'
+    - 'git rm -rf "${TARGET_REPO_2019}/civmanage"'
+    - 'git commit -m "chore: clear folder civmanage"'
+    - 'git push origin map'
     - 'robocopy "${CI_PROJECT_DIR}/../CivWebPublish2021/civmanage" "${TARGET_REPO_2019}/civmanage" /S ;
-        IF ((${LASTEXITCODE} -le 8)) {cmd /c "exit /b 0"}'
+          IF ((${LASTEXITCODE} -le 8)) {cmd /c "exit /b 0"}'
     - 'git add . ; git reset HEAD Web.config CityInterface/Web.config CityWebFW/Web.config ; git commit -m "auto package civmanage."'
-  #- 'git push origin map'
-
+    - 'git push origin map'
   only:
     - master
   when: manual

push.sh

-#!/usr/bin/env sh
-set -e
-
-TARGET_REPO_2021=$1
-TARGET_REPO_2020=$2
-TARGET_REPO_2019=$3
-CI_PROJECT_DIR=$4
-GIT_ACCESS_USER=$5
-GIT_ACCESS_PASSWORD=$6
-
-
-# 2021
-echo "拉取CivPublish2021"
-cd "${TARGET_REPO_2021}"
-git reset --hard head
-git clean -fd
-git remote set-url origin "https://${GIT_ACCESS_USER}:${GIT_ACCESS_PASSWORD}@g.civnet.cn:8443/CivPublish/CivWebPublish2021.git"
-git pull origin map
-robocopy "${CI_PROJECT_DIR}/../CivWebPublish2021/civmanage" "${TARGET_REPO_2021}/civmanage" /S
-    IF ((${LASTEXITCODE} -le 8)) {cmd /c "exit /b 0"}
-git add .
-git reset HEAD Web.config CityInterface/Web.config CityWebFW/Web.config
-git commit -m "auto package civmanage."

src/pages/log/loginLog/index.js

@@ -16,7 +16,7 @@ import moment from 'moment';
 import { post, PUBLISH_SERVICE } from '@/services/index';
 import styles from './index.less';
 
-const ServiceLog = () => {
+const LoginLog = () => {
   const [loading, setLoading] = useState(false); // 源数据
   const [data0, setData0] = useState([]); // 源数据
   const [LoginNameFilters, setLoginNameFilters] = useState([]); // 用户列筛选
@@ -76,8 +76,6 @@ const ServiceLog = () => {
   }, [startTime, endTime]);
   const getData = () => {
     post(`${PUBLISH_SERVICE}/LogCenter/GetLoginLog`, {
-      PageIndex: 1,
-      PageSize: 1000,
       DateFrom: startTime.format('YYYY-MM-DD HH:mm:ss'),
       DateTo: endTime.format('YYYY-MM-DD HH:mm:ss'),
       IP: '',
@@ -88,17 +86,17 @@ const ServiceLog = () => {
     })
       .then(res => {
         if (res.code === 0) {
-          setData0(res.data.list);
+          setData0(res.data);
           // 过滤LoginName
-          let arr1 = res.data.list.map(item => item.LoginName);
+          let arr1 = res.data.map(item => item.LoginName);
           arr1 = arr1.filter((value, index) => arr1.indexOf(value) === index);
           setLoginNameFilters(arr1.map(item => ({ text: item, value: item })));
           // 过滤ShowName
-          let arr2 = res.data.list.map(item => item.ShowName);
+          let arr2 = res.data.map(item => item.ShowName);
           arr2 = arr2.filter((value, index) => arr2.indexOf(value) === index);
           setShowNameFilters(arr2.map(item => ({ text: item, value: item })));
           // 过滤系统类型SystemType
-          let arr3 = res.data.list.map(item => item.SystemType);
+          let arr3 = res.data.map(item => item.SystemType);
           arr3 = arr3.filter((value, index) => arr3.indexOf(value) === index);
           setSystemTypeFilters(arr3.map(item => ({ text: item, value: item })));
         } else {
@@ -114,30 +112,6 @@ const ServiceLog = () => {
         setLoading(false);
       });
   };
-  // const dataTransforrm = data => {
-  //   data.map((item, index) => {
-  //     item.key = index;
-  //     return item;
-  //   });
-
-  //   const dv1 = new DataSet.View().source(data);
-  //   dv1
-  //     .transform({
-  //       type: 'aggregate', // 别名summary
-  //       fields: ['IP'], // 统计字段集
-  //       operations: ['count'], // 统计操作集
-  //       as: ['计数'], // 存储字段集
-  //       groupBy: ['IP'], // 分组字段集
-  //     })
-  //     .transform({
-  //       type: 'sort-by',
-  //       fields: ['计数'], // 根据指定的字段集进行排序，与lodash的sortBy行为一致
-  //       order: 'DESC', // 默认为 ASC，DESC 则为逆序
-  //     });
-  //   console.log(dv1.rows);
-  //   setIPCount(dv1.rows.slice(0, 20));
-  // };
-
   // DatePicker改变点击确定时
   const changeStartTime = time => {
     setStartTime(time);
@@ -170,7 +144,7 @@ const ServiceLog = () => {
               onChange={changeStartTime}
               allowClear={false}
             />
-            <SwapRightOutlined style={{ lineHeight: 2 }} />
+            <SwapRightOutlined style={{ verticalAlign: '0.125em' }} />
             <DatePicker
               showTime
               format="YYYY-MM-DD HH:mm:ss"
@@ -189,27 +163,6 @@ const ServiceLog = () => {
           </Col>
         </Row>
         <Spin spinning={loading} tip="loading">
-          {/* <Row className={styles.chart}>
-            <Col span={12}>
-              <Chart
-                height={316}
-                width={400}
-                autoFit
-                data={IPCount}
-                interactions={['active-region']}
-                padding="auto"
-              >
-                <Axis
-                  name="IP"
-                  label="null"
-                  title={{ offset: 20, position: 'end' }}
-                />
-                <Axis name="计数" title />
-                <Interval position="IP*计数" />
-                <Tooltip shared />
-              </Chart>
-            </Col>
-          </Row> */}
           <div className={styles.table}>
             <Table
               size="small"
@@ -232,4 +185,4 @@ const ServiceLog = () => {
     </>
   );
 };
-export default ServiceLog;
+export default LoginLog;

src/pages/log/omsLog/index.less

-.serviceLog{
+.omsLog{
     .head{
         padding: 10px;
         background: white;
@@ -6,7 +6,7 @@
         min-width: 1030px;
     }
     .chart{
-        padding: 10px;
+        padding: 16px;
         background: white;
     }
     .table{
@@ -17,9 +17,12 @@
             color:rgba(0,0,0,0.85);
         }
         .ant-table-content{
-            height:calc(100vh - 520px);
+            height:calc(100vh - 172px);
             border-right: white;
             overflow: auto !important;
+            .ant-table-tbody{
+                overflow: scroll !important;
+            }
         }
         .ant-pagination{
             z-index: 999;

src/pages/log/serviceLog/index.js

@@ -265,7 +265,7 @@ const ServiceLog = () => {
             <Select defaultValue="异常" onChange={changeStatus}>
               <Option value="9999">全部</Option>
               <Option value="0">正常</Option>
-              <Option value="-1">错误</Option>
+              <Option value="-1">异常</Option>
             </Select>
             <Search
               allowClear