fix: BUG修改

2023-07-29 10:28:17 +08:00 · 2023-07-29 10:28:17 +08:00 · 9c1a55d987
commit 9c1a55d987
parent d689d39ff0
21 changed files with 159 additions and 29 deletions
--- a/.env.development
+++ b/.env.development
@ -2,9 +2,9 @@
 NODE_ENV = 'development'

 # 本地环境接口地址(/api/index.ts文件中使用)
-# VITE_API_URL = 'http://192.168.34.155:6688'
+VITE_API_URL = 'http://192.168.34.155:6688'
 VITE_WPAPI_URL = "http://182.90.224.147:8081"
-VITE_API_URL = "http://182.90.224.147:6688"
+# VITE_API_URL = "http://182.90.224.147:6688"

 # 上传
 # VITE_ULD_API_URL = 'http://192.168.34.155:8012/onlinePreview?url='
--- a/src/views/enterprise/AIwarning/accessSituation/index.scss
+++ b/src/views/enterprise/AIwarning/accessSituation/index.scss
@ -21,7 +21,7 @@
 	.right_container {
 		display: flex;
 		flex-direction: column;
-		width: 88%;
+		width: 100%;

 		// margin-left: 20px;
 		padding: 0 0 0 20px;
--- a/src/views/enterprise/AIwarning/accessSituation/index.vue
+++ b/src/views/enterprise/AIwarning/accessSituation/index.vue
@ -2,7 +2,7 @@
 <template>
 	<div class="warning-page">
 		<!-- :tabs="['工程名称']" -->
-		<LeftMenu
+		<!-- <LeftMenu
 			v-model="active"
 			:records="records"
 			@change-page="onCurChange"
@ -40,8 +40,7 @@
 					</div>
 				</div>
 			</template>
-		</LeftMenu>
-
+		</LeftMenu> -->
 		<div class="right_container">
 			<div class="form_div">
 				<el-form :model="form" :inline="true" @submit.prevent class="form" ref="FormRef">
@ -136,6 +135,12 @@
 		@confirm="saveItem"
 	>
 	</DialogForm>
+	<engineeringDrawer v-model="engVisable" ref="engDrawer" :request="getengineering">
+		<template #default="{ data }">
+			<span style="margin-left: 10px" @click="onUpdate(data)">{{ data.engineeringName }}</span>
+		</template>
+	</engineeringDrawer>
+	<allEngineering @click="engVisable = true" />
 </template>

 <script lang="ts" setup>
@ -148,7 +153,11 @@ import DialogForm from "@/components/DialogForm/index.vue";
 import { ElMessage } from "element-plus";
 import type { ResAiProjectPage, ResAiEngineerPage } from "@/api/types/government/AIwaring";
 import { format } from "date-fns";
+import engineeringDrawer from "@/components/engineeringDrawer/index.vue";
+import allEngineering from "@/components/allEngineering/index.vue";
+import { getRelevanceList } from "@/api/modules/common";

+const engVisable = ref(false);
 const active = ref(0);
 const imgVisible = ref(false);
 const background = ref(true);
@ -278,6 +287,14 @@ const formConfig = reactive({
 		]
 	}
 });
+// 点击抽屉的工程名称更新页面
+const onUpdate = async row => {
+	ElMessage.success("页面已更新");
+};
+const getengineering = (params: any) => {
+	// let newParams = JSON.parse(JSON.stringify(params));
+	return getRelevanceList();
+};
 const onShowImg = (params: any) => {
 	imgVisible.value = true;
 	imgList.value = { ...params };
--- a/src/views/enterprise/notice/myReceive/index.scss
+++ b/src/views/enterprise/notice/myReceive/index.scss
@ -15,3 +15,28 @@
 .content {
 	padding: 0 40px;
 }
+.html-div {
+	display: flex;
+	align-items: center;
+	justify-content: center;
+	line-height: 50px;
+	height: 50px;
+	width: 100%;
+	white-space: nowrap;
+	text-overflow: ellipsis;
+	overflow: hidden;
+	:deep() {
+		p:first-child {
+			width: 100%;
+			display: flex;
+			align-items: center;
+			justify-content: center;
+			white-space: nowrap;
+			text-overflow: ellipsis;
+			overflow: hidden;
+		}
+		p:not(:first-child) {
+			display: none !important;
+		}
+	}
+}
--- a/src/views/enterprise/notice/myReceive/index.vue
+++ b/src/views/enterprise/notice/myReceive/index.vue
@ -11,6 +11,9 @@
 			background
 			:isShowSearch="false"
 		>
+			<template #content="{ row }">
+				<div v-html="row.content" class="html-div"></div>
+			</template>
 			<template #operation="{ row }">
 				<el-button type="primary" link @click="onLook(row)">
 					<img src="@/assets/images/tableIcon/look.png" alt="" class="configureIcon" />
--- a/src/views/enterprise/policyLows/myReceive/index.scss
+++ b/src/views/enterprise/policyLows/myReceive/index.scss
@ -18,3 +18,28 @@
 .content :deep(.ql-align-left) {
 	text-align: left;
 }
+.html-div {
+	display: flex;
+	align-items: center;
+	justify-content: center;
+	line-height: 50px;
+	height: 50px;
+	width: 100%;
+	white-space: nowrap;
+	text-overflow: ellipsis;
+	overflow: hidden;
+	:deep() {
+		p:first-child {
+			width: 100%;
+			display: flex;
+			align-items: center;
+			justify-content: center;
+			white-space: nowrap;
+			text-overflow: ellipsis;
+			overflow: hidden;
+		}
+		p:not(:first-child) {
+			display: none !important;
+		}
+	}
+}
--- a/src/views/enterprise/policyLows/myReceive/index.vue
+++ b/src/views/enterprise/policyLows/myReceive/index.vue
@ -11,6 +11,9 @@
 			background
 			@row-click="rowClick"
 		>
+			<template #content="{ row }">
+				<div v-html="row.content" class="html-div"></div>
+			</template>
 			<template #operation="{ row }">
 				<el-button type="primary" link @click="ondownLoad(row)">
 					<img src="@/assets/images/tableIcon/下载附件.png" alt="" class="configureIcon" />
--- a/src/views/enterprise/progressManagement/subItemManagement/index.vue
+++ b/src/views/enterprise/progressManagement/subItemManagement/index.vue
@ -304,8 +304,8 @@ const getDataList = async () => {
 	console.log(searchForm.value);
 	let requestData = {
 		...searchForm.value,
-		realEndTime_begin: searchForm.value.timeRange[0],
-		realEndTime_end: searchForm.value.timeRange[1],
+		realEndTime_begin: searchForm.value.timeRange && searchForm.value.timeRange.length > 0 ? searchForm.value.timeRange[0] : "",
+		realEndTime_end: searchForm.value.timeRange && searchForm.value.timeRange.length > 0 ? searchForm.value.timeRange[1] : "",
 		pageNo: pageable.value.pageNo,
 		pageSize: pageable.value.pageSize
 	};
--- a/src/views/enterprise/unmannedVideo/equipList/index.vue
+++ b/src/views/enterprise/unmannedVideo/equipList/index.vue
@ -17,7 +17,7 @@
 					<div class="leftMenu_item">
 						<div class="video">
 							<img src="@/assets/images/leftTab/设备列表.png" alt="" />
-							<span class="middleSize">影像视频树：{{ data.deviceNum }}</span>
+							<span class="middleSize">影像视频数：{{ data.deviceNum }}</span>
 						</div>
 					</div>
 				</div>
--- a/src/views/enterprise/unmannedVideo/videoData/index.vue
+++ b/src/views/enterprise/unmannedVideo/videoData/index.vue
@ -17,7 +17,7 @@
 					<div class="leftMenu_item">
 						<div class="video">
 							<img src="@/assets/images/leftTab/设备列表.png" alt="" />
-							<span class="middleSize">影像视频树：{{ data.deviceNum }}</span>
+							<span class="middleSize">影像视频数：{{ data.deviceNum }}</span>
 						</div>
 					</div>
 				</div>
--- a/src/views/goverment/progressManagement/divisionsAndISubItems/index.vue
+++ b/src/views/goverment/progressManagement/divisionsAndISubItems/index.vue
@ -335,8 +335,8 @@ const getDataList = async () => {
 	console.log(searchForm.value);
 	let requestData = {
 		...searchForm.value,
-		realEndTime_begin: searchForm.value.timeRange[0],
-		realEndTime_end: searchForm.value.timeRange[1],
+		realEndTime_begin: searchForm.value.timeRange && searchForm.value.timeRange.length > 0 ? searchForm.value.timeRange[0] : "",
+		realEndTime_end: searchForm.value.timeRange && searchForm.value.timeRange.length > 0 ? searchForm.value.timeRange[1] : "",
 		pageNo: pageable.value.pageNo,
 		pageSize: pageable.value.pageSize
 	};
@ -365,7 +365,7 @@ const searchName = ref<string>("");
 // 页面的项目名称和工程名称的div点击事件
 const onSearch = async (params: any) => {
 	// const { result } = await getAIQuestionPage(
-	// 	active.value === 0
+	// active.value === 0
 	// 		? { projectSn: (params as ResAiProjectPage).projectSn, pageNo: pageable.value.pageNo, pageSize: pageable.value.pageSize }
 	// 		: {
 	// 				engineeringSn: (params as ResAiEngineerPage).engineeringSn,
--- a/src/views/goverment/progressManagement/investmentPayment/components/transformInfo2.vue
+++ b/src/views/goverment/progressManagement/investmentPayment/components/transformInfo2.vue
@ -27,7 +27,7 @@
 					:cell-style="{ height: '40px' }"
 				>
 					<el-table-column type="index" label="序号" width="80"> </el-table-column>
-					<el-table-column prop="reportContent" label="汇报内容" align="center"> </el-table-column>
+					<el-table-column prop="reportContent" label="汇报内容" align="left"> </el-table-column>
 					<el-table-column prop="totalAmount" label="总工程造价(元)" align="center">
 						<template #default="scope">
 							<el-input
--- a/src/views/goverment/unmannedVideo/accessSituation/index.vue
+++ b/src/views/goverment/unmannedVideo/accessSituation/index.vue
@ -28,9 +28,10 @@
 			<!-- <div class="form_div"> -->
 			<el-form :model="form" :inline="true" @submit.prevent class="form" ref="FormRef">
 				<el-form-item label="标题">
-					<el-select class="select" clearable v-model="form.code" placeholder="请输入">
+					<!-- <el-select class="select" clearable v-model="form.code" placeholder="请输入">
 						<el-option v-for="item in nameList" :key="item.code" :label="item.name" :value="item.code" />
-					</el-select>
+					</el-select> -->
+					<el-input v-model="form.title" placeholder="请输入" clearable />
 				</el-form-item>
 				<el-form-item label="创建时间">
 					<el-date-picker
@ -164,7 +165,7 @@ const questList = ref({
 	records: []
 });
 const form = ref({
-	code: "",
+	title: "",
 	createTime: "",
 	startTime: "",
 	endTime: ""
@ -340,12 +341,12 @@ const onSearch = async (params: ResAiProjectPage | ResAiEngineerPage) => {
 		: (searchName.value = (params as ResAiEngineerPage).engineeringName);
 	// 清空form
 	form.value = {
-		code: "",
+		title: "",
 		createTime: "",
 		startTime: "",
 		endTime: ""
 	};
-	getAiMonitorDevList();
+	// getAiMonitorDevList();
 };

 // leftMenu页面的搜索按钮
@ -395,10 +396,10 @@ const getAIengPage = async () => {
 };

 // 这里监控名称的下拉框列表
-const getAiMonitorDevList = async () => {
-	const res = await getAiMonitorDev(active.value === 0 ? { projectSn: searchSn.value } : { engineeringSn: searchSn.value });
-	nameList.value = res.result;
-};
+// const getAiMonitorDevList = async () => {
+// 	const res = await getAiMonitorDev(active.value === 0 ? { projectSn: searchSn.value } : { engineeringSn: searchSn.value });
+// 	nameList.value = res.result;
+// };

 watch(
 	() => active.value,
@ -432,7 +433,7 @@ watch(

 onMounted(async () => {
 	// getAIengPage();
-	getAiMonitorDevList();
+	// getAiMonitorDevList();
 	await getAIproPage();
 	onSearch(records.value[0]);
 	searchSn.value = (records.value as ResAiProjectPage[])[0].projectSn;
--- a/src/views/goverment/unmannedVideo/alarmRecord/index.vue
+++ b/src/views/goverment/unmannedVideo/alarmRecord/index.vue
@ -18,7 +18,7 @@
 						<div class="leftMenu_item">
 							<div class="video">
 								<img src="@/assets/images/unmannedVideo/video.png" width="11" height="11" alt="" />
-								<span class="middleSize">接入无人机总数：{{ data.videoNum }}</span>
+								<span class="middleSize">接入无人机总数：{{ data.deviceNum }}</span>
 							</div>
 						</div>
 					</div>
--- a/src/views/project/notice/myReceive/index.scss
+++ b/src/views/project/notice/myReceive/index.scss
@ -15,3 +15,28 @@
 .content {
 	padding: 0 40px;
 }
+.html-div {
+	display: flex;
+	align-items: center;
+	justify-content: center;
+	line-height: 50px;
+	height: 50px;
+	width: 100%;
+	white-space: nowrap;
+	text-overflow: ellipsis;
+	overflow: hidden;
+	:deep() {
+		p:first-child {
+			width: 100%;
+			display: flex;
+			align-items: center;
+			justify-content: center;
+			white-space: nowrap;
+			text-overflow: ellipsis;
+			overflow: hidden;
+		}
+		p:not(:first-child) {
+			display: none !important;
+		}
+	}
+}
--- a/src/views/project/notice/myReceive/index.vue
+++ b/src/views/project/notice/myReceive/index.vue
@ -11,6 +11,9 @@
 			background
 			:isShowSearch="false"
 		>
+			<template #content="{ row }">
+				<div v-html="row.content" class="html-div"></div>
+			</template>
 			<template #operation="{ row }">
 				<el-button type="primary" link @click="onLook(row)">
 					<img src="@/assets/images/tableIcon/look.png" alt="" class="configureIcon" />
--- a/src/views/project/policyLows/myReceive/index.scss
+++ b/src/views/project/policyLows/myReceive/index.scss
@ -18,3 +18,28 @@
 .content :deep(.ql-align-left) {
 	text-align: left;
 }
+.html-div {
+	display: flex;
+	align-items: center;
+	justify-content: center;
+	line-height: 50px;
+	height: 50px;
+	width: 100%;
+	white-space: nowrap;
+	text-overflow: ellipsis;
+	overflow: hidden;
+	:deep() {
+		p:first-child {
+			width: 100%;
+			display: flex;
+			align-items: center;
+			justify-content: center;
+			white-space: nowrap;
+			text-overflow: ellipsis;
+			overflow: hidden;
+		}
+		p:not(:first-child) {
+			display: none !important;
+		}
+	}
+}
--- a/src/views/project/policyLows/myReceive/index.vue
+++ b/src/views/project/policyLows/myReceive/index.vue
@ -12,6 +12,9 @@
 			:isShowSearch="false"
 			@row-click="rowClick"
 		>
+			<template #content="{ row }">
+				<div v-html="row.content" class="html-div"></div>
+			</template>
 			<template #operation="{ row }">
 				<el-button type="primary" link @click="ondownLoad(row)">
 					<img src="@/assets/images/tableIcon/下载附件.png" alt="" class="configureIcon" />
--- a/src/views/project/progressManagement/payManagement/components/transformInfo2.vue
+++ b/src/views/project/progressManagement/payManagement/components/transformInfo2.vue
@ -29,7 +29,7 @@
 					:cell-style="{ height: '40px' }"
 				>
 					<el-table-column type="index" label="序号" width="80" align="center"> </el-table-column>
-					<el-table-column prop="reportContent" label="汇报内容" align="center"> </el-table-column>
+					<el-table-column prop="reportContent" label="汇报内容" align="left"> </el-table-column>
 					<el-table-column prop="totalAmount" label="总工程造价(元)" align="center">
 						<template #default="scope">
 							<el-input
--- a/src/views/project/progressManagement/planFinishSituation/components/transformInfo1.vue
+++ b/src/views/project/progressManagement/planFinishSituation/components/transformInfo1.vue
@ -74,7 +74,7 @@
 			<el-table
 				:data="recordItemData"
 				class="el-table"
-				height="100%"
+				height="90%"
 				:row-style="{ height: '40px' }"
 				:header-cell-style="{ textAlign: 'center', height: '40px' }"
 				:cell-style="{ textAlign: 'center', height: '40px' }"
--- a/src/views/project/progressManagement/subItemManagement/index.vue
+++ b/src/views/project/progressManagement/subItemManagement/index.vue
@ -304,8 +304,8 @@ const getDataList = async () => {
 	console.log(searchForm.value);
 	let requestData = {
 		...searchForm.value,
-		realEndTime_begin: searchForm.value.timeRange[0],
-		realEndTime_end: searchForm.value.timeRange[1],
+		realEndTime_begin: searchForm.value.timeRange && searchForm.value.timeRange.length > 0 ? searchForm.value.timeRange[0] : "",
+		realEndTime_end: searchForm.value.timeRange && searchForm.value.timeRange.length > 0 ? searchForm.value.timeRange[1] : "",
 		pageNo: pageable.value.pageNo,
 		pageSize: pageable.value.pageSize
 	};