admin/zhgdlarge
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix: BUG修改

Browse Source
This commit is contained in:
kun 2024-05-23 13:54:17 +08:00
parent b95136ae36
commit 04f22c0aca
7 changed files with 48 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
.env.development
View File

@ -4,8 +4,8 @@ NODE_ENV = 'development'
# 本地环境接口地址(/api/index.ts文件中使用) # 本地环境接口地址(/api/index.ts文件中使用)
# 后端本地 # 后端本地
# VITE_API_URL = 'http://192.168.34.221:19111' # VITE_API_URL = 'http://192.168.34.221:19111'
VITE_API_URL = 'http://192.168.34.221:9111' # VITE_API_URL = 'http://192.168.34.221:9111'
# VITE_API_URL = 'http://192.168.34.221:28888' VITE_API_URL = 'http://192.168.34.221:28889'
# VITE_API_URL = 'http://121.196.214.246/api' # VITE_API_URL = 'http://121.196.214.246/api'
# VITE_API_URL = 'http://jxj.zhgdyun.com:100' # VITE_API_URL = 'http://jxj.zhgdyun.com:100'
# VITE_API_URL = 'http://192.168.34.221:12360' # VITE_API_URL = 'http://192.168.34.221:12360'

4
src/config/config.ts
View File

@ -27,10 +27,10 @@ export const BASE_IMAGE_URL = import.meta.env.VITE_BASE_IMAGE_URL;
// export const COMPANY: string = "zhzrf"; //中海·臻如府 // export const COMPANY: string = "zhzrf"; //中海·臻如府
// export const COMPANY: string = "zsbf"; //中水北方 // export const COMPANY: string = "zsbf"; //中水北方
// export const COMPANY: string = "as"; //鞍山项目 // export const COMPANY: string = "as"; //鞍山项目
export const COMPANY: string = "agjt"; //鞍钢集团 // export const COMPANY: string = "agjt"; //鞍钢集团
// export const COMPANY: string = "agjtCommand"; //鞍钢集团指挥部大屏 // export const COMPANY: string = "agjtCommand"; //鞍钢集团指挥部大屏
// export const COMPANY: string = "slx"; //苏立信项目 // export const COMPANY: string = "slx"; //苏立信项目
// export const COMPANY: string = "hfqc"; //合肥启程项目 export const COMPANY: string = "hfqc"; //合肥启程项目
// export const COMPANY: string = "jsyc"; // 江苏盐城项目 // export const COMPANY: string = "jsyc"; // 江苏盐城项目
// export const COMPANY: string = "syhy"; //沈阳合盈盘锦项目 (需要去src\routers\modules\staticRouter.ts更换首页) // export const COMPANY: string = "syhy"; //沈阳合盈盘锦项目 (需要去src\routers\modules\staticRouter.ts更换首页)
// export const COMPANY: string = "jxwjj"; //嘉兴王江泾公用码头项目 (需要去src\routers\modules\staticRouter.ts更换首页) // export const COMPANY: string = "jxwjj"; //嘉兴王江泾公用码头项目 (需要去src\routers\modules\staticRouter.ts更换首页)

7
src/views/sevenLargeScreen/safetyManagement/highFormwork/alarm-list.vue
View File

@ -58,7 +58,7 @@ import { watch, ref, onMounted } from "vue";
import { alarmRecordList } from "@/api/modules/highFormwork"; import { alarmRecordList } from "@/api/modules/highFormwork";
import { GlobalStore } from "@/stores"; import { GlobalStore } from "@/stores";
const store = GlobalStore(); const store = GlobalStore();
const props = defineProps(["selectPoint"]); const props = defineProps(["selectObj"]);
const pageNo = ref(1 as any); const pageNo = ref(1 as any);
const pageSize = ref(15 as any); const pageSize = ref(15 as any);
const refScrollbar = ref(null as any); // 绑定到滚动的盒子上 const refScrollbar = ref(null as any); // 绑定到滚动的盒子上
@ -152,7 +152,8 @@ const timeChange = () => {
const getAlarmRecord = async (type: any) => { const getAlarmRecord = async (type: any) => {
let requestData: any = { let requestData: any = {
projectSn: store.sn, projectSn: store.sn,
measurePointNumber: props.selectPoint, measurePointNumber: props.selectObj.measurePointNumber,
acquisitionInstrumentNumber: props.selectObj.acquisitionInstrumentNumber,
pageNo: pageNo.value, pageNo: pageNo.value,
pageSize: pageSize.value pageSize: pageSize.value
}; };
@ -174,7 +175,7 @@ const getAlarmRecord = async (type: any) => {
} }
}; };
watch( watch(
() => props.selectPoint, () => props.selectObj,
newVal => { newVal => {
// console.log(newVal, "newVal"); // console.log(newVal, "newVal");
if (newVal) { if (newVal) {

16
src/views/sevenLargeScreen/safetyManagement/highFormwork/bottomRight.vue
View File

@ -8,7 +8,7 @@
v-for="(item, index) in pointList" v-for="(item, index) in pointList"
:key="index" :key="index"
:label="item.measurePointName" :label="item.measurePointName"
:value="item.measurePointNumber" :value="item.id"
/> />
</el-select> </el-select>
</div> </div>
@ -324,7 +324,17 @@ function drawChart() {
} }
// 获取累计变形量 // 获取累计变形量
const getCountTransform = async () => { const getCountTransform = async () => {
const res: any = await countTransform({ projectSn: store.sn, measurePointNumber: selectPoint.value }); let requestData:any = {
projectSn: store.sn
}
let findItem = pointList.value.find((item:any) => {
return item.id == selectPoint.value
})
if(findItem){
requestData.measurePointNumber = findItem.measurePointNumber
requestData.acquisitionInstrumentNumber = findItem.acquisitionInstrumentNumber
}
const res: any = await countTransform(requestData);
console.log("获取高支模累计变形量", res); console.log("获取高支模累计变形量", res);
option.value.series = []; // 每次渲染先置空 option.value.series = []; // 每次渲染先置空
for (let i = 0; i < typeList.value.length; i++) { for (let i = 0; i < typeList.value.length; i++) {
@ -353,7 +363,7 @@ const getMonitorViewPoint = async () => {
console.log("获取测点数据", res); console.log("获取测点数据", res);
pointList.value = res.result.records; pointList.value = res.result.records;
if (res.result.records && res.result.records.length > 0) { if (res.result.records && res.result.records.length > 0) {
selectPoint.value = res.result.records[0].measurePointNumber; selectPoint.value = res.result.records[0].id;
} }
}; };
onMounted(async () => { onMounted(async () => {

7
src/views/sevenLargeScreen/safetyManagement/highFormwork/history-list.vue
View File

@ -70,7 +70,7 @@ import { ref, onMounted, watch } from "vue";
import { realMonitorList } from "@/api/modules/highFormwork"; import { realMonitorList } from "@/api/modules/highFormwork";
import { GlobalStore } from "@/stores"; import { GlobalStore } from "@/stores";
const store = GlobalStore(); const store = GlobalStore();
const props = defineProps(["selectPoint"]); const props = defineProps(["selectObj"]);
const pageNo = ref(1 as any); const pageNo = ref(1 as any);
const pageSize = ref(15 as any); const pageSize = ref(15 as any);
const refScrollbar = ref(null as any); // 绑定到滚动的盒子上 const refScrollbar = ref(null as any); // 绑定到滚动的盒子上
@ -163,7 +163,8 @@ const timeChange = () => {
const getMonitorViewPoint = async (type: any) => { const getMonitorViewPoint = async (type: any) => {
let requestData: any = { let requestData: any = {
projectSn: store.sn, projectSn: store.sn,
measurePointNumber: props.selectPoint, measurePointNumber: props.selectObj.measurePointNumber,
acquisitionInstrumentNumber: props.selectObj.acquisitionInstrumentNumber,
pageNo: pageNo.value, pageNo: pageNo.value,
pageSize: pageSize.value pageSize: pageSize.value
}; };
@ -185,7 +186,7 @@ const getMonitorViewPoint = async (type: any) => {
} }
}; };
watch( watch(
() => props.selectPoint, () => props.selectObj,
newVal => { newVal => {
// console.log(newVal, "newVal"); // console.log(newVal, "newVal");
if (newVal) { if (newVal) {

8
src/views/sevenLargeScreen/safetyManagement/highFormwork/real-time-list.vue
View File

@ -67,7 +67,7 @@ import { watch, ref, onMounted } from "vue";
import { realMonitorList } from "@/api/modules/highFormwork"; import { realMonitorList } from "@/api/modules/highFormwork";
import { GlobalStore } from "@/stores"; import { GlobalStore } from "@/stores";
const store = GlobalStore(); const store = GlobalStore();
const props = defineProps(["selectPoint"]); const props = defineProps(["selectObj"]);
const pageNo = ref(1 as any); const pageNo = ref(1 as any);
const pageSize = ref(15 as any); const pageSize = ref(15 as any);
const refScrollbar = ref(null as any); // 绑定到滚动的盒子上 const refScrollbar = ref(null as any); // 绑定到滚动的盒子上
@ -155,9 +155,11 @@ let formworkOption = ref([
const list = ref([] as any); const list = ref([] as any);
// 获取监测数据（实时值、历史数据） // 获取监测数据（实时值、历史数据）
const getMonitorViewPoint = async (type: any) => { const getMonitorViewPoint = async (type: any) => {
console.log(props.selectObj,777888)
const res: any = await realMonitorList({ const res: any = await realMonitorList({
projectSn: store.sn, projectSn: store.sn,
measurePointNumber: props.selectPoint, measurePointNumber: props.selectObj.measurePointNumber,
acquisitionInstrumentNumber: props.selectObj.acquisitionInstrumentNumber,
pageNo: pageNo.value, pageNo: pageNo.value,
pageSize: pageSize.value pageSize: pageSize.value
}); });
@ -174,7 +176,7 @@ const getMonitorViewPoint = async (type: any) => {
} }
}; };
watch( watch(
() => props.selectPoint, () => props.selectObj,
newVal => { newVal => {
// console.log(newVal, "newVal"); // console.log(newVal, "newVal");
if (newVal) { if (newVal) {

26
src/views/sevenLargeScreen/safetyManagement/highFormwork/topRight.vue
View File

@ -64,19 +64,19 @@
</div> </div>
</div> </div>
<div class="select-project"> <div class="select-project">
<el-select v-model="selectPoint" style="width: 90%; margin-right: 5%" size="small"> <el-select v-model="selectPoint" style="width: 90%; margin-right: 5%" size="small" @change="selectPointChange">
<el-option v-for="(item, index) in pointList" :key="index" :label="item.measurePointName" :value="item.measurePointNumber" /> <el-option v-for="(item, index) in pointList" :key="index" :label="item.measurePointName" :value="item.id" />
</el-select> </el-select>
</div> </div>
<div class="monitor-list"> <div class="monitor-list">
<div class="realTime-list" v-if="tabIndex == 1"> <div class="realTime-list" v-if="tabIndex == 1">
<real-time-list :selectPoint="selectPoint"></real-time-list> <real-time-list :selectObj="selectObj"></real-time-list>
</div> </div>
<div class="history-list" v-if="tabIndex == 2"> <div class="history-list" v-if="tabIndex == 2">
<history-list :selectPoint="selectPoint"></history-list> <history-list :selectObj="selectObj"></history-list>
</div> </div>
<div class="alarm-list" v-if="tabIndex == 3"> <div class="alarm-list" v-if="tabIndex == 3">
<alarm-list :selectPoint="selectPoint"></alarm-list> <alarm-list :selectObj="selectObj"></alarm-list>
</div> </div>
</div> </div>
</div> </div>
@ -97,7 +97,8 @@ const selectView = ref("");
const viewList = ref([] as any); const viewList = ref([] as any);
const monitorTimeText = ref(""); const monitorTimeText = ref("");
const planViewData = ref<any>(); const planViewData = ref<any>();
const selectPoint = ref("" as any); const selectPoint = ref({} as any);
const selectObj = ref({} as any);
const pointList = ref([] as any); const pointList = ref([] as any);
let tabIndex = ref(1 as any); let tabIndex = ref(1 as any);
let topText = ref([ let topText = ref([
@ -105,7 +106,15 @@ let topText = ref([
{ id: 2, title: "历史数据", isActive: false }, { id: 2, title: "历史数据", isActive: false },
{ id: 3, title: "报警记录", isActive: false } { id: 3, title: "报警记录", isActive: false }
]); ]);
const selectPointChange = () => {
let findItem = pointList.value.find((item:any) => {
return item.id == selectPoint.value
})
console.log(findItem,888999)
if(findItem){
selectObj.value = findItem;
}
}
function getStyle(item: any) { function getStyle(item: any) {
if (item.isActive) { if (item.isActive) {
let choiseStyle = { let choiseStyle = {
@ -170,7 +179,8 @@ const getMonitorViewPoint = async () => {
list.value = res.result list.value = res.result
pointList.value = res.result pointList.value = res.result
if(res.result && res.result.length > 0){ if(res.result && res.result.length > 0){
selectPoint.value = res.result[0].measurePointNumber selectPoint.value = res.result[0].id
selectObj.value = res.result[0]
} }
}; };
onMounted(async () => { onMounted(async () => {