Commits · d9dc514ce63c8ade89eb109e144e71f162ef4554 · station / amos-station-module-view

27 May, 2020 15 commits
- jiejuechogntu · d9dc514c
  张博 authored May 27, 2020
  
  d9dc514c
- 风险点，风险区域 · 8d5a96a1
  张博 authored May 27, 2020
  
  8d5a96a1
- 图片 · 3b84a5cf
  shanqiyun authored May 27, 2020
  
  3b84a5cf
- Merge branch 'developer' of http://172.16.10.76/station/amos-station-module-view into developer · 801a2c12
  shanqiyun authored May 27, 2020
  
  801a2c12
- 修改样式 · 6b53e693
  shanqiyun authored May 27, 2020
  
  6b53e693
- 1.修改样式 · 6a7e1c61
  suhuiguang authored May 27, 2020
  
  6a7e1c61
- 1.修改描述 · 6919fabc
  suhuiguang authored May 27, 2020
  
  6919fabc
- 1.修改编辑模式退出后区域显示bug · e2c7e38b
  suhuiguang authored May 27, 2020
```
2.页面样式
```
  e2c7e38b
- 1.修改今日安全指数详情样式 · e94546a5
  suhuiguang authored May 27, 2020
  
  e94546a5
- Merge branch 'developer' of http://172.16.10.76/station/amos-station-module-view into developer · e7f40486
  taabe authored May 27, 2020
  
  e7f40486
- 添加遗漏文件 · 62377ff8
  taabe authored May 27, 2020
  
  62377ff8
- Merge branch 'developer' of http://172.16.10.76/station/amos-station-module-view into developer · 7d4193b9
  suhuiguang authored May 27, 2020
  
  7d4193b9
- 1.修改是异常区域但没绘制区域也不显示 · a9e5600e
  suhuiguang authored May 27, 2020
  
  a9e5600e
- Merge branch 'developer' of http://172.16.10.76/station/amos-station-module-view into developer · b7178c7d
  taabe authored May 27, 2020
```
# Conflicts:
#	mods/components/3dviewConvertor/consts/urlConsts.js
#	mods/components/3dviewConvertor/view/MaskContent.js
```
  b7178c7d
- 修改预案交互区样式 · 1eccb877
  taabe authored May 27, 2020
  
  1eccb877
26 May, 2020 20 commits
- 解决冲突 · af248adc
  张博 authored May 26, 2020
  
  af248adc
- 区域点，树详情ui 及接口调试 · c092a97f
  张博 authored May 26, 2020
  
  c092a97f
- 修改样式 · 8f7965a8
  shanqiyun authored May 26, 2020
  
  8f7965a8
- 修改样式 · bf0991b4
  shanqiyun authored May 26, 2020
  
  bf0991b4
- Merge branch 'developer' of http://172.16.10.76/station/amos-station-module-view into developer · 8b09f84d
  shanqiyun authored May 26, 2020
  
  8b09f84d
- 冲突 · 4eb27685
  shanqiyun authored May 26, 2020
  
  4eb27685
- Merge branch 'developer' of http://172.16.10.76/station/amos-station-module-view into developer · ff63ee5f
  吴江 authored May 26, 2020
  
  ff63ee5f
- 规则修改适配 · 2e91a601
  吴江 authored May 26, 2020
  
  2e91a601
- 检索弹框 · 51236b5c
  shanqiyun authored May 26, 2020
  
  51236b5c
- 1.修改照片路径为绝对路径，否则打包后引用系统加载不到图片 · 9c1f38af
  suhuiguang authored May 26, 2020
```
2.增加100%,否则引用系统样式不对
```
  9c1f38af
- 规则修改适配 · 9d998c56
  吴江 authored May 26, 2020
  
  9d998c56
- 1.增加ruleuri · 0c28219d
  suhuiguang authored May 26, 2020
  
  0c28219d
- Merge branch 'developer' of http://172.16.10.76/station/amos-station-module-view into developer · e9e9104c
  suhuiguang authored May 26, 2020
```
# Conflicts:
#	mods/components/3dviewConvertor/view/View3D.js
```
  e9e9104c
- 1.修改刷新列表异常，执行天数，代码整理 · 469ef37c
  suhuiguang authored May 26, 2020
  
  469ef37c
- 默认隐藏左边控制按钮 · 73e2a76d
  taabe authored May 26, 2020
  
  73e2a76d
- 修改3维页面初始化接口参数调整 · e157987a
  taabe authored May 26, 2020
  
  e157987a
- 修改，替换文件（修改启动报错） · 727e7b41
  taabe authored May 26, 2020
  
  727e7b41
- Merge branch 'developer' of http://172.16.10.76/station/amos-station-module-view into developer · a5063aa1
  张博 authored May 26, 2020
  
  a5063aa1
- 重点设备弹框 · fdd5918b
  张博 authored May 26, 2020
  
  fdd5918b
- 1.修改成绝对路径 · 47800763
  suhuiguang authored May 26, 2020
  
  47800763
25 May, 2020 5 commits
- Merge branch 'developer' of http://172.16.10.76/station/amos-station-module-view into developer · b600effe
  张博 authored May 25, 2020
  
  b600effe
- 弹框样式 · c23f8259
  张博 authored May 25, 2020
  
  c23f8259
- 1.修改header和编辑居中 · 959b9a77
  suhuiguang authored May 25, 2020
  
  959b9a77
- 1.修改监控评样式 · 16fec21d
  suhuiguang authored May 25, 2020
  
  16fec21d
- 1.修改进入故障模式字段 · 9a6170aa
  suhuiguang authored May 25, 2020
  
  9a6170aa