Merge branch 'dev-2.19.0' of http://101.36.160.140:21044/province-vue-qh/province-vue-all into dev-2.19.0

* 'dev-2.19.0' of http://101.36.160.140:21044/province-vue-qh/province-vue-all:
  视频相关
  视频相关
  视频相关
  视频相关
  视频相关
  视频相关
  视频相关
  fix:bug
  视频相关
  视频相关
  视频相关
  视频相关
  视频相关
  视频相关

src/api/previewPlayback/index.js

@@ -11,5 +11,9 @@ export const controlling = (data) => {
 }
 
 export const getPlayback = (data) => {
-	return request('/getPlayback', data, 'get')
+	return request('/getPlayback', data, 'post')
+}
+
+export const manualCapture = (data) => {
+	return request('/manualCapture', data, 'get')
 }

src/components/video/Live.vue

@@ -1,11 +1,12 @@
 <!-- 实时视频监控 -->
 <script setup>
-	import { getPreview, controlling } from '@/api/previewPlayback'
+	import { getPreview, controlling, manualCapture } from '@/api/previewPlayback'
 	import { useRoute } from 'vue-router'
 	import commonSelect from '@/components/CommonSelector/index.vue'
 	import api from '@/api/orgInfo/info'
 	import cameraApi from '@/api/camera/index'
 	import { message } from 'ant-design-vue'
+	import { downloadLink } from '@/utils/systemUtils'
 
 	const activeKey = ref('1')
 	const route = useRoute()
@@ -21,6 +22,7 @@
 	let videoMap = {}
 	let currentWindowIndex = 0
 	const mode = 0 // 0 普通模式  1 高级模式
+	const isActive = ref(false)
 
 	const init = () => {
 		window.addEventListener('resize', () => {
@@ -59,7 +61,7 @@
 	const createPlayer = () => {
 		player.value = new window.JSPlugin({
 			szId: 'player',
-			szBasePath: './',
+			szBasePath: '/h5player/',
 			iMaxSplit: 4,
 			iCurrentSplit: parseInt(splitNum.value),
 			openDebug: true,
@@ -193,8 +195,10 @@
 	}
 
 	const doControl = (command, action = 0, speed = 50, presetIndex = 10) => {
+		console.log('do control 2', command)
 		if (videoMap[currentWindowIndex]) {
 			const data = videoMap[currentWindowIndex]
+			const cameraId = data.cameraId
 			const c = findCameraByCameraId(cameraId)
 			if (c.cameraType !== '1') {
 				return message.warning('该操作必须是球形摄像机')
@@ -212,6 +216,23 @@
 		}
 	}
 
+	const circle = () => {
+		if (isActive.value) {
+			doControl('LEFT', 1)
+		} else {
+			doControl('LEFT', 0)
+		}
+		isActive.value = !isActive.value
+	}
+
+	const doControl1 = (command) => {
+		console.log('do control 1', command)
+		doControl(command, 0)
+		setTimeout(() => {
+			doControl(command, 1)
+		}, 2000)
+	}
+
 	const startTrack = () => {
 		doControl('START_TRACK', 0)
 	}
@@ -220,6 +241,30 @@
 		doControl('STOP_TRACK', 1)
 	}
 
+	const captureOne = (i = null) => {
+		console.log('ready capture one')
+		if (i == null) {
+			i = currentWindowIndex
+		}
+		if (videoMap[i]) {
+			const data = videoMap[i]
+			const cameraIndexCode = data.cameraIndexCode
+			manualCapture({ cameraIndexCode }).then((url) => {
+				console.log('capture url', url)
+				downloadLink(url)
+			})
+		} else {
+			return message.warning('请选择播放中的窗口')
+		}
+	}
+
+	const captureAll = () => {
+		let i = 0
+		for (const _ of Object.values(videoMap)) {
+			captureOne(i++)
+		}
+	}
+
 	const orgSelect = (orgId, event) => {
 		const org = event.node
 		cameraListData.value = []
@@ -247,7 +292,7 @@
 				}
 			]
 			list.forEach((d) => {
-				const type = d.cameraType
+				const type = d.live
 				const temp = {
 					title: d.cameraName,
 					key: d.cameraId,
@@ -273,9 +318,9 @@
 		console.log('选择摄像头', camera)
 		const { cameraIndexCode } = camera
 		getPreview({ cameraIndexCode, protocol: 'WS' }).then((resp) => {
-			if (!resp || !resp.data || !resp.data.url) return message.error('无法获取视频地址')
-			const url = resp.data.url
-			const exists = Object.values(videoMap).findIndex((u) => u.url === url)
+			if (!resp || !resp.url) return message.error('无法获取视频地址')
+			const url = resp.url
+			const exists = Object.values(videoMap).findIndex((u) => u.cameraIndexCode === cameraIndexCode)
 			if (exists >= 0) {
 				return message.warning(`该视频已经在 ${exists + 1} 窗口播放`)
 			}
@@ -283,7 +328,7 @@
 				.then((_) => {
 					videoMap[currentWindowIndex] = {
 						url,
-						cameraIndexCode: n.cameraIndexCode,
+						cameraIndexCode,
 						cameraId
 					}
 				})
@@ -335,11 +380,11 @@
 						<a-button type="primary" class="btn">中止轮巡</a-button>
 					</div>
 					<div class="row">
-						<a-button type="primary" class="mr-5 btn">窗口抓图</a-button>
+						<a-button type="primary" class="mr-5 btn" @click="captureOne(null)">窗口抓图</a-button>
 						<a-button type="primary" class="btn" @click="stopPlay">窗口关闭</a-button>
 					</div>
 					<div class="row">
-						<a-button type="primary" class="mr-5 btn">全部抓图</a-button>
+						<a-button type="primary" class="mr-5 btn" @click="captureAll()">全部抓图</a-button>
 						<a-button type="primary" class="btn" @click="stopAllPlay">全部关闭</a-button>
 					</div>
 					<div v-if="hasPerm(['controlCloud'])" class="flex flex-col">
@@ -366,10 +411,15 @@
 							>
 								<div class="control-row">
 									<template v-for="item in list">
-										<a-button v-if="item.code !== 'GOTO_PRESET'" :key="item.code" class="small-btn"
+										<a-button
+											v-if="item.code !== 'GOTO_PRESET'"
+											:key="item.code"
+											class="small-btn"
+											@mousedown="doControl(item.code, 0)"
+											@mouseup="doControl(item.code, 1)"
 											>{{ item.label }}
 										</a-button>
-										<a-button v-else class="small-btn">
+										<a-button v-else class="small-btn" :class="{ 'active-button': isActive }" @click="circle()">
 											<template #icon>
 												<UndoOutlined />
 											</template>
@@ -380,12 +430,38 @@
 						</div>
 					</div>
 					<div class="row">
-						<a-button type="primary" class="mr-5 btn"> + 聚焦 </a-button>
-						<a-button type="primary" class="btn">- 聚焦</a-button>
+						<a-button
+							type="primary"
+							class="mr-5 btn"
+							@mousedown="doControl('FOCUS_NEAR', 0)"
+							@mouseup="doControl('FOCUS_NEAR', 1)"
+						>
+							+ 聚焦
+						</a-button>
+						<a-button
+							type="primary"
+							class="btn"
+							@mousedown="doControl('FOCUS_FAR', 0)"
+							@mouseup="doControl('FOCUS_FAR', 1)"
+							>- 聚焦</a-button
+						>
 					</div>
 					<div class="row">
-						<a-button type="primary" class="mr-5 btn"> + 调焦 </a-button>
-						<a-button type="primary" class="btn">- 调焦</a-button>
+						<a-button
+							type="primary"
+							class="mr-5 btn"
+							@mousedown="doControl('ZOOM_IN', 0)"
+							@mouseup="doControl('ZOOM_IN', 1)"
+						>
+							+ 调焦
+						</a-button>
+						<a-button
+							type="primary"
+							class="btn"
+							@mousedown="doControl('ZOOM_OUT', 0)"
+							@mouseup="doControl('ZOOM_OUT', 1)"
+							>- 调焦</a-button
+						>
 					</div>
 					<!--					<div class="row">-->
 					<!--						<a-button type="primary" class="mr-5 btn"> 录像开始 </a-button>-->
@@ -427,4 +503,9 @@
 			margin-top: 5px;
 		}
 	}
+
+	.active-button {
+		background-color: #1890ff;
+		color: white;
+	}
 </style>

src/components/video/Replay.vue

@@ -58,7 +58,7 @@
 	const createPlayer = () => {
 		player.value = new window.JSPlugin({
 			szId: 'player',
-			szBasePath: './',
+			szBasePath: '/h5player/',
 			iMaxSplit: 4,
 			iCurrentSplit: parseInt(splitNum.value),
 			openDebug: true,
@@ -152,7 +152,7 @@
 				}
 			]
 			list.forEach((d) => {
-				const type = d.cameraType
+				const type = d.live
 				const temp = {
 					title: d.cameraName,
 					key: d.cameraId,
@@ -181,8 +181,8 @@
 		}
 		const { cameraIndexCode } = camera
 		getPlaybackVideo({ cameraIndexCode }).then((resp) => {
-			if (!resp || !resp.data || !resp.data.url) return message.error('无法获取视频地址')
-			const url = resp.data.url
+			if (!resp || !resp.url) return message.error('无法获取视频地址')
+			const url = resp.url
 			if (url) {
 				const [realUrl, params] = url.split('?')
 				const [startTime, endTime] = date.value
@@ -207,7 +207,7 @@
 			endTime,
 			cameraIndexCode,
 			recordLocation: 1,
-			protocol: 'WSS'
+			protocol: 'wss'
 		})
 	}
 

src/utils/systemUtils.js

@@ -155,9 +155,9 @@ export const getALlOrgData = () => {
 export const getShiZhou = () => {
 	const dicList = JSON.parse(localStorage.getItem('DICT_TYPE_TREE_DATA')) || []
 	let cityList = []
-	const d = dicList.find(d => d.dictValue === 'xzqh')
+	const d = dicList.find((d) => d.dictValue === 'xzqh')
 	const children = d.children
-	for(const el of children) {
+	for (const el of children) {
 		if (el.name == '青海省') {
 			cityList = el.children
 			break
@@ -184,3 +184,13 @@ export const getQueryParams = (name) => {
 	}
 	return null
 }
+
+export const downloadLink = (url) => {
+	const a = document.createElement('a')
+	a.href = url
+	a.download = 'download'
+	a.target = '_blank'
+	document.body.appendChild(a)
+	a.click()
+	document.body.removeChild(a)
+}

src/views/Arevenue/Averification/form.vue

@@ -25,7 +25,7 @@
 								<a-table-summary-cell>
 									<a-typography-text class="tc"></a-typography-text>
 								</a-table-summary-cell>
-								<a-table-summary-cell> <a-typography-text class="tc"></a-typography-text> </a-table-summary-cell
+								<a-table-summary-cell></a-table-summary-cell
 								><a-table-summary-cell>
 									<a-typography-text class="tc"></a-typography-text>
 								</a-table-summary-cell>

src/views/financialSupervision/ProvincialReserveGrainClearingManagement/SafeCostGrainSubsidyClear/index.vue

@@ -27,14 +27,7 @@
 		<div style="display: flex; justify-content: end; margin-right: 120px">
 			<span>单位：万公斤、万元</span>
 		</div>
-		<a-table
-			id="table"
-			:columns="columns"
-			:data-source="data"
-			bordered
-			:pagination="false"
-			style="width: 150%; overflow-x: auto; scrollbar-width: none; -ms-overflow-style: none"
-		>
+		<a-table id="table" :columns="columns" :data-source="data" bordered :pagination="false" :scroll="{ x: 0, y: 500 }">
 			<template #bodyCell="{ column, text, record }">
 				<template v-if="['age', 'building', 'street', 'companyAddress'].includes(column.dataIndex)">
 					<div>
@@ -127,8 +120,8 @@ const flag = ref('1')
 const columns = [
 	{
 		title: '承储企业',
-		dataIndex: 'orgId',
-		key: 'orgId',
+		dataIndex: 'orgName',
+		key: 'orgName',
 		width: 300,
 		align: 'center',
 		fixed: 'left'

src/views/financialSupervision/ProvincialReserveGrainClearingManagement/interestSubsidysettlem/index.vue

@@ -28,7 +28,7 @@
 		<div style="display: flex; justify-content: end; margin-right: 120px">
 			<span>单位：万公斤、万元</span>
 		</div>
-		<a-table :columns="columns" :data-source="data" bordered :pagination="false" id="table">
+		<a-table :columns="columns" :data-source="data" bordered :pagination="false" id="table" :scroll="{ y: 500 }">
 			<template #bodyCell="{ column, record }">
 				<template v-if="column.key === 'interestAllocated'">
 					<a-input autocomplete="off" v-model:value="record.interestAllocated" v-if="flag === 2" />

src/views/financialSupervision/ProvincialReserveGrainClearingManagement/liquidationInterestSubsidy/index.vue

@@ -1,5 +1,5 @@
 <template>
-	<!-- 费用利息补贴清算表 -->
+	<!-- 轮换费用利息补贴清算表 -->
 	<div>
 		<a-space class="header" ref="tableElem">
 			<div class="input-box">
@@ -35,6 +35,7 @@
 			bordered
 			:pagination="false"
 			:row-class-name="(_record, index) => (index % 2 === 1 ? 'table-striped' : null)"
+			:scroll="{  y: 500 }"
 		>
 			<template #bodyCell="{ column, record }">
 				<template v-if="column.key === 'totalAllocation'">
@@ -76,16 +77,16 @@
 				<a-table-summary-row>
 					<a-table-summary-cell class="tc">合计</a-table-summary-cell>
 					<a-table-summary-cell>
-						<a-typography-text class="tc">{{ totals.totalAverageInventory }}</a-typography-text>
+						<a-typography-text class="tc">{{ totals.totalAverageInventory.toFixed(2) }}</a-typography-text>
 					</a-table-summary-cell>
 					<a-table-summary-cell>
-						<a-typography-text class="tc">{{ totals.totalAverageRawGrainInventory }}</a-typography-text>
+						<a-typography-text class="tc">{{ totals.totalAverageRawGrainInventory.toFixed(2) }}</a-typography-text>
 					</a-table-summary-cell>
 					<a-table-summary-cell>
-						<a-typography-text class="tc">{{ totals.totalAverageRawGrainInventoryPhysical }}</a-typography-text>
+						<a-typography-text class="tc">{{ totals.totalAverageRawGrainInventoryPhysical.toFixed(2) }}</a-typography-text>
 					</a-table-summary-cell>
 					<a-table-summary-cell>
-						<a-typography-text class="tc">{{ totals.totalAverageRawGrainInventoryEmpty }}</a-typography-text>
+						<a-typography-text class="tc">{{ totals.totalAverageRawGrainInventoryEmpty.toFixed(2) }}</a-typography-text>
 					</a-table-summary-cell>
 					<a-table-summary-cell>
 						<a-typography-text class="tc"></a-typography-text>
@@ -146,7 +147,7 @@ const columns = [
 				align: 'center'
 			},
 			{
-				title: '利息费用',
+				title: '利息费用应拨数',
 				dataIndex: 'interestCostAllocation',
 				key: 'interestCostAllocation',
 				width: 200,

src/views/finishedProduct/warehouseFiling/form.vue

@@ -9,7 +9,7 @@
 			:maskClosable="false"
 			:title="titleText"
 		>
-			<a-form>
+			<a-form style="height: 500px; overflow-y: auto">
 				<a-row>
 					<a-col :span="8"
 						><a-form-item label="所属粮仓名称">
@@ -502,7 +502,7 @@
 					<a-col :span="3" class=""> </a-col>
 				</a-row>
 			</a-form>
-			<div class="btn-box">
+			<div class="btn-box1">
 				<a-button @click="isClose">关闭</a-button>
 			</div>
 		</a-modal>
@@ -599,7 +599,20 @@ watch(
 	margin-top: 10px;
 	text-align: center;
 }
-
+.btn-box1 {
+	position: absolute;
+	margin-top: 10px;
+	text-align: center;
+	bottom: 20px;
+	width: 96%;
+	background: rgba(190, 190, 190, 0.2);
+}
+// ::v-deep .btn-box1 {
+// 	margin-top: 10px;
+// 	text-align: center;
+// 	height: 600px !important;
+// 	overflow-y: auto !important;
+// }
 .int-box {
 	width: 80% !important;
 }
@@ -610,7 +623,6 @@ watch(
 .read-the-docs {
 	color: #888;
 }
-
 .bp1 {
 	border: 1px solid #999;
 	box-sizing: border-box;