Skip to content

C
CivManage
Commit f0a8e78b authored by 皮倩雯's avatar 皮倩雯
Browse files
Options

Merge branch 'master' of https://g.civnet.cn:8443/ReactWeb5/maintenance

parents 17fe8003 5946debb
Pipeline #52556 waiting for manual action with stages
          Expand all Hide whitespace changes
          Inline Side-by-side
          Showing with 75 additions and 75 deletions
          package.json
          View file @ f0a8e78b
          ...@@ -142,6 +142,7 @@ ...@@ -142,6 +142,7 @@
          "sortablejs": "^1.13.0", "sortablejs": "^1.13.0",
          "styled-components": "4.2.0", "styled-components": "4.2.0",
          "use-merge-value": "^1.0.2", "use-merge-value": "^1.0.2",
          "react-color": "^2.19.3",
          "voca": "^1.4.0" "voca": "^1.4.0"
          }, },
          "devDependencies": { "devDependencies": {
          ......
          src/pages/log/omsLog/index.jsx
          View file @ f0a8e78b
          ...@@ -37,8 +37,7 @@ const OmsLog = () => { ...@@ -37,8 +37,7 @@ const OmsLog = () => {
          width: 150, width: 150,
          defaultSortOrder: 'descend', defaultSortOrder: 'descend',
          sortDirections: ['descend', 'ascend'], sortDirections: ['descend', 'ascend'],
          sorter: (a, b) => sorter: (a, b) => new Date(a.LogTime).getTime() - new Date(b.LogTime).getTime(),
          new Date(a.LogTime).getTime() - new Date(b.LogTime).getTime(),
          }, },
          { {
          title: '接口名称', title: '接口名称',
          ...@@ -65,8 +64,8 @@ const OmsLog = () => { ...@@ -65,8 +64,8 @@ const OmsLog = () => {
          width: 850, width: 850,
          ellipsis: 'true', ellipsis: 'true',
          render: record => ( render: record => (
          <Tooltip placement="left" title={decodeURI(record)}> <Tooltip placement="left" title={record}>
          {decodeURI(record)} {record}
          </Tooltip> </Tooltip>
          ), ),
          }, },
          ...@@ -110,10 +109,7 @@ const OmsLog = () => { ...@@ -110,10 +109,7 @@ const OmsLog = () => {
          const searchStyle1 = val => { const searchStyle1 = val => {
          let n; let n;
          if (showSearchStyle) { if (showSearchStyle) {
          n = val.replace( n = val.replace(new RegExp(label, 'g'), `<span style='color:red'>${label}</span>`);
          new RegExp(label, 'g'),
          `<span style='color:red'>${label}</span>`,
          );
          } else { } else {
          n = val; n = val;
          } }
          ...@@ -180,10 +176,7 @@ const OmsLog = () => { ...@@ -180,10 +176,7 @@ const OmsLog = () => {
          const setTime = time => { const setTime = time => {
          setEndTime(moment(new Date(), 'YYYY-MM-DD HH:mm:ss')); setEndTime(moment(new Date(), 'YYYY-MM-DD HH:mm:ss'));
          setStartTime( setStartTime(
          moment( moment(new Date(new Date().getTime() - time * 60 * 60 * 1000), 'YYYY-MM-DD HH:mm:ss'),
          new Date(new Date().getTime() - time * 60 * 60 * 1000),
          'YYYY-MM-DD HH:mm:ss',
          ),
          ); );
          }; };
          const handleReset = () => { const handleReset = () => {
          ...@@ -249,8 +242,8 @@ const OmsLog = () => { ...@@ -249,8 +242,8 @@ const OmsLog = () => {
          <Button <Button
          type="primary" type="primary"
          style={{ marginLeft: '10px' }} style={{ marginLeft: '10px' }}
          onClick={() =>{ onClick={() => {
          getData() getData();
          setShowSearchStyle(true); setShowSearchStyle(true);
          }} }}
          > >
          ...@@ -278,8 +271,7 @@ const OmsLog = () => { ...@@ -278,8 +271,7 @@ const OmsLog = () => {
          dataSource={data} dataSource={data}
          scroll={{ x: 'max-content', y: 'calc(100vh - 230px)' }} scroll={{ x: 'max-content', y: 'calc(100vh - 230px)' }}
          pagination={{ pagination={{
          showTotal: (total, range) => showTotal: (total, range) => `第${range[0]}-${range[1]} 条/共 ${total} 条`,
          `第${range[0]}-${range[1]} 条/共 ${total} 条`,
          pageSizeOptions: [10, 20, 50, 100], pageSizeOptions: [10, 20, 50, 100],
          defaultPageSize: 20, defaultPageSize: 20,
          showQuickJumper: true, showQuickJumper: true,
          ......
          src/pages/log/serviceLog/index.jsx
          View file @ f0a8e78b
          ...@@ -60,10 +60,7 @@ const ServiceLog = () => { ...@@ -60,10 +60,7 @@ const ServiceLog = () => {
          message: '时间设置有误', message: '时间设置有误',
          description: '起始时间应该早于结束时间', description: '起始时间应该早于结束时间',
          }); });
          } else if ( } else if ((startMonth !== endMonth && startYear === endYear) || startYear !== endYear) {
          (startMonth !== endMonth && startYear === endYear) ||
          startYear !== endYear
          ) {
          notification.info({ notification.info({
          message: '时间设置提示', message: '时间设置提示',
          description: '不允许跨月份查询', description: '不允许跨月份查询',
          ...@@ -133,14 +130,11 @@ const ServiceLog = () => { ...@@ -133,14 +130,11 @@ const ServiceLog = () => {
          }, },
          ]; ];
          // 模糊查询匹配的样式 // 模糊查询匹配的样式
          const searchStyle = val => { const searchStyle = val => {
          let n; let n;
          if (showSearchStyle) { if (showSearchStyle) {
          n = val.replace( n = val.replace(new RegExp(searchWord, 'g'), `<span style='color:red'>${searchWord}</span>`);
          new RegExp(searchWord, 'g'),
          `<span style='color:red'>${searchWord}</span>`,
          );
          } else { } else {
          n = val; n = val;
          } }
          ...@@ -242,12 +236,7 @@ const ServiceLog = () => { ...@@ -242,12 +236,7 @@ const ServiceLog = () => {
          const setTime = (time, value) => { const setTime = (time, value) => {
          setTimeInterval(value); setTimeInterval(value);
          setEndTime(moment(new Date(), 'YYYY-MM-DD HH:mm:ss')); setEndTime(moment(new Date(), 'YYYY-MM-DD HH:mm:ss'));
          setStartTime( setStartTime(moment(new Date(new Date().getTime() - time * 60 * 1000), 'YYYY-MM-DD HH:mm:ss'));
          moment(
          new Date(new Date().getTime() - time * 60 * 1000),
          'YYYY-MM-DD HH:mm:ss',
          ),
          );
          }; };
          // 设置返回状态 // 设置返回状态
          const changeStatus = value => { const changeStatus = value => {
          ...@@ -337,9 +326,7 @@ const ServiceLog = () => { ...@@ -337,9 +326,7 @@ const ServiceLog = () => {
          <Spin spinning={loading} tip="loading"> <Spin spinning={loading} tip="loading">
          <Row style={{ background: 'white' }}> <Row style={{ background: 'white' }}>
          <Col span={8} style={{ paddingTop: '8px', paddingLeft: '5px' }}> <Col span={8} style={{ paddingTop: '8px', paddingLeft: '5px' }}>
          <span style={{ fontSize: '14px', fontWeight: '600' }}> <span style={{ fontSize: '14px', fontWeight: '600' }}>访问量统计</span>
          访问量统计
          </span>
          <span style={{ paddingLeft: '60%' }}>间隔：</span> <span style={{ paddingLeft: '60%' }}>间隔：</span>
          <Select <Select
          defaultValue="每小时" defaultValue="每小时"
          ...@@ -355,14 +342,10 @@ const ServiceLog = () => { ...@@ -355,14 +342,10 @@ const ServiceLog = () => {
          </Select> </Select>
          </Col> </Col>
          <Col span={7} offset={1} style={{ paddingTop: '8px' }}> <Col span={7} offset={1} style={{ paddingTop: '8px' }}>
          <span style={{ fontSize: '14px', fontWeight: '600' }}> <span style={{ fontSize: '14px', fontWeight: '600' }}>接口调用频次统计</span>
          接口调用频次统计
          </span>
          </Col> </Col>
          <Col span={7} offset={1} style={{ paddingTop: '8px' }}> <Col span={7} offset={1} style={{ paddingTop: '8px' }}>
          <span style={{ fontSize: '14px', fontWeight: '600' }}> <span style={{ fontSize: '14px', fontWeight: '600' }}>接口平均耗时统计</span>
          接口平均耗时统计
          </span>
          </Col> </Col>
          </Row> </Row>
          <Row className={styles.chart}> <Row className={styles.chart}>
          ...@@ -403,12 +386,7 @@ const ServiceLog = () => { ...@@ -403,12 +386,7 @@ const ServiceLog = () => {
          Path: { alias: '接口调用频次' }, Path: { alias: '接口调用频次' },
          }} }}
          > >
          <Axis <Axis name="Path" label="" title={{ offset: 20 }} className={styles.fontColor} />
          name="Path"
          label=""
          title={{ offset: 20 }}
          className={styles.fontColor}
          />
          <Axis name="Count" title /> <Axis name="Count" title />
          <Interval position="Path*Count" /> <Interval position="Path*Count" />
          <Tooltip shared lock /> <Tooltip shared lock />
          ...@@ -442,8 +420,7 @@ const ServiceLog = () => { ...@@ -442,8 +420,7 @@ const ServiceLog = () => {
          dataSource={dataTable} dataSource={dataTable}
          scroll={{ x: 'max-content', y: 'calc(100vh - 580px)' }} scroll={{ x: 'max-content', y: 'calc(100vh - 580px)' }}
          pagination={{ pagination={{
          showTotal: (total, range) => showTotal: (total, range) => `第${range[0]}-${range[1]} 条/共 ${total} 条`,
          `第${range[0]}-${range[1]} 条/共 ${total} 条`,
          pageSizeOptions: [10, 20, 50, 100], pageSizeOptions: [10, 20, 50, 100],
          defaultPageSize: 20, defaultPageSize: 20,
          showQuickJumper: true, showQuickJumper: true,
          ......
          src/pages/productCenter/webConfig/components/siteConfigDrawer.less
          View file @ f0a8e78b
          .siteConfigContainer{ .siteConfigContainer {}
          .mask {
          position: fixed;
          top: 0;
          left: 0;
          width: 100vh;
          height: 100vh;
          // z-index: 1;
          }
          .colorBox {
          .colorSwatch {
          display: flex;
          justify-content: center;
          width: 80px;
          height: 30px;
          line-height: 30px;
          text-align: center;
          border: 1px solid #ccc;
          border-radius: 2px;
          }
          .popover {
          position: absolute;
          z-index: 2;
          }
          } }
          \ No newline at end of file
          src/pages/userCenter/roleManage/SelectUser/NewSelectUser.jsx
          View file @ f0a8e78b
          ...@@ -260,22 +260,22 @@ const NewSelectUser = props => { ...@@ -260,22 +260,22 @@ const NewSelectUser = props => {
          </div> </div>
          {/* 复选框模块 */} {/* 复选框模块 */}
          <div className={styles.checkScrollBox}> <div className={styles.checkScrollBox}>
          <Spin spinning={loading}> {/* <Spin spinning={loading}> */}
          <div className={styles.checkContainer}> <div className={styles.checkContainer}>
          {allList.map((item, index) => ( {allList.map((item, index) => (
          <div className={styles.checkBoxContent} key={item.groupId}> <div className={styles.checkBoxContent} key={item.groupId}>
          <CardCheck <CardCheck
          cardMsg={item} cardMsg={item}
          cardIndex={index} cardIndex={index}
          callback={(val, newCheckList) => checkCallBack(val, newCheckList)} callback={(val, newCheckList) => checkCallBack(val, newCheckList)}
          checkList={checkList} checkList={checkList}
          deleKey={deleKey} deleKey={deleKey}
          delFlag={delFlag} delFlag={delFlag}
          /> />
          </div> </div>
          ))} ))}
          </div> </div>
          </Spin> {/* </Spin> */}
          </div> </div>
          </div> </div>
          <div className={styles.tableRight}> <div className={styles.tableRight}>
          ......
          src/pages/userCenter/roleManage/SelectUser/SelectUser.less
          View file @ f0a8e78b
          ...@@ -70,15 +70,18 @@ ...@@ -70,15 +70,18 @@
          .tableRight { .tableRight {
          margin-left: 10px; margin-left: 10px;
          height: 100%; height: 100%;
          .ant-spin-nested-loading {
          height: 100%; .ant-spin-nested-loading {
          .ant-table { height: 100%;
          height: 100%;
          .ant-table-container { .ant-table {
          height: 100%; height: 100%;
          }
          } .ant-table-container {
          } height: 100%;
          }
          }
          }
          } }
          .ant-table-body { .ant-table-body {
          ......
          Markdown is supported
          0% or
          You are about to add 0 people to the discussion. Proceed with caution.
          Finish editing this message first!
          Please register or to comment