Skip to content

A
amos-station-module-view
Commit a8c2579e authored by 张博's avatar 张博
Browse files
Options

bug

parents 28f1cb4b 65a1bc65
Hide whitespace changes
Inline Side-by-side
Showing with 246 additions and 155 deletions
mods/components/3dviewConvertor/consts/imgStatic.js
View file @ a8c2579e
...@@ -25,6 +25,15 @@ export default { ...@@ -25,6 +25,15 @@ export default {
check_louyan: require('../assets/panoramic/main_icon_tag_louyan.png'), check_louyan: require('../assets/panoramic/main_icon_tag_louyan.png'),
check_weizhixing: require('../assets/panoramic/main_icon_tag_weizhixing.png') check_weizhixing: require('../assets/panoramic/main_icon_tag_weizhixing.png')
}, },
moduleEditIcon: {
editBtn: require('../assets/convertor/moduleEdit/editBtn.png'),
bindedTip: require('../assets/convertor/moduleEdit/bindedTip.png'),
noSaveTip: require('../assets/convertor/moduleEdit/noSaveTip.png'),
nobindTip: require('../assets/convertor/moduleEdit/nobindTip.png'),
rightModalTitleIcon: require('../assets/convertor/moduleEdit/rightModalTitleIcon.png'),
rightBaseMsgIcon: require('../assets/convertor/moduleEdit/rightBaseMsgIcon.png'),
right3dIcon: require('../assets/convertor/moduleEdit/right3dIcon.png')
},
contorls: { contorls: {
riskPoint: require('../assets/convertor/3dview/risk-point.png'), riskPoint: require('../assets/convertor/3dview/risk-point.png'),
videoPoint: require('../assets/convertor/3dview/video-point.png'), videoPoint: require('../assets/convertor/3dview/video-point.png'),
...@@ -204,26 +213,26 @@ export const marker3DIoncMapper = { ...@@ -204,26 +213,26 @@ export const marker3DIoncMapper = {
riskSource_3: require('../assets/convertor/3dview/markers/risk-3.png'), riskSource_3: require('../assets/convertor/3dview/markers/risk-3.png'),
riskSource_4: require('../assets/convertor/3dview/markers/risk-4.png'), riskSource_4: require('../assets/convertor/3dview/markers/risk-4.png'),
riskSource_5: require('../assets/convertor/3dview/markers/risk-5.png'), riskSource_5: require('../assets/convertor/3dview/markers/risk-5.png'),
risk_0: '/mods/components/3dviewConvertor/threeres/markers/risk-0.png', risk_0: require('../threeres/markers/risk-0.png'),
risk_1: '/mods/components/3dviewConvertor/threeres/markers/risk-1.png', risk_1: require('../threeres/markers/risk-1.png'),
risk_2: '/mods/components/3dviewConvertor/threeres/markers/risk-2.png', risk_2: require('../threeres/markers/risk-2.png'),
risk_3: '/mods/components/3dviewConvertor/threeres/markers/risk-3.png', risk_3: require('../threeres/markers/risk-3.png'),
risk_4: '/mods/components/3dviewConvertor/threeres/markers/risk-4.png', risk_4: require('../threeres/markers/risk-4.png'),
risk_5: '/mods/components/3dviewConvertor/threeres/markers/risk-5.png', risk_5: require('../threeres/markers/risk-5.png'),
patrol_1: '/mods/components/3dviewConvertor/threeres/markers/patrol-1.png', patrol_1: require('../threeres/markers/patrol-1.png'),
patrol_2: '/mods/components/3dviewConvertor/threeres/markers/patrol-2.png', patrol_2: require('../threeres/markers/patrol-2.png'),
patrol_3: '/mods/components/3dviewConvertor/threeres/markers/patrol-3.png', patrol_3: require('../threeres/markers/patrol-3.png'),
patrol_4: '/mods/components/3dviewConvertor/threeres/markers/patrol-4.png', patrol_4: require('../threeres/markers/patrol-4.png'),
patrol_5: '/mods/components/3dviewConvertor/threeres/markers/patrol-5.png', patrol_5: require('../threeres/markers/patrol-5.png'),
person_0: '/mods/components/3dviewConvertor/threeres/markers/person-0.png', person_0: require('../threeres/markers/person-0.png'),
data_0: '/mods/components/3dviewConvertor/threeres/markers/data-0.png', data_0: require('../threeres/markers/data-0.png'),
data_1: '/mods/components/3dviewConvertor/threeres/markers/data-1.png', data_1: require('../threeres/markers/data-1.png'),
croom_0: '/mods/components/3dviewConvertor/threeres/markers/croom-0.png', croom_0: require('../threeres/markers/croom-0.png'),
croom_1: '/mods/components/3dviewConvertor/threeres/markers/croom-1.png', croom_1: require('../threeres/markers/croom-1.png'),
//重点设备模式 //重点设备模式
impEquipmentMode_monitorEquipment: require('../assets/convertor/3dview/markers/IeqMode-monitorEquipment.png'), impEquipmentMode_monitorEquipment: require('../assets/convertor/3dview/markers/IeqMode-monitorEquipment.png'),
...@@ -231,24 +240,24 @@ export const marker3DIoncMapper = { ...@@ -231,24 +240,24 @@ export const marker3DIoncMapper = {
impEquipmentMode_hydrant: require('../assets/convertor/3dview/markers/IeqMode-hydrant.png'), impEquipmentMode_hydrant: require('../assets/convertor/3dview/markers/IeqMode-hydrant.png'),
impEquipmentMode_pool: require('../assets/convertor/3dview/markers/IeqMode-pool.png'),// impEquipmentMode_pool: require('../assets/convertor/3dview/markers/IeqMode-pool.png'),//
impEquipmentMode_fireChamber: require('../assets/convertor/3dview/markers/IeqMode-fireChamber.png'),// impEquipmentMode_fireChamber: require('../assets/convertor/3dview/markers/IeqMode-fireChamber.png'),//
impEquipmentMode_fireCar: require('../assets/convertor/3dview/markers/IeqMode-fireCar.png'), impEquipmentMode_fireCar: require('../assets/convertor/3dview/markers/IeqMode-fireCar.png')
}; };
export const safetyIndexIconMapper = { export const safetyIndexIconMapper = {
allEror: '/mods/components/3dviewConvertor/threeres/markers/exception_all.png', allEror: require('../threeres/markers/exception_all.png'),
faultEror: '/mods/components/3dviewConvertor/threeres/markers/exception_fault.png', faultEror: require('../threeres/markers/exception_fault.png'),
riskEror: '/mods/components/3dviewConvertor/threeres/markers/exception_risk.png', riskEror: require('../threeres/markers/exception_risk.png'),
transparent_rpn: require('./../threeres/markers/transparent_rpn.png') transparent_rpn: require('./../threeres/markers/transparent_rpn.png')
}; };
export const markerTitleBgMapper = { export const markerTitleBgMapper = {
base: '/mods/components/3dviewConvertor/assets/convertor/3dview/markers/markerTitle.png' base: require('../assets/convertor/3dview/markers/markerTitle.png')
}; };
export const equipStatusIconMapper = { export const equipStatusIconMapper = {
equip_false: '/mods/components/3dviewConvertor/assets/convertor/3dview/markers/pa-0.png', equip_false: require('../assets/convertor/3dview/markers/pa-0.png'),
equip_true: '/mods/components/3dviewConvertor/assets/convertor/3dview/markers/pa-1.png' equip_true: require('../assets/convertor/3dview/markers/pa-1.png')
}; };
mods/components/3dviewConvertor/styles/common.scss
View file @ a8c2579e
...@@ -97,7 +97,7 @@ ...@@ -97,7 +97,7 @@
// border-radius: $core-border-radius; // border-radius: $core-border-radius;
// box-shadow: 0 0 5px rgba(0, 0, 0, 0.3); // box-shadow: 0 0 5px rgba(0, 0, 0, 0.3);
// box-sizing: border-box; // box-sizing: border-box;
background-image: url('/mods/components/3dviewConvertor/assets/convertor/3dview/dialogbg.png'); background-image: url('../assets/convertor/3dview/dialogbg.png');
background-color: rgba(25, 86, 147, 0.5); background-color: rgba(25, 86, 147, 0.5);
.body-min-header { .body-min-header {
......
mods/components/3dviewConvertor/styles/moduleEdit.scss
View file @ a8c2579e
...@@ -26,7 +26,7 @@ ...@@ -26,7 +26,7 @@
.editTitle { .editTitle {
width:257px; width:257px;
height:55px; height:55px;
background: url('/mods/components/3dviewConvertor/assets/convertor/moduleEdit/title.png') no-repeat 100% 100%; background: url('../assets/convertor/moduleEdit/title.png') no-repeat 100% 100%;
// opacity:0.4; // opacity:0.4;
font-size: 24px; font-size: 24px;
text-align: center; text-align: center;
...@@ -48,7 +48,7 @@ ...@@ -48,7 +48,7 @@
margin-top: 10px; margin-top: 10px;
margin-left: 70px; margin-left: 70px;
cursor: pointer; cursor: pointer;
background: url('/mods/components/3dviewConvertor/assets/convertor/moduleEdit/quip.png') no-repeat 100% 100%; background: url('../assets/convertor/moduleEdit/quip.png') no-repeat 100% 100%;
} }
} }
.bottomBox { .bottomBox {
...@@ -70,16 +70,16 @@ ...@@ -70,16 +70,16 @@
cursor: pointer; cursor: pointer;
} }
.editAreaBtn { .editAreaBtn {
background: url('/mods/components/3dviewConvertor/assets/convertor/moduleEdit/areaBtn.png') no-repeat 100% 100%; background: url('../assets/convertor/moduleEdit/areaBtn.png') no-repeat 100% 100%;
} }
.editPointBtn { .editPointBtn {
background: url('/mods/components/3dviewConvertor/assets/convertor/moduleEdit/pointBtn.png') no-repeat 100% 100%; background: url('../assets/convertor/moduleEdit/pointBtn.png') no-repeat 100% 100%;
} }
.editAreaBtn.selected { .editAreaBtn.selected {
background: url('/mods/components/3dviewConvertor/assets/convertor/moduleEdit/areaBtn_select.png') no-repeat 100% 100%; background: url('../assets/convertor/moduleEdit/areaBtn_select.png') no-repeat 100% 100%;
} }
.editPointBtn.selected { .editPointBtn.selected {
background: url('/mods/components/3dviewConvertor/assets/convertor/moduleEdit/poingBtn_select.png') no-repeat 100% 100%; background: url('../assets/convertor/moduleEdit/poingBtn_select.png') no-repeat 100% 100%;
} }
} }
...@@ -106,7 +106,7 @@ ...@@ -106,7 +106,7 @@
height: 39px; height: 39px;
width: 100%; width: 100%;
margin-bottom: 10px; margin-bottom: 10px;
background: url('/mods/components/3dviewConvertor/assets/convertor/moduleEdit/selectBox.png') no-repeat 100% 100%; background: url('../assets/convertor/moduleEdit/selectBox.png') no-repeat 100% 100%;
border: none; border: none;
line-height: 31px; line-height: 31px;
padding: 5px; padding: 5px;
...@@ -118,7 +118,7 @@ ...@@ -118,7 +118,7 @@
.leftSearch { .leftSearch {
height: 33px; height: 33px;
line-height: 33px; line-height: 33px;
background: url('/mods/components/3dviewConvertor/assets/convertor/moduleEdit/searchBg.png') no-repeat 100% 100%; background: url('../assets/convertor/moduleEdit/searchBg.png') no-repeat 100% 100%;
input { input {
background-color: transparent; background-color: transparent;
box-shadow: none; box-shadow: none;
...@@ -156,13 +156,13 @@ ...@@ -156,13 +156,13 @@
.sureBtn { .sureBtn {
width: 100px; width: 100px;
height: 33px; height: 33px;
background: url('/mods/components/3dviewConvertor/assets/convertor/moduleEdit/sureBtn.png') no-repeat 100% 100%; background: url('../assets/convertor/moduleEdit/sureBtn.png') no-repeat 100% 100%;
border: none; border: none;
} }
.deleteBtn { .deleteBtn {
width: 100px; width: 100px;
height: 33px; height: 33px;
background: url('/mods/components/3dviewConvertor/assets/convertor/moduleEdit/deleteBtn.png') no-repeat 100% 100%; background: url('../assets/convertor/moduleEdit/deleteBtn.png') no-repeat 100% 100%;
border: none; border: none;
} }
} }
...@@ -237,19 +237,19 @@ ...@@ -237,19 +237,19 @@
.sureBtn { .sureBtn {
width: 100px; width: 100px;
height: 33px; height: 33px;
background: url('/mods/components/3dviewConvertor/assets/convertor/moduleEdit/sureBtn.png') no-repeat 100% 100%; background: url('../assets/convertor/moduleEdit/sureBtn.png') no-repeat 100% 100%;
border: none; border: none;
} }
.deleteBtn { .deleteBtn {
width: 100px; width: 100px;
height: 33px; height: 33px;
background: url('/mods/components/3dviewConvertor/assets/convertor/moduleEdit/deleteBtn.png') no-repeat 100% 100%; background: url('../assets/convertor/moduleEdit/deleteBtn.png') no-repeat 100% 100%;
border: none; border: none;
} }
.cancelBtn { .cancelBtn {
width: 100px; width: 100px;
height: 33px; height: 33px;
background: url('/mods/components/3dviewConvertor/assets/convertor/moduleEdit/cancelBtn.png') no-repeat 100% 100%; background: url('../assets/convertor/moduleEdit/cancelBtn.png') no-repeat 100% 100%;
border: none; border: none;
} }
} }
...@@ -275,7 +275,7 @@ ...@@ -275,7 +275,7 @@
.pormpt-modal{ .pormpt-modal{
height:100%; height:100%;
.amos-modal-container{ .amos-modal-container{
background-image: url('/mods/components/3dviewconvertor/assets/convertor/3dview/promptModal.png'); background-image: url('../assets/convertor/3dview/promptModal.png');
background-repeat: no-repeat; background-repeat: no-repeat;
background-size: 100% 100%; background-size: 100% 100%;
height:253px; height:253px;
...@@ -306,16 +306,16 @@ ...@@ -306,16 +306,16 @@
text-align: center; text-align: center;
} }
.promptOk{ .promptOk{
background: url('/mods/components/3dviewConvertor/assets/convertor/3dview/promptOk.png') no-repeat 100% 100%; background: url('../assets/convertor/3dview/promptOk.png') no-repeat 100% 100%;
} }
.promptNo { .promptNo {
background: url('/mods/components/3dviewConvertor/assets/convertor/3dview/promptNo.png') no-repeat 100% 100%; background: url('../assets/convertor/3dview/promptNo.png') no-repeat 100% 100%;
} }
.promptSave{ .promptSave{
background: url('/mods/components/3dviewConvertor/assets/convertor/3dview/promptSave.png') no-repeat 100% 100%; background: url('../assets/convertor/3dview/promptSave.png') no-repeat 100% 100%;
} }
.promptCancel{ .promptCancel{
background: url('/mods/components/3dviewConvertor/assets/convertor/3dview/promptCancel.png') no-repeat 100% 100%; background: url('../assets/convertor/3dview/promptCancel.png') no-repeat 100% 100%;
} }
} }
} }
...@@ -333,6 +333,3 @@ ...@@ -333,6 +333,3 @@
// color: #fff !important; // color: #fff !important;
// } // }
// } // }
mods/components/3dviewConvertor/styles/planDetail.scss
View file @ a8c2579e
...@@ -3,7 +3,7 @@ ...@@ -3,7 +3,7 @@
width: 216px !important; width: 216px !important;
height: 100% !important; height: 100% !important;
padding: 0px; padding: 0px;
background: url('/mods/components/3dviewconvertor/assets/convertor/3dview/prePlan/detail-info.png') no-repeat; background: url('../assets/convertor/3dview/prePlan/detail-info.png') no-repeat;
background-size: 100%; background-size: 100%;
background-repeat: round; background-repeat: round;
position: relative; position: relative;
...@@ -108,7 +108,7 @@ ...@@ -108,7 +108,7 @@
.carImg { .carImg {
width: 35px; width: 35px;
background: url('/mods/components/3dviewconvertor/assets/convertor/3dview/plan/car.png') no-repeat top; background: url('../assets/convertor/3dview/plan/car.png') no-repeat top;
} }
.carHead { .carHead {
...@@ -131,7 +131,7 @@ ...@@ -131,7 +131,7 @@
width: 81px !important; width: 81px !important;
margin-left: 5px !important; margin-left: 5px !important;
font-size: 5px !important; font-size: 5px !important;
background-image: url('/mods/components/3dviewconvertor/assets/convertor/3dview/plan/post.png'); background-image: url('../assets/convertor/3dview/plan/post.png');
text-align: center !important; text-align: center !important;
line-height: 27px !important; line-height: 27px !important;
} }
...@@ -147,7 +147,7 @@ ...@@ -147,7 +147,7 @@
margin-left: 0px; margin-left: 0px;
height: 25px; height: 25px;
color: white; color: white;
background-image: url('/mods/components/3dviewconvertor/assets/convertor/3dview/plan/detail-title.png'); background-image: url('../assets/convertor/3dview/plan/detail-title.png');
background-size: 100%; background-size: 100%;
background-repeat: round; background-repeat: round;
} }
...@@ -156,7 +156,7 @@ ...@@ -156,7 +156,7 @@
margin-left: 3px; margin-left: 3px;
height: 25px; height: 25px;
color: white; color: white;
background-image: url('/mods/components/3dviewconvertor/assets/convertor/3dview/prePlan/zhuyibar.png'); background-image: url('../assets/convertor/3dview/prePlan/zhuyibar.png');
background-size: 100%; background-size: 100%;
background-repeat: round; background-repeat: round;
} }
...@@ -165,7 +165,7 @@ ...@@ -165,7 +165,7 @@
margin-left: 3px; margin-left: 3px;
height: 25px; height: 25px;
color: white; color: white;
background-image: url('/mods/components/3dviewconvertor/assets/convertor/3dview/prePlan/jianyibar.png'); background-image: url('../assets/convertor/3dview/prePlan/jianyibar.png');
background-size: 100%; background-size: 100%;
background-repeat: round; background-repeat: round;
} }
...@@ -174,7 +174,7 @@ ...@@ -174,7 +174,7 @@
margin-left: 3px; margin-left: 3px;
height: 25px; height: 25px;
color: white; color: white;
background-image: url('/mods/components/3dviewconvertor/assets/convertor/3dview/prePlan/jinggaobar.png'); background-image: url('../assets/convertor/3dview/prePlan/jinggaobar.png');
background-size: 100%; background-size: 100%;
background-repeat: round; background-repeat: round;
} }
...@@ -436,7 +436,7 @@ ...@@ -436,7 +436,7 @@
width: 316px !important; width: 316px !important;
height: 100% !important; height: 100% !important;
padding: 0px; padding: 0px;
background: url('/mods/components/3dviewconvertor/assets/convertor/3dview/prePlan/detail-info.png') no-repeat; background: url('../assets/convertor/3dview/prePlan/detail-info.png') no-repeat;
background-size: 100%; background-size: 100%;
background-repeat: round; background-repeat: round;
position: relative; position: relative;
...@@ -534,7 +534,7 @@ ...@@ -534,7 +534,7 @@
.carImg { .carImg {
width: 59px; width: 59px;
background: url('/mods/components/3dviewconvertor/assets/convertor/3dview/plan/car.png') no-repeat top; background: url('../assets/convertor/3dview/plan/car.png') no-repeat top;
} }
.carHead { .carHead {
...@@ -557,7 +557,7 @@ ...@@ -557,7 +557,7 @@
width: 81px !important; width: 81px !important;
margin-left: 45px !important; margin-left: 45px !important;
font-size: 13px !important; font-size: 13px !important;
background-image: url('/mods/components/3dviewconvertor/assets/convertor/3dview/plan/post.png'); background-image: url('../assets/convertor/3dview/plan/post.png');
text-align: center !important; text-align: center !important;
line-height: 27px !important; line-height: 27px !important;
} }
...@@ -571,7 +571,7 @@ ...@@ -571,7 +571,7 @@
margin-left: 5px; margin-left: 5px;
height: 35px; height: 35px;
color: white; color: white;
background-image: url('/mods/components/3dviewconvertor/assets/convertor/3dview/plan/detail-title.png'); background-image: url('../assets/convertor/3dview/plan/detail-title.png');
background-size: 100%; background-size: 100%;
background-repeat: round; background-repeat: round;
} }
...@@ -580,7 +580,7 @@ ...@@ -580,7 +580,7 @@
margin-left: 5px; margin-left: 5px;
height: 35px; height: 35px;
color: white; color: white;
background-image: url('/mods/components/3dviewconvertor/assets/convertor/3dview/prePlan/zhuyibar.png'); background-image: url('../assets/convertor/3dview/prePlan/zhuyibar.png');
background-size: 100%; background-size: 100%;
background-repeat: round; background-repeat: round;
} }
...@@ -589,7 +589,7 @@ ...@@ -589,7 +589,7 @@
margin-left: 5px; margin-left: 5px;
height: 35px; height: 35px;
color: white; color: white;
background-image: url('/mods/components/3dviewconvertor/assets/convertor/3dview/prePlan/jianyibar.png'); background-image: url('../assets/convertor/3dview/prePlan/jianyibar.png');
background-size: 100%; background-size: 100%;
background-repeat: round; background-repeat: round;
} }
...@@ -598,7 +598,7 @@ ...@@ -598,7 +598,7 @@
margin-left: 5px; margin-left: 5px;
height: 35px; height: 35px;
color: white; color: white;
background-image: url('/mods/components/3dviewconvertor/assets/convertor/3dview/prePlan/jinggaobar.png'); background-image: url('../assets/convertor/3dview/prePlan/jinggaobar.png');
background-size: 100%; background-size: 100%;
background-repeat: round; background-repeat: round;
} }
......
mods/components/3dviewConvertor/styles/pointsDetails.scss
View file @ a8c2579e
...@@ -159,7 +159,7 @@ ...@@ -159,7 +159,7 @@
width: 100%; width: 100%;
height: 100%; height: 100%;
.amos-modal-container{ .amos-modal-container{
background-image: url('/mods/components/3dviewconvertor/assets/convertor/3dview/toolmodalbg.png'); background-image: url('../assets/convertor/3dview/toolmodalbg.png');
background-repeat: no-repeat; background-repeat: no-repeat;
height:262px; height:262px;
width: 452px !important; width: 452px !important;
...@@ -225,7 +225,7 @@ ...@@ -225,7 +225,7 @@
height: 8px; height: 8px;
} }
::-webkit-scrollbar-thumb { /* 拖动条 */ ::-webkit-scrollbar-thumb { /* 拖动条 */
background-image: url('/mods/components/3dviewconvertor/assets/convertor/3dview/scrollslider.png') ; background-image: url('../assets/convertor/3dview/scrollslider.png') ;
background-repeat: no-repeat; background-repeat: no-repeat;
height: 10px; height: 10px;
} }
...@@ -233,13 +233,13 @@ ...@@ -233,13 +233,13 @@
background-color:rgba(17, 44, 88, 0.2); background-color:rgba(17, 44, 88, 0.2);
} }
::-webkit-scrollbar-button{ ::-webkit-scrollbar-button{
background-image: url('/mods/components/3dviewconvertor/assets/convertor/3dview/scrollbutton.png') ; background-image: url('../assets/convertor/3dview/scrollbutton.png') ;
background-repeat: no-repeat; background-repeat: no-repeat;
} }
height:100%; height:100%;
.amos-modal-container{ .amos-modal-container{
background-image: url('/mods/components/3dviewconvertor/assets/convertor/3dview/modalbg.png'); background-image: url('../assets/convertor/3dview/modalbg.png');
height:497px; height:497px;
width: 866px !important; width: 866px !important;
background-color: rgba(255,255,255,0); background-color: rgba(255,255,255,0);
......
mods/components/3dviewConvertor/styles/preControl.scss
View file @ a8c2579e
...@@ -59,22 +59,22 @@ ...@@ -59,22 +59,22 @@
width: 260px; width: 260px;
height: 206px; height: 206px;
padding: 20px; padding: 20px;
background: url('/mods/components/3dviewconvertor/assets/convertor/3dview/prePlan/buzhouqu.png') no-repeat; background: url('../assets/convertor/3dview/prePlan/buzhouqu.png') no-repeat;
.step-trace { .step-trace {
height: 144px; height: 144px;
background: url('/mods/components/3dviewconvertor/assets/convertor/3dview/prePlan/step-trace.png') no-repeat; background: url('../assets/convertor/3dview/prePlan/step-trace.png') no-repeat;
.next-step { .next-step {
width: 24px; width: 24px;
height: 24px; height: 24px;
background: url('/mods/components/3dviewconvertor/assets/convertor/3dview/prePlan/buzhouqu-xiayibu.png') no-repeat; background: url('../assets/convertor/3dview/prePlan/buzhouqu-xiayibu.png') no-repeat;
} }
.previous-step { .previous-step {
width: 24px; width: 24px;
height: 24px; height: 24px;
background: url('/mods/components/3dviewconvertor/assets/convertor/3dview/prePlan/buzhouqu-dangqianbu.png') no-repeat; background: url('../assets/convertor/3dview/prePlan/buzhouqu-dangqianbu.png') no-repeat;
} }
} }
...@@ -130,7 +130,7 @@ ...@@ -130,7 +130,7 @@
width: 840px; width: 840px;
height: 60px; height: 60px;
margin: 0 auto; margin: 0 auto;
background-image: url('/mods/components/3dviewconvertor/assets/convertor/3dview/prePlan/dingbu.png'); background-image: url('../assets/convertor/3dview/prePlan/dingbu.png');
background-repeat: no-repeat; background-repeat: no-repeat;
background-size: 100% 100%; background-size: 100% 100%;
...@@ -155,7 +155,7 @@ ...@@ -155,7 +155,7 @@
height: 30px; height: 30px;
margin: 0 auto; margin: 0 auto;
margin-top: 10px; margin-top: 10px;
background-image: url('/mods/components/3dviewconvertor/assets/convertor/3dview/prePlan/baojing.png'); background-image: url('../assets/convertor/3dview/prePlan/baojing.png');
background-repeat: no-repeat; background-repeat: no-repeat;
background-size: 100% 100%; background-size: 100% 100%;
...@@ -179,7 +179,7 @@ ...@@ -179,7 +179,7 @@
height: 60px; height: 60px;
margin-bottom: 7px; margin-bottom: 7px;
text-align: center; text-align: center;
background: url('/mods/components/3dviewconvertor/assets/convertor/3dview/prePlan/shujuqu.png'); background: url('../assets/convertor/3dview/prePlan/shujuqu.png');
.text-icon { .text-icon {
width: 36px; width: 36px;
...@@ -200,7 +200,7 @@ ...@@ -200,7 +200,7 @@
.text-icon { .text-icon {
// flex: 1 0 16%; // flex: 1 0 16%;
background: url('/mods/components/3dviewconvertor/assets/convertor/3dview/prePlan/shujuqu-shijian.png'); background: url('../assets/convertor/3dview/prePlan/shujuqu-shijian.png');
background-repeat: no-repeat; background-repeat: no-repeat;
} }
...@@ -214,7 +214,7 @@ ...@@ -214,7 +214,7 @@
.text-icon { .text-icon {
// flex: 1 0 16%; // flex: 1 0 16%;
background: url('/mods/components/3dviewconvertor/assets/convertor/3dview/prePlan/shujuqu-shuichi.png'); background: url('../assets/convertor/3dview/prePlan/shujuqu-shuichi.png');
background-repeat: no-repeat; background-repeat: no-repeat;
} }
...@@ -228,7 +228,7 @@ ...@@ -228,7 +228,7 @@
.text-icon { .text-icon {
// flex: 1 0 8%; // flex: 1 0 8%;
background: url('/mods/components/3dviewconvertor/assets/convertor/3dview/prePlan/shujuqu-shuiwei.png'); background: url('../assets/convertor/3dview/prePlan/shujuqu-shuiwei.png');
background-repeat: no-repeat; background-repeat: no-repeat;
} }
...@@ -243,7 +243,7 @@ ...@@ -243,7 +243,7 @@
.text-icon { .text-icon {
// flex: 1 0 7%; // flex: 1 0 7%;
background: url('/mods/components/3dviewconvertor/assets/convertor/3dview/prePlan/shujuqu-gongshu.png'); background: url('../assets/convertor/3dview/prePlan/shujuqu-gongshu.png');
background-repeat: no-repeat; background-repeat: no-repeat;
} }
...@@ -257,7 +257,7 @@ ...@@ -257,7 +257,7 @@
.text-icon { .text-icon {
// flex: 1 0 7%; // flex: 1 0 7%;
background: url('/mods/components/3dviewconvertor/assets/convertor/3dview/prePlan/shujuqu-paomo.png'); background: url('../assets/convertor/3dview/prePlan/shujuqu-paomo.png');
background-repeat: no-repeat; background-repeat: no-repeat;
} }
...@@ -279,7 +279,7 @@ ...@@ -279,7 +279,7 @@
.amos-modal-confirm-confirm { .amos-modal-confirm-confirm {
.amos-modal-container { .amos-modal-container {
text-align: center; text-align: center;
background: url('/mods/components/3dviewconvertor/assets/convertor/3dview/prePlan/tishitanchuang.png') no-repeat; background: url('../assets/convertor/3dview/prePlan/tishitanchuang.png') no-repeat;
background-size: 100% 100%; background-size: 100% 100%;
box-shadow: unset; box-shadow: unset;
...@@ -305,7 +305,7 @@ ...@@ -305,7 +305,7 @@
.amos-btn { .amos-btn {
width: 95px; width: 95px;
height: 44px; height: 44px;
background: url('/mods/components/3dviewconvertor/assets/convertor/3dview/prePlan/jiaohuqu-2anniu-cheng-chang.png') no-repeat; background: url('../assets/convertor/3dview/prePlan/jiaohuqu-2anniu-cheng-chang.png') no-repeat;
background-size: 100% 100%; background-size: 100% 100%;
border: 0; border: 0;
} }
...@@ -315,7 +315,7 @@ ...@@ -315,7 +315,7 @@
height: 40px; height: 40px;
margin-top: -5px; margin-top: -5px;
color: white; color: white;
background: url('/mods/components/3dviewconvertor/assets/convertor/3dview/prePlan/jiaohuqu-2anniu-lan-chang.png') no-repeat; background: url('../assets/convertor/3dview/prePlan/jiaohuqu-2anniu-lan-chang.png') no-repeat;
border: 0; border: 0;
} }
} }
...@@ -455,7 +455,7 @@ ...@@ -455,7 +455,7 @@
.precontrol-water-view { .precontrol-water-view {
width: 260px; width: 260px;
text-align: center; text-align: center;
background: url('/mods/components/3dviewconvertor/assets/convertor/3dview/prePlan/buzhouqu.png') no-repeat; background: url('../assets/convertor/3dview/prePlan/buzhouqu.png') no-repeat;
background-size: 100% 100%; background-size: 100% 100%;
padding-bottom: 10px; padding-bottom: 10px;
padding-top: 10px; padding-top: 10px;
...@@ -494,7 +494,7 @@ ...@@ -494,7 +494,7 @@
height: 20px; height: 20px;
width: 20px; width: 20px;
float: left; float: left;
background: url('/mods/components/3dviewconvertor/assets/convertor/3dview/prePlan/shujuqu-shuiwei.png'); background: url('../assets/convertor/3dview/prePlan/shujuqu-shuiwei.png');
background-size: cover; background-size: cover;
// background-repeat: no-repeat; // background-repeat: no-repeat;
} }
...@@ -503,7 +503,7 @@ ...@@ -503,7 +503,7 @@
height: 17px; height: 17px;
width: 20px; width: 20px;
float: left; float: left;
background: url('/mods/components/3dviewconvertor/assets/convertor/3dview/prePlan/shujuqu-shuichi.png'); background: url('../assets/convertor/3dview/prePlan/shujuqu-shuichi.png');
background-size: cover; background-size: cover;
} }
} }
......
mods/components/3dviewConvertor/styles/searchpane.scss
View file @ a8c2579e
...@@ -4,7 +4,7 @@ ...@@ -4,7 +4,7 @@
bottom: 20px; bottom: 20px;
width: 460px; width: 460px;
height: 600px; height: 600px;
background: url('/mods/components/3dviewConvertor/assets//convertor//3dview//searchpane-background.png'); background: url('../assets/convertor/3dview/searchpane-background.png');
filter:blur(3px); filter:blur(3px);
background-repeat: no-repeat; background-repeat: no-repeat;
background-size: 100% 100%; background-size: 100% 100%;
...@@ -307,16 +307,16 @@ ...@@ -307,16 +307,16 @@
background-color: #2b8dd4; background-color: #2b8dd4;
} }
.ant-calendar-input::-webkit-input-placeholder { .ant-calendar-input::-webkit-input-placeholder {
color: white; color: white;
} }
} }
.ant-calendar-header{ .ant-calendar-header{
color: white; color: white;
div a{ div a{
color: white; color: white;
} }
div span a{ div span a{
color: white; color: white;
} }
} }
.ant-calendar-body{ .ant-calendar-body{
...@@ -334,6 +334,6 @@ ...@@ -334,6 +334,6 @@
color: white; color: white;
} }
} }
} }
} }
\ No newline at end of file
mods/components/3dviewConvertor/styles/view/panoramic/statistical.scss
View file @ a8c2579e
...@@ -88,7 +88,7 @@ ...@@ -88,7 +88,7 @@
.down{ .down{
height: calc(100% - 90px); height: calc(100% - 90px);
margin-left: 20px; margin-left: 20px;
background-image: url('/mods/components/3dviewConvertor/assets/panoramic/main_bg_warning.png'); background-image: url('../../assets/panoramic/main_bg_warning.png');
background-repeat: repeat; background-repeat: repeat;
background-size: 100% 100%; background-size: 100% 100%;
...@@ -213,7 +213,7 @@ ...@@ -213,7 +213,7 @@
} }
.safetyIndex-content-chart { .safetyIndex-content-chart {
background-image: url('/mods/components/3dviewConvertor/assets/panoramic/main_bg_dashboard.png') !important; background-image: url('../../assets/panoramic/main_bg_dashboard.png') !important;
background-repeat: no-repeat !important; background-repeat: no-repeat !important;
margin-top: -25px !important; margin-top: -25px !important;
width: 125px !important; width: 125px !important;
...@@ -235,7 +235,7 @@ ...@@ -235,7 +235,7 @@
.echart-week { .echart-week {
width: 321px !important; width: 321px !important;
height: 248px !important; height: 248px !important;
background-image: url('/mods/components/3dviewConvertor/assets/panoramic/main_bg_line_bg.png') !important; background-image: url('../../assets/panoramic/main_bg_line_bg.png') !important;
background-repeat: no-repeat !important; background-repeat: no-repeat !important;
background-position: 31px 47px !important; background-position: 31px 47px !important;
left: 24px; left: 24px;
...@@ -285,13 +285,13 @@ ...@@ -285,13 +285,13 @@
color: rgba(112, 238, 255, 1); color: rgba(112, 238, 255, 1);
line-height: 65px; line-height: 65px;
} }
.content-xj-middle { .content-xj-middle {
height: 44%; height: 44%;
margin-top: 4%; margin-top: 4%;
margin: 0 37px; margin: 0 37px;
background: url('/mods/components/3dviewConvertor/assets/panoramic/main_bg_rightmiddle.png'); background: url('../../assets/panoramic/main_bg_rightmiddle.png');
background-repeat: repeat; background-repeat: repeat;
background-size: 100% 100%; background-size: 100% 100%;
} }
...@@ -319,7 +319,7 @@ ...@@ -319,7 +319,7 @@
} }
.yellow-div { .yellow-div {
background-image: url('/mods/components/3dviewConvertor/assets/panoramic/main_bg_tag_buhege.png') !important; background-image: url('../../assets/panoramic/main_bg_tag_buhege.png') !important;
background-repeat: no-repeat !important; background-repeat: no-repeat !important;
width: 100%; width: 100%;
...@@ -330,7 +330,7 @@ ...@@ -330,7 +330,7 @@
} }
} }
.green-div { .green-div {
background-image: url('/mods/components/3dviewConvertor/assets/panoramic/main_bg_tag_hege.png') !important; background-image: url('../../assets/panoramic/main_bg_tag_hege.png') !important;
background-repeat: no-repeat !important; background-repeat: no-repeat !important;
width: 100%; width: 100%;
...@@ -342,7 +342,7 @@ ...@@ -342,7 +342,7 @@
} }
.red-div { .red-div {
background-image: url('/mods/components/3dviewConvertor/assets/panoramic/main_bg_tag_louyan.png') !important; background-image: url('../../assets/panoramic/main_bg_tag_louyan.png') !important;
background-repeat: no-repeat !important; background-repeat: no-repeat !important;
width: 100%; width: 100%;
...@@ -353,7 +353,7 @@ ...@@ -353,7 +353,7 @@
} }
} }
.grey-div { .grey-div {
background-image: url('/mods/components/3dviewConvertor/assets/panoramic/main_bg_tag_weizhixing.png') !important; background-image: url('../../assets/panoramic/main_bg_tag_weizhixing.png') !important;
background-repeat: no-repeat !important; background-repeat: no-repeat !important;
width: 100%; width: 100%;
...@@ -368,7 +368,7 @@ ...@@ -368,7 +368,7 @@
.div-echars { .div-echars {
// height: 200px !important; // height: 200px !important;
background: url('/mods/components/3dviewConvertor/assets/panoramic/circle_bg.png') no-repeat center center !important; background: url('../../assets/panoramic/circle_bg.png') no-repeat center center !important;
// background-position: 60px 14px !important; // background-position: 60px 14px !important;
background-repeat: no-repeat !important; background-repeat: no-repeat !important;
} }
...@@ -398,7 +398,7 @@ ...@@ -398,7 +398,7 @@
display: inline-flex; display: inline-flex;
.content-image { .content-image {
background-image: url('/mods/components/3dviewConvertor/assets/panoramic/main_icon_baoan.png') !important; background-image: url('../../assets/panoramic/main_icon_baoan.png') !important;
background-repeat: no-repeat !important; background-repeat: no-repeat !important;
height: 42px !important; height: 42px !important;
width: 100%; width: 100%;
...@@ -431,7 +431,7 @@ ...@@ -431,7 +431,7 @@
float: left; float: left;
display: inline-flex; display: inline-flex;
.content-image { .content-image {
background-image: url('/mods/components/3dviewConvertor/assets/panoramic/main_icon_baoan.png') !important; background-image: url('../../assets/panoramic/main_icon_baoan.png') !important;
background-repeat: no-repeat !important; background-repeat: no-repeat !important;
height: 42px !important; height: 42px !important;
width: 100%; width: 100%;
...@@ -463,7 +463,7 @@ ...@@ -463,7 +463,7 @@
float: left; float: left;
display: inline-flex; display: inline-flex;
.content-image { .content-image {
background-image: url('/mods/components/3dviewConvertor/assets/panoramic/main_icon_baoan.png') !important; background-image: url('../../assets/panoramic/main_icon_baoan.png') !important;
background-repeat: no-repeat !important; background-repeat: no-repeat !important;
height: 42px !important; height: 42px !important;
width: 100%; width: 100%;
...@@ -506,7 +506,7 @@ ...@@ -506,7 +506,7 @@
bottom: 250px; bottom: 250px;
left: 250px; left: 250px;
right: 250px; right: 250px;
background-image: url('/mods/components/3dviewConvertor/assets/panoramic/main_bg_model.png'); background-image: url('../../assets/panoramic/main_bg_model.png');
background-repeat: repeat; background-repeat: repeat;
background-size: 100% 100%; background-size: 100% 100%;
.close{ .close{
......
mods/components/3dviewConvertor/view/PointsPool.js
View file @ a8c2579e
...@@ -6,17 +6,12 @@ import { connect3D } from 'amos-3d/lib/designer'; ...@@ -6,17 +6,12 @@ import { connect3D } from 'amos-3d/lib/designer';
import { RiskPoint, PatrolPoint, PersonPoint3D, MonitorPoint, ProbePoint, import { RiskPoint, PatrolPoint, PersonPoint3D, MonitorPoint, ProbePoint,
FireResourcePoint, EquipmentPoint, FireCar3D, FirePoint, WorkerMen3D, PointStatistics, ImpEquipmentMode } from './points'; FireResourcePoint, EquipmentPoint, FireCar3D, FirePoint, WorkerMen3D, PointStatistics, ImpEquipmentMode } from './points';
import { eventTopics, isPointEvent , isLevelFilter } from './consts'; import { eventTopics, isPointEvent , isLevelFilter } from './consts';
import { parseMarkers, parseLevelFilter, objRunning } from './dataProcessor'; import { parseMarkers, parseLevelFilter } from './dataProcessor';
const loginUserName = Store.lsTool.read('userName'); const loginUserName = Store.lsTool.read('userName');
const filterUser = ['tianbo', 'opera1', 'opera2']; const filterUser = ['tianbo', 'opera1', 'opera2'];
const eventConnect = Connect.eventConnect; const eventConnect = Connect.eventConnect;
const markers3D = [
{ key: '1', position: [153, -10, -20], size: 10, url: '/mods/components/3dviewConvertor/threeres/markers/person.png' },
{ key: '2', position: [-100, 22, 0], size: 10, url: '/mods/components/3dviewConvertor/threeres/markers/video.png', label: '视频点' },
{ key: '4', position: [30, -5, -90], size: 10, keepSize: true, label: '大小不变' }
];
const Shuttle = (props) => props.children; const Shuttle = (props) => props.children;
......
mods/components/3dviewConvertor/view/moduleEditComponent/AreaLeftTree.js
View file @ a8c2579e
import React, { Component } from 'react'; import React, { Component } from 'react';
import PropTypes from 'prop-types'; import PropTypes from 'prop-types';
import { Connect, Modal, Tree,Select,Search,Button } from 'amos-framework'; import { Connect, Tree, Search, Button } from 'amos-framework';
import * as endConf from 'amos-processor/lib/config/endconf'; import imgStatic from '../../consts/imgStatic';
import { getAreaTreeAction,saveAreaDataAction } from '../../services/moduleEditServices'
const moduleEditIcon = imgStatic.moduleEditIcon;
const eventConnect = Connect.eventConnect; const eventConnect = Connect.eventConnect;
const TreeNode = Tree.TreeNode; const TreeNode = Tree.TreeNode;
const Option = Select.Option;
const getParentKey = (key, tree) => { const getParentKey = (key, tree) => {
let parentKey; let parentKey;
for (let i = 0; i < tree.length; i++) { for (let i = 0; i < tree.length; i++) {
...@@ -26,18 +25,16 @@ const getParentKey = (key, tree) => { ...@@ -26,18 +25,16 @@ const getParentKey = (key, tree) => {
class AreaLeftTree extends Component { class AreaLeftTree extends Component {
constructor(props) { constructor(props) {
super(props); super(props);
this.state = { this.state = {
// showScreenSaver: false //是否打开屏保 expandedKeys: [],
expandedKeys: [], autoExpandParent: true,
autoExpandParent: true, checkedKeys: [],
checkedKeys: [], selectedKeys: [],
selectedKeys: [], treeData: [],
treeData:[], pointTypeArr: [],
pointTypeArr:[], pointType: '',
pointType:'', treeDataList: [],
treeDataList : [], searchValue: ''
searchValue:''
}; };
} }
...@@ -163,9 +160,9 @@ class AreaLeftTree extends Component { ...@@ -163,9 +160,9 @@ class AreaLeftTree extends Component {
{title} {title}
<span className='icon'> <span className='icon'>
{ {
item.isBind?'': item.isBind ? '' :
<img <img
src='/mods/components/3dviewConvertor/assets/convertor/moduleEdit/editBtn.png' src={moduleEditIcon.editBtn}
onClick={(e) => { onClick={(e) => {
e.nativeEvent.stopImmediatePropagation(); e.nativeEvent.stopImmediatePropagation();
e.stopPropagation(); e.stopPropagation();
...@@ -174,9 +171,9 @@ class AreaLeftTree extends Component { ...@@ -174,9 +171,9 @@ class AreaLeftTree extends Component {
/> />
} }
{ {
item.isBind?<img src='/mods/components/3dviewConvertor/assets/convertor/moduleEdit/bindedTip.png' />: item.isBind ? <img src={moduleEditIcon.bindedTip} alt='' /> :
item.routePath?<img src='/mods/components/3dviewConvertor/assets/convertor/moduleEdit/noSaveTip.png' />: item.routePath ? <img src={moduleEditIcon.noSaveTip} alt='' /> :
<img src='/mods/components/3dviewConvertor/assets/convertor/moduleEdit/nobindTip.png' /> <img src={moduleEditIcon.noSaveTip} alt='' />
} }
</span> </span>
</span> </span>
......
mods/components/3dviewConvertor/view/moduleEditComponent/PointLeftTree.js
View file @ a8c2579e
/* eslint-disable react/prop-types */ /* eslint-disable react/prop-types */
import React, { Component } from 'react'; import React, { Component } from 'react';
import PropTypes from 'prop-types'; import PropTypes from 'prop-types';
<<<<<<< HEAD
import { Connect,Tree,Select,Search,Button } from 'amos-framework'; import { Connect,Tree,Select,Search,Button } from 'amos-framework';
=======
import { Connect, Tree, Select, Search, Button } from 'amos-framework';
import imgStatic from '../../consts/imgStatic';
const moduleEditIcon = imgStatic.moduleEditIcon;
>>>>>>> 65a1bc65d6a063bb28ef1709a82cec0df2fe3505
const eventConnect = Connect.eventConnect; const eventConnect = Connect.eventConnect;
const TreeNode = Tree.TreeNode; const TreeNode = Tree.TreeNode;
const Option = Select.Option; const Option = Select.Option;
...@@ -41,13 +48,23 @@ class PointLeftTree extends Component { ...@@ -41,13 +48,23 @@ class PointLeftTree extends Component {
} }
componentDidMount() { componentDidMount() {
<<<<<<< HEAD
let { treeData,pointTypeArr,treeDataList } = this.props; let { treeData,pointTypeArr,treeDataList } = this.props;
=======
let { treeData, pointTypeArr, treeDataList } = this.props;
>>>>>>> 65a1bc65d6a063bb28ef1709a82cec0df2fe3505
this.setState({ this.setState({
treeData, treeData,
treeDataList, treeDataList,
pointTypeArr, pointTypeArr,
<<<<<<< HEAD
pointType: pointTypeArr[0] ? pointTypeArr[0].code : '' pointType: pointTypeArr[0] ? pointTypeArr[0].code : ''
}); });
=======
pointType: pointTypeArr[0]?pointTypeArr[0].code:''
});
// console.log(this.props)
>>>>>>> 65a1bc65d6a063bb28ef1709a82cec0df2fe3505
} }
componentWillReceiveProps(nextProps) { componentWillReceiveProps(nextProps) {
...@@ -117,6 +134,7 @@ class PointLeftTree extends Component { ...@@ -117,6 +134,7 @@ class PointLeftTree extends Component {
); );
if (item.children) { if (item.children) {
return ( return (
<<<<<<< HEAD
<TreeNode <TreeNode
title={ title={
<div> <div>
...@@ -156,6 +174,42 @@ class PointLeftTree extends Component { ...@@ -156,6 +174,42 @@ class PointLeftTree extends Component {
</span> </span>
</span>} </span>}
</div> </div>
=======
<TreeNode
title={
<div>
{item.isRegion ?
<span>
{title}
<span className='icon'>
{
item.isRegion ? item.isBind ? <img src={moduleEditIcon.bindedTip} alt='' /> :
<img src={moduleEditIcon.nobindTip} alt='' /> :
item.isBind ? <img src={moduleEditIcon.bindedTip} alt='' /> :
item.position3d ? <img src={moduleEditIcon.noSaveTip} alt='' /> :
<img src={moduleEditIcon.nobindTip} alt='' />
}
</span>
</span> :
<span
draggable
onDragStart={() => {
this.props.dragItemChange(item);
}}
>
{title}
<span className='icon'>
{
item.isRegion ? item.isBind ? <img src={moduleEditIcon.bindedTip} alt='' /> :
<img src={moduleEditIcon.nobindTip} alt='' /> :
item.isBind ? <img src={moduleEditIcon.bindedTip} alt='' /> :
item.position3d ? <img src={moduleEditIcon.noSaveTip} alt='' /> :
<img src={moduleEditIcon.nobindTip} alt='' />
}
</span>
</span>}
</div>
>>>>>>> 65a1bc65d6a063bb28ef1709a82cec0df2fe3505
} }
key={item.id} key={item.id}
dataRef={item} dataRef={item}
......
mods/components/3dviewConvertor/view/moduleEditComponent/RightEditPointPanel.js
View file @ a8c2579e
...@@ -2,7 +2,9 @@ import React, { Component } from 'react'; ...@@ -2,7 +2,9 @@ import React, { Component } from 'react';
import PropTypes from 'prop-types'; import PropTypes from 'prop-types';
import { Connect, Button, Input, Form, Radio } from 'amos-framework'; import { Connect, Button, Input, Form, Radio } from 'amos-framework';
import { getPointTreeDetailAction } from '../../services/moduleEditServices'; import { getPointTreeDetailAction } from '../../services/moduleEditServices';
import imgStatic from '../../consts/imgStatic';
const moduleEditIcon = imgStatic.moduleEditIcon;
const eventConnect = Connect.eventConnect; const eventConnect = Connect.eventConnect;
const FormItem = Form.Item; const FormItem = Form.Item;
const RadioGroup = Radio.Group; const RadioGroup = Radio.Group;
...@@ -107,31 +109,30 @@ class RightEditPointPanel extends Component { ...@@ -107,31 +109,30 @@ class RightEditPointPanel extends Component {
<Form className="basic-demo" ref={component => this.form = component} model={form} rules={rules}> <Form className="basic-demo" ref={component => this.form = component} model={form} rules={rules}>
<div className='topForm'> <div className='topForm'>
<div className='rightTitle'> <div className='rightTitle'>
<img src='/mods/components/3dviewConvertor/assets/convertor/moduleEdit/rightModalTitleIcon.png'/> <img src={moduleEditIcon.rightModalTitleIcon} alt='' />
<span className='titleText'>风险点信息</span> <span className='titleText'>风险点信息</span>
</div> </div>
<div className='baseMsg'> <div className='baseMsg'>
<div className='moduleTitle'> <div className='moduleTitle'>
<img src='/mods/components/3dviewConvertor/assets/convertor/moduleEdit/rightBaseMsgIcon.png'/> <img src={moduleEditIcon.rightBaseMsgIcon} alt='' />
<span className='titleText'>基本信息</span> <span className='titleText'>基本信息</span>
</div>
<div className='moduleContent'>
<div className='msgItem'>
<div className='itemLabel'>风险名称</div>
<FormItem field="name" >
<Input value={detailData.name} disabled />
</FormItem>
</div> </div>
<div className='moduleContent'>
<div className='msgItem'> <div className='msgItem'>
<div className='itemLabel'>风险名称</div>
<FormItem field="name" >
<Input value={detailData.name} disabled/>
</FormItem>
</div>
<div className='msgItem'>
<div className='itemLabel'>参考编号</div> <div className='itemLabel'>参考编号</div>
<FormItem field="code" > <FormItem field="code" >
<Input <Input
onChange={(e) => this.onChange('name', e)} onChange={(e) => this.onChange('name', e)}
value={detailData.code} value={detailData.code}
disabled disabled
/> />
</FormItem> </FormItem>
</div> </div>
<div className='msgItem'> <div className='msgItem'>
<div className='itemLabel'>风险等级</div> <div className='itemLabel'>风险等级</div>
...@@ -140,7 +141,7 @@ class RightEditPointPanel extends Component { ...@@ -140,7 +141,7 @@ class RightEditPointPanel extends Component {
</FormItem> </FormItem>
</div> </div>
</div> </div>
</div> </div>
<div className='3dMsg'> <div className='3dMsg'>
<div className='moduleTitle'> <div className='moduleTitle'>
......
mods/components/3dviewConvertor/view/moduleEditComponent/RightEditRegionPanel.js
View file @ a8c2579e
...@@ -2,8 +2,10 @@ import React, { Component } from 'react'; ...@@ -2,8 +2,10 @@ import React, { Component } from 'react';
import PropTypes from 'prop-types'; import PropTypes from 'prop-types';
import { Connect, Modal, Tree, Select, Search, Button, Input,InputNumber, Form, Radio } from 'amos-framework'; import { Connect, Modal, Tree, Select, Search, Button, Input,InputNumber, Form, Radio } from 'amos-framework';
import * as endConf from 'amos-processor/lib/config/endconf'; import * as endConf from 'amos-processor/lib/config/endconf';
import { getAreaTreeAction,saveAreaDataAction } from '../../services/moduleEditServices' import { getAreaTreeAction,saveAreaDataAction } from '../../services/moduleEditServices';
import imgStatic from '../../consts/imgStatic';
const moduleEditIcon = imgStatic.moduleEditIcon;
const eventConnect = Connect.eventConnect; const eventConnect = Connect.eventConnect;
const TreeNode = Tree.TreeNode; const TreeNode = Tree.TreeNode;
const Option = Select.Option; const Option = Select.Option;
...@@ -128,12 +130,12 @@ class RightEditRegionPanel extends Component { ...@@ -128,12 +130,12 @@ class RightEditRegionPanel extends Component {
<Form className="basic-demo" ref={component => this.form = component} model={form} rules={rules}> <Form className="basic-demo" ref={component => this.form = component} model={form} rules={rules}>
<div className='topForm'> <div className='topForm'>
<div className='rightTitle'> <div className='rightTitle'>
<img src='/mods/components/3dviewConvertor/assets/convertor/moduleEdit/rightModalTitleIcon.png'/> <img src={moduleEditIcon.rightModalTitleIcon} alt='' />
<span className='titleText'>风险区域信息</span> <span className='titleText'>风险区域信息</span>
</div> </div>
<div className='baseMsg'> <div className='baseMsg'>
<div className='moduleTitle'> <div className='moduleTitle'>
<img src='/mods/components/3dviewConvertor/assets/convertor/moduleEdit/rightBaseMsgIcon.png'/> <img src={moduleEditIcon.rightBaseMsgIcon} alt='' />
<span className='titleText'>基本信息</span> <span className='titleText'>基本信息</span>
</div> </div>
<div className='moduleContent'> <div className='moduleContent'>
...@@ -165,7 +167,7 @@ class RightEditRegionPanel extends Component { ...@@ -165,7 +167,7 @@ class RightEditRegionPanel extends Component {
<Option value="4">四级</Option> <Option value="4">四级</Option>
<Option value="5">五级</Option> <Option value="5">五级</Option>
</Select> */} </Select> */}
<Input value={detailData.level} disabled/> <Input value={detailData.level} disabled />
</FormItem> </FormItem>
</div> </div>
...@@ -173,7 +175,7 @@ class RightEditRegionPanel extends Component { ...@@ -173,7 +175,7 @@ class RightEditRegionPanel extends Component {
</div> </div>
<div className='3dMsg'> <div className='3dMsg'>
<div className='moduleTitle'> <div className='moduleTitle'>
<img src='/mods/components/3dviewConvertor/assets/convertor/moduleEdit/right3dIcon.png'/> <img src={moduleEditIcon.right3dIcon} alt='' />
<span className='titleText'>三维信息</span> <span className='titleText'>三维信息</span>
</div> </div>
<div className='moduleContent'> <div className='moduleContent'>
......
readme.md
View file @ a8c2579e
# 说明
## 换流站3d前端打包说明
1.复制amos-station-module-view的mods文件夹到mos-iot-graphmod根目录
2.使用 amos-iot-graphmod 打包, 运行打包命令
```bash
npm run build-mod
```
3.打包完成后，复制根目录下lib文件到使用系统
4.修改使用系统的webpack.config文件
```bash
`defaultConfig.plugins.push(
new HtmlInlineCodePlugin([
{ inject: 'body', begin: true, tag: 'script', attr: { src: '/extra/convertor3d/graphmod.js' } },
{ inject: 'body', begin: false, tag: 'script', attr: { src: '/extra/convertor3d/worker.69f3bd5bcb7ff720afa4.js' } }
])
);`
```
5.修改文件graphmod 将 webpack_require__.p修改为第3步放置的路径
```bash
`// __webpack_public_path__
__webpack_require__.p = "/extra/convertor3d/";`
```
## 注意 src路径为第3步放置的路径 文件名字要与打包后的文件名字一致
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