fix: merge

packages/extend-components/EC_ConfigurationView/CHANGELOG.md

@@ -2,6 +2,12 @@
 
 All notable changes to this project will be documented in this file. See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+## [1.4.60](https://g.civnet.cn:8443/ReactWeb5/wisdom-components/compare/@wisdom-components/ec_configurationview@1.4.59...@wisdom-components/ec_configurationview@1.4.60) (2023-05-17)
+
+### Bug Fixes
+
+- 修改组态 ([d38f85e](https://g.civnet.cn:8443/ReactWeb5/wisdom-components/commits/d38f85eff9872c63605d5aaf3ff67567d3a51dd9))
+
 ## [1.4.59](https://g.civnet.cn:8443/ReactWeb5/wisdom-components/compare/@wisdom-components/ec_configurationview@1.4.58...@wisdom-components/ec_configurationview@1.4.59) (2023-05-17)
 
 ### Bug Fixes

packages/extend-components/EC_ConfigurationView/package.json

 {
     "name": "@wisdom-components/ec_configurationview",
-    "version": "1.4.59",
+    "version": "1.4.60",
     "description": "> TODO: description",
     "author": "tuqian <webtuqian@163.com>",
     "homepage": "",

packages/extend-components/EC_ConfigurationView/src/RealModel.js

@@ -1296,7 +1296,7 @@ const ConfigurationView = (props) => {
   const videoScanMethod = async (data) => {
     try {
       const opRule = JSON.parse(data.opRule);
-      const { vdCode, vdList } = opRule;
+      const { vdCode, vdList, vdName } = opRule;
       if (!vdCode || !vdList) return setVideoData([]);
       const detail = await getVideoDetail({
         UserID: 1,
@@ -1326,7 +1326,7 @@ const ConfigurationView = (props) => {
             address: list.address,
           });
       });
-      setVideoTitle(dataList?.deviceName || '视频查看');
+      setVideoTitle(vdName + '视频查看');
       setVideoData(detailList);
       detailList.length && setIsVideoVisible(true);
     } catch (e) {