简柏林 / thingskit-view · Commits

perf(src/views/chart): 优化三维地图右侧区块配置项，并且修复兼容之前旧地图

See merge request yunteng/thingskit-view!185

fix: 单个视频切换视频源，切换后未播放为新的视频源

See merge request yunteng/thingskit-view!183

fix: 修复自定义Naiveui组件进度条刻度的问题

See merge request yunteng/thingskit-view!181

fix(src/views/chart):修复当历史数据折线图开启动画效果时，数据显示为10条数据，但是只执行动效到第七条又返回从第一条开始执行了

See merge request yunteng/thingskit-view!182

feat(src/views/chart):  装饰新增17~26

See merge request yunteng/thingskit-view!180

fix(src/views/chart):  修改打包失败

See merge request yunteng/thingskit-view!179

feat(src/views/chart): 新增部分小组件

See merge request yunteng/thingskit-view!178

feat(src/views/chart): 新增图标，可配置自定义内容弹窗和优化多个摄像头，可以自动切换也可以手动切换

See merge request yunteng/thingskit-view!177

Main dev

See merge request yunteng/thingskit-view!176

fix: 修复实时轨迹&&历史轨迹marker图片引入问题

See merge request yunteng/thingskit-view!175

feat：函数绘图、历史轨迹、实时轨迹组件及相关代码优化bug修复

See merge request yunteng/thingskit-view!174

feat: 分页画布、组件优化及bug修复

See merge request yunteng/thingskit-view!165

perf: 优化未绑定页面时显示空数据

See merge request yunteng/thingskit-view!146

fix: 修复组态未选择时直接访问

See merge request yunteng/thingskit-view!145

feat:合并ThingsKit v1.2.0版本

See merge request yunteng/thingskit-view!143

fix: 修复重构组态后组态链接生成方式变更

See merge request yunteng/thingskit-view!144

# Conflicts:
#	src/api/external/common/index.ts
#	src/assets/images/chart/photos/carousel1.jpeg
#	src/assets/images/chart/photos/carousel2.jpeg
#	src/packages/components/Informations/Mores/Image/index.vue
#	src/packages/components/external/Charts/Lines/OverrideLineForDeviceHistoryQuery/index.vue
#	src/packages/components/external/Charts/Maps/AddThreeDimensionalMap/config.ts
#	src/packages/components/external/Charts/Maps/AddThreeDimensionalMap/index.vue
#	src/packages/components/external/Charts/Maps/OverrideMapAmap/components/SearchBox.vue
#	src/packages/components/external/Charts/Maps/OverrideMapAmap/config.ts
#	src/packages/components/external/Charts/Maps/OverrideMapAmap/config.vue
#	src/packages/components/external/Charts/Maps/OverrideMapAmap/data.json
#	src/packages/components/external/Charts/Maps/OverrideMapAmap/images/djh.png
#	src/packages/components/external/Charts/Maps/OverrideMapAmap/images/lx1.png
#	src/packages/components/external/Charts/Maps/OverrideMapAmap/images/online.png
#	src/packages/components/external/Charts/Maps/OverrideMapAmap/index.ts
#	src/packages/components/external/Charts/Maps/OverrideMapAmap/index.vue
#	src/packages/components/external/Charts/Maps/OverrideMapBase/config.ts
#	src/packages/components/external/Charts/Maps/OverrideMapBase/index.vue
#	src/packages/components/external/Informations/Mores/SingleCamera/components/VideoPlay.vue
#	src/packages/components/external/Informations/Mores/SingleCamera/config.vue
#	src/packages/components/external/Tables/Tables/OverrideTableScrollBoard/index.vue
#	src/packages/index.ts
#	src/views/chart/ContentEdit/components/EditTools/external/index.ts