Browse Source

bug

wangqin
zhoule 12 months ago
parent
commit
08bc6b793c
  1. 19
      ruoyi-ui/src/views/JiHeExpressway/components/RoadStateCard/index.vue
  2. 2
      ruoyi-ui/src/views/JiHeExpressway/pages/Home/components/Dialogs/TrafficIncidents/index.vue
  3. 6
      ruoyi-ui/src/views/JiHeExpressway/pages/control/event/event/index.vue
  4. 4
      ruoyi-ui/src/views/JiHeExpressway/utils/enum.js

19
ruoyi-ui/src/views/JiHeExpressway/components/RoadStateCard/index.vue

@ -2,8 +2,14 @@
<BorderRadiusImage class='RoadStateCard' borderRadius="2px" <BorderRadiusImage class='RoadStateCard' borderRadius="2px"
borderColor="linear-gradient(360deg, rgba(55, 231, 255, 0.3), rgba(55, 231, 255, 0))" borderWidth="2px"> borderColor="linear-gradient(360deg, rgba(55, 231, 255, 0.3), rgba(55, 231, 255, 0))" borderWidth="2px">
<div class="left"> <div class="left">
<img :src="(cardData.pictures ? cardData.pictures[0] : null) || require(`./test.png`)"> <!-- <img :src="(cardData.pictures ? cardData.pictures[0] : null) || require(`./test.png`)"> -->
<!-- <img :src="require(`./test.png`)"> --> <!-- <img :src="require(`./test.png`)"> -->
<ElImage style="width: 212px; height: 159px;" :src="cardData.pictures ? cardData.pictures[0] : null"
:preview-src-list="cardData.pictures || []">
<div slot="error">
<i class="el-icon-picture-outline icon"></i>
</div>
</ElImage>
</div> </div>
<div class="right"> <div class="right">
<div class="info"> <div class="info">
@ -23,7 +29,7 @@
</div> </div>
</div> </div>
<img v-if="cardData.state" class="status" :src="require(`./images/${statusMap[cardData.state]}.svg`)" /> <img v-if="cardData.state" class="status" :src="require(`./images/${statusMap[cardData.state]}.svg`) " />
</BorderRadiusImage> </BorderRadiusImage>
</template> </template>
@ -135,6 +141,15 @@ export default {
width: 212px; width: 212px;
height: 159px; height: 159px;
} }
.icon {
display:inline-block;
width: 212px;
height: 159px;
line-height: 157px;
text-align: center;
border: 1px solid #fff;
}
} }
.right { .right {

2
ruoyi-ui/src/views/JiHeExpressway/pages/Home/components/Dialogs/TrafficIncidents/index.vue

@ -132,7 +132,7 @@ export default {
if (code != 200) return; if (code != 200) return;
this.data = { ...data, ...this.data }; this.data = { ...data, ...this.data };
console.log(data); console.log('trafficIncidents',data);
}) })
.catch((err) => {}); .catch((err) => {});
}, },

6
ruoyi-ui/src/views/JiHeExpressway/pages/control/event/event/index.vue

@ -359,8 +359,8 @@ export default {
data.visibility = otherConfig.visibility; data.visibility = otherConfig.visibility;
data.pictures = otherConfig.pictures || []; data.pictures = otherConfig.pictures || [];
// data.videoList = otherConfig.videoList || [] data.videoList = otherConfig.videoList || []
data.videoList = otherConfig.videoList || ['https://sf1-cdn-tos.huoshanstatic.com/obj/media-fe/xgplayer_doc_video/mp4/xgplayer-demo-480p.mp4'] // data.videoList = otherConfig.videoList || ['https://sf1-cdn-tos.huoshanstatic.com/obj/media-fe/xgplayer_doc_video/mp4/xgplayer-demo-480p.mp4']
} }
this.detailDialogFormData = data; this.detailDialogFormData = data;
@ -377,7 +377,7 @@ export default {
let data = result.data; let data = result.data;
data.stringDirection = gzDirectionMapping[data.direction] || data.direction; data.stringDirection = gzDirectionMapping[data.direction] || data.direction;
data.videoList = ['https://sf1-cdn-tos.huoshanstatic.com/obj/media-fe/xgplayer_doc_video/mp4/xgplayer-demo-480p.mp4']; data.videoList = [];
if (data.otherConfig) { if (data.otherConfig) {
let otherConfig = JSON.parse(data.otherConfig); let otherConfig = JSON.parse(data.otherConfig);
// data.pictures = otherConfig.pictures || []; // data.pictures = otherConfig.pictures || [];

4
ruoyi-ui/src/views/JiHeExpressway/utils/enum.js

@ -40,13 +40,13 @@ export const CameraDirectionEnum = {
// text: "上下行 (双向)", // text: "上下行 (双向)",
// }, // },
1: { 1: {
text: "上行(菏泽方向)", text: "菏泽方向",
}, },
2: { 2: {
text: "中", text: "中",
}, },
3: { 3: {
text: "下行(济南方向)", text: "济南方向",
}, },
}; };

Loading…
Cancel
Save