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

src/api/financialSupervision.info/financialSupervision.js

@@ -113,12 +113,30 @@ export default {
         return request(`priceApproval/getApprovalThreeRKMX/${orgId}`, {}, 'get')
     },
 
-
     // 添加财务监管-省级储备粮清算管理-轮换费用利息补贴清算表
     fsrpcostinterestsettleAddd(data) {
-        return request('/financialSupervision/fsrpcostinterestsettle/add', data, 'post')
+        return request('/fsrpcostinterestsettle/add', data, 'post')
+    },
+
+    // 获取销售收入上报分页  
+    fsSaleRevenuePage(data) {
+        return request('/fsSaleRevenue/page', data, 'get')
+    },
+
+    // 编辑销售收入上报 
+    fsSaleRevenueEdit(data) {
+        return request('/fsSaleRevenue/edit', data, 'post')
+    },
+
+    // 销售收入上报详情 
+    fsSaleRevenueDetail(data) {
+        return request('fsSaleRevenue/detail', data, 'get')
     },
 
+    // 三账一致性-出库明细
+    getOutStorageDetailedBy(contractNumber) {
+        return request(`/fsSaleRevenue/getOutStorageDetailed/${contractNumber}`, {}, 'get')
+    },
 }
 
 

src/api/previewPlayback/index.js

@@ -5,3 +5,11 @@ const request = (url, ...arg) => baseRequest(`/previewPlayback` + url, ...arg)
 export const getPreview = (query) => {
 	return request('/getPreview', query, 'get')
 }
+
+export const controlling = (data) => {
+	return request('/controlling', data, 'get')
+}
+
+export const getPlayback = (data) => {
+	return request('/getPlayback', data, 'get')
+}

src/components/video/Live.vue

@@ -1,6 +1,6 @@
 <!-- 实时视频监控 -->
 <script setup>
-	import { getPreview } from '@/api/previewPlayback'
+	import { getPreview, controlling } from '@/api/previewPlayback'
 	import { useRoute } from 'vue-router'
 	import commonSelect from '@/components/CommonSelector/index.vue'
 	import api from '@/api/orgInfo/info'
@@ -180,9 +180,25 @@
 		)
 	}
 
+	const findCameraByCameraId = (cameraId) => {
+		for (const root of cameraListData.value) {
+			const list = root.children || []
+			for (const d of list) {
+				if (d.cameraId == cameraId) {
+					return d
+				}
+			}
+		}
+		return undefined
+	}
+
 	const doControl = (command, action = 0, speed = 50, presetIndex = 10) => {
 		if (videoMap[currentWindowIndex]) {
 			const data = videoMap[currentWindowIndex]
+			const c = findCameraByCameraId(cameraId)
+			if (c.cameraType !== '1') {
+				return message.warning('该操作必须是球形摄像机')
+			}
 			const cmd = {
 				action,
 				command,
@@ -282,7 +298,6 @@
 		getOrgData()
 		init()
 		createPlayer()
-		getPreview({ cameraIndexCode: '0' })
 	})
 </script>
 

src/components/video/Replay.vue

@@ -1,5 +1,5 @@
 <script setup>
-	import { getPreview } from '@/api/previewPlayback'
+	import { getPlayback, getPreview } from '@/api/previewPlayback'
 	import { useRoute } from 'vue-router'
 	import commonSelect from '@/components/CommonSelector/index.vue'
 	import api from '@/api/orgInfo/info'
@@ -20,6 +20,7 @@
 	let videoMap = {}
 	let currentWindowIndex = 0
 	const mode = 0 // 0 普通模式  1 高级模式
+	const date = ref([])
 
 	const init = () => {
 		window.addEventListener('resize', () => {
@@ -171,11 +172,100 @@
 		})
 	}
 
+	const cameraSelect = (cameraId, event) => {
+		const camera = event.node
+		if (camera.root) return
+		console.log('选择摄像头', camera)
+		if (!date.value || date.value.length <= 0) {
+			return message.warning('请先选择日期')
+		}
+		const { cameraIndexCode } = camera
+		getPlaybackVideo({ cameraIndexCode }).then((resp) => {
+			const { url } = resp
+			if (url) {
+				const { startTime, endTime } = date.value
+				player.value.JS_Play(url, { playURL: url, mode }, 0, startTime, endTime).then(
+					() => {
+						console.log('playbackStart success')
+					},
+					(e) => {
+						console.error(e)
+					}
+				)
+			} else {
+				message.error('无法获取视频地址')
+			}
+		})
+	}
+
+	const getPlaybackVideo = ({ cameraIndexCode }) => {
+		const [beginTime, endTime] = date.value
+		return getPlayback({
+			beginTime,
+			endTime,
+			cameraIndexCode,
+			recordLocation: 1,
+			protocol: 'WSS'
+		})
+	}
+
+	const slow = () => {
+		player.value.JS_Slow().then(
+			(rate) => {
+				// this.playback.rate = rate
+			},
+			(e) => {
+				console.error(e)
+			}
+		)
+	}
+
+	const fast = () => {
+		player.value.JS_Fast().then(
+			(rate) => {
+				// this.playback.rate = rate
+			},
+			(e) => {
+				console.error(e)
+			}
+		)
+	}
+
+	const pause = () => {
+		player.value.JS_Pause().then(
+			() => {
+				console.log('playbackPause success')
+			},
+			(e) => {
+				console.error(e)
+			}
+		)
+	}
+
+	const resume = () => {
+		player.value.JS_Resume().then(
+			() => {
+				console.log('playbackResume success')
+			},
+			(e) => {
+				console.error(e)
+			}
+		)
+	}
+
+	const stop = () => {
+		player.value.JS_Stop().then(
+			() => {},
+			(e) => {
+				console.error(e)
+			}
+		)
+	}
+
 	onMounted(() => {
 		getOrgData()
 		init()
 		createPlayer()
-		getPreview({ cameraIndexCode: '0' })
 	})
 </script>
 
@@ -196,7 +286,7 @@
 		<div class="control w-[20%] h-full">
 			<a-tabs v-model:activeKey="activeKey">
 				<a-tab-pane key="1" tab="摄像头列表">
-					回放日期 <a-range-picker value-format="YYYY-MM-DD HH:mm:ss" show-time />
+					回放日期 <a-range-picker v-model:value="date" value-format="YYYY-MM-DDTHH:mm:ssZ" show-time />
 					<div class="mt-5">
 						<a-tree :tree-data="cameraListData" @select="cameraSelect" class="w-full">
 							<template #title="{ title, key }">
@@ -208,14 +298,13 @@
 				</a-tab-pane>
 				<a-tab-pane key="2" tab="操作" force-render>
 					<div class="row">
-						<a-button type="primary" class="mr-5 btn">&lt;&lt; 慢放</a-button>
-						<a-button type="primary" class="btn">快放 &gt;&gt;</a-button>
+						<a-button type="primary" class="mr-5 btn" @click="slow">&lt;&lt; 慢放</a-button>
+						<a-button type="primary" class="btn" @click="fast">快放 &gt;&gt;</a-button>
 					</div>
 					<div class="row">
-						<a-button type="primary" class="mr-1 w-[60px]">暂停</a-button>
-						<a-button type="primary" class="mr-1 w-[60px]">恢复</a-button>
-						<a-button type="primary" class="mr-1 w-[60px]">停止</a-button>
-						<a-button type="primary" class="w-[120px]">全部停止</a-button>
+						<a-button type="primary" class="mr-1 w-[60px]" @click="pause">暂停</a-button>
+						<a-button type="primary" class="mr-1 w-[60px]" @click="resume">恢复</a-button>
+						<a-button type="primary" class="mr-1 w-[60px]" @click="stop">停止</a-button>
 					</div>
 				</a-tab-pane>
 			</a-tabs>

src/views/Arevenue/ARSales/index.vue

@@ -1,4 +1,5 @@
 <template>
+	<!-- 销售收入上报 -->
 	<div class="pricemoitorrecord">
 		<a-card :bordered="false">
 			<a-space class="search">
@@ -6,39 +7,25 @@
 					<span style="width: 70px; margin-right: 8px; text-align: right; display: block; line-height: 30px">
 						企业名称
 					</span>
-					<a-input style="width: 220px" v-model:value="SearchFormDel.unitName" placeholder="请输入" />
+					<a-input style="width: 220px" v-model:value="SearchFormDel.dwmc" placeholder="请输入" />
 				</div>
 				<div class="silt-title">
 					<span style="width: 70px; margin-right: 8px; text-align: right; display: block; line-height: 30px">
 						库区名称
 					</span>
-					<a-input style="width: 220px" v-model:value="SearchFormDel.unitName" placeholder="请输入" />
-					<!-- <a-select style="width: 220px" v-model:value="SearchFormDel.unitName">
-						<a-select-option :value="1">1</a-select-option>
-					</a-select> -->
+					<a-input style="width: 220px" v-model:value="SearchFormDel.orgName" placeholder="请输入" />
 				</div>
 				<div class="btnBox">
 					<a-button type="primary" class="primarySele" @click="Search"> 查询 </a-button>
 					<a-button class="primarySele snowy-buttom-left" @click="onReset"> 重置 </a-button>
-					<a-button type="primary" class="primarySele" @click="onView('add', {})"> 新增 </a-button>
 				</div>
 			</a-space>
 		</a-card>
-
 		<div class="list" style="margin-top: 10px">
 			<a-table :dataSource="tableData" :pagination="pagination" :columns="tableColumns">
 				<template #bodyCell="{ column, record }">
-					<template v-if="column.dataIndex === 'creditLevel'">
-						<div v-if="record.creditLevel == '1'">一级</div>
-						<div v-if="record.creditLevel == '2'">二级</div>
-						<div v-if="record.creditLevel == '3'">三级</div>
-					</template>
 					<template v-if="column.key === '操作'">
 						<a-button type="link" @click="onView('view', record)">查看</a-button>
-						<a-button type="link" @click="onView('edit', record)">编辑</a-button>
-						<a-popconfirm title="确定要删除吗？" @confirm="onView('del', record)">
-							<a-button type="link">删除</a-button>
-						</a-popconfirm>
 					</template>
 				</template>
 			</a-table>
@@ -46,74 +33,74 @@
 	</div>
 </template>
 <script setup name="sharing">
-	import { listPagination } from '@/hook/listlistPagination.js'
-	import { reactive, ref } from 'vue'
-	import business from '@/api/basic.info/verifyQuery.js'
-	import { useRouter } from 'vue-router'
-	import { defineComponent } from 'vue'
-	const formRef = ref(null)
-	const router = useRouter()
-	const tableColumns = [
-		{
-			title: '序号',
-			dataIndex: 'Index',
-			align: 'center',
-			customRender: ({ text, record, index }) => {
-				return `${index + 1}`
-			}
-		},
-		{ title: '企业名称', align: 'center', dataIndex: 'unitName' },
-		{ title: '库区名称', align: 'center', dataIndex: 'dwdm' },
-		{ title: '结算金额', align: 'center', dataIndex: 'fddbr' },
-		{ title: '结算时间', align: 'center', dataIndex: 'creditLevel' },
-		{ title: '合同编号', align: 'center', dataIndex: 'updateTime' },
-		{ title: '操作', align: 'center', key: '操作' }
-	]
+import { listPagination } from '@/hook/listlistPagination.js'
+import { useRouter } from 'vue-router'
+import financialSupervisionApi from '@/api/financialSupervision.info/financialSupervision.js'
 
-	const { DEl, change, tableData, onSearch, handlePageChange, pagination, Search, onReset, SearchFormDel } =
-		listPagination({ unitName: '', fddbr: '' }, business.XYDAlist, business.XYDAXdel, { sortOrder: 'ASCEND' })
-	setTimeout(() => {
-		tableData.value = [{ 1: 1 }]
-	}, 1000)
-	// 查看表单数据
-	const onView = (record, row) => {
-		switch (record) {
-			case 'add':
-				router.push('/Arevenue/ARSalesDel?add')
-				break
-			case 'del':
-				DEl(row)
-				break
-			case 'view':
-				router.push(`/Arevenue/ARSalesDel?codeLJH=${true}&id=${row.id}`)
-				break
-			case 'edit':
-				router.push(`/Arevenue/ARSalesDel?codeLJH=1&id=${row.id}`)
-				break
-			default:
-				// router.push('/business/personnelDel')
-				break
+const router = useRouter()
+const tableColumns = [
+	{
+		title: '序号',
+		dataIndex: 'Index',
+		align: 'center',
+		customRender: ({ text, record, index }) => {
+			return `${index + 1}`
 		}
+	},
+	{ title: '标题', align: 'center', dataIndex: 'unitName' },
+	{ title: '企业名称', align: 'center', dataIndex: 'dwmc' },
+	{ title: '库区名称', align: 'center', dataIndex: 'orgName' },
+	{ title: '上报时间', align: 'center', dataIndex: 'reportTime' },
+	{ title: '操作', align: 'center', key: '操作' }
+]
+
+const { DEl, change, tableData, onSearch, handlePageChange, pagination, Search, onReset, SearchFormDel } =
+	listPagination(
+		{ orgName: '', dwmc: '' },
+		financialSupervisionApi.fsSaleRevenuePage,
+		financialSupervisionApi.fsSaleRevenueDetail,
+		{
+			sortOrder: 'ASCEND'
+		}
+	)
+// 查看表单数据
+const onView = (record, row) => {
+	switch (record) {
+		case 'add':
+			router.push('/Arevenue/ARSalesDel?add')
+			break
+		case 'del':
+			DEl(row)
+			break
+		case 'view':
+			router.push(`/Arevenue/ARSalesDel?codeLJH=${true}&id=${row.id}`)
+			break
+		case 'edit':
+			router.push(`/Arevenue/ARSalesDel?codeLJH=1&id=${row.id}`)
+			break
+		default:
+			break
 	}
+}
 </script>
 <style lang="less" scoped>
-	.search {
-		padding-top: 20px;
-		// padding-left: 50px;
-		margin-bottom: 32px;
-		.btnBox {
-			width: 100%;
-			display: inline-block;
-			display: flex;
-			justify-content: space-around;
-			align-items: center;
-			.primarySele {
-				margin-left: 20px;
-				margin-right: 20px;
-			}
-		}
-	}
-	.silt-title {
+.search {
+	padding-top: 20px;
+	// padding-left: 50px;
+	margin-bottom: 32px;
+	.btnBox {
+		width: 100%;
+		display: inline-block;
 		display: flex;
+		justify-content: space-around;
+		align-items: center;
+		.primarySele {
+			margin-left: 20px;
+			margin-right: 20px;
+		}
 	}
+}
+.silt-title {
+	display: flex;
+}
 </style>

src/views/Arevenue/Averification/form.vue

@@ -0,0 +1,180 @@
+<template>
+	<div>
+		<a-modal
+			class="btn-box"
+			v-model:visible="visible"
+			width="80%"
+			:footer="null"
+			:maskClosable="false"
+			:title="titleText"
+			@ok="isClose"
+		>
+			<a-row>
+				<a-col :span="24">
+					<a-table
+						:dataSource="crkList"
+						:row-key="(record) => record.key"
+						:pagination="false"
+						@change="onChangePage"
+						bordered
+						:columns="columns"
+					>
+						<template #summary>
+							<a-table-summary-row>
+								<a-table-summary-cell class="tc">合计</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-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-typography-text class="tc">{{ summary.totalMz }}</a-typography-text>
+								</a-table-summary-cell>
+								<a-table-summary-cell>
+									<a-typography-text class="tc">{{ summary.totalPz }}</a-typography-text>
+								</a-table-summary-cell>
+								<a-table-summary-cell>
+									<a-typography-text class="tc">{{ summary.totalKl }}</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-row>
+						</template>
+					</a-table>
+				</a-col>
+			</a-row>
+		</a-modal>
+	</div>
+</template>
+
+<script setup>
+import { message } from 'ant-design-vue'
+import financialSupervisionApi from '@/api/financialSupervision.info/financialSupervision.js'
+const columns = [
+	{
+		title: '合同编号',
+		dataIndex: 'htbh',
+		align: 'center',
+		key: 'htbh'
+	},
+	{
+		title: '仓房名称',
+		dataIndex: 'storehouseName',
+		align: 'center',
+		key: 'storehouseName'
+	},
+	{
+		title: '货位名称',
+		dataIndex: 'warehouseName',
+		align: 'center',
+		key: 'warehouseName'
+	},
+	{
+		title: '车牌号',
+		dataIndex: 'qcph',
+		align: 'center',
+		key: 'qcph'
+	},
+	{
+		title: '毛重',
+		dataIndex: 'mzzl',
+		align: 'center',
+		key: 'mzzl'
+	},
+	{
+		title: '皮重',
+		dataIndex: 'pz',
+		align: 'center',
+		key: 'pz'
+	},
+	{
+		title: '扣量',
+		dataIndex: 'bzwkl',
+		align: 'center',
+		key: 'bzwkl'
+	},
+	{
+		title: '出入库时间',
+		dataIndex: 'cpzsj',
+		align: 'center',
+		key: 'cpzsj'
+	}
+]
+const props = defineProps({
+	dataObj: {
+		type: Object,
+		default: () => {}
+	}
+})
+
+const visible = ref(false)
+const titleText = ref('')
+const formState = ref({})
+const emit = defineEmits(['isVisible'])
+const crkList = ref([])
+// 详情
+const detailData = (contractNumber) => {
+	financialSupervisionApi.getOutStorageDetailedBy(contractNumber).then((res) => {
+		crkList.value = res
+	})
+}
+
+const isClose = () => {
+	visible.value = false
+	emit('isVisible', false)
+	formState.value = {}
+}
+
+// 新增/查询/编辑控制器
+const flag = ref('')
+// 监听点击事件更新数据
+watch(
+	() => props.dataObj,
+	async (newValue, oldvalue) => {
+		formState.value = {}
+		await nextTick()
+		titleText.value = newValue.titleText
+		visible.value = newValue.visible
+		flag.value = newValue.flag
+		detailData(newValue.contractNumber)
+	},
+	{ deep: true }
+)
+
+const summary = computed(() => {
+	let totalMz = 0
+	let totalPz = 0
+	let totalKl = 0
+	crkList.value.forEach(({ mzzl, pz, bzwkl }) => {
+		totalMz += Number(mzzl)
+		totalPz += Number(pz)
+		totalKl += Number(bzwkl)
+	})
+	return { totalMz, totalPz, totalKl }
+})
+
+onMounted(() => {})
+</script>
+<style lang="less" scoped>
+.btn-box {
+	text-align: center;
+	width: 100%;
+	display: flex;
+	justify-content: center;
+	align-items: center;
+	button {
+		margin: 0 50px;
+		width: 100px;
+		border-radius: 5px;
+	}
+}
+
+.tc {
+	display: flex;
+	justify-content: center;
+	align-items: center;
+}
+</style>

src/views/Arevenue/Averification/index.vue

@@ -1,4 +1,5 @@
 <template>
+	<!-- 销售收入核定 -->
 	<div class="pricemoitorrecord">
 		<a-card :bordered="false">
 			<a-space class="search">
@@ -6,21 +7,17 @@
 					<span style="width: 70px; margin-right: 8px; text-align: right; display: block; line-height: 30px">
 						企业名称
 					</span>
-					<a-input style="width: 220px" v-model:value="SearchFormDel.unitName" placeholder="请输入" />
+					<a-input style="width: 220px" v-model:value="SearchFormDel.dwmc" placeholder="请输入" />
 				</div>
 				<div class="silt-title">
 					<span style="width: 70px; margin-right: 8px; text-align: right; display: block; line-height: 30px">
 						库区名称
 					</span>
-					<a-input style="width: 220px" v-model:value="SearchFormDel.unitName" placeholder="请输入" />
-					<!-- <a-select style="width: 220px" v-model:value="SearchFormDel.unitName">
-						<a-select-option :value="1">1</a-select-option>
-					</a-select> -->
+					<a-input style="width: 220px" v-model:value="SearchFormDel.orgName" placeholder="请输入" />
 				</div>
 				<div class="btnBox">
 					<a-button type="primary" class="primarySele" @click="Search"> 查询 </a-button>
 					<a-button class="primarySele snowy-buttom-left" @click="onReset"> 重置 </a-button>
-					<a-button type="primary" class="primarySele" @click="onView('add', {})"> 新增 </a-button>
 				</div>
 			</a-space>
 		</a-card>
@@ -28,17 +25,9 @@
 		<div class="list" style="margin-top: 10px">
 			<a-table :dataSource="tableData" :pagination="pagination" :columns="tableColumns">
 				<template #bodyCell="{ column, record }">
-					<template v-if="column.dataIndex === 'creditLevel'">
-						<div v-if="record.creditLevel == '1'">一级</div>
-						<div v-if="record.creditLevel == '2'">二级</div>
-						<div v-if="record.creditLevel == '3'">三级</div>
-					</template>
 					<template v-if="column.key === '操作'">
 						<a-button type="link" @click="onView('view', record)">查看</a-button>
-						<a-button type="link" @click="onView('edit', record)">编辑</a-button>
-						<a-popconfirm title="确定要删除吗？" @confirm="onView('del', record)">
-							<a-button type="link">删除</a-button>
-						</a-popconfirm>
+						<a-button type="link" @click="onView('edit', record)">修改</a-button>
 					</template>
 				</template>
 			</a-table>
@@ -46,74 +35,72 @@
 	</div>
 </template>
 <script setup name="sharing">
-	import { listPagination } from '@/hook/listlistPagination.js'
-	import { reactive, ref } from 'vue'
-	import business from '@/api/basic.info/verifyQuery.js'
-	import { useRouter } from 'vue-router'
-	import { defineComponent } from 'vue'
-	const formRef = ref(null)
-	const router = useRouter()
-	const tableColumns = [
-		{
-			title: '序号',
-			dataIndex: 'Index',
-			align: 'center',
-			customRender: ({ text, record, index }) => {
-				return `${index + 1}`
-			}
-		},
-		{ title: '企业名称', align: 'center', dataIndex: 'unitName' },
-		{ title: '库区名称', align: 'center', dataIndex: 'dwdm' },
-		{ title: '合同编号', align: 'center', dataIndex: 'updateTime' },
-		{ title: '结算金额', align: 'center', dataIndex: 'fddbr' },
-		{ title: '结算时间', align: 'center', dataIndex: 'creditLevel' },
-		{ title: '操作', align: 'center', key: '操作' }
-	]
-
-	const { DEl, change, tableData, onSearch, handlePageChange, pagination, Search, onReset, SearchFormDel } =
-		listPagination({ unitName: '', fddbr: '' }, business.XYDAlist, business.XYDAXdel, { sortOrder: 'ASCEND' })
-	setTimeout(() => {
-		tableData.value = [{ 1: 1 }]
-	}, 1000)
-	// 查看表单数据
-	const onView = (record, row) => {
-		switch (record) {
-			case 'add':
-				router.push('/Arevenue/AverificationDel?add')
-				break
-			case 'del':
-				DEl(row)
-				break
-			case 'view':
-				router.push(`/Arevenue/AverificationDel?codeLJH=${true}&id=${row.id}`)
-				break
-			case 'edit':
-				router.push(`/Arevenue/AverificationDel?codeLJH=1&id=${row.id}`)
-				break
-			default:
-				// router.push('/business/personnelDel')
-				break
+import { listPagination } from '@/hook/listlistPagination.js'
+import { useRouter } from 'vue-router'
+import financialSupervisionApi from '@/api/financialSupervision.info/financialSupervision.js'
+const router = useRouter()
+const tableColumns = [
+	{
+		title: '序号',
+		dataIndex: 'Index',
+		align: 'center',
+		customRender: ({ text, record, index }) => {
+			return `${index + 1}`
 		}
+	},
+	{ title: '企业名称', align: 'center', dataIndex: 'dwmc' },
+	{ title: '库区名称', align: 'center', dataIndex: 'orgName' },
+	{ title: '合同编号', align: 'center', dataIndex: 'contractNumber' },
+	{ title: '结算金额', align: 'center', dataIndex: 'moneyQuantity' },
+	{ title: '核定时间', align: 'center', dataIndex: 'updatedate' },
+	{ title: '操作', align: 'center', key: '操作' }
+]
+
+const { DEl, change, tableData, onSearch, handlePageChange, pagination, Search, onReset, SearchFormDel } =
+	listPagination({ orgName: '', dwmc: '' }, financialSupervisionApi.fsSaleRevenuePage, financialSupervisionApi.fsSaleRevenueDetail, {
+		sortOrder: 'ASCEND'
+	})
+// setTimeout(() => {
+// 	tableData.value = [{ 1: 1 }]
+// }, 1000)
+
+// 查看表单数据
+const onView = (record, row) => {
+	switch (record) {
+		case 'add':
+			router.push('/Arevenue/AverificationDel?add')
+			break
+		case 'del':
+			DEl(row)
+			break
+		case 'view':
+			router.push(`/Arevenue/AverificationDel?codeLJH=${true}&id=${row.id}`)
+			break
+		case 'edit':
+			router.push(`/Arevenue/AverificationDel?codeLJH=1&id=${row.id}`)
+			break
+		default:
+			break
 	}
+}
 </script>
 <style lang="less" scoped>
-	.search {
-		padding-top: 20px;
-		// padding-left: 50px;
-		margin-bottom: 32px;
-		.btnBox {
-			width: 100%;
-			display: inline-block;
-			display: flex;
-			justify-content: space-around;
-			align-items: center;
-			.primarySele {
-				margin-left: 20px;
-				margin-right: 20px;
-			}
-		}
-	}
-	.silt-title {
+.search {
+	padding-top: 20px;
+	margin-bottom: 32px;
+	.btnBox {
+		width: 100%;
+		display: inline-block;
 		display: flex;
+		justify-content: space-around;
+		align-items: center;
+		.primarySele {
+			margin-left: 20px;
+			margin-right: 20px;
+		}
 	}
+}
+.silt-title {
+	display: flex;
+}
 </style>

src/views/Grain/template/index.vue

@@ -16,7 +16,6 @@
 						<!-- 生效状态 0:未生效 1:生效 -->
 						<a-select-option :value="0">未生效</a-select-option>
 						<a-select-option :value="1">生效</a-select-option>
-
 					</a-select>
 				</div>
 				<div class="btnBox">
@@ -80,7 +79,9 @@
 	]
 
 	const { DEl, change, tableData, onSearch, handlePageChange, pagination, Search, onReset, SearchFormDel } =
-		listPagination({ inspectionName: '', effectiveStatus: '' }, Grain.LHJCLISTlist, Grain.LHJCLISTdel, { sortOrder: 'ASCEND' })
+		listPagination({ inspectionName: '', effectiveStatus: '' }, Grain.LHJCLISTlist, Grain.LHJCLISTdel, {
+			sortOrder: 'ASCEND'
+		})
 
 	// 查看表单数据
 	const onView = (record, row) => {

src/views/Grain/template/templateDel.vue

@@ -105,8 +105,8 @@
 		formState.value = res
 		tableData.value = []
 		tableData.value = res.items
-		checked1.value = res.effectiveStatus == 0 ? true : false
-		checked2.value = res.effectiveStatus == 1 ? true : false
+		checked1.value = res.effectiveStatus == 1 ? true : false
+		checked2.value = res.effectiveStatus == 0 ? true : false
 	}
 	const optionsGender = ref([])
 	const getGender = async () => {
@@ -208,13 +208,13 @@
 
 	// 新增
 	const pustFrom = async (value) => {
-		value.effectiveStatus = checked1.value == true ? 0 : checked2.value == true ? 1 : ''
+		value.effectiveStatus = checked1.value == true ? 1 : checked2.value == true ? 0 : ''
 		const delDate = { ...value, items: tableData.value }
 		const res = await Grain.LHJCLISTadd(delDate)
 	}
 	// 编辑
 	const pustEdit = async (value) => {
-		value.effectiveStatus = checked1.value == true ? 0 : checked2.value == true ? 1 : ''
+		value.effectiveStatus = checked1.value == true ? 1 : checked2.value == true ? 0 : ''
 		const delDate = { ...value, items: tableData.value }
 		const res = await Grain.LHJCLISTedit(delDate)
 	}

src/views/auth/login/login.vue

@@ -1,6 +1,9 @@
 <template>
 	<div class="login_background">
 		<div class="login_background_front"></div>
+		<div class="login_left">
+			<img src="/img/login/left2.png" alt="" />
+		</div>
 		<div class="login_main">
 			<div class="login_head">
 				<span class="text">欢迎登录系统</span>
@@ -41,255 +44,263 @@
 	</div>
 </template>
 <script setup>
-	import LoginInput from './LoginInput.vue'
+import LoginInput from './LoginInput.vue'
 
-	const showPWD = ref(false)
-	import loginApi from '@/api/auth/loginApi'
-	import PhoneLoginForm from './phoneLoginForm.vue'
-	import ThreeLogin from './threeLogin.vue'
-	import smCrypto from '@/utils/smCrypto'
-	import { required } from '@/utils/formRules'
-	import { afterLogin } from './util'
-	import configData from '@/config'
-	import configApi from '@/api/dev/configApi'
-	import tool from '@/utils/tool'
-	import { message } from 'ant-design-vue'
+const showPWD = ref(false)
+import loginApi from '@/api/auth/loginApi'
+import PhoneLoginForm from './phoneLoginForm.vue'
+import ThreeLogin from './threeLogin.vue'
+import smCrypto from '@/utils/smCrypto'
+import { required } from '@/utils/formRules'
+import { afterLogin } from './util'
+import configData from '@/config'
+import configApi from '@/api/dev/configApi'
+import tool from '@/utils/tool'
+import { message } from 'ant-design-vue'
 
-	import { globalStore, iframeStore, keepAliveStore, viewTagsStore, enumMaplistStore } from '@/store'
-	const { proxy } = getCurrentInstance()
+import { globalStore, iframeStore, keepAliveStore, viewTagsStore, enumMaplistStore } from '@/store'
+const { proxy } = getCurrentInstance()
 
-	const activeKey = ref('userAccount')
-	const captchaOpen = ref(configData.SYS_BASE_CONFIG.SNOWY_SYS_DEFAULT_CAPTCHA_OPEN)
-	const validCodeBase64 = ref('')
-	const loading = ref(false)
+const activeKey = ref('userAccount')
+const captchaOpen = ref(configData.SYS_BASE_CONFIG.SNOWY_SYS_DEFAULT_CAPTCHA_OPEN)
+const validCodeBase64 = ref('')
+const loading = ref(false)
 
-	const ruleForm = reactive({
-		// account: 'superAdmin',
-		// password: '123456',
-		account: '',
-		password: '',
-		validCode: '',
-		validCodeReqNo: '',
-		autologin: false
-	})
+const ruleForm = reactive({
+	// account: 'superAdmin',
+	// password: '123456',
+	account: '',
+	password: '',
+	validCode: '',
+	validCodeReqNo: '',
+	autologin: false
+})
 
-	const rules = reactive({
-		account: [required(proxy.$t('login.accountError'), 'blur')],
-		password: [required(proxy.$t('login.PWError'), 'blur')]
-	})
-	const lang = ref([
-		{
-			name: '简体中文',
-			value: 'zh-cn'
-		},
-		{
-			name: 'English',
-			value: 'en'
-		}
-	])
-	const config = ref({
-		lang: tool.data.get('APP_LANG') || proxy.$CONFIG.LANG,
-		theme: tool.data.get('APP_THEME') || 'default'
-	})
+const rules = reactive({
+	account: [required(proxy.$t('login.accountError'), 'blur')],
+	password: [required(proxy.$t('login.PWError'), 'blur')]
+})
+const lang = ref([
+	{
+		name: '简体中文',
+		value: 'zh-cn'
+	},
+	{
+		name: 'English',
+		value: 'en'
+	}
+])
+const config = ref({
+	lang: tool.data.get('APP_LANG') || proxy.$CONFIG.LANG,
+	theme: tool.data.get('APP_THEME') || 'default'
+})
 
-	const store = globalStore()
-	const kStore = keepAliveStore()
-	const iStore = iframeStore()
-	const vStore = viewTagsStore()
-	// const StoreDEl = enumMaplistStore()
+const store = globalStore()
+const kStore = keepAliveStore()
+const iStore = iframeStore()
+const vStore = viewTagsStore()
+// const StoreDEl = enumMaplistStore()
 
-	const setSysBaseConfig = store.setSysBaseConfig
-	const clearKeepLive = kStore.clearKeepLive
-	const clearIframeList = iStore.clearIframeList
-	const clearViewTags = vStore.clearViewTags
-	// const businessDElasync = StoreDEl.businessDElasync
+const setSysBaseConfig = store.setSysBaseConfig
+const clearKeepLive = kStore.clearKeepLive
+const clearIframeList = iStore.clearIframeList
+const clearViewTags = vStore.clearViewTags
+// const businessDElasync = StoreDEl.businessDElasync
 
-	const sysBaseConfig = computed(() => {
-		return store.sysBaseConfig
-	})
+const sysBaseConfig = computed(() => {
+	return store.sysBaseConfig
+})
 
-	onMounted(() => {
-		let formData = ref(configData.SYS_BASE_CONFIG)
-		configApi.configSysBaseList().then((data) => {
-			if (data) {
-				data.forEach((item) => {
-					formData.value[item.configKey] = item.configValue
-				})
-				captchaOpen.value = formData.value.SNOWY_SYS_DEFAULT_CAPTCHA_OPEN
-				tool.data.set('SNOWY_SYS_BASE_CONFIG', formData.value)
-				setSysBaseConfig(formData.value)
-				refreshSwitch()
-			}
-		})
+onMounted(() => {
+	let formData = ref(configData.SYS_BASE_CONFIG)
+	configApi.configSysBaseList().then((data) => {
+		if (data) {
+			data.forEach((item) => {
+				formData.value[item.configKey] = item.configValue
+			})
+			captchaOpen.value = formData.value.SNOWY_SYS_DEFAULT_CAPTCHA_OPEN
+			tool.data.set('SNOWY_SYS_BASE_CONFIG', formData.value)
+			setSysBaseConfig(formData.value)
+			refreshSwitch()
+		}
 	})
+})
 
-	onBeforeMount(() => {
-		clearViewTags()
-		clearKeepLive()
-		clearIframeList()
-	})
+onBeforeMount(() => {
+	clearViewTags()
+	clearKeepLive()
+	clearIframeList()
+})
 
-	// 监听语言
-	watch(
-		() => config.value.lang,
-		(newValue) => {
-			proxy.$i18n.locale = newValue
-			tool.data.set('APP_LANG', newValue)
-		}
-	)
-	// 主题
-	watch(
-		() => config.value.theme,
-		(newValue) => {
-			document.body.setAttribute('data-theme', newValue)
-		}
-	)
-	// 通过开关加载内容
-	const refreshSwitch = () => {
-		// 判断是否开启验证码
-		if (captchaOpen.value === 'true') {
-			// 加载验证码
-			loginCaptcha()
-			// 加入校验
-			rules.validCode = [required(proxy.$t('login.validError'), 'blur')]
-		}
+// 监听语言
+watch(
+	() => config.value.lang,
+	(newValue) => {
+		proxy.$i18n.locale = newValue
+		tool.data.set('APP_LANG', newValue)
+	}
+)
+// 主题
+watch(
+	() => config.value.theme,
+	(newValue) => {
+		document.body.setAttribute('data-theme', newValue)
 	}
+)
+// 通过开关加载内容
+const refreshSwitch = () => {
+	// 判断是否开启验证码
+	if (captchaOpen.value === 'true') {
+		// 加载验证码
+		loginCaptcha()
+		// 加入校验
+		rules.validCode = [required(proxy.$t('login.validError'), 'blur')]
+	}
+}
 
-	// 获取验证码
-	const loginCaptcha = () => {
-		loginApi.getPicCaptcha().then((data) => {
-			validCodeBase64.value = data.validCodeBase64
-			ruleForm.validCodeReqNo = data.validCodeReqNo
-		})
+// 获取验证码
+const loginCaptcha = () => {
+	loginApi.getPicCaptcha().then((data) => {
+		validCodeBase64.value = data.validCodeBase64
+		ruleForm.validCodeReqNo = data.validCodeReqNo
+	})
+}
+//登陆
+const loginForm = ref()
+const login = async () => {
+	if (!ruleForm.account) {
+		message.error('请输入账号')
+		return
 	}
-	//登陆
-	const loginForm = ref()
-	const login = async () => {
-		if (!ruleForm.account) {
-			message.error('请输入账号')
-			return
-		}
-		if (!ruleForm.password) {
-			message.error('请输入密码')
-			return
-		}
-		loading.value = true
-		const loginData = {
-			account: ruleForm.account,
-			// 密码进行SM2加密，传输过程中看到的只有密文，后端存储使用hash
-			password: smCrypto.doSm2Encrypt(ruleForm.password),
-			validCode: ruleForm.validCode,
-			validCodeReqNo: ruleForm.validCodeReqNo
-		}
-		// 获取token
-		try {
-			const loginToken = await loginApi.login(loginData)
-			afterLogin(loginToken)
-		} catch (err) {
-			loading.value = false
-			loginCaptcha()
-		}
-		// businessDElasync()
+	if (!ruleForm.password) {
+		message.error('请输入密码')
+		return
 	}
-	const configLang = (key) => {
-		config.value.lang = key
+	loading.value = true
+	const loginData = {
+		account: ruleForm.account,
+		// 密码进行SM2加密，传输过程中看到的只有密文，后端存储使用hash
+		password: smCrypto.doSm2Encrypt(ruleForm.password),
+		validCode: ruleForm.validCode,
+		validCodeReqNo: ruleForm.validCodeReqNo
 	}
+	// 获取token
+	try {
+		const loginToken = await loginApi.login(loginData)
+		afterLogin(loginToken)
+	} catch (err) {
+		loading.value = false
+		loginCaptcha()
+	}
+	// businessDElasync()
+}
+const configLang = (key) => {
+	config.value.lang = key
+}
 </script>
 <style lang="less">
-	.login_background {
-		background: url('/img/login_bg.jpg') no-repeat center;
-		position: relative;
+.login_background {
+	background: url('/img/login_bg.png') no-repeat center;
+	position: relative;
+	width: 100%;
+	height: 100%;
+	.login_left {
+		position: absolute;
+		top: 204px;
+		left: 190px;
+		img {
+			width: 700px;
+		}
+	}
+	.login_background_front {
+		background: url('/img/login/LOGO.png') no-repeat center;
+		width: 800px;
+		height: 92px;
+		position: absolute;
+		left: 10%;
+		top: 10%;
+	}
+	.login_main {
+		width: 570px;
+		height: 500px;
+		position: absolute;
+		right: 80px;
+		top: 200px;
+		background: rgba(255, 255, 255, 0.75);
+		border-radius: 8px;
+	}
+	.login_head {
 		width: 100%;
-		height: 100%;
-		.login_background_front {
-			background: url('/img/LOGO2.png') no-repeat center;
-			width: 800px;
-			height: 92px;
-			position: absolute;
-			left: 10%;
-			top: 10%;
+		display: flex;
+		justify-content: space-between;
+		align-items: center;
+		overflow: hidden;
+		white-space: nowrap;
+		padding: 50px 0 40px;
+		user-select: none;
+		.text {
+			padding: 0 30px;
+			font-size: 25px;
 		}
-		.login_main {
-			width: 570px;
-			height: 640px;
-			position: absolute;
-			right: 290px;
-			top: 200px;
-			background: rgba(255, 255, 255, 0.75);
-			border-radius: 8px;
+		&:before,
+		&:after {
+			width: 50%;
+			height: 1px;
+			content: '';
+			background: rgba(0, 0, 0, 0.3);
 		}
-		.login_head {
+	}
+	.login_form {
+		margin: 0 50px;
+		.icon {
+			font-size: 16px;
+			padding: 0 6px;
+			color: #666;
+		}
+		.LoginInput {
+			font-size: 15px;
+			box-shadow: 0 0 3px rgba(0, 0, 0, 0.06);
+			margin-top: 30px;
+		}
+		.login_auto {
+			margin-top: 20px;
+			.auto_text {
+				color: #444;
+			}
+		}
+		.login_btn {
+			cursor: pointer;
 			width: 100%;
+			border: none;
+			background: url('/img/login_btn.png') no-repeat center;
+			height: 74px;
+			line-height: 50px;
+			color: #fff;
+			font-size: 18px;
+			font-weight: bold;
+			letter-spacing: 10px;
+			margin-top: 50px;
 			display: flex;
-			justify-content: space-between;
-			align-items: center;
-			overflow: hidden;
-			white-space: nowrap;
-			padding: 50px 0 40px;
-			user-select: none;
-			.text {
-				padding: 0 30px;
-				font-size: 25px;
-			}
-			&:before,
-			&:after {
-				width: 50%;
-				height: 1px;
-				content: '';
-				background: rgba(0, 0, 0, 0.3);
-			}
+			justify-content: center;
+			align-items: flex-start;
 		}
-		.login_form {
-			margin: 0 50px;
-			.icon {
-				font-size: 16px;
-				padding: 0 6px;
-				color: #666;
-			}
-			.LoginInput {
-				font-size: 15px;
-				box-shadow: 0 0 3px rgba(0, 0, 0, 0.06);
-				margin-top: 30px;
-			}
-			.login_auto {
-				margin-top: 20px;
-				.auto_text {
-					color: #444;
-				}
-			}
-			.login_btn {
-				cursor: pointer;
-				width: 100%;
-				border: none;
-				background: url('/img/login_btn.png') no-repeat center;
-				height: 74px;
-				line-height: 50px;
-				color: #fff;
-				font-size: 18px;
-				font-weight: bold;
-				letter-spacing: 10px;
-				margin-top: 50px;
-				display: flex;
-				justify-content: center;
-				align-items: flex-start;
-			}
-			.login_forgetbox {
-				margin-top: 20px;
-				text-align: right;
-				.login_forget {
-					color: #444;
-				}
+		.login_forgetbox {
+			margin-top: 20px;
+			text-align: right;
+			.login_forget {
+				color: #444;
 			}
 		}
-		@media (max-width: 1000px) {
-			.login_background_front {
-				left: 50%;
-				margin-left: -400px;
-			}
-			.login_main {
-				left: calc(50% - 285px);
-				top: 24%;
-			}
+	}
+	@media (max-width: 1000px) {
+		.login_background_front {
+			left: 50%;
+			margin-left: -400px;
+		}
+		.login_main {
+			left: calc(50% - 285px);
+			top: 24%;
 		}
 	}
+}
 </style>

src/views/emergencySupport/moduleView/yjccqyAdd.vue

@@ -413,7 +413,8 @@
 		getCityDicList()
 		// 查看详情
 		if (props.modalData.type == 'look' || props.modalData.type == 'edit') {
-			pageTitle.value = '查看应急配送企业详情'
+			let str = props.modalData.type == 'look' ? '查看' : '修改'
+			pageTitle.value = str + '应急仓储企业详情'
 			api.getDetails({ id: props.modalData.id }).then((res) => {
 				formData.value = res
 				formData.value.emergencyLevel = []
@@ -474,7 +475,6 @@
 			}
 		})
 		dictList.sjjyProvince.map((item) => {
-			console.log(item.id, formData.value.actualAddressProvince)
 			if (item.id == formData.value.actualAddressProvince) {
 				if (item.dictLabel == '北京市' || item.dictLabel == '上海市' || item.dictLabel == '重庆市') {
 					dictList.sjjyCity.push(item)

src/views/provincialMedia/live.vue

@@ -1,94 +1,9 @@
-<script setup>
-	import control from '@/components/player/control1.vue'
-	import api from '@/api/orgInfo/info'
-	import cameraApi from '@/api/camera/index'
-	const orgTreeData = ref([])
-
-	const getOrgData = () => {
-		orgTreeData.value = []
-		api.getAllList({}).then((resp) => {
-			const list = resp || []
-
-			// list[0].parentId = 12
-
-			const temp = {}
-			const leaf = []
-			list.forEach((d) => {
-				d.children = []
-				d.title = d.orgName
-				d.key = d.orgId
-				temp[d.orgId] = d
-			})
-			list.forEach((d) => {
-				const pid = d.parentId
-				if (temp[pid]) {
-					temp[pid].children.push(d)
-					leaf.push(d.orgId)
-				}
-			})
-			orgTreeData.value = list.filter((d) => !leaf.includes(d.orgId))
-			// console.log('ttttt', list, orgTreeData.value)
-		})
-	}
-	const orgSelect = (n, e) => {
-		cameraApi.getNVRVideo({ orgId: n[0] }).then((resp) => {
-			console.log('nnnnn', resp)
-		})
-	}
-	onMounted(() => {
-		getOrgData()
-	})
+<script setup name="provincialMediaLive">
+	import Live from '@/components/video/Live.vue'
 </script>
 
 <template>
-	<div class="live-main">
-		<div class="left">
-			<a-tree :tree-data="orgTreeData" @select="orgSelect">
-				<template #title="{ title, key }">
-					<span v-if="key === '0-0-1-0'" style="color: #1890ff">{{ title }}</span>
-					<template v-else>{{ title }}</template>
-				</template>
-			</a-tree>
-		</div>
-		<div class="middle">
-			<div class="player">No Signal</div>
-		</div>
-		<div class="right">
-			<control />
-		</div>
-	</div>
+	<live />
 </template>
 
-<style scoped lang="less">
-	.live-main {
-		display: flex;
-		height: 100%;
-		margin-top: 10px;
-		.left {
-			min-width: 20%;
-			height: 100%;
-			margin-top: 10px;
-		}
-		.middle {
-			min-width: 50%;
-			height: 100%;
-			display: flex;
-			justify-content: center;
-			align-items: flex-start;
-			.player {
-				width: 90%;
-				min-height: 600px;
-				background-color: black;
-				display: flex;
-				justify-content: center;
-				align-items: center;
-				color: white;
-				font-size: 10em;
-			}
-		}
-		.right {
-			min-width: 30%;
-			height: 100%;
-		}
-	}
-</style>
+<style scoped lang="less"></style>

src/views/provincialMedia/record.vue

@@ -1,94 +1,8 @@
 <script setup>
-	import control from '@/components/player/control3.vue'
-	import api from '@/api/orgInfo/info'
-	import cameraApi from '@/api/camera/index'
-	const orgTreeData = ref([])
-
-	const getOrgData = () => {
-		orgTreeData.value = []
-		api.getAllList({}).then((resp) => {
-			const list = resp || []
-
-			// list[0].parentId = 12
-
-			const temp = {}
-			const leaf = []
-			list.forEach((d) => {
-				d.children = []
-				d.title = d.orgName
-				d.key = d.orgId
-				temp[d.orgId] = d
-			})
-			list.forEach((d) => {
-				const pid = d.parentId
-				if (temp[pid]) {
-					temp[pid].children.push(d)
-					leaf.push(d.orgId)
-				}
-			})
-			orgTreeData.value = list.filter((d) => !leaf.includes(d.orgId))
-			// console.log('ttttt', list, orgTreeData.value)
-		})
-	}
-	const orgSelect = (n, e) => {
-		cameraApi.getNVRVideo({ orgId: n[0] }).then((resp) => {
-			console.log('nnnnn', resp)
-		})
-	}
-	onMounted(() => {
-		getOrgData()
-	})
+	import Replay from '@/components/video/Replay.vue'
 </script>
-
 <template>
-	<div class="live-main">
-		<div class="left">
-			<a-tree :tree-data="orgTreeData">
-				<template #title="{ title, key }">
-					<span v-if="key === '0-0-1-0'" style="color: #1890ff">{{ title }}</span>
-					<template v-else>{{ title }}</template>
-				</template>
-			</a-tree>
-		</div>
-		<div class="middle">
-			<div class="player">No Signal</div>
-		</div>
-		<div class="right">
-			<control />
-		</div>
-	</div>
+	<replay />
 </template>
 
-<style scoped lang="less">
-	.live-main {
-		display: flex;
-		height: 100%;
-		margin-top: 10px;
-		.left {
-			min-width: 20%;
-			height: 100%;
-			margin-top: 10px;
-		}
-		.middle {
-			min-width: 60%;
-			height: 100%;
-			display: flex;
-			justify-content: center;
-			align-items: flex-start;
-			.player {
-				width: 90%;
-				min-height: 600px;
-				background-color: black;
-				display: flex;
-				justify-content: center;
-				align-items: center;
-				color: white;
-				font-size: 10em;
-			}
-		}
-		.right {
-			min-width: 20%;
-			height: 100%;
-		}
-	}
-</style>
+<style scoped lang="less"></style>