Merge branch 'main' of https://git.cityme.com.cn/xiangshan/ggfwjsc

src/view/dialog/dialogMapDp.vue

@@ -45,7 +45,7 @@
             :data="data.tableData"
             height="100%"
             :header-cell-style="{ background: '#008FCD' }"
-            :row-style="{height: '20px'}"
+            :row-style="{height: '26px'}"
             :key="tableKey"
             @row-click="handleRowClick"
             class="custom-table-font"

src/view/sy_map.vue

@@ -1,7 +1,7 @@
 <template>
   <div class="module">
     <teleport to="body">
-      <div id="map" style="width: 100vw; height: 100vh" v-show="openD"></div>
+      <div id="map" style="width: 100vw; height: 100vh" v-show="!openD"></div>
       <div class="left" style="width: 517px" v-show="!showEdit">
         <div class="lyx">
           <div class="title">
@@ -225,7 +225,10 @@
           退出
         </div>
       </div>
-
+      <div class="btnBj" v-if="!showEdit && !dialogShow && !openD" @click="openqx()">
+        地图权限(123456)：
+        <p :style="{ color: jsqx ? 'green' : 'red' }">{{ bjtitle }}</p>
+      </div>
       <Dialog
         :dialogShow="dialogShow"
         :columns="tableType.columns"
@@ -261,7 +264,7 @@
       <personDetail
         class="detail"
         style="width: 1920px; height: 1080px"
-        v-show="!openD"
+        v-show="openD"
         :message="message"
         @closeDetail="closeDetail"
       ></personDetail>
@@ -296,6 +299,7 @@
           </div>
         </template>
       </el-dialog>
+      <!-- 修改村社中心点 -->
       <el-dialog v-model="dialogVisible3" title="修改村社中心点" width="500">
         <el-input v-model="input2" placeholder="请选择" disabled />
         <template #footer>
@@ -304,6 +308,7 @@
           </div>
         </template>
       </el-dialog>
+      <!-- 添加村社 -->
       <el-dialog v-model="dialogVisible2" title="新村社列表" width="500">
         <el-form
           :model="add_new_cs"
@@ -328,6 +333,19 @@
           </div>
         </template>
       </el-dialog>
+      <!-- 修改村名 -->
+      <el-dialog v-model="qx" title="地图编辑权限" width="300">
+        <el-input
+          v-model="qxvalue"
+          style="width: 240px"
+          placeholder="请输入密码"
+        />
+        <template #footer>
+          <div class="dialog-footer">
+            <el-button type="primary" @click="saveqx()"> 确认权限 </el-button>
+          </div>
+        </template>
+      </el-dialog>
     </teleport>
   </div>
 </template>
@@ -422,11 +440,12 @@ const input2 = ref([]);
 const dialogVisible = ref(false);
 const dialogVisible2 = ref(false);
 const dialogVisible3 = ref(false);
+const qx = ref(false);
 //加载
 const loadingss = ref(false);
 const loadTable = ref(false);
 //是否打开人物详情
-const openD = ref(true);
+const openD = ref(false);
 const message = ref({});
 //存放渲染的地块及图标的数组
 const jdm_arr = ref([]); //街道名
@@ -1025,6 +1044,43 @@ const getCssj = async () => {
 /**
  * 地块编辑
  */
+//解锁
+const jsqx = ref(false);
+const qxkey = "123456";
+const qxvalue = ref("");
+const bjtitle = computed(() => {
+  if (jsqx.value) {
+    return "已解锁";
+  } else {
+    return "锁定";
+  }
+});
+const openqx = () => {
+  console.log(1111);
+
+  if (jsqx.value) {
+      ElMessageBox.confirm("确定要取消权限吗?")
+    .then(() => {
+      qxvalue.value=''
+      jsqx.value = false;
+    })
+    .catch(() => {
+      
+    });
+  } else {
+    qx.value = true;
+  }
+};
+const saveqx = () => {
+  if (qxvalue.value == qxkey) {
+    jsqx.value = true;
+    qx.value = false;
+    qxvalue.value=''
+    ElMessage.success("解锁成功");
+  } else {
+    ElMessage.error("解锁密码错误");
+  }
+};
 //移动模式
 const movemode = () => {
   drawing.value = true;
@@ -2741,14 +2797,14 @@ const openCamera = () => {
 //打开人物详情页面
 const openMessage = (e) => {
   message.value = e;
-  openD.value = false;
+  openD.value = true;
   reset_font2();
   //监听实现人物详情动态缩放
   window.addEventListener("resize", reset_font2);
 };
 //关闭人物详情页面
 const closeDetail = () => {
-  openD.value = true;
+  openD.value = false;
   window.removeEventListener("resize", reset_font2);
 };
 //获取人口列表接口
@@ -3789,16 +3845,16 @@ const DGcreateCs = (polygon, indexx) => {
   });
   map.addOverlay(cs_dd_arr.value[indexx]);
   cs_dd_arr.value[indexx].addEventListener("click", () => {
+    if (jsqx.value) {
       if (showEdit.value) {
         changeCsqkId.value = polygon.id;
       } else {
         console.log(polygon.id);
         changeCsqkId.value = polygon.id;
         showEdit.value = !showEdit.value;
-      // let a = document.documentElement.getElementsByClassName("left")[0];
+      }
-      // a.style.opacity = "0";
+    }else{
-      // let b = document.documentElement.getElementsByClassName("right")[0];
+
-      // b.style.opacity = "0";
     }
   });
 };
@@ -4503,6 +4559,20 @@ onMounted(async () => {
     border-radius: 0 3px 3px 0;
   }
 }
+.btnBj {
+  cursor: pointer;
+  z-index: 100;
+  position: absolute;
+  color: #ffffff;
+  top: 12%;
+  right: 28%;
+  background: #7aceff;
+  padding: 5px;
+  border-radius: 5px;
+  display: flex;
+  align-items: center;
+  opacity: 0.8;
+}
 .title {
   background-image: url(@/assets/images/map/map_title_bg.png);
   background-repeat: no-repeat;