更新了bug

main
李劲龙 6 months ago
parent f76f2821e4
commit 4541e54f9c

Binary file not shown.

Before

Width:  |  Height:  |  Size: 1.1 MiB

After

Width:  |  Height:  |  Size: 1.3 MiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 151 KiB

After

Width:  |  Height:  |  Size: 165 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 162 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 714 KiB

After

Width:  |  Height:  |  Size: 821 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 755 KiB

After

Width:  |  Height:  |  Size: 770 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 44 KiB

After

Width:  |  Height:  |  Size: 22 KiB

@ -7,7 +7,7 @@
<!-- <top-nav id="topmenu-container" class="topmenu-container" v-if="topNav"/> -->
<div class="navbar-left">
<img src="@/assets/images/login-logo.png" alt=""/>
<span>城市精细化治理系统</span>
<span>长沙镇综合治理协同平台</span>
<!-- <div v-if="$route.meta.title != '门户'" class="goBack" @click="goMenHu"><span class="gobackText">返回门户</span><img src="../../assets/images/goback.png" alt=""></div> -->
</div>

@ -194,7 +194,7 @@ export default {
imgSrc: require("@/assets/images/icon/xuncha.png")
},
{
position: [121.318413448767714, 32.411908360092688],
position: [121.318413448767714, 32.3981908360092688],
id: 3,
name: "飞机",
content: '<i class="el-icon-user-solid bendiren"></i>',

@ -13,10 +13,10 @@
<!-- 线 -->
<el-amap-polyline :editable="false" :visible="true" :draggable="false"
:path="myxiuanlu.features[0].geometry.coordinates[0]" :zIndex="8000" strokeColor="red" isOutline
lineCap="round" @click="(e) => { polylineclick(e, '线1') }" :strokeWeight="4" :strokeOpacity="10"/>
lineCap="round" @click="(e) => { polylineclick(e, '线1') }" :strokeWeight="4" :strokeOpacity="10" />
<el-amap-polyline :editable="false" :visible="true" :draggable="false"
:path="roadline2.features[0].geometry.coordinates[0]" :zIndex="8000" strokeColor="greenyellow" isOutline
lineCap="round" @click="(e) => { polylineclick(e, '线2') }" :strokeWeight="4" :strokeOpacity="10"/>
lineCap="round" @click="(e) => { polylineclick(e, '线2') }" :strokeWeight="4" :strokeOpacity="10" />
<!-- 人员 -->
<el-amap-marker v-for="(marker, index) in markers" :title="marker.name" :key="index" :position="marker.position"
@click="(e) => { clickArrayMarker(marker, e) }">
@ -27,7 +27,7 @@
<el-amap-info-window v-if="personInfo.visible" anchor="bottom-center" :offset="[0, 0]" :closeWhenClickMap="true"
:position="personInfo.position" :visible.sync="personInfo.visible" :zIndex="900">
<div class="person-popup" v-if="markername=='设备'">
<div class="person-popup" v-if="markername == '设备'">
<div class="person-title">
<div class="title">{{ markername }}信息</div>
<img src="@/assets/images/dialogbg/close.png" class="mask" @click="markersClosePopup" alt="" />
@ -75,7 +75,7 @@
</div>
<div class="position">{{ 79898 }}</div>
</div>
<div class="btns" >
<div class="btns">
<div @click="travelPath()"></div>
<div @click="shareClick"></div>
<!-- <div @click="watchClick"></div>
@ -83,23 +83,24 @@
</div>
</div>
</div>
<div class="person-popup" v-if="markername=='车辆'">
<!-- person-maincheliangxinxi -->
<div class="person-popup" v-if="markername == '车辆'">
<div class="person-title">
<div class="title">{{ markername }}信息</div>
<img src="@/assets/images/dialogbg/close.png" class="mask" @click="markersClosePopup" alt="" />
</div>
<div class="person-main">
<div class="person-main ">
<div class="person-info">
<div class="info-left">
<div class="dot"></div>
<div class="name">驾驶员姓名</div>
<div class="name">驾驶员</div>
</div>
<div class="position">{{ "张三" }}</div>
</div>
<div class="person-info">
<div class="info-left">
<div class="dot"></div>
<div class="name">联系方式</div>
</div>
<div class="position">{{ "1361111111" }}</div>
@ -107,6 +108,7 @@
<div class="person-info">
<div class="info-left">
<div class="dot"></div>
<div class="name">车辆类型</div>
</div>
<div class="position">{{ "轿车" }}</div>
@ -114,6 +116,7 @@
<div class="person-info">
<div class="info-left">
<div class="dot"></div>
<div class="name">车牌号</div>
</div>
<div class="position">苏E1958</div>
@ -121,8 +124,8 @@
</div>
</div>
<div class="person-popup" v-if="markername=='人员'">
<!-- person-maincheliangxinxiTow -->
<div class="person-popup " v-if="markername == '人员'">
<div class="person-title">
<div class="title">{{ markername }}信息</div>
<img src="@/assets/images/dialogbg/close.png" class="mask" @click="markersClosePopup" alt="" />
@ -233,7 +236,7 @@ import righttEcahts from "./righttEcahts/index.vue"
export default {
name: "map-view",
components: { ZhanshiTubiao, leftrightEcahts, righttEcahts, MapHuodongdialog,Mapdialogyuyin,Mapdialogyuyinshipin },
components: { ZhanshiTubiao, leftrightEcahts, righttEcahts, MapHuodongdialog, Mapdialogyuyin, Mapdialogyuyinshipin },
data() {
return {
zoom: 11.8,
@ -260,7 +263,7 @@ export default {
visible: true,
draggable: false
},
markername:"设备",
markername: "设备",
//
markers: [
{
@ -397,7 +400,7 @@ export default {
}
if(type == "线2"){
if (type == "线2") {
this.$refs.MapHuodongdialog.open("person")
}
},
@ -426,7 +429,7 @@ export default {
travelPath() {
this.$refs.Mapdialogyuyin.open("person")
},
},
//
markersradio(type) {
@ -460,4 +463,47 @@ export default {
font-size: 26px;
}
}
::v-deep .person-maincheliangxinxi {
width: 270px;
height: 200px;
.person-info {
width: 270px;
}
.name {
flex: none !important;
margin-right: 10px;
text-align: right;
width: 75px;
}
.position {
flex: none !important;
}
}
::v-deep .person-maincheliangxinxiTow {
width: 270px;
height: 200px;
.person-info {
width: 270px;
}
.name {
flex: none !important;
margin-right: 10px;
text-align: right;
width: 60px;
}
.position {
flex: none !important;
}
}
</style>

@ -14,7 +14,7 @@
</el-tabs>
</div>
<div class="activity-info">
<div class="activity-items" v-for="item in 10" @click="lookMapHu">
<div class="activity-items" v-for="item in 6" @click="lookMapHu">
<div>重大活动预案</div>
<i class="el-icon-arrow-right"></i>
</div>
@ -128,9 +128,9 @@ export default {
.activity-info {
margin: 20px 0px;
display: grid;
grid-template-columns: 1fr;
row-gap: 10px;
// display: grid;
// grid-template-columns: 1fr;
// row-gap: 10px;
height: calc(100% - 80px);
overflow: scroll;
@ -141,6 +141,8 @@ export default {
justify-content: space-between;
border-radius: 5px;
background-color: #2d609c;
height: 60px;
margin-bottom: 20px;
cursor: pointer;
div {

@ -54,7 +54,7 @@
<title-box title="预警提示"></title-box>
<div class="activity-info">
<div class="activity-items" v-for="item in 20" >
<div class="activity-items" v-for="item in 3" >
<div>重大活动预案预警提示</div>
<span >16:00:00</span>
</div>
@ -147,12 +147,12 @@ export default {
.activity-info {
margin: 0px 0px;
display: grid;
grid-template-columns: 1fr;
row-gap: 10px;
height: 100%;
// display: grid;
// grid-template-columns: 1fr;
// row-gap: 10px;
height: 300px;
overflow: scroll;
padding-bottom: 400px;
padding-bottom: 150px;
.activity-items {
@ -161,6 +161,8 @@ export default {
align-items: center;
justify-content: space-between;
border-radius: 5px;
height: 60px;
margin: 10px 0;
background-color: #2d609c;
cursor: pointer;

@ -65,9 +65,8 @@ export default {
},
xAxis: {
type: 'value',
min: 200,
max: 600,
interval: 50,
interval: 100,
// y 线
axisLabel: {
textStyle: {

@ -40,64 +40,25 @@ export default {
name:"张三",
phone:"13618681115"
},{
name:"张三",
phone:"13618681115"
},{
name:"张三",
phone:"13618681115"
},{
name:"张三",
phone:"13618681115"
},{
name:"张三",
phone:"13618681115"
},{
name:"张三",
phone:"13618681115"
},{
name:"张三",
phone:"13618681115"
},{
name:"张三",
phone:"13618681115"
},{
name:"张三",
phone:"13618681115"
},{
name:"张三",
phone:"13618681115"
},{
name:"张三",
name:"李四",
phone:"13618681115"
},{
name:"张三",
name:"王五",
phone:"13618681115"
},{
name:"张三",
name:"赵六",
phone:"13618681115"
},{
name:"张三",
name:"孙七",
phone:"13618681115"
},{
name:"张三",
name:"周八",
phone:"13618681115"
},{
name:"张三",
name:"吴九",
phone:"13618681115"
},{
name:"张三",
phone:"13618681115"
},{
name:"张三",
phone:"13618681115"
},{
name:"张三",
phone:"13618681115"
},{
name:"张三",
phone:"13618681115"
},{
name:"张三",
name:"郑十",
phone:"13618681115"
},],
query: {

@ -7,34 +7,14 @@
<div class="search-input">
<div class="inputSonBox">
<div class="texts1" style="width: 6%">小区名称:</div>
<el-input
size="mini"
v-model="form1.name"
placeholder="请输入"
></el-input>
<el-input size="mini" v-model="form1.name" placeholder="请输入"></el-input>
<div class="texts1" style="width: 8%">物业管理公司:</div>
<el-input
size="mini"
v-model="form1.sfz"
placeholder="请输入"
></el-input>
<el-input size="mini" v-model="form1.sfz" placeholder="请输入"></el-input>
<div class="texts1" style="width: 8%">物业电话:</div>
<el-input
size="mini"
v-model="form1.lxfs"
placeholder="请输入"
></el-input>
<el-input size="mini" v-model="form1.lxfs" placeholder="请输入"></el-input>
<div class="searchBtn">
<el-button
type="primary"
size="mini"
icon="el-icon-search"
@click="addlist"
>查询</el-button
>
<el-button size="mini" icon="el-icon-refresh-left" @click="resetTwo"
>重置</el-button
>
<el-button type="primary" size="mini" icon="el-icon-search" @click="addlist"></el-button>
<el-button size="mini" icon="el-icon-refresh-left" @click="resetTwo"></el-button>
</div>
</div>
</div>
@ -42,7 +22,7 @@
<div class="tabsBottom">
<div class="foot-main">
<div class="headerText">
<div class="searchP searchA">小区管理列表</div>
<div class="searchP searchA">楼栋管理列表</div>
</div>
<div class="exportBtn1">
<div class="danchunxinzeng" @click="addRules">
@ -56,58 +36,25 @@
<div class="table-item">
<el-table v-loading="loading" :data="tableData" border>
<!-- <el-table-column type="selection" width="35" align="center" /> -->
<el-table-column
type="index"
label="序号"
width="55"
align="center"
/>
<el-table-column type="index" label="序号" width="55" align="center" />
<el-table-column label="小区名称" align="center" prop="xm">
<!-- <template slot-scope="scope">
{{ scope.row.mc || scope.row.cpmc }}
</template> -->
</el-table-column>
<el-table-column
label="楼栋名称"
align="center"
prop="xb"
>
<el-table-column label="楼栋名称" align="center" prop="xb">
</el-table-column>
<el-table-column
label="建筑类型"
align="center"
prop="sfzh"
>
<el-table-column label="建筑类型" align="center" prop="sfzh">
</el-table-column>
<el-table-column
label="总层数"
align="center"
prop="lxfs"
>
<el-table-column label="总层数" align="center" prop="lxfs">
</el-table-column>
<el-table-column
label="每户层数"
align="center"
prop="zz"
>
<el-table-column label="每户层数" align="center" prop="zz">
</el-table-column>
<el-table-column
label="安全检查记录"
align="center"
prop="shgx"
>
<el-table-column label="安全检查记录" align="center" prop="shgx">
</el-table-column>
<el-table-column
label="楼栋管理员"
align="center"
prop="jgyy"
>
<el-table-column label="楼栋管理员" align="center" prop="jgyy">
</el-table-column>
<el-table-column
label="联系方式"
align="center"
prop="jgdy"
>
<el-table-column label="联系方式" align="center" prop="jgdy">
</el-table-column>
<el-table-column label="操作" align="center" width="200">
@ -127,110 +74,57 @@
</el-table>
</div>
</section>
<pagination
:total="total"
:page="form1.current"
:limit="form1.size"
@pagination="getPagination"
:current-page.sync="form1.current"
></pagination>
<pagination :total="total" :page="form1.current" :limit="form1.size" @pagination="getPagination"
:current-page.sync="form1.current"></pagination>
</div>
</div>
<el-dialog
:visible.sync="showCK"
width="40%"
title="新增楼栋信息"
@close="close"
:close-on-click-modal="false"
:close-on-press-escape="false"
>
<el-dialog :visible.sync="showCK" width="40%" title="新增楼栋信息" @close="close" :close-on-click-modal="false"
:close-on-press-escape="false">
<div>
<el-form
ref="form"
:model="form"
:rules="rules"
label-width="120px"
:disabled="mytitle == '查看人员'"
>
<el-form-item label="所属小区名称" size="mini" prop="xm">
<el-input
v-model="form.xm"
placeholder="请输入"
></el-input>
<el-form ref="form" :model="form" :rules="rules" label-width="120px" :disabled="mytitle == '查看人员'">
<el-form-item label="所属小区" size="mini" prop="xm">
<el-select v-model="form.xb" multiple placeholder="请选择" size="mini">
<el-option v-for="item in options" :key="item.value" :label="item.groupName" :value="item.id">
</el-option>
</el-select>
</el-form-item>
<el-form-item label="楼栋名称" prop="xb">
<el-input
v-model="form.sfzhaas"
placeholder="请输入"
></el-input>
<el-input v-model="form.sfzhaas" placeholder="请输入"></el-input>
</el-form-item>
<el-form-item label="建筑类型" size="mini" prop="sfzh">
<el-input
v-model="form.sfzh"
placeholder="请输入号"
></el-input>
<el-input v-model="form.sfzh" placeholder="请输入号"></el-input>
</el-form-item>
<el-form-item label="总层数(层)" size="mini" prop="zz">
<el-input
v-model="form.zz"
placeholder="请输入"
></el-input>
<el-input v-model="form.zz" placeholder="请输入"></el-input>
</el-form-item>
<el-form-item label="每层户数" size="mini" prop="lxfs">
<el-input
v-model="form.lxfs"
placeholder="请输入"
></el-input>
<el-input v-model="form.lxfs" placeholder="请输入"></el-input>
</el-form-item>
<el-form-item label="楼栋管理员" size="mini" prop="jgyr">
<el-input
v-model="form.jgyra"
placeholder="请输入"
></el-input>
<el-input v-model="form.jgyra" placeholder="请输入"></el-input>
</el-form-item>
<el-form-item label="联系方式" prop="shgx">
<el-input
v-model="form.jgyrb"
placeholder="请输入"
></el-input>
<el-input v-model="form.jgyrb" placeholder="请输入"></el-input>
</el-form-item>
<el-form-item label="安全记录检查" prop="jgyy">
<el-input
v-model="form.jgyrc
"
placeholder="请输入"
></el-input>
<el-input v-model="form.jgyrc
" placeholder="请输入"></el-input>
</el-form-item>
</el-form>
</div>
<span
slot="footer"
class="dialog-footer"
v-show="mytitle != '查看人员'"
>
<el-button
size="mini"
icon="el-icon-refresh-left"
@click="reset('form')"
>重置</el-button
>
<el-button
size="mini"
type="primary"
icon="el-icon-document"
@click="save('form')"
>保存</el-button
>
<span slot="footer" class="dialog-footer" v-show="mytitle != '查看人员'">
<el-button size="mini" icon="el-icon-refresh-left" @click="reset('form')"></el-button>
<el-button size="mini" type="primary" icon="el-icon-document" @click="save('form')"></el-button>
</span>
</el-dialog>
</div>
@ -284,84 +178,84 @@ export default {
loading: false,
tableData: [
{
xm:"阳光花园",
xb:"阳光楼",
sfzh:"高层",
lxfs:"13",
zz:"4",
shgx:"2024-01-05",
jgyy:"王五",
jgdy:"13911111111",
xm: "阳光花园",
xb: "阳光楼",
sfzh: "高层",
lxfs: "13",
zz: "4",
shgx: "2024-01-05",
jgyy: "王五",
jgdy: "13911111111",
},{
xm:"绿茵雅苑",
xb:"绿茵阁",
sfzh:"小高层",
lxfs:"13",
zz:"4",
shgx:"2024-01-05",
jgyy:"王五",
jgdy:"13911111111",
}, {
xm: "绿茵雅苑",
xb: "绿茵阁",
sfzh: "小高层",
lxfs: "13",
zz: "4",
shgx: "2024-01-05",
jgyy: "王五",
jgdy: "13911111111",
},{
xm:"绿茵雅苑",
xb:"绿茵阁",
sfzh:"小高层",
lxfs:"13",
zz:"4",
shgx:"2024-01-05",
jgyy:"王五",
jgdy:"13911111111",
}, {
xm: "绿茵雅苑",
xb: "绿茵阁",
sfzh: "小高层",
lxfs: "13",
zz: "4",
shgx: "2024-01-05",
jgyy: "王五",
jgdy: "13911111111",
},{
xm:"蓝湾半岛",
xb:"蓝湾轩",
sfzh:"多层",
lxfs:"13",
zz:"4",
shgx:"2024-01-05",
jgyy:"王五",
jgdy:"13911111111",
}, {
xm: "蓝湾半岛",
xb: "蓝湾轩",
sfzh: "多层",
lxfs: "13",
zz: "4",
shgx: "2024-01-05",
jgyy: "王五",
jgdy: "13911111111",
},{
xm:"金色港湾",
xb:"金港府",
sfzh:"小高层",
lxfs:"13",
zz:"4",
shgx:"2024-01-05",
jgyy:"王五",
jgdy:"13911111111",
}, {
xm: "金色港湾",
xb: "金港府",
sfzh: "小高层",
lxfs: "13",
zz: "4",
shgx: "2024-01-05",
jgyy: "王五",
jgdy: "13911111111",
},{
xm:"绿茵雅苑",
xb:"绿茵阁",
sfzh:"小高层",
lxfs:"13",
zz:"4",
shgx:"2024-01-05",
jgyy:"王五",
jgdy:"13911111111",
}, {
xm: "绿茵雅苑",
xb: "绿茵阁",
sfzh: "小高层",
lxfs: "13",
zz: "4",
shgx: "2024-01-05",
jgyy: "王五",
jgdy: "13911111111",
},,{
xm:"绿茵雅苑",
xb:"绿茵阁",
sfzh:"小高层",
lxfs:"13",
zz:"4",
shgx:"2024-01-05",
jgyy:"王五",
jgdy:"13911111111",
}, , {
xm: "绿茵雅苑",
xb: "绿茵阁",
sfzh: "小高层",
lxfs: "13",
zz: "4",
shgx: "2024-01-05",
jgyy: "王五",
jgdy: "13911111111",
},,{
xm:"绿茵雅苑",
xb:"绿茵阁",
sfzh:"小高层",
lxfs:"13",
zz:"4",
shgx:"2024-01-05",
jgyy:"王五",
jgdy:"13911111111",
}, , {
xm: "绿茵雅苑",
xb: "绿茵阁",
sfzh: "小高层",
lxfs: "13",
zz: "4",
shgx: "2024-01-05",
jgyy: "王五",
jgdy: "13911111111",
},
],
@ -453,7 +347,7 @@ export default {
this.form1.size = res.pageSize;
this.getList();
},
addAttendance() {},
addAttendance() { },
addRules() {
this.mytitle = "新增人员";
this.showCK = true;
@ -477,9 +371,8 @@ export default {
);
this.exportLoading = false;
})
.catch(() => {});
.catch(() => { });
},
},
};
</script>

@ -42,7 +42,7 @@
<div class="tabsBottom">
<div class="foot-main">
<div class="headerText">
<div class="searchP searchA">楼栋管理列表</div>
<div class="searchP searchA">小区管理列表</div>
</div>
<div class="exportBtn1">
<div class="danchunxinzeng" @click="addRules">

@ -152,7 +152,7 @@
<el-dialog
:visible.sync="showCK"
width="40%"
width="45%"
title="新增住户信息"
@close="close"
:close-on-click-modal="false"
@ -163,7 +163,7 @@
ref="form"
:model="form"
:rules="rules"
label-width="120px"
label-width="150px"
:disabled="mytitle == '查看人员'"
>
<el-form-item label="姓名" size="mini" prop="xm">
@ -175,17 +175,18 @@
<el-form-item label="所属小区" prop="xb">
<el-input
v-model="form.xms"
placeholder="请输入"
></el-input>
<el-select v-model="form.xms" multiple placeholder="请选择" size="mini">
<el-option v-for="item in options" :key="item.value" :label="item.groupName" :value="item.id">
</el-option>
</el-select>
</el-form-item>
<el-form-item label="楼栋名称" size="mini" prop="sfzh">
<el-input
v-model="form.sfzh"
placeholder="请输入"
></el-input>
<el-select v-model="form.sfzh" multiple placeholder="请选择" size="mini">
<el-option v-for="item in options" :key="item.value" :label="item.groupName" :value="item.id">
</el-option>
</el-select>
</el-form-item>
<el-form-item label="门牌号" size="mini" prop="zz">
<el-input

@ -1,5 +1,5 @@
<template>
<dia-log ref="dialog" width="45%" :title="title" :type="1">
<dia-log ref="dialog" width="21%" :title="title" :type="1">
<div class="personage-track">
<img src="@/assets/images/phone.png" alt="">
</div>
@ -123,6 +123,5 @@ export default {
}
::v-deep .el-dialog {
width: 18.5% !important;
}
</style>

@ -1,7 +1,7 @@
<template>
<dia-log ref="dialog" width="45%" :title="title" :type="1">
<div class="personage-track">
<video width="660" controls>
<video width="100%" controls>
<source src="@/assets/images/MP4/jiankong.mp4" type="video/mp4">
<!-- <source src="your-video-file.ogg" type="video/ogg"> -->
您的浏览器不支持 video 标签

Loading…
Cancel
Save