site修改

b54972b8 · 程恺文 · 04295432 · b54972b8 · b54972b8 · b54972b8
Commit b54972b8 authored Jun 07, 2023 by 程恺文
9 changed files
--- a/packages/base-components/AlarmScrollAssembly/CHANGELOG.md
+++ b/packages/base-components/AlarmScrollAssembly/CHANGELOG.md
 # Change Log

-All notable changes to this project will be documented in this file.
-See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
+All notable changes to this project will be documented in this file. See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.

 # [1.14.0](https://g.civnet.cn:8443/ReactWeb5/wisdom-components/compare/@wisdom-components/alarmscrollassembly@1.12.2...@wisdom-components/alarmscrollassembly@1.14.0) (2023-05-30)

-
 ### Features

-* 优化滚动组件 ([5c4f790](https://g.civnet.cn:8443/ReactWeb5/wisdom-components/commits/5c4f790150e03081e6077853225263dc4b9164fa))
-* 优化滚动组件 ([2c1b0f9](https://g.civnet.cn:8443/ReactWeb5/wisdom-components/commits/2c1b0f91fb4ff520872b161fa2484888a346f054))
-
-
-
-
-
+- 优化滚动组件 ([5c4f790](https://g.civnet.cn:8443/ReactWeb5/wisdom-components/commits/5c4f790150e03081e6077853225263dc4b9164fa))
+- 优化滚动组件 ([2c1b0f9](https://g.civnet.cn:8443/ReactWeb5/wisdom-components/commits/2c1b0f91fb4ff520872b161fa2484888a346f054))

 # [1.13.0](https://g.civnet.cn:8443/ReactWeb5/wisdom-components/compare/@wisdom-components/alarmscrollassembly@1.12.2...@wisdom-components/alarmscrollassembly@1.13.0) (2023-05-29)


--- a/packages/base-components/VideoSliderModal/CHANGELOG.md
+++ b/packages/base-components/VideoSliderModal/CHANGELOG.md
 # Change Log

-All notable changes to this project will be documented in this file.
-See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
+All notable changes to this project will be documented in this file. See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.

 ## [1.1.23](https://g.civnet.cn:8443/ReactWeb5/wisdom-components/compare/@wisdom-components/videoslidermodal@1.1.22...@wisdom-components/videoslidermodal@1.1.23) (2023-06-02)

-
 ### Bug Fixes

-* 修改弹窗样式 ([ff3972e](https://g.civnet.cn:8443/ReactWeb5/wisdom-components/commits/ff3972e707b7e18405121bb35651ce6f22a02b7a))
-
-
-
-
-
+- 修改弹窗样式 ([ff3972e](https://g.civnet.cn:8443/ReactWeb5/wisdom-components/commits/ff3972e707b7e18405121bb35651ce6f22a02b7a))

 ## [1.1.22](https://g.civnet.cn:8443/ReactWeb5/wisdom-components/compare/@wisdom-components/videoslidermodal@1.1.21...@wisdom-components/videoslidermodal@1.1.22) (2023-06-02)

-
 ### Bug Fixes

-* 修改弹窗固定高度 ([b8baca9](https://g.civnet.cn:8443/ReactWeb5/wisdom-components/commits/b8baca9bdb7af6d188f57c3d5d94b36d3e72798b))
-
-
-
-
-
+- 修改弹窗固定高度 ([b8baca9](https://g.civnet.cn:8443/ReactWeb5/wisdom-components/commits/b8baca9bdb7af6d188f57c3d5d94b36d3e72798b))

 ## [1.1.21](https://g.civnet.cn:8443/ReactWeb5/wisdom-components/compare/@wisdom-components/videoslidermodal@1.1.20...@wisdom-components/videoslidermodal@1.1.21) (2023-05-30)

 **Note:** Version bump only for package @wisdom-components/videoslidermodal

-
-
-
-
-
 ## [1.1.20](https://g.civnet.cn:8443/ReactWeb5/wisdom-components/compare/@wisdom-components/videoslidermodal@1.1.19...@wisdom-components/videoslidermodal@1.1.20) (2023-05-24)

 **Note:** Version bump only for package @wisdom-components/videoslidermodal

-
-
-
-
-
 ## [1.1.19](https://g.civnet.cn:8443/ReactWeb5/wisdom-components/compare/@wisdom-components/videoslidermodal@1.1.18...@wisdom-components/videoslidermodal@1.1.19) (2023-05-24)

 **Note:** Version bump only for package @wisdom-components/videoslidermodal

-
-
-
-
-
 ## [1.1.18](https://g.civnet.cn:8443/ReactWeb5/wisdom-components/compare/@wisdom-components/videoslidermodal@1.1.17...@wisdom-components/videoslidermodal@1.1.18) (2023-05-23)

 **Note:** Version bump only for package @wisdom-components/videoslidermodal

-
-
-
-
-
 ## [1.1.17](https://g.civnet.cn:8443/ReactWeb5/wisdom-components/compare/@wisdom-components/videoslidermodal@1.1.16...@wisdom-components/videoslidermodal@1.1.17) (2023-05-22)

 ### Bug Fixes

--- a/packages/base-components/VmsVideo/CHANGELOG.md
+++ b/packages/base-components/VmsVideo/CHANGELOG.md
 # Change Log

-All notable changes to this project will be documented in this file.
-See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
+All notable changes to this project will be documented in this file. See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.

 ## [1.2.16](https://g.civnet.cn:8443/ReactWeb5/wisdom-components/compare/@wisdom-components/VmsVideo@1.2.15...@wisdom-components/VmsVideo@1.2.16) (2023-05-30)

 **Note:** Version bump only for package @wisdom-components/VmsVideo

-
-
-
-
-
 ## [1.2.15](https://g.civnet.cn:8443/ReactWeb5/wisdom-components/compare/@wisdom-components/VmsVideo@1.2.14...@wisdom-components/VmsVideo@1.2.15) (2023-05-24)

 **Note:** Version bump only for package @wisdom-components/VmsVideo

-
-
-
-
-
 ## [1.2.14](https://g.civnet.cn:8443/ReactWeb5/wisdom-components/compare/@wisdom-components/VmsVideo@1.2.13...@wisdom-components/VmsVideo@1.2.14) (2023-05-24)

 **Note:** Version bump only for package @wisdom-components/VmsVideo

-
-
-
-
-
 ## [1.2.13](https://g.civnet.cn:8443/ReactWeb5/wisdom-components/compare/@wisdom-components/VmsVideo@1.2.12...@wisdom-components/VmsVideo@1.2.13) (2023-05-23)

 **Note:** Version bump only for package @wisdom-components/VmsVideo

-
-
-
-
-
 ## [1.2.12](https://g.civnet.cn:8443/ReactWeb5/wisdom-components/compare/@wisdom-components/VmsVideo@1.2.11...@wisdom-components/VmsVideo@1.2.12) (2023-05-22)

 **Note:** Version bump only for package @wisdom-components/VmsVideo

-
-
-
-
 ## [1.2.11](https://g.civnet.cn:8443/ReactWeb5/wisdom-components/compare/@wisdom-components/VmsVideo@1.2.10...@wisdom-components/VmsVideo@1.2.11) (2023-05-18)

 **Note:** Version bump only for package @wisdom-components/VmsVideo

--- a/packages/base-components/VmsVideo/src/App.jsx
+++ b/packages/base-components/VmsVideo/src/App.jsx
@@ -22,8 +22,13 @@ class App extends React.Component {
    if (VideoInfo.url) {
      this.create(this.refs[`myVideo` + VideoInfo.id], `key`, JessibucaObj);
      setTimeout(() => {
-        let code =window.independence?window.siteCode:(window.globalConfig?.userInfo?.LocalSite||localStorage.getItem('token'))
-        this.play(VideoInfo.url + `/${VideoInfo.dataRate == 'Sub' ? 2 : 1}?Civ_Site=${code}`, `key`);
+        let code = window.independence
+          ? window.siteCode
+          : window.globalConfig?.userInfo?.site || localStorage.getItem('token');
+        this.play(
+          VideoInfo.url + `/${VideoInfo.dataRate == 'Sub' ? 2 : 1}?Civ_Site=${code}`,
+          `key`,
+        );
      }, 10);
    }
  }

--- a/packages/base-components/VmsVideo/src/demos/dmeo1.tsx
+++ b/packages/base-components/VmsVideo/src/demos/dmeo1.tsx
@@ -37,17 +37,16 @@ const Demo1 = (props) => {
  // protocol: '萤石EZOPEN',
  //};

-  let VideoParam ={
-    id: "9745259F-76B5-4ECB-BDD7-8B1B2C5C84CD",
-    name: "3L00AE9PAJ00034",
-    protocol: "乐橙云HTTP-FLV",
-    username: "lc0f4b952c86c34c4b",
-    password: "dfdcae9267bf4964ae09998e16f016",
-    pandavmsHost:'ws://192.168.12.154:8080/',
-    address: "3L00AE9PAJ00034"
-  }
-  
-  
+  let VideoParam = {
+    id: '9745259F-76B5-4ECB-BDD7-8B1B2C5C84CD',
+    name: '3L00AE9PAJ00034',
+    protocol: '乐橙云HTTP-FLV',
+    username: 'lc0f4b952c86c34c4b',
+    password: 'dfdcae9267bf4964ae09998e16f016',
+    pandavmsHost: 'ws://192.168.12.154:8080/',
+    address: '3L00AE9PAJ00034',
+  };
+
  /*{
    id: '11F102BC-CE03-4E32-AE60-F297934DFE3F', // 398993BB-A795-4237-BE75-B6A7EC9D675
    name: '琼海电信小区', // 设备名称

--- a/packages/base-components/VmsVideo/src/index.jsx
+++ b/packages/base-components/VmsVideo/src/index.jsx
@@ -98,11 +98,6 @@ const Video = (props, ref) => {
      });
  };

-
-
-
-
-
  const resizeUpdate = (e) => {
    // 通过事件对象获取浏览器窗口的高度

@@ -119,12 +114,10 @@ const Video = (props, ref) => {
  }
  useEffect(() => {
    if (VideoInfo.protocol != '萤石EZOPEN') {
-    
    } else {
      getToken();
    }
    // 页面刚加载完成后获取浏览器窗口的大小
- 

    // 页面变化时获取浏览器窗口的大小
    window.addEventListener('resize', resizeUpdate);

--- a/packages/extend-components/EC_QuotaSelect/CHANGELOG.md
+++ b/packages/extend-components/EC_QuotaSelect/CHANGELOG.md
 # Change Log

-All notable changes to this project will be documented in this file.
-See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
+All notable changes to this project will be documented in this file. See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.

 ## [1.4.7](https://g.civnet.cn:8443/ReactWeb5/wisdom-components/compare/@wisdom-components/ec_quotaselect@1.4.5...@wisdom-components/ec_quotaselect@1.4.7) (2023-05-30)

-
 ### Bug Fixes

-* 指标选择增加isCommonTag参数 ([fbafe19](https://g.civnet.cn:8443/ReactWeb5/wisdom-components/commits/fbafe19e1539d6621b512d96b45ec9bd01d8dd83))
-
-
-
-
-
+- 指标选择增加 isCommonTag 参数 ([fbafe19](https://g.civnet.cn:8443/ReactWeb5/wisdom-components/commits/fbafe19e1539d6621b512d96b45ec9bd01d8dd83))

 ## [1.4.6](https://g.civnet.cn:8443/ReactWeb5/wisdom-components/compare/@wisdom-components/ec_quotaselect@1.4.5...@wisdom-components/ec_quotaselect@1.4.6) (2023-05-29)


--- a/packages/extend-components/EC_QuotaSelect/src/index.js
+++ b/packages/extend-components/EC_QuotaSelect/src/index.js
@@ -12,7 +12,7 @@ import {
  Tree,
  ConfigProvider,
  message,
-  Tooltip
+  Tooltip,
 } from 'antd';
 import Empty from '@wisdom-components/empty';
 import {
@@ -20,7 +20,7 @@ import {
  ExclamationCircleFilled,
  SearchOutlined,
  CloseOutlined,
-  InfoCircleOutlined
+  InfoCircleOutlined,
 } from '@ant-design/icons';
 import './index.less';
 import { getQuataList, updateMonitorConf } from './apis';
@@ -432,7 +432,16 @@ const QuotaSelect = ({
                              onChange={(e) => handleCheckboxChange(e, item)}
                            >
                              {item.title}
-                              {item.notInFVersion && <Tooltip placement="bottom" title={`${item.notInFVersion} 版本不存在当前指标`}><InfoCircleOutlined className={classNames(`${prefixCls}-modal-class-mark`)}/></Tooltip>}
+                              {item.notInFVersion && (
+                                <Tooltip
+                                  placement="bottom"
+                                  title={`${item.notInFVersion} 版本不存在当前指标`}
+                                >
+                                  <InfoCircleOutlined
+                                    className={classNames(`${prefixCls}-modal-class-mark`)}
+                                  />
+                                </Tooltip>
+                              )}
                            </Checkbox>
                          </Col>
                        ))}

--- a/packages/extend-components/EC_QuotaSelect/src/index.less
+++ b/packages/extend-components/EC_QuotaSelect/src/index.less
@@ -104,7 +104,7 @@

  &-class-mark {
    margin-left: 5px;
-    color: #aaaaaa;;
+    color: #aaaaaa;
  }

  .@{ant-prefix}-checkbox + span {