diff --git a/.env.production b/.env.production
index f053e0a..63e061f 100644
--- a/.env.production
+++ b/.env.production
@@ -5,4 +5,5 @@ VUE_APP_TITLE = 综合治理协同平台
 ENV = 'production'
 
 # 若依管理系统/生产环境
-VUE_APP_BASE_API = '/prod-api'
+VUE_APP_BASE_API = 'http://39.101.188.84:9041'
+
diff --git a/src/assets/images/MP4/jiankong.mp4 b/src/assets/images/MP4/jiankong.mp4
new file mode 100644
index 0000000..ad3095e
Binary files /dev/null and b/src/assets/images/MP4/jiankong.mp4 differ
diff --git a/src/assets/images/Nanjuese.jpg b/src/assets/images/Nanjuese.jpg
new file mode 100644
index 0000000..afd161d
Binary files /dev/null and b/src/assets/images/Nanjuese.jpg differ
diff --git a/src/assets/images/phone.png b/src/assets/images/phone.png
index d6e1af4..3e35685 100644
Binary files a/src/assets/images/phone.png and b/src/assets/images/phone.png differ
diff --git a/src/views/Map/Map_ZhongDahuodong/index.vue b/src/views/Map/Map_ZhongDahuodong/index.vue
index aa1b2fc..97c52b8 100644
--- a/src/views/Map/Map_ZhongDahuodong/index.vue
+++ b/src/views/Map/Map_ZhongDahuodong/index.vue
@@ -12,11 +12,11 @@
 
         <!-- 线 -->
         <el-amap-polyline :editable="false" :visible="true" :draggable="false"
-          :path="myxiuanlu.features[0].geometry.coordinates[0]" :zIndex="500" strokeColor="red" isOutline
-          lineCap="round" @click="(e) => { polylineclick(e, '线1') }" :strokeWeight="4"/>
+          :path="myxiuanlu.features[0].geometry.coordinates[0]" :zIndex="8000" strokeColor="red" isOutline
+          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="500" strokeColor="green" isOutline
-          lineCap="round" @click="(e) => { polylineclick(e, '线2') }" :strokeWeight="4"/>
+          :path="roadline2.features[0].geometry.coordinates[0]" :zIndex="8000" strokeColor="greenyellow" isOutline
+          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) }">
@@ -52,7 +52,7 @@
                   <div class="dot"></div>
                   <div class="name">当前位置：</div>
                 </div>
-                <div class="position">{{ "长沙镇xx号" }}</div>
+                <div class="position">{{ "长沙镇108号" }}</div>
               </div>
               <div class="person-info">
                 <div class="info-left">
@@ -116,7 +116,7 @@
                   <div class="dot"></div>
                   <div class="name">车牌号：</div>
                 </div>
-                <div class="position">苏Exxx</div>
+                <div class="position">苏E1958</div>
               </div>
             
             </div>
@@ -155,7 +155,7 @@
                   <div class="dot"></div>
                   <div class="name">当前位置：</div>
                 </div>
-                <div class="position">xxxxx</div>
+                <div class="position">长沙镇108号</div>
               </div>
             
             </div>
@@ -204,6 +204,8 @@
     <righttEcahts></righttEcahts>
     <MapHuodongdialog ref="MapHuodongdialog"></MapHuodongdialog>
     <Mapdialogyuyin ref="Mapdialogyuyin"></Mapdialogyuyin>
+    <Mapdialogyuyinshipin ref="Mapdialogyuyinshipin"></Mapdialogyuyinshipin>
+
   </div>
 </template>
 
@@ -220,9 +222,9 @@ import roadpoint2 from "@/assets/mapjson/Chaangshazhen/road-point2.geojson"
 // 短线
 import myxiuanlu from "@/assets/mapjson/Chaangshazhen/myxiuanlu.geojson"
 
-// 人员分布图标
 import ZhanshiTubiao from "@/views/components/ZhanshiTubiao/index.vue"
 import MapHuodongdialog from "@/views/components/MapHuodongdialog/index.vue"
+import Mapdialogyuyinshipin from "@/views/components/Mapdialogyuyinshipin/index.vue"
 import Mapdialogyuyin from "@/views/components/Mapdialogyuyin/index.vue"
 
 // 左右两边图
@@ -231,7 +233,7 @@ import righttEcahts from "./righttEcahts/index.vue"
 
 export default {
   name: "map-view",
-  components: { ZhanshiTubiao, leftrightEcahts, righttEcahts, MapHuodongdialog,Mapdialogyuyin },
+  components: { ZhanshiTubiao, leftrightEcahts, righttEcahts, MapHuodongdialog,Mapdialogyuyin,Mapdialogyuyinshipin },
   data() {
     return {
       zoom: 11.8,
@@ -416,7 +418,7 @@ export default {
     },
     // 位置分享
     shareClick() {
-      // console.log(this.personInfo,"位置分享");
+      this.$refs.Mapdialogyuyinshipin.open("person")
 
     },
     taskClick() { },
diff --git a/src/views/Map/Map_ZhongDahuodong/leftrightEcahts/index.vue b/src/views/Map/Map_ZhongDahuodong/leftrightEcahts/index.vue
index df79468..f30a589 100644
--- a/src/views/Map/Map_ZhongDahuodong/leftrightEcahts/index.vue
+++ b/src/views/Map/Map_ZhongDahuodong/leftrightEcahts/index.vue
@@ -14,8 +14,8 @@
           </el-tabs>
         </div>
         <div class="activity-info">
-          <div class="activity-items" v-for="item in 20" @click="lookMapHu">
-            <div>XXXXX活动预案</div>
+          <div class="activity-items" v-for="item in 10" @click="lookMapHu">
+            <div>重大活动预案</div>
             <i class="el-icon-arrow-right"></i>
           </div>
         </div>
diff --git a/src/views/Map/Map_ZhongDahuodong/righttEcahts/index.vue b/src/views/Map/Map_ZhongDahuodong/righttEcahts/index.vue
index a449c58..d4e7e13 100644
--- a/src/views/Map/Map_ZhongDahuodong/righttEcahts/index.vue
+++ b/src/views/Map/Map_ZhongDahuodong/righttEcahts/index.vue
@@ -18,10 +18,10 @@
         <div class="zhongdahuodong_top">
           <div class="zhongdahuodong_top_item">
             <div>
-              活动名称：<span>xxx活动</span>
+              活动名称：<span>重大活动</span>
             </div>
             <div>
-              活动名称：<span>xxx号大街</span>
+              活动名称：<span>108号大街</span>
             </div>
             <div>
               现场监控:
@@ -35,10 +35,10 @@
           </div>
           <div class="zhongdahuodong_top_item">
             <div>
-              活动名称：<span>xxx活动</span>
+              活动名称：<span>重大活动</span>
             </div>
             <div>
-              活动名称：<span>xxx号大街</span>
+              活动名称：<span>885号大街</span>
             </div>
             <div>
               现场监控:
@@ -55,7 +55,7 @@
         <title-box title="预警提示"></title-box>
         <div class="activity-info">
           <div class="activity-items" v-for="item in 20" >
-            <div>XXXXX活动预案</div>
+            <div>重大活动预案预警提示</div>
             <span >16:00:00</span>
           </div>
         </div>
diff --git a/src/views/ZhongdianRen/Xinxiguanli/zhongdianxiangqing/components/tabThree/index.vue b/src/views/ZhongdianRen/Xinxiguanli/zhongdianxiangqing/components/tabThree/index.vue
index dd19914..3d02fa5 100644
--- a/src/views/ZhongdianRen/Xinxiguanli/zhongdianxiangqing/components/tabThree/index.vue
+++ b/src/views/ZhongdianRen/Xinxiguanli/zhongdianxiangqing/components/tabThree/index.vue
@@ -28,7 +28,7 @@
     </el-row>
     <el-row style="margin-top: 20px;">
       <div style="display: flex;">
-        <div>轨迹地图：</div>
+        <div class="dituziti">轨迹地图：</div>
         <div id="gjMap">
           <el-amap
             ref="map"
@@ -234,7 +234,9 @@ export default {
     }
   }
 }
-
+.dituziti{
+  font-size: 16px;
+}
 #gjMap {
   width: 700px;
   height: 400px;
diff --git a/src/views/ZhongdianRen/Xinxiguanli/zhongdianxiangqing/components/tabTwo/index.vue b/src/views/ZhongdianRen/Xinxiguanli/zhongdianxiangqing/components/tabTwo/index.vue
index 1c215a3..23e6571 100644
--- a/src/views/ZhongdianRen/Xinxiguanli/zhongdianxiangqing/components/tabTwo/index.vue
+++ b/src/views/ZhongdianRen/Xinxiguanli/zhongdianxiangqing/components/tabTwo/index.vue
@@ -8,27 +8,14 @@
             <div class="enterprise-header-title">正面照</div>
           </div>
           <div class="upload-img-box">
-            <el-upload
-              :action="uploadImgUrl"
-              :headers="headers"
-              list-type="picture-card"
-              class="up-load-el"
-              :file-list="fileListOne"
-              :on-success="handleUploadSuccess"
-              :before-upload="handleBeforeUpload"
-            >
+            <el-upload :action="uploadImgUrl" :headers="headers" list-type="picture-card" class="up-load-el"
+              :file-list="fileListOne" :on-success="handleUploadSuccess" :before-upload="handleBeforeUpload">
               <i slot="default" class="el-icon-plus"></i>
-              <span>上传图片</span>
+              <span class="huisetouxiang">上传图片</span>
               <div slot="file" slot-scope="{file}">
-                <img
-                  class="el-upload-list__item-thumbnail"
-                  :src="VUE_APP_BASE_API + file.url" alt=""
-                >
+                <img class="el-upload-list__item-thumbnail" :src="VUE_APP_BASE_API + file.url" alt="">
                 <span class="el-upload-list__item-actions">
-                  <span
-                    class="el-upload-list__item-preview"
-                    @click="handlePictureCardPreview(file)"
-                  >
+                  <span class="el-upload-list__item-preview" @click="handlePictureCardPreview(file)">
                     <i class="el-icon-zoom-in"></i>
                   </span>
                   <!-- <span
@@ -38,11 +25,7 @@
                   >
                     <i class="el-icon-download"></i>
                   </span> -->
-                  <span
-                    v-if="!disabled"
-                    class="el-upload-list__item-delete"
-                    @click="handleRemoveOne(file)"
-                  >
+                  <span v-if="!disabled" class="el-upload-list__item-delete" @click="handleRemoveOne(file)">
                     <i class="el-icon-delete"></i>
                   </span>
                 </span>
@@ -59,34 +42,17 @@
             <div class="enterprise-header-title">其他照片</div>
           </div>
           <div class="upload-img-box">
-            <el-upload
-              :action="uploadImgUrl"
-              :headers="headers"
-              list-type="picture-card"
-              class="up-load-el"
-              :file-list="fileListTwo"
-              :on-success="handleUploadSuccessTwo"
-              :before-upload="handleBeforeUpload"
-            >
+            <el-upload :action="uploadImgUrl" :headers="headers" list-type="picture-card" class="up-load-el"
+              :file-list="fileListTwo" :on-success="handleUploadSuccessTwo" :before-upload="handleBeforeUpload">
               <i slot="default" class="el-icon-plus"></i>
-              <span>上传图片</span>
+              <span class="huisetouxiang">上传图片</span>
               <div slot="file" slot-scope="{file}">
-                <img
-                  class="el-upload-list__item-thumbnail"
-                  :src="VUE_APP_BASE_API + file.url" alt=""
-                >
+                <img class="el-upload-list__item-thumbnail" :src="VUE_APP_BASE_API + file.url" alt="">
                 <span class="el-upload-list__item-actions">
-                  <span
-                    class="el-upload-list__item-preview"
-                    @click="handlePictureCardPreview(file)"
-                  >
+                  <span class="el-upload-list__item-preview" @click="handlePictureCardPreview(file)">
                     <i class="el-icon-zoom-in"></i>
                   </span>
-                  <span
-                    v-if="!disabled"
-                    class="el-upload-list__item-delete"
-                    @click="handleRemoveTwo(file)"
-                  >
+                  <span v-if="!disabled" class="el-upload-list__item-delete" @click="handleRemoveTwo(file)">
                     <i class="el-icon-delete"></i>
                   </span>
                 </span>
@@ -106,33 +72,21 @@
           </div>
           <div class="built_in_box">
             <!-- 身份证正面 -->
-            <el-upload
-              class="up-load-el-two up-load-el-three"
-              :action="uploadImgUrl"
-              :headers="headers"
-              :limit="1" 
-              :show-file-list="false"
-              :on-success="handleAvatarSuccessOne"
-              :before-upload="handleBeforeUpload">
+            <el-upload class="up-load-el-two up-load-el-three" :action="uploadImgUrl" :headers="headers" :limit="1"
+              :show-file-list="false" :on-success="handleAvatarSuccessOne" :before-upload="handleBeforeUpload">
               <img v-if="imageUrlOne" :src="VUE_APP_BASE_API + imageUrlOne" class="avatar">
               <div class="avatar-box" v-else>
                 <i class="el-icon-plus avatar-uploader-icon"></i>
-                <span>请上传国徽侧照片</span>
+                <span class="huisetouxiang">请上传国徽侧照片</span>
               </div>
             </el-upload>
             <!-- 身份证反面 -->
-            <el-upload
-              class="up-load-el-two"
-              :action="uploadImgUrl"
-              :headers="headers"
-              :limit="1" 
-              :show-file-list="false"
-              :on-success="handleAvatarSuccessTwo"
-              :before-upload="handleBeforeUpload">
+            <el-upload class="up-load-el-two" :action="uploadImgUrl" :headers="headers" :limit="1"
+              :show-file-list="false" :on-success="handleAvatarSuccessTwo" :before-upload="handleBeforeUpload">
               <img v-if="imageUrlTwo" :src="VUE_APP_BASE_API + imageUrlTwo" class="avatar">
               <div class="avatar-box" v-else>
                 <i class="el-icon-plus avatar-uploader-icon"></i>
-                <span>请上传头像侧照片</span>
+                <span class="huisetouxiang">请上传头像侧照片</span>
               </div>
             </el-upload>
           </div>
@@ -141,8 +95,8 @@
           <el-button type="primary" @click="save">保存</el-button>
         </div>
         <div class="rightleft">
-          <eluploadimgshenfenz></eluploadimgshenfenz>
-          <eluploadimgshenfenz></eluploadimgshenfenz>
+          <!-- <eluploadimgshenfenz></eluploadimgshenfenz>
+          <eluploadimgshenfenz></eluploadimgshenfenz> -->
         </div>
       </el-col>
     </el-row>
@@ -150,9 +104,10 @@
 </template>
 <script>
 import { getToken } from "@/utils/auth";
+import eluploadimgshenfenz from "@/views/components/eluploadimgshenfenz/index.vue"
 export default {
   name: "tabTwo",
-  components: { eluploadimg,eluploadimgshenfenz },
+  components: { eluploadimgshenfenz },
   data() {
     return {
       uploadImgUrl: process.env.VUE_APP_BASE_API + "/common/upload", // 上传的图片服务器地址
@@ -164,9 +119,9 @@ export default {
       dialogImageUrl: '',
       disabled: false,
       // 正面照
-      fileListOne:[],
+      fileListOne: [],
       // 其他照片
-      fileListTwo:[],
+      fileListTwo: [],
       // 身份证正面
       imageUrlOne: "",
       // 身份证反面
@@ -182,14 +137,16 @@ export default {
       }
     }
   },
-  methods:{
+  methods: {
     // 放大当前图片
     handlePictureCardPreview(file) {
-      this.dialogImageUrl = file.url;
+      console.log(file);
+
+      this.dialogImageUrl = process.env.VUE_APP_BASE_API + file.url;
       this.dialogVisible = true;
     },
     // 正面照的删除
-    handleRemoveOne() {
+    handleRemoveOne(file) {
       const findex = this.fileListOne.map(f => f.name).indexOf(file.name);
       if (findex > -1) {
         this.fileListOne.splice(findex, 1);
@@ -241,44 +198,44 @@ export default {
       }
     },
     // 身份证国徽侧上传成功钩子
-    handleAvatarSuccessOne(res,file){
+    handleAvatarSuccessOne(res, file) {
       if (res.code === 200) {
         this.imageUrlOne = res.fileName;
         this.$modal.closeLoading();
       }
     },
     // 身份证头像侧上传成功钩子
-    handleAvatarSuccessTwo(res,file){
+    handleAvatarSuccessTwo(res, file) {
       if (res.code === 200) {
         this.imageUrlTwo = res.fileName;
         this.$modal.closeLoading();
       }
     },
     // 保存按钮
-    save(){
-      if(this.imageUrlOne && this.imageUrlTwo && this.fileListOne.length) {
+    save() {
+      if (this.imageUrlOne && this.imageUrlTwo && this.fileListOne.length) {
         let imgArrOne = [];
         let imgArrTwo = [];
-        if(this.fileListOne.length > 0) {
-          this.fileListOne.forEach(item=>{
+        if (this.fileListOne.length > 0) {
+          this.fileListOne.forEach(item => {
             imgArrOne.push(item.url);
           })
         }
-        if(this.fileListTwo.length > 0) {
-          this.fileListTwo.forEach(item=>{
+        if (this.fileListTwo.length > 0) {
+          this.fileListTwo.forEach(item => {
             imgArrTwo.push(item.url);
           })
         }
-        console.log("正面照",imgArrOne.join(','));
-        console.log("其他照片",imgArrTwo.join(','));
-        console.log("国徽侧照片",this.imageUrlOne);
-        console.log("头像侧照片",this.imageUrlTwo);
+        console.log("正面照", imgArrOne.join(','));
+        console.log("其他照片", imgArrTwo.join(','));
+        console.log("国徽侧照片", this.imageUrlOne);
+        console.log("头像侧照片", this.imageUrlTwo);
       } else {
-        if(!this.imageUrlOne) {
+        if (!this.imageUrlOne) {
           this.$modal.msgError(`请上传国徽侧照片`);
-        } else if(!this.imageUrlTwo) {
+        } else if (!this.imageUrlTwo) {
           this.$modal.msgError(`请上传头像侧照片`);
-        } else if(!this.fileListOne.length) {
+        } else if (!this.fileListOne.length) {
           this.$modal.msgError(`请上传正面照`);
         }
       }
@@ -290,6 +247,7 @@ export default {
 .L-unitInfo {
   padding: 10px;
   height: 100%;
+
   .enterprise-header {
     display: flex;
     align-items: center;
@@ -311,23 +269,29 @@ export default {
       color: #333333;
     }
   }
+
   .upload-img-box {
     margin: 10px 0;
-    height: 170px;
+    height: 150px;
     display: flex;
     align-items: flex-end;
+
     ::v-deep .up-load-el {
       display: flex;
       align-items: flex-end;
       width: 100%;
+
       // 列表
       .el-upload-list--picture-card {
         margin-right: 10px;
         max-width: calc(100% - 120px);
-        overflow-x: auto; /* 开启 X 轴滚动 */
-        white-space: nowrap; /* 防止换行 */
+        overflow-x: auto;
+        /* 开启 X 轴滚动 */
+        white-space: nowrap;
+        /* 防止换行 */
       }
-       // 选择框
+
+      // 选择框
       .el-upload--picture-card {
         width: 100px;
         height: 100px;
@@ -338,11 +302,13 @@ export default {
         justify-content: center;
         line-height: 25px;
       }
+
       li {
         margin-bottom: 0;
       }
     }
   }
+
   // 身份证照片
   .built_in_box {
     display: flex;
@@ -351,16 +317,17 @@ export default {
     ::v-deep .up-load-el-two {
       width: 400px;
       height: 240px;
-      
+
       .el-upload {
         width: 100%;
         height: 100%;
-        
+
         .avatar {
           width: 100%;
           height: 100%;
           border-radius: 5px;
         }
+
         .avatar-box {
           display: flex;
           align-items: center;
@@ -373,27 +340,32 @@ export default {
         }
       }
     }
+
     ::v-deep .up-load-el-three {
       margin-right: 40px;
     }
   }
- 
+
   .left-img-box {
     display: flex;
     flex-direction: column;
-    .img-top-box {
-      
-    }
-    .img-bottom-box {
-    }
+
+    .img-top-box {}
+
+    .img-bottom-box {}
   }
+
   .right-img-box {
     display: flex;
     flex-direction: column;
     height: 100%;
+
     .right-btn-box {
+      margin-left: 700px;
+      margin-top: 100px;
       display: flex;
       justify-content: center;
+
       .el-button {
         // width: 80%;
         width: 100px;
@@ -402,13 +374,25 @@ export default {
   }
 }
 
-.img-box  {
+.img-box {
   margin-bottom: 20px;
 }
-.rightleft{
+
+.rightleft {
   width: 100%;
   display: grid;
   grid-template-columns: 45% 45%;
   // grid-row-gap: 10px;
 }
+
+.huisetouxiang {
+  font-family: "Source Han Sans CN-Regular";
+  font-size: 20px;
+  color: #8c939d;
+}
+.el-icon-plus {
+  color: #8c939d;
+
+    font-size: 35px;
+}
 </style>
\ No newline at end of file
diff --git a/src/views/ZhongdianRen/Xinxiguanli/zhongdianxiangqing/index.vue b/src/views/ZhongdianRen/Xinxiguanli/zhongdianxiangqing/index.vue
index f84838c..995ca5f 100644
--- a/src/views/ZhongdianRen/Xinxiguanli/zhongdianxiangqing/index.vue
+++ b/src/views/ZhongdianRen/Xinxiguanli/zhongdianxiangqing/index.vue
@@ -9,7 +9,7 @@
         <el-col :span="5" style="margin-right: 40px;">
           <div class="img-box">
             <span>人员照片：</span>
-            <img src="@/assets/images/yyzz.png" alt="">
+            <img src="@/assets/images/Nanjuese.jpg" alt="">
           </div>
         </el-col>
         <el-col :span="19">
@@ -36,7 +36,7 @@
                 <span>男</span>
               </div>
               <div class="item">
-                <div>联系方式</div>
+                <div>联系方式：</div>
                 <span>139xxxx5657</span>
               </div>
             </div>
@@ -140,7 +140,7 @@ export default {
       }
 
       img {
-        flex: 1;
+        // flex: 1;
         height: 150px;
       }
     }
diff --git a/src/views/ZhongdianRen/Yihuyidang/loudongguanli/index copy.vue b/src/views/ZhongdianRen/Yihuyidang/loudongguanli/index copy.vue
new file mode 100644
index 0000000..902ead9
--- /dev/null
+++ b/src/views/ZhongdianRen/Yihuyidang/loudongguanli/index copy.vue	
@@ -0,0 +1,456 @@
+<template>
+  <div class="container">
+    <div class="tabs">
+      <div class="headerText">
+        <div class="searchP">查询条件</div>
+      </div>
+      <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>
+          <div class="texts1" style="width: 8%">物业管理公司:</div>
+          <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>
+          <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
+            >
+          </div>
+        </div>
+      </div>
+    </div>
+    <div class="tabsBottom">
+      <div class="foot-main">
+        <div class="headerText">
+          <div class="searchP searchA">楼栋管理列表</div>
+        </div>
+        <div class="exportBtn1">
+          <div class="danchunxinzeng" @click="addRules">
+            新增
+          </div>
+          <!-- <el-button icon="el-icon-edit-outline" size="mini" @click="exportList"
+            >导出</el-button
+          > -->
+        </div>
+        <section class="table-box">
+          <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 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>
+              <el-table-column
+                label="总户口"
+                align="center"
+                prop="sfzh"
+              >
+              </el-table-column>
+              <el-table-column
+                label="总人口数"
+                align="center"
+                prop="lxfs"
+              >
+              </el-table-column>
+              <el-table-column
+                label="建成年份"
+                align="center"
+                prop="zz"
+              >
+              </el-table-column>
+              <el-table-column
+                label="物业管理公司"
+                align="center"
+                prop="shgx"
+              >
+              </el-table-column>
+              <el-table-column
+                label="物业电话"
+                align="center"
+                prop="jgyy"
+              >
+              </el-table-column>
+             
+           
+              <el-table-column label="操作" align="center" width="200">
+                <template slot-scope="scope">
+                  <button @click="toDetail(scope.row, 0)" class="sqbtn sqbtn1">
+                    查看
+                  </button>
+                  <button @click="toDetail(scope.row, 1)" class="sqbtn sqbtn2">
+                    编辑
+                  </button>
+                  <button @click="delTable(scope.row)" class="sqbtn sqbtn3">
+                    删除
+                  </button>
+                  <!-- <el-button size="mini" plain type="warning">编辑</el-button> -->
+                </template>
+              </el-table-column>
+            </el-table>
+          </div>
+        </section>
+        <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"
+    >
+      <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-item>
+       
+
+          <el-form-item label="地址" prop="xb">
+            <el-input
+              v-model="form.sfzhd"
+              placeholder="请输入"
+            ></el-input>
+          </el-form-item>
+
+          <el-form-item label="总户口（户）" size="mini" prop="sfzh">
+            <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-form-item>
+          <el-form-item label="建成年份" size="mini" prop="lxfs">
+            <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.jgyr"
+              placeholder="请输入"
+            ></el-input>
+          </el-form-item>
+
+             
+          <el-form-item label="物业管理公司" prop="shgx">
+            <el-input
+              type="textarea"
+              resize="none"
+              :rows="5"
+              v-model="form.shgx"
+              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>
+    </el-dialog>
+  </div>
+</template>
+<script>
+
+export default {
+  data() {
+    const startTimeAndendTime = (rule, value, callback) => {
+      // const date1 = this.form.startTime;
+      // const date2 = this.form.endTime;
+      // const timeString = "01:07:53";
+      const date1 = new Date(`2000-01-01 ${this.form.startTime}`);
+      const date2 = new Date(`2000-01-01 ${this.form.endTime}`);
+      if (this.form.startTime === "" || this.form.endTime === "") {
+        callback(new Error("开始时间和结束时间都不能为空"));
+      } else if (date1 > date2) {
+        callback(new Error("结束时间不能小于开始时间"));
+      } else {
+        callback();
+      }
+    };
+    return {
+      mytitle: "新增人员",
+      radio: 1,
+      rules: {
+        attendanceDescription: [
+          { required: true, message: "请输入考勤规则描述", trigger: "blur" },
+        ],
+        name: [
+          { required: true, message: "请输入考勤规则名称", trigger: "blur" },
+        ],
+        status: [{ required: true, message: "请选择状态", trigger: "change" }],
+        groupIdList: [
+          { required: true, message: "请选择考勤组", trigger: "blur" },
+        ],
+        date: [
+          { required: true, validator: startTimeAndendTime, trigger: "blur" },
+        ],
+      },
+      form: {
+        name: "",
+        attendanceDescription: "", //考勤规则描述
+        status: 1,
+        groupIdList: [],
+        groupNames: "",
+        endTime: "", //打卡结束时间
+        startTime: "", //打卡开始时间
+      },
+      showCK: false,
+      loading: false,
+      tableData: [
+        {
+          xm:"阳光花园",
+          xb:"幸福路88号",
+          sfzh:"300",
+          lxfs:"900",
+          zz:"2010",
+          shgx:"阳光物业",
+          jgyy:"13255698852",
+          
+
+        },{
+          xm:"阳光花园",
+          xb:"幸福路88号",
+          sfzh:"300",
+          lxfs:"900",
+          zz:"2010",
+          shgx:"阳光物业",
+          jgyy:"13255698852",
+          
+
+        },{
+          xm:"阳光花园",
+          xb:"幸福路88号",
+          sfzh:"300",
+          lxfs:"900",
+          zz:"2010",
+          shgx:"阳光物业",
+          jgyy:"13255698852",
+          
+
+        },{
+          xm:"阳光花园",
+          xb:"幸福路88号",
+          sfzh:"300",
+          lxfs:"900",
+          zz:"2010",
+          shgx:"阳光物业",
+          jgyy:"13255698852",
+          
+
+        },{
+          xm:"阳光花园",
+          xb:"幸福路88号",
+          sfzh:"300",
+          lxfs:"900",
+          zz:"2010",
+          shgx:"阳光物业",
+          jgyy:"13255698852",
+          
+
+        },{
+          xm:"阳光花园",
+          xb:"幸福路88号",
+          sfzh:"300",
+          lxfs:"900",
+          zz:"2010",
+          shgx:"阳光物业",
+          jgyy:"13255698852",
+          
+
+        },
+      ],
+      options: [],
+      total: 0,
+      form1: {
+        name: "",
+        current: 1,
+        size: 10,
+      },
+      //添加之后的数组渲染按钮数组
+      tagList: [],
+    };
+  },
+  mounted() {
+    this.getList();
+    this.remoteMethod();
+  },
+  methods: {
+    // 查询
+    addlist() {
+      this.getList();
+    },
+    // 重置
+    resetTwo() {
+      this.form1 = { name: "", current: 1, size: 10 };
+      this.getList();
+    },
+    getList() {
+      this.loading = false;
+     
+    },
+    // 保存
+    save(refForm) {
+     
+    },
+    // 新增/修改规则重置
+    reset(formRef) {
+      if (this.mytitle == "新增人员") {
+        this.$refs[formRef].resetFields();
+      } else {
+        this.chakanxiangqing(this.form);
+      }
+    },
+    // 查看编辑
+    async toDetail(rew, type) {
+      if (type == 0) {
+        // 查看
+        this.mytitle = "查看人员";
+        this.chakanxiangqing(rew);
+      } else if (type == 1) {
+        // 编辑
+        this.mytitle = "编辑考勤规则";
+        this.chakanxiangqing(rew);
+      }
+    },
+    delTable(rew) {
+      // 删除
+      this.$confirm("此操作将永久删除该数据, 是否继续?", "提示", {
+        confirmButtonText: "确定",
+        cancelButtonText: "取消",
+        type: "warning",
+      })
+        .then(() => {
+         
+        })
+        .catch(() => {
+          this.$message({
+            type: "info",
+            message: "已取消删除",
+          });
+        });
+    },
+    // 回显
+    async chakanxiangqing(rew) {
+     
+      this.showCK = true;
+    },
+    remoteMethod() {
+    
+    },
+    // 关闭
+    close() {
+      this.$refs["form"].resetFields();
+      this.showCK = false;
+    },
+    getPagination(res) {
+      this.form1.current = res.pageNum;
+      this.form1.size = res.pageSize;
+      this.getList();
+    },
+    addAttendance() {},
+    addRules() {
+      this.mytitle = "新增人员";
+      this.showCK = true;
+    },
+
+    // 导出
+    exportList() {
+      this.$confirm("是否确认导出考勤点数据项?", "警告", {
+        confirmButtonText: "确定",
+        cancelButtonText: "取消",
+        type: "warning",
+      })
+        .then(() => {
+          this.exportLoading = true;
+          this.download(
+            "/jn/rule/export",
+            {
+              ...this.form1,
+            },
+            "考勤规则" + new Date().getTime() + ".xlsx"
+          );
+          this.exportLoading = false;
+        })
+        .catch(() => {});
+    },
+  },
+};
+</script>
+
diff --git a/src/views/ZhongdianRen/Yihuyidang/loudongguanli/index.vue b/src/views/ZhongdianRen/Yihuyidang/loudongguanli/index.vue
index d0a5a24..ee1474b 100644
--- a/src/views/ZhongdianRen/Yihuyidang/loudongguanli/index.vue
+++ b/src/views/ZhongdianRen/Yihuyidang/loudongguanli/index.vue
@@ -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">
@@ -68,42 +68,47 @@
                         </template> -->
               </el-table-column>
               <el-table-column
-                label="地址"
+                label="楼栋名称"
                 align="center"
                 prop="xb"
               >
               </el-table-column>
               <el-table-column
-                label="总户口"
+                label="建筑类型"
                 align="center"
                 prop="sfzh"
               >
               </el-table-column>
               <el-table-column
-                label="总人口数"
+                label="总层数"
                 align="center"
                 prop="lxfs"
               >
               </el-table-column>
               <el-table-column
-                label="建成年份"
+                label="每户层数"
                 align="center"
                 prop="zz"
               >
               </el-table-column>
               <el-table-column
-                label="物业管理公司"
+                label="安全检查记录"
                 align="center"
                 prop="shgx"
               >
               </el-table-column>
               <el-table-column
-                label="物业电话"
+                label="楼栋管理员"
                 align="center"
                 prop="jgyy"
               >
               </el-table-column>
-             
+              <el-table-column
+                label="联系方式"
+                align="center"
+                prop="jgdy"
+              >
+              </el-table-column>
            
               <el-table-column label="操作" align="center" width="200">
                 <template slot-scope="scope">
@@ -135,7 +140,7 @@
     <el-dialog
       :visible.sync="showCK"
       width="40%"
-      title="新增小区信息"
+      title="新增楼栋信息"
       @close="close"
       :close-on-click-modal="false"
       :close-on-press-escape="false"
@@ -148,74 +153,59 @@
           label-width="120px"
           :disabled="mytitle == '查看人员'"
         >
-          <el-form-item label="姓名" size="mini" prop="xm">
+          <el-form-item label="所属小区名称" size="mini" prop="xm">
             <el-input
               v-model="form.xm"
-              placeholder="请输入姓名"
+              placeholder="请输入"
             ></el-input>
           </el-form-item>
        
 
-          <el-form-item label="性别" prop="xb">
-            <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 label="楼栋名称" prop="xb">
+            <el-input
+              v-model="form.sfzhaas"
+              placeholder="请输入"
+            ></el-input>
           </el-form-item>
 
-          <el-form-item label="身份证号" size="mini" prop="sfzh">
+          <el-form-item label="建筑类型" size="mini" prop="sfzh">
             <el-input
               v-model="form.sfzh"
-              placeholder="请输入身份证号"
+              placeholder="请输入号"
             ></el-input>
           </el-form-item>
-          <el-form-item label="住址" size="mini" prop="zz">
+          <el-form-item label="总层数(层)" size="mini" prop="zz">
             <el-input
               v-model="form.zz"
-              placeholder="请输入住址"
+              placeholder="请输入"
             ></el-input>
           </el-form-item>
-          <el-form-item label="联系方式" size="mini" prop="lxfs">
+          <el-form-item label="每层户数" size="mini" prop="lxfs">
             <el-input
               v-model="form.lxfs"
-              placeholder="请输入联系方式"
+              placeholder="请输入"
             ></el-input>
           </el-form-item>
-          <el-form-item label="监管人员" size="mini" prop="jgyr">
+          <el-form-item label="楼栋管理员" size="mini" prop="jgyr">
             <el-input
-              v-model="form.jgyr"
-              placeholder="请输入监管人员"
+              v-model="form.jgyra"
+              placeholder="请输入"
             ></el-input>
           </el-form-item>
 
              
-          <el-form-item label="社会关系" prop="shgx">
+          <el-form-item label="联系方式" prop="shgx">
             <el-input
-              type="textarea"
-              resize="none"
-              :rows="5"
-              v-model="form.shgx"
+              v-model="form.jgyrb"
               placeholder="请输入"
             ></el-input>
           </el-form-item>
 
              
-          <el-form-item label="社会关系" prop="jgyy">
+          <el-form-item label="安全记录检查" prop="jgyy">
             <el-input
-              type="textarea"
-              resize="none"
-              :rows="5"
-              v-model="form.jgyy"
+              v-model="form.jgyrc
+              "
               placeholder="请输入"
             ></el-input>
           </el-form-item>
@@ -295,63 +285,83 @@ export default {
       tableData: [
         {
           xm:"阳光花园",
-          xb:"幸福路88号",
-          sfzh:"300",
-          lxfs:"900",
-          zz:"2010",
-          shgx:"阳光物业",
-          jgyy:"13255698852",
-          
+          xb:"阳光楼",
+          sfzh:"高层",
+          lxfs:"13",
+          zz:"4",
+          shgx:"2024-01-05",
+          jgyy:"王五",
+          jgdy:"13911111111",
 
         },{
-          xm:"阳光花园",
-          xb:"幸福路88号",
-          sfzh:"300",
-          lxfs:"900",
-          zz:"2010",
-          shgx:"阳光物业",
-          jgyy:"13255698852",
-          
+          xm:"绿茵雅苑",
+          xb:"绿茵阁",
+          sfzh:"小高层",
+          lxfs:"13",
+          zz:"4",
+          shgx:"2024-01-05",
+          jgyy:"王五",
+          jgdy:"13911111111",
 
         },{
-          xm:"阳光花园",
-          xb:"幸福路88号",
-          sfzh:"300",
-          lxfs:"900",
-          zz:"2010",
-          shgx:"阳光物业",
-          jgyy:"13255698852",
-          
+          xm:"绿茵雅苑",
+          xb:"绿茵阁",
+          sfzh:"小高层",
+          lxfs:"13",
+          zz:"4",
+          shgx:"2024-01-05",
+          jgyy:"王五",
+          jgdy:"13911111111",
 
         },{
-          xm:"阳光花园",
-          xb:"幸福路88号",
-          sfzh:"300",
-          lxfs:"900",
-          zz:"2010",
-          shgx:"阳光物业",
-          jgyy:"13255698852",
-          
+          xm:"蓝湾半岛",
+          xb:"蓝湾轩",
+          sfzh:"多层",
+          lxfs:"13",
+          zz:"4",
+          shgx:"2024-01-05",
+          jgyy:"王五",
+          jgdy:"13911111111",
 
         },{
-          xm:"阳光花园",
-          xb:"幸福路88号",
-          sfzh:"300",
-          lxfs:"900",
-          zz:"2010",
-          shgx:"阳光物业",
-          jgyy:"13255698852",
-          
+          xm:"金色港湾",
+          xb:"金港府",
+          sfzh:"小高层",
+          lxfs:"13",
+          zz:"4",
+          shgx:"2024-01-05",
+          jgyy:"王五",
+          jgdy:"13911111111",
 
         },{
-          xm:"阳光花园",
-          xb:"幸福路88号",
-          sfzh:"300",
-          lxfs:"900",
-          zz:"2010",
-          shgx:"阳光物业",
-          jgyy:"13255698852",
-          
+          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",
 
         },
       ],
diff --git a/src/views/ZhongdianRen/Yihuyidang/xiaoquguanli/index copy.vue b/src/views/ZhongdianRen/Yihuyidang/xiaoquguanli/index copy.vue
new file mode 100644
index 0000000..bc1fef2
--- /dev/null
+++ b/src/views/ZhongdianRen/Yihuyidang/xiaoquguanli/index copy.vue	
@@ -0,0 +1,485 @@
+<template>
+  <div class="container">
+    <div class="tabs">
+      <div class="headerText">
+        <div class="searchP">查询条件</div>
+      </div>
+      <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>
+          <div class="texts1" style="width: 8%">物业管理公司:</div>
+          <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>
+          <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
+            >
+          </div>
+        </div>
+      </div>
+    </div>
+    <div class="tabsBottom">
+      <div class="foot-main">
+        <div class="headerText">
+          <div class="searchP searchA">小区管理列表</div>
+        </div>
+        <div class="exportBtn1">
+          <div class="danchunxinzeng" @click="addRules">
+            新增
+          </div>
+          <!-- <el-button icon="el-icon-edit-outline" size="mini" @click="exportList"
+            >导出</el-button
+          > -->
+        </div>
+        <section class="table-box">
+          <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 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>
+              <el-table-column
+                label="建筑类型"
+                align="center"
+                prop="sfzh"
+              >
+              </el-table-column>
+              <el-table-column
+                label="总层数"
+                align="center"
+                prop="lxfs"
+              >
+              </el-table-column>
+              <el-table-column
+                label="每户层数"
+                align="center"
+                prop="zz"
+              >
+              </el-table-column>
+              <el-table-column
+                label="安全检查记录"
+                align="center"
+                prop="shgx"
+              >
+              </el-table-column>
+              <el-table-column
+                label="楼栋管理员"
+                align="center"
+                prop="jgyy"
+              >
+              </el-table-column>
+              <el-table-column
+                label="联系方式"
+                align="center"
+                prop="jgdy"
+              >
+              </el-table-column>
+           
+              <el-table-column label="操作" align="center" width="200">
+                <template slot-scope="scope">
+                  <button @click="toDetail(scope.row, 0)" class="sqbtn sqbtn1">
+                    查看
+                  </button>
+                  <button @click="toDetail(scope.row, 1)" class="sqbtn sqbtn2">
+                    编辑
+                  </button>
+                  <button @click="delTable(scope.row)" class="sqbtn sqbtn3">
+                    删除
+                  </button>
+                  <!-- <el-button size="mini" plain type="warning">编辑</el-button> -->
+                </template>
+              </el-table-column>
+            </el-table>
+          </div>
+        </section>
+        <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"
+    >
+      <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-item>
+       
+
+          <el-form-item label="楼栋名称" prop="xb">
+            <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-form-item>
+          <el-form-item label="总层数(层)" size="mini" prop="zz">
+            <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-form-item>
+          <el-form-item label="楼栋管理员" size="mini" prop="jgyr">
+            <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-form-item>
+
+             
+          <el-form-item label="安全记录检查" prop="jgyy">
+            <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>
+    </el-dialog>
+  </div>
+</template>
+<script>
+
+export default {
+  data() {
+    const startTimeAndendTime = (rule, value, callback) => {
+      // const date1 = this.form.startTime;
+      // const date2 = this.form.endTime;
+      // const timeString = "01:07:53";
+      const date1 = new Date(`2000-01-01 ${this.form.startTime}`);
+      const date2 = new Date(`2000-01-01 ${this.form.endTime}`);
+      if (this.form.startTime === "" || this.form.endTime === "") {
+        callback(new Error("开始时间和结束时间都不能为空"));
+      } else if (date1 > date2) {
+        callback(new Error("结束时间不能小于开始时间"));
+      } else {
+        callback();
+      }
+    };
+    return {
+      mytitle: "新增人员",
+      radio: 1,
+      rules: {
+        attendanceDescription: [
+          { required: true, message: "请输入考勤规则描述", trigger: "blur" },
+        ],
+        name: [
+          { required: true, message: "请输入考勤规则名称", trigger: "blur" },
+        ],
+        status: [{ required: true, message: "请选择状态", trigger: "change" }],
+        groupIdList: [
+          { required: true, message: "请选择考勤组", trigger: "blur" },
+        ],
+        date: [
+          { required: true, validator: startTimeAndendTime, trigger: "blur" },
+        ],
+      },
+      form: {
+        name: "",
+        attendanceDescription: "", //考勤规则描述
+        status: 1,
+        groupIdList: [],
+        groupNames: "",
+        endTime: "", //打卡结束时间
+        startTime: "", //打卡开始时间
+      },
+      showCK: false,
+      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",
+
+        },
+      ],
+      options: [],
+      total: 0,
+      form1: {
+        name: "",
+        current: 1,
+        size: 10,
+      },
+      //添加之后的数组渲染按钮数组
+      tagList: [],
+    };
+  },
+  mounted() {
+    this.getList();
+    this.remoteMethod();
+  },
+  methods: {
+    // 查询
+    addlist() {
+      this.getList();
+    },
+    // 重置
+    resetTwo() {
+      this.form1 = { name: "", current: 1, size: 10 };
+      this.getList();
+    },
+    getList() {
+      this.loading = false;
+     
+    },
+    // 保存
+    save(refForm) {
+     
+    },
+    // 新增/修改规则重置
+    reset(formRef) {
+      if (this.mytitle == "新增人员") {
+        this.$refs[formRef].resetFields();
+      } else {
+        this.chakanxiangqing(this.form);
+      }
+    },
+    // 查看编辑
+    async toDetail(rew, type) {
+      if (type == 0) {
+        // 查看
+        this.mytitle = "查看人员";
+        this.chakanxiangqing(rew);
+      } else if (type == 1) {
+        // 编辑
+        this.mytitle = "编辑考勤规则";
+        this.chakanxiangqing(rew);
+      }
+    },
+    delTable(rew) {
+      // 删除
+      this.$confirm("此操作将永久删除该数据, 是否继续?", "提示", {
+        confirmButtonText: "确定",
+        cancelButtonText: "取消",
+        type: "warning",
+      })
+        .then(() => {
+         
+        })
+        .catch(() => {
+          this.$message({
+            type: "info",
+            message: "已取消删除",
+          });
+        });
+    },
+    // 回显
+    async chakanxiangqing(rew) {
+     
+      this.showCK = true;
+    },
+    remoteMethod() {
+    
+    },
+    // 关闭
+    close() {
+      this.$refs["form"].resetFields();
+      this.showCK = false;
+    },
+    getPagination(res) {
+      this.form1.current = res.pageNum;
+      this.form1.size = res.pageSize;
+      this.getList();
+    },
+    addAttendance() {},
+    addRules() {
+      this.mytitle = "新增人员";
+      this.showCK = true;
+    },
+
+    // 导出
+    exportList() {
+      this.$confirm("是否确认导出考勤点数据项?", "警告", {
+        confirmButtonText: "确定",
+        cancelButtonText: "取消",
+        type: "warning",
+      })
+        .then(() => {
+          this.exportLoading = true;
+          this.download(
+            "/jn/rule/export",
+            {
+              ...this.form1,
+            },
+            "考勤规则" + new Date().getTime() + ".xlsx"
+          );
+          this.exportLoading = false;
+        })
+        .catch(() => {});
+    },
+  },
+};
+</script>
+
diff --git a/src/views/ZhongdianRen/Yihuyidang/xiaoquguanli/index.vue b/src/views/ZhongdianRen/Yihuyidang/xiaoquguanli/index.vue
index e140e13..5515a06 100644
--- a/src/views/ZhongdianRen/Yihuyidang/xiaoquguanli/index.vue
+++ b/src/views/ZhongdianRen/Yihuyidang/xiaoquguanli/index.vue
@@ -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">
@@ -62,53 +62,48 @@
                 width="55"
                 align="center"
               />
-              <el-table-column label="所属小区名称" align="center" prop="xm">
+              <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="楼栋名称"
+                label="地址"
                 align="center"
                 prop="xb"
               >
               </el-table-column>
               <el-table-column
-                label="建筑类型"
+                label="总户口"
                 align="center"
                 prop="sfzh"
               >
               </el-table-column>
               <el-table-column
-                label="总层数"
+                label="总人口数"
                 align="center"
                 prop="lxfs"
               >
               </el-table-column>
               <el-table-column
-                label="每户层数"
+                label="建成年份"
                 align="center"
                 prop="zz"
               >
               </el-table-column>
               <el-table-column
-                label="安全检查记录"
+                label="物业管理公司"
                 align="center"
                 prop="shgx"
               >
               </el-table-column>
               <el-table-column
-                label="楼栋管理员"
+                label="物业电话"
                 align="center"
                 prop="jgyy"
               >
               </el-table-column>
-              <el-table-column
-                label="联系方式"
-                align="center"
-                prop="jgdy"
-              >
-              </el-table-column>
+             
            
               <el-table-column label="操作" align="center" width="200">
                 <template slot-scope="scope">
@@ -140,7 +135,7 @@
     <el-dialog
       :visible.sync="showCK"
       width="40%"
-      title="新增人员"
+      title="新增小区信息"
       @close="close"
       :close-on-click-modal="false"
       :close-on-press-escape="false"
@@ -153,58 +148,48 @@
           label-width="120px"
           :disabled="mytitle == '查看人员'"
         >
-          <el-form-item label="姓名" size="mini" prop="xm">
+          <el-form-item label="小区名称" size="mini" prop="xm">
             <el-input
               v-model="form.xm"
-              placeholder="请输入姓名"
+              placeholder="请输入"
             ></el-input>
           </el-form-item>
        
 
-          <el-form-item label="性别" prop="xb">
-            <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 label="地址" prop="xb">
+            <el-input
+              v-model="form.sfzhd"
+              placeholder="请输入"
+            ></el-input>
           </el-form-item>
 
-          <el-form-item label="身份证号" size="mini" prop="sfzh">
+          <el-form-item label="总户口（户）" size="mini" prop="sfzh">
             <el-input
               v-model="form.sfzh"
-              placeholder="请输入身份证号"
+              placeholder="请输入"
             ></el-input>
           </el-form-item>
-          <el-form-item label="住址" size="mini" prop="zz">
+          <el-form-item label="总人口数" size="mini" prop="zz">
             <el-input
               v-model="form.zz"
-              placeholder="请输入住址"
+              placeholder="请输入"
             ></el-input>
           </el-form-item>
-          <el-form-item label="联系方式" size="mini" prop="lxfs">
+          <el-form-item label="建成年份" size="mini" prop="lxfs">
             <el-input
               v-model="form.lxfs"
-              placeholder="请输入联系方式"
+              placeholder="请输入"
             ></el-input>
           </el-form-item>
-          <el-form-item label="监管人员" size="mini" prop="jgyr">
+          <el-form-item label="物业电话" size="mini" prop="jgyr">
             <el-input
               v-model="form.jgyr"
-              placeholder="请输入监管人员"
+              placeholder="请输入"
             ></el-input>
           </el-form-item>
 
              
-          <el-form-item label="社会关系" prop="shgx">
+          <el-form-item label="物业管理公司" prop="shgx">
             <el-input
               type="textarea"
               resize="none"
@@ -214,16 +199,7 @@
             ></el-input>
           </el-form-item>
 
-             
-          <el-form-item label="社会关系" prop="jgyy">
-            <el-input
-              type="textarea"
-              resize="none"
-              :rows="5"
-              v-model="form.jgyy"
-              placeholder="请输入"
-            ></el-input>
-          </el-form-item>
+        
      
         </el-form>
       </div>
@@ -300,83 +276,63 @@ export default {
       tableData: [
         {
           xm:"阳光花园",
-          xb:"阳光楼",
-          sfzh:"高层",
-          lxfs:"13",
-          zz:"4",
-          shgx:"2024-01-05",
-          jgyy:"王五",
-          jgdy:"13911111111",
+          xb:"幸福路88号",
+          sfzh:"300",
+          lxfs:"900",
+          zz:"2010",
+          shgx:"阳光物业",
+          jgyy:"13255698852",
+          
 
         },{
-          xm:"绿茵雅苑",
-          xb:"绿茵阁",
-          sfzh:"小高层",
-          lxfs:"13",
-          zz:"4",
-          shgx:"2024-01-05",
-          jgyy:"王五",
-          jgdy:"13911111111",
+          xm:"阳光花园",
+          xb:"幸福路88号",
+          sfzh:"300",
+          lxfs:"900",
+          zz:"2010",
+          shgx:"阳光物业",
+          jgyy:"13255698852",
+          
 
         },{
-          xm:"绿茵雅苑",
-          xb:"绿茵阁",
-          sfzh:"小高层",
-          lxfs:"13",
-          zz:"4",
-          shgx:"2024-01-05",
-          jgyy:"王五",
-          jgdy:"13911111111",
+          xm:"阳光花园",
+          xb:"幸福路88号",
+          sfzh:"300",
+          lxfs:"900",
+          zz:"2010",
+          shgx:"阳光物业",
+          jgyy:"13255698852",
+          
 
         },{
-          xm:"蓝湾半岛",
-          xb:"蓝湾轩",
-          sfzh:"多层",
-          lxfs:"13",
-          zz:"4",
-          shgx:"2024-01-05",
-          jgyy:"王五",
-          jgdy:"13911111111",
+          xm:"阳光花园",
+          xb:"幸福路88号",
+          sfzh:"300",
+          lxfs:"900",
+          zz:"2010",
+          shgx:"阳光物业",
+          jgyy:"13255698852",
+          
 
         },{
-          xm:"金色港湾",
-          xb:"金港府",
-          sfzh:"小高层",
-          lxfs:"13",
-          zz:"4",
-          shgx:"2024-01-05",
-          jgyy:"王五",
-          jgdy:"13911111111",
+          xm:"阳光花园",
+          xb:"幸福路88号",
+          sfzh:"300",
+          lxfs:"900",
+          zz:"2010",
+          shgx:"阳光物业",
+          jgyy:"13255698852",
+          
 
         },{
-          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:"幸福路88号",
+          sfzh:"300",
+          lxfs:"900",
+          zz:"2010",
+          shgx:"阳光物业",
+          jgyy:"13255698852",
+          
 
         },
       ],
diff --git a/src/views/ZhongdianRen/Yihuyidang/zhuhuguanli/index.vue b/src/views/ZhongdianRen/Yihuyidang/zhuhuguanli/index.vue
index ee60669..4012916 100644
--- a/src/views/ZhongdianRen/Yihuyidang/zhuhuguanli/index.vue
+++ b/src/views/ZhongdianRen/Yihuyidang/zhuhuguanli/index.vue
@@ -80,7 +80,7 @@
               >
               </el-table-column>
               <el-table-column
-                label="单元号"
+                label="门牌号"
                 align="center"
                 prop="lxfs"
               >
@@ -97,12 +97,7 @@
                 prop="shgx"
               >
               </el-table-column>
-              <el-table-column
-                label="分色"
-                align="center"
-                prop="jgyy"
-              >
-              </el-table-column>
+           
               <el-table-column
                 label="租赁/产权状态"
                 align="center"
@@ -115,13 +110,19 @@
                 prop="rzrq"
               >
               </el-table-column>
+            
               <el-table-column
                 label="紧急联系人"
                 align="center"
                 prop="jjllr"
               >
               </el-table-column>
-           
+              <el-table-column
+                label="紧急联系人号码"
+                align="center"
+                prop="zz"
+              >
+              </el-table-column>
               <el-table-column label="操作" align="center" width="200">
                 <template slot-scope="scope">
                   <button @click="toDetail(scope.row, 0)" class="sqbtn sqbtn1">
@@ -152,7 +153,7 @@
     <el-dialog
       :visible.sync="showCK"
       width="40%"
-      title="新增人员"
+      title="新增住户信息"
       @close="close"
       :close-on-click-modal="false"
       :close-on-press-escape="false"
@@ -168,75 +169,71 @@
           <el-form-item label="姓名" size="mini" prop="xm">
             <el-input
               v-model="form.xm"
-              placeholder="请输入姓名"
+              placeholder="请输入"
             ></el-input>
           </el-form-item>
        
 
-          <el-form-item label="性别" prop="xb">
-            <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 label="所属小区" prop="xb">
+            <el-input
+              v-model="form.xms"
+              placeholder="请输入"
+            ></el-input>
           </el-form-item>
 
-          <el-form-item label="身份证号" size="mini" prop="sfzh">
+          <el-form-item label="楼栋名称" size="mini" prop="sfzh">
             <el-input
               v-model="form.sfzh"
-              placeholder="请输入身份证号"
+              placeholder="请输入"
             ></el-input>
           </el-form-item>
-          <el-form-item label="住址" size="mini" prop="zz">
+          <el-form-item label="门牌号" size="mini" prop="zz">
             <el-input
               v-model="form.zz"
-              placeholder="请输入住址"
+              placeholder="请输入"
             ></el-input>
           </el-form-item>
           <el-form-item label="联系方式" size="mini" prop="lxfs">
             <el-input
               v-model="form.lxfs"
-              placeholder="请输入联系方式"
+              placeholder="请输入"
             ></el-input>
           </el-form-item>
-          <el-form-item label="监管人员" size="mini" prop="jgyr">
+          <el-form-item label="身份证号" size="mini" prop="jgyr">
             <el-input
               v-model="form.jgyr"
-              placeholder="请输入监管人员"
+              placeholder="请输入"
             ></el-input>
           </el-form-item>
 
+     
+
              
-          <el-form-item label="社会关系" prop="shgx">
+          <el-form-item label="租赁/产权状态" prop="jgyy">
             <el-input
-              type="textarea"
-              resize="none"
-              :rows="5"
-              v-model="form.shgx"
+              v-model="form.zlt"
               placeholder="请输入"
             ></el-input>
           </el-form-item>
 
-             
-          <el-form-item label="社会关系" prop="jgyy">
+          <el-form-item label="入住时间" prop="jgyy">
             <el-input
-              type="textarea"
-              resize="none"
-              :rows="5"
-              v-model="form.jgyy"
+              v-model="form.rzsj"
+              placeholder="请输入"
+            ></el-input>
+          </el-form-item>
+          <el-form-item label="紧急联系人手机号码" prop="jgyy">
+            <el-input
+              v-model="form.jjlxra"
+              placeholder="请输入"
+            ></el-input>
+          </el-form-item>
+          <el-form-item label="紧急联系人" prop="jgyy">
+            <el-input
+              v-model="form.jjlxr"
               placeholder="请输入"
             ></el-input>
           </el-form-item>
-     
         </el-form>
       </div>
 
diff --git a/src/views/components/MapTItle/index.vue b/src/views/components/MapTItle/index.vue
index 4a62612..358ab10 100644
--- a/src/views/components/MapTItle/index.vue
+++ b/src/views/components/MapTItle/index.vue
@@ -18,21 +18,28 @@
         {{ this.$route.meta.title }}
       </div>
       <div class="right-tags">
-        <el-avatar  icon="el-icon-s-custom"></el-avatar>
-        <el-dropdown trigger="click"  @command="dropdown">
-          <span class="el-dropdown-link">
-            admin<i class="el-icon-caret-bottom el-icon-caret-top"></i>
-          </span>
-          <el-dropdown-menu slot="dropdown" >
-            <el-dropdown-item>返回首页</el-dropdown-item>
-          </el-dropdown-menu>
-        </el-dropdown>
+        <div v-cloak class="goBack" @click="goMenHu"><span class="gobackText">返回门户</span><img src="@/assets/images/goback.png" alt=""></div>
+
+        <el-avatar icon="el-icon-s-custom"></el-avatar>
+       
+          <el-dropdown trigger="click" @command="dropdown">
+            <span class="el-dropdown-link">
+              admin<i class="el-icon-caret-bottom el-icon-caret-top"></i>
+            </span>
+            <el-dropdown-menu slot="dropdown">
+              <el-dropdown-item>退出登录</el-dropdown-item>
+            </el-dropdown-menu>
+          </el-dropdown>
+        </div>
       </div>
     </div>
-  </div>
+ 
 </template>
 
 <script>
+import { removeToken, removeAccess } from '@/utils/auth'
+import Cookies from "js-cookie";
+
 export default {
   name: "MapTItle",
   data() {
@@ -65,9 +72,24 @@ export default {
 
   },
   methods: {
-    dropdown(){
-      console.log(11);
-      this.$router.push("/index")
+    goMenHu() {
+      this.$router.push('/index');
+    },
+    dropdown() {
+      this.$confirm('确定注销并退出系统吗？', '提示', {
+        confirmButtonText: '确定',
+        cancelButtonText: '取消',
+        type: 'warning'
+      }).then(() => {
+
+        Cookies.remove('testToken');
+        removeToken();
+        removeAccess();
+        // location.href = process.env.VUE_APP_TEST_LOGIN;
+        this.$store.dispatch('LogOut').then(() => {
+          this.$router.push("/login")
+        })
+      }).catch(() => { });
     }
   },
 
@@ -160,19 +182,22 @@ div {
       align-items: center;
       justify-content: center;
       margin-top: 20px;
-      .el-avatar{
+
+      .el-avatar {
         width: 30px !important;
         height: 30px !important;
         color: #ffffff;
         background-color: #000000;
         border: 2.5px solid #ffffff;
         margin-right: 10px;
-        .el-icon-s-custom{
+
+        .el-icon-s-custom {
           font-size: 23px;
         }
- 
+
       }
-      .el-dropdown{
+
+      .el-dropdown {
         color: #ffffff;
         font-weight: 600;
       }
@@ -188,4 +213,29 @@ div {
     height: calc(100% - 80px);
   }
 }
+.goBack {
+      // background-image: url("../../assets/images/goback.png");
+      // background-size: 100% 100%;
+      height: 25px;
+      padding: 0 10px;
+      text-shadow: 4px 5px 6px rgba(0,0,0,0.6);
+      border-radius: 10px;
+      margin-right: 20px;
+      img {
+        width: 13px;
+      }
+      .gobackText {
+        font-size: 12px;
+        font-family: Source Han Sans CN;
+        font-weight: bold;
+        // line-height: 50px;
+        color: #FFFFFF;
+        text-shadow: 4px 5px 6px rgba(0,0,0,0.16);
+        letter-spacing: 1px;
+        margin-right: 5px;
+      }
+      display: flex;
+      align-items: center;
+      cursor: pointer;
+    }
 </style>
diff --git a/src/views/components/Mapdialog/index.vue b/src/views/components/Mapdialog/index.vue
index 608c8c1..7b2eefa 100644
--- a/src/views/components/Mapdialog/index.vue
+++ b/src/views/components/Mapdialog/index.vue
@@ -21,7 +21,7 @@
                         <div class="ball"></div>
                         <div class="content">
                             住址:
-                            <span>xxx村</span>
+                            <span>临海村</span>
                         </div>
                     </div>
                 </div>
diff --git a/src/views/components/Mapdialogyuyinshipin/index.vue b/src/views/components/Mapdialogyuyinshipin/index.vue
index 4844398..593fd2c 100644
--- a/src/views/components/Mapdialogyuyinshipin/index.vue
+++ b/src/views/components/Mapdialogyuyinshipin/index.vue
@@ -1,7 +1,11 @@
 <template>
     <dia-log ref="dialog" width="45%" :title="title" :type="1">
         <div class="personage-track">
-            <img src="@/assets/images/jiankong.jpg" alt="">
+            <video width="660" controls>
+                <source src="@/assets/images/MP4/jiankong.mp4" type="video/mp4">
+                <!-- <source src="your-video-file.ogg" type="video/ogg"> -->
+                您的浏览器不支持 video 标签。
+            </video>
         </div>
     </dia-log>
 </template>
@@ -14,7 +18,7 @@ export default {
     components: { diaLog },
     data() {
         return {
-            title: "语音呼叫",
+            title: "监控视频",
             person: false,
             personItem: null,
             queryTime: {
@@ -53,7 +57,7 @@ export default {
             // console.log(item);
 
             if (person == "person") {
-                this.title = "语音呼叫";
+                this.title = "监控视频";
                 this.person = true;
                 this.queryTime.fromTime = this.getCurrentTime();
                 this.queryTime.toTime = this.getCurrentTime(1);
@@ -61,7 +65,7 @@ export default {
             } else {
                 this.queryTime.fromTime = this.getCurrentTime();
                 this.queryTime.toTime = this.getCurrentTime(1);
-                this.title = "语音呼叫";
+                this.title = "监控视频";
                 this.person = false;
             }
             this.$refs.dialog.open("1");
@@ -115,6 +119,7 @@ export default {
 <style lang="scss" scoped>
 .personage-track {
     width: 100%;
+
     img {
         width: 100%;
     }
@@ -123,7 +128,8 @@ export default {
 ::v-deep .el-dialog {
     width: 45% !important;
 }
-::v-deep .el-dialog__body{
+
+::v-deep .el-dialog__body {
     padding: 20px !important;
 
 }
diff --git a/src/views/index.vue b/src/views/index.vue
index 9c56f80..bd22325 100644
--- a/src/views/index.vue
+++ b/src/views/index.vue
@@ -33,14 +33,22 @@ export default {
                     name: '重点监管人员一张图',
                     img: require('../assets/images/menhu/portal1.png'),
                     pat: "/Map/Map_Zhongdianrenyuan"
-                }, {
-                    name: '事件处置监管一张图',
-                    img: require('../assets/images/menhu/portal1.png')
                 }, {
                     name: '重大活动保障一张图',
                     img: require('../assets/images/menhu/zhongda.png'),
                     pat: "/Map/Map_ZhongDahuodong"
+                },  {
+                    name: '地空协同巡查一张图',
+                    img: require('../assets/images/menhu/dikong.png'),
+                    pat: "/Map/Map_Dikong"
+                }, {
+                    name: '综合治理协同系统',
+                    img: require('../assets/images/menhu/guanlixitong.png'),
+                    pat: '/ZhongdianRen/Xinxiguanli'
                 }, {
+                    name: '事件处置监管一张图',
+                    img: require('../assets/images/menhu/portal1.png')
+                },{
                     name: '道路拥堵处置一张图',
                     img: require('../assets/images/menhu/portal1.png')
                 }, {
@@ -49,18 +57,10 @@ export default {
                 }, {
                     name: '城市管家AI巡检一张图',
                     img: require('../assets/images/menhu/portal1.png')
-                }, {
-                    name: '地空协同巡查一张图',
-                    img: require('../assets/images/menhu/dikong.png'),
-                    pat: "/Map/Map_Dikong"
                 }, {
                     name: '海上拖拉机监管一张图',
                     img: require('../assets/images/menhu/portal1.png')
-                }, {
-                    name: '综合治理协同系统',
-                    img: require('../assets/images/menhu/guanlixitong.png'),
-                    pat: '/ZhongdianRen/Xinxiguanli'
-                }
+                },
             ],
         };
     },
diff --git a/vue.config.js b/vue.config.js
index 64c1506..c6d7dfd 100644
--- a/vue.config.js
+++ b/vue.config.js
@@ -18,7 +18,7 @@ module.exports = {
   // 部署生产环境和开发环境下的URL。
   // 默认情况下，Vue CLI 会假设你的应用是被部署在一个域名的根路径上
   // 例如 https://www.ruoyi.vip/。如果应用被部署在一个子路径上，你就需要用这个选项指定这个子路径。例如，如果你的应用被部署在 https://www.ruoyi.vip/admin/，则设置 baseUrl 为 /admin/。
-  publicPath: process.env.NODE_ENV === "production" ? "/" : "/",
+  publicPath: process.env.NODE_ENV === "production" ? "/demo/changshazhenpc/" : "/",
   // 在npm run build 或 yarn build 时 ，生成文件的目录名称（要和baseUrl的生产环境路径一致）（默认dist）
   outputDir: 'dist',
   // 用于放置生成的静态资源 (js、css、img、fonts) 的；（项目打包之后，静态资源会放在这个文件夹下）