fix: 修改视频监控以及绿色施工中的一些样式BUG
This commit is contained in:
kun
parent
dc26fae1b4
commit
abc7f12db5
@ -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_API_URL = "http://zjjsghj.weihai.cn"
|
||||
VITE_API_URL = 'http://jat.weihaihuancui.cn'
|
||||
# VITE_API_URL = 'http://jat.weihaihuancui.cn'
|
||||
# VITE_API_URL = "http://60.212.191.85:9000"
|
||||
VITE_WPAPI_URL = "http://182.90.224.147:8081"
|
||||
# VITE_API_URL = "http://182.90.224.147:6688"
|
||||
|
||||
@ -12,7 +12,7 @@
|
||||
<el-scrollbar :style="{ height: title ? `calc(100% - 95px)` : `calc(100% - 56px)` }">
|
||||
<el-tree
|
||||
ref="treeRef"
|
||||
default-expand-all
|
||||
:default-expand-all="defaultExpandAll"
|
||||
:node-key="id"
|
||||
:data="multiple ? treeData : treeAllData"
|
||||
:show-checkbox="multiple"
|
||||
@ -44,7 +44,7 @@
|
||||
</template>
|
||||
|
||||
<script setup lang="ts" name="TreeFilter">
|
||||
import { ref, watch, onBeforeMount } from "vue";
|
||||
import { ref, watch, onBeforeMount, onMounted } from "vue";
|
||||
import { ElTree } from "element-plus";
|
||||
|
||||
// 接收父组件参数并设置默认值
|
||||
@ -56,11 +56,13 @@ interface TreeFilterProps {
|
||||
label?: string; // 显示的label ==> 非必传，默认为 “label”
|
||||
multiple?: boolean; // 是否为多选 ==> 非必传，默认为 false
|
||||
defaultValue?: any; // 默认选中的值 ==> 非必传
|
||||
defaultExpandAll?: boolean; // 是否展开全部 ==> 非必传，默认为 false
|
||||
}
|
||||
const props = withDefaults(defineProps<TreeFilterProps>(), {
|
||||
id: "id",
|
||||
label: "label",
|
||||
multiple: false
|
||||
multiple: false,
|
||||
defaultExpandAll: false
|
||||
});
|
||||
|
||||
const defaultProps = {
|
||||
@ -91,14 +93,21 @@ onBeforeMount(async () => {
|
||||
treeAllData.value = props.data;
|
||||
return;
|
||||
}
|
||||
// const res = await props.requestApi!();
|
||||
// console.log(res);
|
||||
// treeData.value = res?.result;
|
||||
// // treeAllData.value = [{ id: "", [props.label]: "全部" }, ...result];
|
||||
|
||||
// treeAllData.value = res?.result ? [...res.result] : [];
|
||||
});
|
||||
watch(props.requestApi!, async val => {
|
||||
const res = await props.requestApi!();
|
||||
console.log(res);
|
||||
treeData.value = res?.result;
|
||||
// treeAllData.value = [{ id: "", [props.label]: "全部" }, ...result];
|
||||
|
||||
treeAllData.value = [...res.result];
|
||||
treeAllData.value = res?.result ? [...res.result] : [];
|
||||
});
|
||||
|
||||
watch(filterText, val => {
|
||||
treeRef.value!.filter(val);
|
||||
});
|
||||
|
||||
@ -140,7 +140,7 @@
|
||||
height: 70px;
|
||||
font-family: "siyuan_Bold";
|
||||
span {
|
||||
font-size: 24px;
|
||||
font-size: 22px;
|
||||
color: #00378f;
|
||||
}
|
||||
p {
|
||||
|
||||
@ -181,8 +181,10 @@ const onSearch = async (params: ResAiEngineerPage | ResAiProjectPage) => {
|
||||
);
|
||||
monitorList.value = monitorList.value.map(item => (item === curr ? { ...curr, showGif: true } : { ...item, showGif: false }));
|
||||
if (params.longitude && params.latitude) {
|
||||
console.log(111);
|
||||
map.value?.setCenter([+params.longitude, +params.latitude]);
|
||||
console.log(params, 222333111);
|
||||
// map.value?.setCenter([+params.longitude, +params.latitude]);
|
||||
map.value?.setCenter([+params.longitude, +params.latitude + 0.2]); // +0.2是让中心点稍微往上偏移一点，防止信息弹窗与顶部数据统计互相遮挡
|
||||
map.value?.setZoom(10);
|
||||
showInfoPage(curr);
|
||||
}
|
||||
// params.longitude !== "" && params.longitude !== null
|
||||
@ -362,7 +364,8 @@ const addMarker = () => {
|
||||
const mapData = async () => {
|
||||
const AMap = await initAMap();
|
||||
AMapRef.value = AMap;
|
||||
map.value = new AMap.Map("map-container", { zoom: 7, center: [116.481181, 39.90923], viewMode: "2D", resizeEnable: true });
|
||||
map.value = new AMap.Map("map-container", { zoom: 7, viewMode: "2D", resizeEnable: true });
|
||||
// map.value = new AMap.Map("map-container", { zoom: 7, center: [122.073543, 37.449337], viewMode: "2D", resizeEnable: true });
|
||||
// map.value?.on("click", function (e) {
|
||||
// map.value?.clearInfoWindow();
|
||||
// });
|
||||
@ -450,9 +453,9 @@ watch(
|
||||
|
||||
onMounted(async () => {
|
||||
await mapData();
|
||||
getStatisticsList();
|
||||
await getStatisticsList();
|
||||
// getAIengPage();
|
||||
getproList();
|
||||
await getproList();
|
||||
await getAIproPage();
|
||||
|
||||
onSearch(records.value[0]);
|
||||
|
||||
@ -3,8 +3,8 @@
|
||||
<layoutTop></layoutTop>
|
||||
<div class="plr-20" style="display: flex">
|
||||
<el-tabs class="demo-tabs" v-model="active">
|
||||
<el-tab-pane label="项目名称" name="first">
|
||||
<!-- <div>11</div> -->
|
||||
<TreeFilter ref="engTree" label="title" :requestApi="engApi" @change="changeTreeFilter" class="treefilter"> </TreeFilter>
|
||||
<!-- <el-tab-pane label="项目名称" name="first">
|
||||
<TreeFilter
|
||||
ref="proTree"
|
||||
:checkStrictly="true"
|
||||
@ -18,7 +18,7 @@
|
||||
<el-tab-pane label="工程名称" name="two">
|
||||
<TreeFilter ref="engTree" label="title" :requestApi="engApi" @change="changeTreeFilter" class="treefilter">
|
||||
</TreeFilter>
|
||||
</el-tab-pane>
|
||||
</el-tab-pane> -->
|
||||
</el-tabs>
|
||||
|
||||
<div class="middle-video">
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user