2025年04月23日 1.0.2 治超页面显示视频问题修复

main
gaoshuguang 7 months ago
parent c2fa9616e3
commit 13921f75a3

@ -216,7 +216,12 @@
<artifactId>mybatis-plus-join</artifactId> <artifactId>mybatis-plus-join</artifactId>
<version>1.2.4</version> <version>1.2.4</version>
</dependency> </dependency>
<dependency>
<groupId>com.dm</groupId>
<artifactId>DmJdbcDriver18</artifactId>
<version>1.8.0</version>
<scope>compile</scope>
</dependency>
</dependencies> </dependencies>
<dependencyManagement> <dependencyManagement>

@ -0,0 +1,25 @@
package com.nmgs.common;
import com.nmgs.common.util.PathUtil;
import com.nmgs.common.util.VersionUtils;
import com.nmgs.zcdataquery.entity.Res;
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.RestController;
import java.io.File;
/**
* @author: shuguang
* @date: 20250102 16:47
* @description:
*/
@RestController
public class ProgramVersionController {
@PostMapping("/queryProgramVersion")
public Res queryProgramVersion() {
String versionPath = PathUtil.versionPath;
File resourceDir = new File(versionPath);
String version = VersionUtils.getVersionFileName(resourceDir);
return Res.success(version);
}
}

@ -0,0 +1,32 @@
package com.nmgs.common.util;
import java.io.File;
import java.util.ArrayList;
import java.util.List;
/**
* @author: shuguang
* @date: 20250102 16:50
* @description:
*/
public class VersionUtils {
public static String getVersionFileName(File dir) {
String version="";
List<String> fileNames = new ArrayList<>();
if (dir == null || !dir.exists() || !dir.isDirectory()) {
return version;
}
File[] files = dir.listFiles();
if (files != null) {
for (File file : files) {
if (file.isFile() && file.getName().endsWith(".txt")) {
fileNames.add(file.getName());
}
}
}
if (!fileNames.isEmpty()) {
version = fileNames.get(0).replace(".txt", "");
}
return version;
}
}

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

@ -5,8 +5,8 @@
<meta charset="UTF-8"/> <meta charset="UTF-8"/>
<title></title> <title></title>
<script type="module" crossorigin src="./assets/index.23d92d8a.js"></script> <script type="module" crossorigin src="./assets/index.1a791677.js"></script>
<link rel="stylesheet" href="./assets/index.1971fb97.css"> <link rel="stylesheet" href="./assets/index.f63ed527.css">
</head> </head>
<body> <body>
<div id="app"> <div id="app">

@ -1,3 +0,0 @@
序号 日期 版本号 说明
1 2025年02月21日 1.0.0 初始版本号合并项目实时信息查询RealTimeInfoQuery、治超信息查询ZCDataQuery、导入导出ImportExport原名DemoUtil

@ -1,3 +1,5 @@
序号 日期 版本号 说明 序号 日期 版本号 说明
1 2025年02月21日 1.0.0 初始版本号合并项目实时信息查询RealTimeInfoQuery、治超信息查询ZCDataQuery、导入导出ImportExport原名DemoUtil 1 2025年02月21日 1.0.0 初始版本号合并项目实时信息查询RealTimeInfoQuery、治超信息查询ZCDataQuery、导入导出ImportExport原名DemoUtil
2 2025年04月18日 1.0.1 兼容达梦数据库,页面增加版本号显示
3 2025年04月23日 1.0.2 治超页面显示视频问题修复

@ -5,8 +5,8 @@
<meta charset="UTF-8"/> <meta charset="UTF-8"/>
<title></title> <title></title>
<script type="module" crossorigin src="./assets/index.23d92d8a.js"></script> <script type="module" crossorigin src="./assets/index.1a791677.js"></script>
<link rel="stylesheet" href="./assets/index.1971fb97.css"> <link rel="stylesheet" href="./assets/index.f63ed527.css">
</head> </head>
<body> <body>
<div id="app"> <div id="app">

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

@ -5,8 +5,8 @@
<meta charset="UTF-8"/> <meta charset="UTF-8"/>
<title></title> <title></title>
<script type="module" crossorigin src="./assets/index.23d92d8a.js"></script> <script type="module" crossorigin src="./assets/index.1a791677.js"></script>
<link rel="stylesheet" href="./assets/index.1971fb97.css"> <link rel="stylesheet" href="./assets/index.f63ed527.css">
</head> </head>
<body> <body>
<div id="app"> <div id="app">

@ -1,3 +0,0 @@
序号 日期 版本号 说明
1 2025年02月21日 1.0.0 初始版本号合并项目实时信息查询RealTimeInfoQuery、治超信息查询ZCDataQuery、导入导出ImportExport原名DemoUtil

@ -23,6 +23,7 @@ com\nmgs\realtimeinfoquery\entity\TollData.class
com\nmgs\zcdataquery\service\impl\QueryImageServiceImpl.class com\nmgs\zcdataquery\service\impl\QueryImageServiceImpl.class
com\nmgs\zcdataquery\mapper\NameTableMapper.class com\nmgs\zcdataquery\mapper\NameTableMapper.class
com\nmgs\common\config\ErrorConfig.class com\nmgs\common\config\ErrorConfig.class
com\nmgs\common\util\VersionUtils.class
com\nmgs\realtimeinfoquery\mapper\NameTableDcomMapper.class com\nmgs\realtimeinfoquery\mapper\NameTableDcomMapper.class
com\nmgs\realtimeinfoquery\service\impl\MinFeeServiceImpl.class com\nmgs\realtimeinfoquery\service\impl\MinFeeServiceImpl.class
com\nmgs\common\util\CheckParamUtil.class com\nmgs\common\util\CheckParamUtil.class
@ -37,6 +38,7 @@ com\nmgs\realtimeinfoquery\entity\Res.class
com\nmgs\realtimeinfoquery\entity\ServerInfo.class com\nmgs\realtimeinfoquery\entity\ServerInfo.class
com\nmgs\common\Result.class com\nmgs\common\Result.class
com\nmgs\realtimeinfoquery\service\QueryParamService.class com\nmgs\realtimeinfoquery\service\QueryParamService.class
com\nmgs\common\ProgramVersionController.class
com\nmgs\realtimeinfoquery\mapper\SubCompanyMapper.class com\nmgs\realtimeinfoquery\mapper\SubCompanyMapper.class
com\nmgs\realtimeinfoquery\service\impl\SectionStationServiceImpl.class com\nmgs\realtimeinfoquery\service\impl\SectionStationServiceImpl.class
com\nmgs\zcdataquery\test\Test01.class com\nmgs\zcdataquery\test\Test01.class

@ -18,6 +18,7 @@ D:\myproject\git\SFXT-AggregationProgram\AggregationProgram\src\main\java\com\nm
D:\myproject\git\SFXT-AggregationProgram\AggregationProgram\src\main\java\com\nmgs\realtimeinfoquery\service\OnlineChargingService.java D:\myproject\git\SFXT-AggregationProgram\AggregationProgram\src\main\java\com\nmgs\realtimeinfoquery\service\OnlineChargingService.java
D:\myproject\git\SFXT-AggregationProgram\AggregationProgram\src\main\java\com\nmgs\common\util\main.java D:\myproject\git\SFXT-AggregationProgram\AggregationProgram\src\main\java\com\nmgs\common\util\main.java
D:\myproject\git\SFXT-AggregationProgram\AggregationProgram\src\main\java\com\nmgs\realtimeinfoquery\entity\GantryTable.java D:\myproject\git\SFXT-AggregationProgram\AggregationProgram\src\main\java\com\nmgs\realtimeinfoquery\entity\GantryTable.java
D:\myproject\git\SFXT-AggregationProgram\AggregationProgram\src\main\java\com\nmgs\common\util\VersionUtils.java
D:\myproject\git\SFXT-AggregationProgram\AggregationProgram\src\main\java\com\nmgs\realtimeinfoquery\mapper\GantryTableMapper.java D:\myproject\git\SFXT-AggregationProgram\AggregationProgram\src\main\java\com\nmgs\realtimeinfoquery\mapper\GantryTableMapper.java
D:\myproject\git\SFXT-AggregationProgram\AggregationProgram\src\main\java\com\nmgs\zcdataquery\mapper\KindTextMapper.java D:\myproject\git\SFXT-AggregationProgram\AggregationProgram\src\main\java\com\nmgs\zcdataquery\mapper\KindTextMapper.java
D:\myproject\git\SFXT-AggregationProgram\AggregationProgram\src\main\java\com\nmgs\common\exception\PPException.java D:\myproject\git\SFXT-AggregationProgram\AggregationProgram\src\main\java\com\nmgs\common\exception\PPException.java
@ -133,6 +134,7 @@ D:\myproject\git\SFXT-AggregationProgram\AggregationProgram\src\main\java\com\nm
D:\myproject\git\SFXT-AggregationProgram\AggregationProgram\src\main\java\com\nmgs\realtimeinfoquery\entity\BillingDetails.java D:\myproject\git\SFXT-AggregationProgram\AggregationProgram\src\main\java\com\nmgs\realtimeinfoquery\entity\BillingDetails.java
D:\myproject\git\SFXT-AggregationProgram\AggregationProgram\src\main\java\com\nmgs\zcdataquery\controller\EntranceQueryController.java D:\myproject\git\SFXT-AggregationProgram\AggregationProgram\src\main\java\com\nmgs\zcdataquery\controller\EntranceQueryController.java
D:\myproject\git\SFXT-AggregationProgram\AggregationProgram\src\main\java\com\nmgs\zcdataquery\service\OverLimitRatioService.java D:\myproject\git\SFXT-AggregationProgram\AggregationProgram\src\main\java\com\nmgs\zcdataquery\service\OverLimitRatioService.java
D:\myproject\git\SFXT-AggregationProgram\AggregationProgram\src\main\java\com\nmgs\common\ProgramVersionController.java
D:\myproject\git\SFXT-AggregationProgram\AggregationProgram\src\main\java\com\nmgs\realtimeinfoquery\entity\GantryInfo.java D:\myproject\git\SFXT-AggregationProgram\AggregationProgram\src\main\java\com\nmgs\realtimeinfoquery\entity\GantryInfo.java
D:\myproject\git\SFXT-AggregationProgram\AggregationProgram\src\main\java\com\nmgs\realtimeinfoquery\entity\minfee\FeeInfo.java D:\myproject\git\SFXT-AggregationProgram\AggregationProgram\src\main\java\com\nmgs\realtimeinfoquery\entity\minfee\FeeInfo.java
D:\myproject\git\SFXT-AggregationProgram\AggregationProgram\src\main\java\com\nmgs\common\util\DatabaseUtil.java D:\myproject\git\SFXT-AggregationProgram\AggregationProgram\src\main\java\com\nmgs\common\util\DatabaseUtil.java

Binary file not shown.

Before

Width:  |  Height:  |  Size: 232 KiB

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

@ -1,31 +0,0 @@
<!DOCTYPE html>
<!--<html lang="en" class="dark">-->
<html lang="en" class="light">
<head>
<meta charset="UTF-8"/>
<title></title>
<script type="module" crossorigin src="./assets/index.23d92d8a.js"></script>
<link rel="stylesheet" href="./assets/index.1971fb97.css">
</head>
<body>
<div id="app">
<div class="loading">
<div class="loading-wrap">
<div class="loading-dots">
<span class="dot dot-spin">
<i></i>
<i></i>
<i></i>
<i></i>
</span>
</div>
<div class="loading-title">
正在缓冲...
</div>
</div>
</div>
</div>
</body>
</html>

@ -37,4 +37,8 @@ export const selectKSInfoQuery = data => post("/AggregationProgram/sys/selectKSI
export const selectQueryOutSta = data => post("/AggregationProgram/sys/selectQueryOutSta", data) export const selectQueryOutSta = data => post("/AggregationProgram/sys/selectQueryOutSta", data)
//增加获取版本号
export const queryProgramVersion = data => post("/AggregationProgram/queryProgramVersion", data)

@ -2,6 +2,7 @@
<div class="app-container"> <div class="app-container">
<div class="content-header"> <div class="content-header">
<h1>参数配置--导入导出</h1> <h1>参数配置--导入导出</h1>
<div class="version-info">版本号{{ version }}</div>
</div> </div>
<div class="filter-container"> <div class="filter-container">
@ -273,11 +274,13 @@
<script> <script>
import axios from "axios"; import axios from "axios";
import {queryProgramVersion} from "../../util/api/realtimeinfoquery/api";
export default { export default {
name: "importIndex", name: "importIndex",
data() { data() {
return { return {
version: '', //
percentage: 0, // percentage: 0, //
progressShow: false, // progressShow: false, //
dataList: [], // dataList: [], //
@ -593,9 +596,17 @@ export default {
this.progressShow = false; this.progressShow = false;
}); });
}, },
fetchVersion(){
queryProgramVersion().then((res) => {
// console.log(res)
this.version = res.data;
})
},
}, },
mounted() { mounted() {
this.getAll(); this.getAll();
this.fetchVersion();
} }
}; };
@ -611,4 +622,12 @@ export default {
.filter-container { .filter-container {
margin-bottom: 20px; margin-bottom: 20px;
} }
.version-info {
position: fixed;
top: 10px; /* 调整为页面顶部 */
right: 10px; /* 调整为页面右侧 */
font-size: 12px;
color: #332f2f;
z-index: 1000; /* 确保版本号在最上层 */
}
</style> </style>

@ -771,17 +771,23 @@
</el-dialog> </el-dialog>
</div> </div>
<div class="version-info">版本号{{ version }}</div>
</el-main> </el-main>
</el-container> </el-container>
</template> </template>
<script lang="ts"> <script lang="ts">
import {queryImageInfo, selectQueryInfo, selectQuerySection, selectQueryStation} from "../../util/api/realtimeinfoquery/api.js"; import {
queryImageInfo,
queryProgramVersion,
selectQueryInfo,
selectQuerySection,
selectQueryStation
} from "../../util/api/realtimeinfoquery/api.js";
import {Delete, Search, View} from '@element-plus/icons-vue' import {Delete, Search, View} from '@element-plus/icons-vue'
import {ElMessage} from "element-plus"; import {ElMessage} from "element-plus";
import moment from 'moment' import moment from 'moment'
function hexToDecimal(hexStr) { function hexToDecimal(hexStr) {
return parseInt(hexStr, 16); return parseInt(hexStr, 16);
} }
@ -812,6 +818,7 @@ export default {
} }
}; };
return { return {
version: '', //
fullscreenLoading:false, fullscreenLoading:false,
imageSrcGantry: '', imageSrcGantry: '',
srcImageGantryList: [], srcImageGantryList: [],
@ -1284,10 +1291,17 @@ export default {
this.$message.error(res.msg); this.$message.error(res.msg);
} }
}) })
} },
fetchVersion(){
queryProgramVersion().then((res) => {
// console.log(res)
this.version = res.data;
})
},
}, },
created() { created() {
this.fetchVersion();
}, },
} }
@ -1304,6 +1318,13 @@ export default {
height: 90%; height: 90%;
flex: 1; flex: 1;
} }
.version-info {
position: fixed;
top: 10px; /* 调整为页面顶部 */
right: 10px; /* 调整为页面右侧 */
font-size: 12px;
color: #332f2f;
z-index: 1000; /* 确保版本号在最上层 */
}
</style> </style>

@ -56,6 +56,7 @@
</el-pagination> </el-pagination>
</el-config-provider> </el-config-provider>
</el-col> </el-col>
<div class="version-info">版本号{{ version }}</div>
</el-row> </el-row>
<!-- :style="{ maxHeight: '700px' }"--> <!-- :style="{ maxHeight: '700px' }"-->
<el-dialog title="治超详情" v-model="viewShow" width="80%" top="0.5%" destroy-on-close <el-dialog title="治超详情" v-model="viewShow" width="80%" top="0.5%" destroy-on-close
@ -490,6 +491,7 @@ import {queryImageInfo} from "../../util/api/zcdataquery/api";
import Dark from '../../views/Dark.vue' import Dark from '../../views/Dark.vue'
import moment from "moment"; import moment from "moment";
import axios from "axios"; import axios from "axios";
import {queryProgramVersion} from "../../util/api/realtimeinfoquery/api";
export default { export default {
name: "EntranceQuery", name: "EntranceQuery",
@ -497,6 +499,89 @@ export default {
data() { data() {
return { return {
version: '', //
fieldMapping: {
LISTNO: "LISTNO",
PASSID: "passId",
ENSTATIONNAME: "enStationName",
ENSTATIONID: "enStationId",
ENTOLLLANEID: "enTollLaneId",
ENTIME: "enTime",
ENWEIGHT: "enWeight",
ENALEXCOUNT: "enAlexCount",
VEHICLEID: "vehicleId",
VEHICLECOLOR: "vehicleColor",
VEHICLETYPE: "vehicleType",
EXSTATIONNAME: "exStationName",
EXSTATIONID: "exStationId",
EXTOLLLANEID: "exTollLaneId",
EQUIPCODE: "equipCode",
CHECKTIME: "checkTime",
WEIGHT: "weight",
ALEXCOUNT: "alexCount",
SPEED: "Speed",
LIMITWEIGHT: "limitWeight",
OVERWEIGHT: "overWeight",
OVERRATE: "overRate",
LENGTH: "length",
WIDTH: "width",
HEIGHT: "height",
ISBULKVEHICLE: "isBulkVehicle",
CERTNO: "certNo",
ISBLACKVEHICLE: "isBlackvehicle",
OBUID: "obuId",
IDENTIFYVEHICLEID: "identifyVehicleId",
IDENTIFYVEHICLECOLOR: "identifyVehicleColor",
IDENTIFYVEHICLETYPE: "identifyVehicleType",
OBUUSERTYPE: "obuUserType",
OBUTOTALWEIGHT: "obuTotalWeight",
OBUMAINTENANCEWEIGHT: "obuMaintenanceWeight",
OBUPERMITTEDTOWWEIGHT: "obuPermittedTowWeight",
OBUPERMITTEDWEIGHT: "obuPermittedWeight",
OBULENGTH: "obuLength",
OBUWEIGHT: "obuWeight",
OBUHEIGHT: "obuHeight",
HEADPICID: "headPicId",
TAILPICID: "tailPicId",
SIDEPICID: "sidePicId",
VIDEOID: "videoId",
BACKUP1: "backup1",
BACKUP2: "backup2",
BACKUP3: "backup3",
BACKUP4: "BACKUP4",
CLASSDATE: "CLASSDATE",
DATEMARK: "datemark",
COLORTEXT: "colortext",
IDCOLORTEXT: "idcolortext",
TYPETEXT: "typetext",
STATISTICALDAY: "statisticalDay",
RECOGNITIONCARN: "recognitionCarNo",
LARGEFLAG: "largeFlag",
BLACKFLAG: "blackFlag",
OBUSER_TYPETEXT: "obuUserTypeText",
ACTUALCARN: "actualCarNo",
CARNO: "CARNO",
FLAG: "flag",
VEHICLESIGNID: "vehicleSignId",
VEHICLESIGNID1: "vehicleSignId1",
VEHICLESIGNID2: "vehicleSignId2",
PORTNO: "PORTNO",
STANO: "STANO",
OBUCONSER: "OBUCONSER",
FKFLAG: "fkFlag",
TOLLSTATIONNAME: "tollStationName",
ACARNO: "ACARNO",
INWEIGHT: "INWEIGHT",
AXISCOUNT: "AXISCOUNT",
VEHICLELENGTH: "vehicleLength",
VEHICLEWIDTH: "vehicleWidth",
VEHICLEHIGHT: "vehicleHight",
OBUWIDTH: "obuWidth",
OBUHIGHT: "obuHight",
},
isDisplayed:false, isDisplayed:false,
videoSrc:'', videoSrc:'',
@ -576,7 +661,16 @@ export default {
}, },
transformData(data) {
return data.map((item) => {
const transformedItem = {};
for (const key in item) {
const transformedKey = this.fieldMapping[key] || key;
transformedItem[transformedKey] = item[key];
}
return transformedItem;
});
},
queryJurisdictionStaList() { queryJurisdictionStaList() {
getJurisdictionStaList({ getJurisdictionStaList({
@ -592,20 +686,20 @@ export default {
queryInfo() { queryInfo() {
this.searchShow = true; this.searchShow = true;
this.searchForm = { // this.searchForm = {
total: 0, // total: 0,
pageNum: 1, // pageNum: 1,
pageSize: 10, // pageSize: 10,
dT: [moment(new Date().setTime(new Date().getTime())).format('YYYY-MM-DD'), moment(new Date()).format('YYYY-MM-DD')], // dT: [moment(new Date().setTime(new Date().getTime())).format('YYYY-MM-DD'), moment(new Date()).format('YYYY-MM-DD')],
}; // };
}, },
viewThis(row) { // viewThis(row) { //
// console.log(row) console.log(row)
this.viewThisRow = row this.viewThisRow = row
this.viewThisRow.actualCarNo = this.viewThisRow.ACARNO + "_" + this.viewThisRow.colortext; this.viewThisRow.actualCarNo = this.viewThisRow.ACARNO + "_" + this.viewThisRow.colortext;
this.viewThisRow.recognitionCarNo = this.viewThisRow.CARNO + "_" + this.viewThisRow.idcolortext; this.viewThisRow.recognitionCarNo = this.viewThisRow.CARNO + "_" + this.viewThisRow.colortext;
this.viewThisRow.statisticalDay = pro.dateFormatDay(this.viewThisRow.CLASSDATE); this.viewThisRow.statisticalDay = pro.dateFormatDay(this.viewThisRow.CLASSDATE);
const flag = this.viewThisRow.FLAG; const flag = this.viewThisRow.FLAG;
@ -658,7 +752,7 @@ export default {
return; return;
} }
this.showShortVideo = true; this.showShortVideo = true;
this.videoSrc=axios.defaults.baseURL+'/ZCDataQuery/getVideo?videNo='+videNo; this.videoSrc=axios.defaults.baseURL+'/AggregationProgram/getVideo?videNo='+videNo;
// this.shortVideoLoad = true; // this.shortVideoLoad = true;
// const shortvideo = this.viewThisRow.vehicleSignId2; // const shortvideo = this.viewThisRow.vehicleSignId2;
// if (shortvideo === null || shortvideo === '' || shortvideo === undefined || shortvideo === 'undefined') { // if (shortvideo === null || shortvideo === '' || shortvideo === undefined || shortvideo === 'undefined') {
@ -840,7 +934,10 @@ export default {
getEntrancePage(this.searchForm).then((res) => { getEntrancePage(this.searchForm).then((res) => {
if (res.records != null) { if (res.records != null) {
console.log(res.records) console.log(res.records)
this.tableData = res.records; // this.tableData = res.records;
//
this.tableData = this.transformData(res.records);
this.searchForm.total = res.total; this.searchForm.total = res.total;
this.searchForm.pageNum = res.current; this.searchForm.pageNum = res.current;
this.searchForm.pageSize = res.size; this.searchForm.pageSize = res.size;
@ -863,7 +960,13 @@ export default {
this.searchForm.pageNum = val this.searchForm.pageNum = val
this.network() this.network()
}, },
fetchVersion(){
queryProgramVersion().then((res) => {
// console.log(res)
this.version = res.data;
})
},
}, },
mounted() { mounted() {
this.queryUserBasic(); this.queryUserBasic();
@ -880,11 +983,19 @@ export default {
// document.documentElement.style.setProperty('--el-bg-color', '#2f39a4') // document.documentElement.style.setProperty('--el-bg-color', '#2f39a4')
this.myHeight = (document.documentElement.clientHeight) * 0.86; this.myHeight = (document.documentElement.clientHeight) * 0.86;
this.fetchVersion();
} }
} }
</script> </script>
<style scoped> <style scoped>
.version-info {
position: fixed;
top: 10px; /* 调整为页面顶部 */
right: 10px; /* 调整为页面右侧 */
font-size: 12px;
color: #332f2f;
z-index: 1000; /* 确保版本号在最上层 */
}
</style> </style>

@ -57,6 +57,7 @@
</el-pagination> </el-pagination>
</el-config-provider> </el-config-provider>
</el-col> </el-col>
<div class="version-info">版本号{{ version }}</div>
</el-row> </el-row>
<!-- :style="{ maxHeight: '700px' }"--> <!-- :style="{ maxHeight: '700px' }"-->
<el-dialog title="治超详情" v-model="viewShow" width="70%" top="0.5%" destroy-on-close <el-dialog title="治超详情" v-model="viewShow" width="70%" top="0.5%" destroy-on-close
@ -509,6 +510,7 @@ import {queryImageInfo} from "../../util/api/zcdataquery/api";
import Dark from '../../views/Dark.vue' import Dark from '../../views/Dark.vue'
import moment from "moment"; import moment from "moment";
import axios from "axios"; import axios from "axios";
import {queryProgramVersion} from "../../util/api/realtimeinfoquery/api";
export default { export default {
name: "ExportQuery", name: "ExportQuery",
@ -516,7 +518,68 @@ export default {
data() { data() {
return { return {
version: '', //
fieldMapping: {
LISTNO: "listno",
PASSID: "passId",
ENSTATIONNAME: "enStationName",
ENSTATIONID: "enStationId",
ENTOLLLANEID: "enTollLaneId",
ENTIME: "enTime",
ENWEIGHT: "enWeight",
ENALEXCOUNT: "enAlexCount",
VEHICLEID: "vehicleId",
VEHICLECOLOR: "vehicleColor",
VEHICLETYPE: "vehicleType",
EXSTATIONNAME: "exStationName",
EXSTATIONID: "exStationId",
EXTOLLLANEID: "exTollLaneId",
EQUIPCODE: "equipCode",
CHECKTIME: "checkTime",
WEIGHT: "weight",
ALEXCOUNT: "alexCount",
SPEED: "speed",
LIMITWEIGHT: "limitWeight",
OVERWEIGHT: "overWeight",
OVERRATE: "overRate",
LENGTH: "length",
WIDTH: "width",
HEIGHT: "height",
ISBULKVEHICLE: "isBulkVehicle",
CERTNO: "certNo",
ISBLACKVEHICLE: "isBlackvehicle",
OBUID: "obuId",
IDENTIFYVEHICLEID: "identifyVehicleId",
IDENTIFYVEHICLECOLOR: "identifyVehicleColor",
IDENTIFYVEHICLETYPE: "identifyVehicleType",
OBUUSERTYPE: "obuUserType",
OBUTOTALWEIGHT: "obuTotalWeight",
OBUMAINTENANCEWEIGHT: "obuMaintenanceWeight",
OBUPERMITTEDTOWWEIGHT: "obuPermittedTowWeight",
OBUPERMITTEDWEIGHT: "obuPermittedWeight",
OBULENGTH: "obuLength",
OBUWEIGHT: "obuWeight",
OBUHEIGHT: "obuHeight",
HEADPICID: "headPicId",
TAILPICID: "tailPicId",
SIDEPICID: "sidePicId",
VIDEOID: "videoId",
BACKUP1: "backup1",
BACKUP2: "backup2",
BACKUP3: "backup3",
BACKUP4: "backup4",
CLASSDATE: "classDate",
DATEMARK: "datemark",
COLORTEXT: "colortext",
IDCOLORTEXT: "idcolortext",
TYPETEXT: "typetext",
STATISTICALDAY: "statisticalDay",
RECOGNITIONCARN: "recognitionCarNo",
LARGEFLAG: "largeFlag",
BLACKFLAG: "blackFlag",
OBUSER_TYPETEXT: "obuUserTypeText",
ACTUALCARN: "actualCarNo",
},
isDisplayed:false, isDisplayed:false,
videoSrc: '', videoSrc: '',
@ -599,7 +662,16 @@ export default {
// window.open(this.videoUrl) // window.open(this.videoUrl)
// //
// }, // },
transformData(data) {
return data.map((item) => {
const transformedItem = {};
for (const key in item) {
const transformedKey = this.fieldMapping[key] || key;
transformedItem[transformedKey] = item[key];
}
return transformedItem;
});
},
queryJurisdictionexportStaList() { queryJurisdictionexportStaList() {
getJurisdictionStaList({ getJurisdictionStaList({
}).then((res) => { }).then((res) => {
@ -614,17 +686,17 @@ export default {
queryInfo() { queryInfo() {
this.searchShow = true; this.searchShow = true;
this.searchForm = { // this.searchForm = {
total: 0, // total: 0,
pageNum: 1, // pageNum: 1,
pageSize: 10, // pageSize: 10,
dT: [moment(new Date().setTime(new Date().getTime())).format('YYYY-MM-DD'), moment(new Date()).format('YYYY-MM-DD')], // dT: [moment(new Date().setTime(new Date().getTime())).format('YYYY-MM-DD'), moment(new Date()).format('YYYY-MM-DD')],
}; // };
}, },
viewThis(row) { // viewThis(row) { //
console.log(row) // console.log(row)
this.viewThisRow = row this.viewThisRow = row
this.viewThisRow.actualCarNo = this.viewThisRow.vehicleId + "_" + this.viewThisRow.colortext; this.viewThisRow.actualCarNo = this.viewThisRow.vehicleId + "_" + this.viewThisRow.colortext;
this.viewThisRow.recognitionCarNo = this.viewThisRow.identifyVehicleId + "_" + this.viewThisRow.idcolortext; this.viewThisRow.recognitionCarNo = this.viewThisRow.identifyVehicleId + "_" + this.viewThisRow.idcolortext;
@ -672,7 +744,7 @@ export default {
return; return;
} }
this.showShortVideo = true; this.showShortVideo = true;
this.videoSrc=axios.defaults.baseURL+'/ZCDataQuery/getVideo?videNo='+videNo; this.videoSrc=axios.defaults.baseURL+'/AggregationProgram/getVideo?videNo='+videNo;
// this.shortVideoLoad = true; // this.shortVideoLoad = true;
// const shortvideo = this.viewThisRow.videoId; // const shortvideo = this.viewThisRow.videoId;
// if (shortvideo === null || shortvideo === '' || shortvideo === undefined || shortvideo === 'undefined') { // if (shortvideo === null || shortvideo === '' || shortvideo === undefined || shortvideo === 'undefined') {
@ -854,7 +926,9 @@ export default {
getExportPage(this.searchForm).then((res) => { getExportPage(this.searchForm).then((res) => {
if (res.records != null) { if (res.records != null) {
// console.log(res.records) // console.log(res.records)
this.tableData = res.records; //
this.tableData = this.transformData(res.records);
// this.tableData = res.records;
this.searchForm.total = res.total; this.searchForm.total = res.total;
this.searchForm.pageNum = res.current; this.searchForm.pageNum = res.current;
this.searchForm.pageSize = res.size; this.searchForm.pageSize = res.size;
@ -877,7 +951,13 @@ export default {
this.searchForm.pageNum = val this.searchForm.pageNum = val
this.network() this.network()
}, },
fetchVersion(){
queryProgramVersion().then((res) => {
// console.log(res)
this.version = res.data;
})
},
}, },
mounted() { mounted() {
this.queryUserBasic(); this.queryUserBasic();
@ -891,11 +971,19 @@ export default {
// document.documentElement.style.setProperty('--el-bg-color', '#2f39a4') // document.documentElement.style.setProperty('--el-bg-color', '#2f39a4')
this.myHeight = (document.documentElement.clientHeight) * 0.86; this.myHeight = (document.documentElement.clientHeight) * 0.86;
this.fetchVersion();
} }
} }
</script> </script>
<style scoped> <style scoped>
.version-info {
position: fixed;
top: 10px; /* 调整为页面顶部 */
right: 10px; /* 调整为页面右侧 */
font-size: 12px;
color: #332f2f;
z-index: 1000; /* 确保版本号在最上层 */
}
</style> </style>

Loading…
Cancel
Save