+
@@ -60,7 +67,8 @@ import RoadAndEvents from "./components/RoadAndEvents/index.vue";
import Button from "@screen/components/Buttons/Button.vue";
import Vue from "vue";
import BMapContainer from "./components/BMapContainer/index.vue";
-
+import RadioGroup from "@screen/components/FormConfig/components/RadioGroup/index.vue";
+import Carbon from "./carbon";
export default {
name: "Home",
components: {
@@ -79,13 +87,16 @@ export default {
HomeWord,
HomeWeather,
HomeWeatherLayer,
- HomeTraffic
+ HomeTraffic,
+ RadioGroup,
+ Carbon
},
data() {
return {
selectedDevice: null,
isGisCompleted: false,
- mapContainer:'BMapContainer'
+ mapContainer:'BMapContainer',
+ jnValue:'1'
};
},
provide() {
@@ -121,7 +132,7 @@ export default {
translateXElement.style.transform = `translateY(0)`;
translateXElement.style.position = `relative`;
}
- },
+ }
},
};
@@ -248,4 +259,10 @@ export default {
}
}
}
+.jn-radio{
+ position: absolute;
+ top: 16px;
+ left: 22.6%;
+ z-index: 2;
+}
diff --git a/ruoyi-ui/src/views/JiHeExpressway/pages/control/event/commandDispatch/Cards/CrowdnessIndicatorRankings/index.vue b/ruoyi-ui/src/views/JiHeExpressway/pages/control/event/commandDispatch/Cards/CrowdnessIndicatorRankings/index.vue
index 17555071..d648f07d 100644
--- a/ruoyi-ui/src/views/JiHeExpressway/pages/control/event/commandDispatch/Cards/CrowdnessIndicatorRankings/index.vue
+++ b/ruoyi-ui/src/views/JiHeExpressway/pages/control/event/commandDispatch/Cards/CrowdnessIndicatorRankings/index.vue
@@ -168,7 +168,7 @@ export default {
);
});
} else {
- Vue.prototype.mapIns.removeLayerByName('lineLayer');
+ Vue.prototype.mapIns.removeLayerByName('lineLayer');
}
//
// this.$refs.MapContainerRef.showRoadConditions(findIndex === -1);
@@ -223,12 +223,16 @@ export default {
points.push({
type: 'event',
longitude: parseFloat(e.longitude),
- latitude: parseFloat(e.latitude),
+ latitude: parseFloat(e.latitude),
iconUrl: iconUrl,
- offset: [0,-48],
- size: [42,100],
- GGoffsetX: 0,
- GGoffsetY: 20,
+ offset: [0,-48],
+ size: [42,100],
+ GGoffsetX: 0,
+ GGoffsetY: -5,
+ GGimgOffset:[0,0],
+ GGimgsize:[42,103],
+ GGstakeOffsetY:45,
+ stakeOffsetY:25,
otherInfo: {
ext: null,
name: e.deviceName,
@@ -289,7 +293,7 @@ export default {
e = null;
});
}
-
+
}
},
handledDialogCamera(bool) {
@@ -326,14 +330,22 @@ export default {
iconUrl = (e.useState ? iconb : iconb_f);
} else if(e.childType==='2-2' || e.childType==='2-4'){
iconUrl = (e.useState ? iconc : iconc_f);
- }
+ }
points.push({
type: 'event',
longitude: parseFloat(e.longitude),
- latitude: parseFloat(e.latitude),
+ latitude: parseFloat(e.latitude),
// iconUrl: e.useState ? icon : icon_f,
iconUrl: iconUrl,
+ offset: [0,-48],
+ size: [42,100],
+ GGoffsetX: 0,
+ GGoffsetY: -5,
+ GGimgOffset:[0,0],
+ GGimgsize:[42,103],
+ GGstakeOffsetY:45,
+ stakeOffsetY:25,
otherInfo: {
ext: null,
name: e.deviceName,
@@ -433,7 +445,7 @@ export default {
if (this.mapContainer === 'BMapContainer') {
const icon = require(`@screen/images/layerb/事件专题/${eventName}_active.svg`);
const center = [parseFloat(longitude), parseFloat(dimension)]
-
+
mapInfo.addPointByArr(
{
pointList: [
@@ -442,6 +454,14 @@ export default {
longitude: center[0], //点坐标经度 【必传字段】
latitude: center[1], //点坐标纬度 【必传字段】
iconUrl: icon, // 图标 【必传字段】
+ offset: [0,-48],
+ size: [42,100],
+ GGoffsetX: 0,
+ GGoffsetY: -5,
+ GGimgOffset:[0,0],
+ GGimgsize:[42,103],
+ GGstakeOffsetY:45,
+ stakeOffsetY:25,
otherInfo: {
name: '123'
}
diff --git a/ruoyi-ui/src/views/JiHeExpressway/pages/control/event/commandDispatch/Cards/ReleaseInformation/index.vue b/ruoyi-ui/src/views/JiHeExpressway/pages/control/event/commandDispatch/Cards/ReleaseInformation/index.vue
index 1468ae29..c9bc1bc9 100644
--- a/ruoyi-ui/src/views/JiHeExpressway/pages/control/event/commandDispatch/Cards/ReleaseInformation/index.vue
+++ b/ruoyi-ui/src/views/JiHeExpressway/pages/control/event/commandDispatch/Cards/ReleaseInformation/index.vue
@@ -31,7 +31,7 @@
+
+
@@ -243,4 +329,87 @@ export default {
}
}
}
+::v-deep .el-table__empty-text {
+ color: #3ae0f8;
+}
+
+.StatsDetail {
+ // height: 770px;
+ margin: 20px 0;
+ width: 100%;
+ display: flex;
+ gap: 5px;
+}
+
+.el-table {
+ border: 1px solid #07aec6;
+ background: #0b6581;
+}
+
+@media (min-width: 3000px) {
+ ::v-deep .el-table .el-table__header-wrapper th,
+ .el-table .el-table__fixed-header-wrapper th {
+ height: 55px !important;
+ background: #0b6581;
+ border: 1px solid #07aec6;
+ font-size: 22px;
+ }
+ ::v-deep .el-table td.el-table__cell div{
+ font-size: 22px;
+ }
+}
+::v-deep .el-table .el-table__header-wrapper th,
+.el-table .el-table__fixed-header-wrapper th {
+ background: #0b6581;
+ border: 1px solid #07aec6;
+}
+
+::v-deep .el-table th.el-table__cell > .cell {
+ color: #3de8ff;
+}
+
+::v-deep .el-table thead.is-group th.el-table__cell {
+ background: #0b6581;
+ border: 1px solid #07aec6;
+}
+
+// ::v-deep .el-table th.el-table__cell.is-leaf,
+::v-deep .el-table td.el-table__cell {
+ border: 1px solid #07aec6;
+ background: #1b586d;
+ color: #fff;
+}
+::v-deep .el-table td.el-table__cell div {
+ line-height: 30px;
+}
+::v-deep .el-checkbox-group {
+ text-align: left;
+ .el-checkbox {
+ min-width: 70px;
+ }
+}
+
+::v-deep .el-table tr {
+ border: 1px solid #07aec6;
+ background-color: #0b6581;
+}
+
+::v-deep
+.el-table--enable-row-hover
+.el-table__body
+tr:hover
+> td.el-table__cell {
+ background: #1b586d;
+ border: 1px solid #07aec6;
+}
+
+::v-deep .el-table::before,
+.el-table--group::after,
+.el-table--border::after {
+ background: none;
+}
+.footer {
+ margin-top: 20px;
+ display: flex;
+}
diff --git a/ruoyi-ui/src/views/JiHeExpressway/pages/service/publicService/components/record/index.vue b/ruoyi-ui/src/views/JiHeExpressway/pages/service/publicService/components/record/index.vue
index 7fbc2e39..4404f136 100644
--- a/ruoyi-ui/src/views/JiHeExpressway/pages/service/publicService/components/record/index.vue
+++ b/ruoyi-ui/src/views/JiHeExpressway/pages/service/publicService/components/record/index.vue
@@ -3,78 +3,70 @@
+ :formConfigOptions="{ dFormData: { eventState: '0' } }" @handleSearch="handleSearch" />
-
-
+
-
+ header-align="center" />
{{ enum_channels[scope.row.publishChannels] }}
-
+
- {{ (scope.row.ip === 'unknown' || !scope.row.ip) ? '服务器': scope.row.ip}}
+ {{ (scope.row.ip === 'unknown' || !scope.row.ip) ? '服务器' : scope.row.ip }}
-
+
- {{ scope.row.position && scope.row.position.replace(/\[/,'').replace(/\]/,'') }}
+ {{ scope.row.position && scope.row.position.replace(/\[/, '').replace(/\]/, '') }}
-
+
-
-
+
+
{{ scope.row.contentDetails }}
-
-
-
+
-
-
+
+
-
@@ -86,12 +78,11 @@ import Pagination from '@screen/components/Pagination.vue';
import Table from '@screen/components/Table.vue';
import request from "@/utils/request";
import BoardRecordPreview from '@screen/components/infoBoard/BoardRecordPreview.vue'
-import {DirectionTypes} from '@screen/utils/enum.js';
+import { DirectionTypes } from '@screen/utils/enum.js';
import InputSearch from "@screen/components/InputSearch/index.vue";
import { searchFormList } from "./data";
import moment from "moment";
import { Loading } from 'element-ui';
-import { e } from 'mathjs';
export default {
name: 'boardRecord',
@@ -107,33 +98,35 @@ export default {
DirectionTypes,
moment,
enum_channels: {
- 4:'情报板',
- 7:'语音广播',
- 8:'企业微信',
+ 4: '情报板',
+ 7: '语音广播',
+ 8: '企业微信',
},
tableData: [],
searchFormList,
isShowPhrases: false,
isShowDisposal: false,
total: 20,
+ sumtotal: 0,
eventType: 1,
searchData: {
pageSize: 20,
pageNum: 1
},
phrasesData: [],
- process: []
+ process: [],
+ sum: 0 // 将 sum 定义为 data 属性
}
},
created() {
-
+
},
methods: {
- onRefreshForm(){
+ onRefreshForm() {
this.searchData.pageNum = 1;
this.$refs.searchComp.handleResetForm();
},
- onDelete(id){
+ onDelete(id) {
const self = this;
this.$confirm("是否删除?", "警告", {
confirmButtonText: "确定",
@@ -142,7 +135,7 @@ export default {
})
.then(function () {
request({
- url: `/business/manage/`+id,
+ url: `/business/manage/${id}`,
method: "DELETE",
data: {},
}).then((result) => {
@@ -152,7 +145,7 @@ export default {
});
})
},
- onExport(){
+ onExport() {
const self = this;
this.$confirm("是否确认导出共计查询内容?", "警告", {
confirmButtonText: "确定",
@@ -171,8 +164,6 @@ export default {
data: self.searchData,
responseType: 'blob',
}).then((res) => {
- console.log(res)
-
const url = window.URL.createObjectURL(new Blob([res]));
let link = document.createElement("a");
link.style.display = "none";
@@ -185,10 +176,10 @@ export default {
link = null;
loadingInstance.close();
})
- .catch((err) => {
- self.$message.error(err);
- loadingInstance.close();
- });
+ .catch((err) => {
+ self.$message.error(err);
+ loadingInstance.close();
+ });
})
},
handleSearch(data) {
@@ -198,77 +189,92 @@ export default {
pageSize: 20,
pageNum: 1
}
- if(daterange && daterange.length > 0){
+ if (daterange && daterange.length > 0) {
_searchData.startTime = daterange[0];
_searchData.endTime = daterange[1];
}
- if(data.publishChannels){
+ if (data.publishChannels) {
_searchData.publishChannels = data.publishChannels
}
- if(data.publishStatus){
+ if (data.publishStatus) {
_searchData.publishStatus = data.publishStatus
}
this.searchData = _searchData;
this.initData();
},
indexMethod(index) {
- return this.searchData.pageSize*(this.searchData.pageNum-1) + index + 1;
- },
+ return this.searchData.pageSize * (this.searchData.pageNum - 1) + index + 1;
+ },
formatterDirection(row, column) {
- return DirectionTypes[row.direction];
- },
+ return DirectionTypes[row.direction];
+ },
initData() {
+ this.sum = 0; // 每次请求前重置 sum
request({
url: `/business/manage/statisticsList?pageNum=${this.searchData.pageNum}&pageSize=${this.searchData.pageSize}`,
method: "post",
params: { pageNum: this.searchData.pageNum, pageSize: this.searchData.pageSize },
data: this.searchData,
}).then((result) => {
- if (result.code != 200) return Message.error(result?.msg);
-
+ if (result.code != 200) return this.$message.error(result?.msg);
result.rows.forEach(e => {
- if(e.publishChannels === 4 || e.publishChannels === 7){
- const contentDetailsInfo = JSON.parse(e.contentDetails)
- if(e.publishChannels === 4){ //情报板
- let msg = '情报板数据异常' // + e.contentDetails
- // 检查是否一键恢复
- if(contentDetailsInfo.length > 0){
- if(contentDetailsInfo[0].functions.length > 1){
- const parameters = contentDetailsInfo[0].functions[1]?.params?.parameters
- if(parameters && parameters.length > 0){
- e.contentDetailsInfo = parameters
- msg = ''
- }
+ if (e.publishChannels === 4 || e.publishChannels === 7) {
+ const contentDetailsInfo = JSON.parse(e.contentDetails)
+ if (e.publishChannels === 4) { // 情报板
+ let msg = '情报板数据异常' // + e.contentDetails
+ // 检查是否一键恢复
+ if (contentDetailsInfo.length > 0) {
+ if (contentDetailsInfo[0].functions.length > 1) {
+ const parameters = contentDetailsInfo[0].functions[1]?.params?.parameters
+ if (parameters && parameters.length > 0) {
+ e.contentDetailsInfo = parameters
+ msg = ''
}
- else if(contentDetailsInfo[0].functions.length > 0){
- if(contentDetailsInfo[0].functions[0].functionId && contentDetailsInfo[0].functions[0].functionId === '1B'){
- msg = '一键恢复操作'
- }
+ } else if (contentDetailsInfo[0].functions.length > 0) {
+ if (contentDetailsInfo[0].functions[0].functionId && contentDetailsInfo[0].functions[0].functionId === '1B') {
+ msg = '一键恢复操作'
}
}
- e.contentDetails = msg
- } else if(e.publishChannels === 7){
- let msg = '语音广播数据异常' //+e.contentDetails
- console.log(contentDetailsInfo)
- if(contentDetailsInfo.length > 0){
- if(contentDetailsInfo[0].functions.length > 0){
- msg = contentDetailsInfo[0].functions[0].params.text
- }
+ }
+ e.contentDetails = msg
+ } else if (e.publishChannels === 7) {
+ let msg = '语音广播数据异常' //+e.contentDetails
+ console.log(contentDetailsInfo)
+ if (contentDetailsInfo.length > 0) {
+ if (contentDetailsInfo[0].functions.length > 0) {
+ msg = contentDetailsInfo[0].functions[0].params.text
}
- e.contentDetails = msg;
}
+ e.contentDetails = msg;
}
+ }
});
-
+
this.tableData = result.rows;
- setTimeout(() => {
- this.tableData = result.rows;
- }, 200);
- // this.$nextTick(()=>{
-
- // })
this.total = result.total;
-
+ });
+ return request({
+ url: '/business/manage/statisticsListNoPage',
+ method: "post",
+ data: this.searchData,
+ }).then((result) => {
+ if (result.code != 200) return this.$message.error(result?.msg);
+ let sum = 0;
+ result.data.forEach(e => {
+ if (e.publishChannels === 4) {
+ const contentDetailsInfo = JSON.parse(e.contentDetails)
+ if (contentDetailsInfo.length > 0) {
+ if (contentDetailsInfo[0].functions.length > 1) {
+ const parameters = contentDetailsInfo[0].functions[1]?.params?.parameters
+ if (parameters && parameters.length > 0) {
+ e.contentDetailsInfo = parameters
+ sum += parameters.length - 1
+ }
+ }
+ }
+ }
+ });
+ this.sumtotal = result.data.length + sum; // 更新 sumtotal
});
},
@@ -300,20 +306,26 @@ export default {
display: flex;
gap: 6px;
}
+
+ .sum-total {
+ margin-left: 10px;
+ font-weight: bold;
+ color: #f6f1f1;
+ }
}
.body {
- flex: 1;
- position: relative;
- overflow-y: auto;
- overflow-x: hidden;
- .content {
- position: absolute;
- width: 100%;
- height: 100%;
- overflow: auto;
- }
+ flex: 1;
+ position: relative;
+ overflow-y: auto;
+ overflow-x: hidden;
+ .content {
+ position: absolute;
+ width: 100%;
+ height: 100%;
+ overflow: auto;
}
+ }
.footer {
margin-top: 15px;
@@ -323,15 +335,18 @@ export default {
justify-content: center;
}
- .board_shower{
+ .board_shower {
margin: 4px;
}
- ::v-deep .el-carousel__indicators--horizontal{
- line-height: 0; height: 16px;
- .el-carousel__indicator--horizontal{
+
+ ::v-deep .el-carousel__indicators--horizontal {
+ line-height: 0;
+ height: 16px;
+ .el-carousel__indicator--horizontal {
padding: 7px 4px;
}
}
+
::v-deep .el-table__cell div.cell {
padding: 0 10px !important;
}
+ 
导出
-
- 刷新
-