From e3bc9c7d75a9dd46b54800d094702622977079d9 Mon Sep 17 00:00:00 2001
From: jiangyy <jiang478938504@126.com>
Date: Fri, 18 Nov 2022 13:24:53 +0800
Subject: [PATCH] =?UTF-8?q?=E6=88=BF=E5=B1=8B=E7=AE=A1=E7=90=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../scss/modules/management/detail-main.scss  |  57 ++++
 src/main.js                                   |   2 +-
 .../modules/base/community/buildTable.vue     |   3 +-
 .../base/community/communityDetail copy.vue   | 263 ++++++++++++++++++
 .../base/community/communityDetail.vue        | 106 ++++---
 5 files changed, 396 insertions(+), 35 deletions(-)
 create mode 100644 src/views/modules/base/community/communityDetail copy.vue

diff --git a/src/assets/scss/modules/management/detail-main.scss b/src/assets/scss/modules/management/detail-main.scss
index 0767b7768..420cf5fb3 100644
--- a/src/assets/scss/modules/management/detail-main.scss
+++ b/src/assets/scss/modules/management/detail-main.scss
@@ -2,8 +2,65 @@
 @import "@/assets/scss/c/config.scss";
 @import "@/assets/scss/c/function.scss";
 
+//新版
+.d-row{
+  width:100%;
+  padding-left:23px;
+  padding-right:30px;
+  margin-top:19px;
+
+  .d-info{
+
+    .d-info-prop{
+      display:flex;
+      justify-content: start;
+      height:38px;
+      border: 1px solid #D3DCE6;
+      margin-top:2px;
+
+      .d-title{
+        flex:0 0 90px;
+        text-align: center;
+        background: #D6E2F8;
+        font-size: 14px;
+        font-family: Source Han Serif CN;
+        font-weight: 400;
+        color: #333333;
+        line-height: 38px;
+        
+      }
+
+      .d-content{
+        padding:5px;
+        background: #FFFFFF;
+        width:100%;
+
+        .d-content-in{
+          width:100%;
+          padding-left:16px;
+          background: #F6F6F6;
+          font-size: 14px;
+          font-family: Source Han Serif CN;
+          font-weight: 400;
+          color: #333333;
+          line-height: 27px;
+        }
+      }
+    }
+
+    //带图片的行高
+    .d-info-prop-pic{
+      height:185px;
+    }
+  }
+}
 
+.d-img{
+  height:140px;
+  width:117px;
+}
 
+//旧版
 .cell-width-area{
   width: 450px
 }
diff --git a/src/main.js b/src/main.js
index 4bebde648..c7d5b6a39 100644
--- a/src/main.js
+++ b/src/main.js
@@ -97,7 +97,7 @@ Vue.prototype.$getElUploadHeaders = () => ({
 // 保存整站vuex本地储存初始状态
 window.SITE_CONFIG["storeState"] = cloneDeep(store.state);
 
-Vue.prototype.tableHeaderStyle = { background: 'linear-gradient(0deg, #005EB3 0%, #0083F0 100%)', color: '#FFFFFF', padding: '6px' };
+Vue.prototype.tableHeaderStyle = { background: 'linear-gradient(0deg, #005EB3 0%, #0083F0 100%)', color: '#FFFFFF', padding: '6px 0px' };
 
 new Vue({
   i18n,
diff --git a/src/views/modules/base/community/buildTable.vue b/src/views/modules/base/community/buildTable.vue
index 7dd28c5e6..0b9501dd6 100644
--- a/src/views/modules/base/community/buildTable.vue
+++ b/src/views/modules/base/community/buildTable.vue
@@ -105,11 +105,12 @@
     <div class="div_table_item">
       <el-table ref="ref_table"
                 :data="tableData"
-                :header-cell-style="tableHeaderStyle"
                 border
                 @sort-change="handleSortOrderChange"
+                :show-overflow-tooltip="true"
                 :height="tableHeight"
                 v-loading="tableLoading"
+                :header-cell-style="tableHeaderStyle"
                 style="width: 100%"
                 @select-all="selectAll"
                 @selection-change="selectionChange">
diff --git a/src/views/modules/base/community/communityDetail copy.vue b/src/views/modules/base/community/communityDetail copy.vue
new file mode 100644
index 000000000..f08478197
--- /dev/null
+++ b/src/views/modules/base/community/communityDetail copy.vue	
@@ -0,0 +1,263 @@
+<template>
+  <div>
+    <div class="dialog-h-content scroll-h">
+
+      <div v-if="initLoading"
+           class="m-row">
+        <div class="m-info">
+          <div class="info-prop">
+            <span class="info-title-2">所属组织：</span>
+            <span>{{ dataForm.agencyName }}</span>
+          </div>
+
+          <div class="info-prop">
+            <span class="info-title-2">所属网格：</span>
+            <span>{{ dataForm.gridName?dataForm.gridName:'--' }}</span>
+          </div>
+
+          <div class="info-prop">
+            <span class="info-title-2">小区名称：</span>
+            <span>{{ dataForm.neighborHoodName}}</span>
+          </div>
+
+          <div class="info-prop">
+            <span class="info-title-2">小区编码：</span>
+            <span>{{ dataForm.coding?dataForm.coding:'--'}}</span>
+          </div>
+
+          <div v-if="dataForm.qrcodeUrl"
+               style="display: flex;flex-direction: column;">
+            <img style="margin-left: 70px;width: 200px;"
+                 :src="dataForm.qrcodeUrl">
+            <a style="margin-left: 80px"
+               :href="dataForm.qrcodeUrl"
+               target="_blank">下载</a>
+          </div>
+
+          <div class="info-prop">
+            <span class="info-title-2">关联物业：</span>
+            <span>{{ dataForm.propertyShow?dataForm.propertyShow:'--'}}</span>
+          </div>
+          <div class="info-prop">
+            <span class="info-title-2">实有楼栋：</span>
+            <span>{{dataForm.realBuilding?dataForm.realBuilding:0 }}</span>
+          </div>
+
+          <div class="info-prop">
+            <span class="info-title-2">详细地址：</span>
+            <span>{{ dataForm.address }}</span>
+          </div>
+
+          <div class="info-prop">
+            <span class="info-title-2">地图位置：</span>
+            <div class="div_map">
+
+              <div id="app_detail_community"></div>
+
+            </div>
+          </div>
+
+        </div>
+      </div>
+
+    </div>
+    <div class="div-btn">
+      <el-button size="small"
+                 @click="handleCancle">关 闭</el-button>
+
+    </div>
+  </div>
+</template>
+
+<script>
+import { mapGetters } from 'vuex'
+import { Loading } from 'element-ui' // 引入Loading服务
+import { requestPost } from '@/js/dai/request'
+import daiMap from "@/utils/dai-map";
+var map
+var search
+var markers
+var infoWindowList
+let loading // 加载动画
+export default {
+  data () {
+    return {
+
+      btnDisable: false,
+      initLoading: false,
+
+      dataForm: {
+        neighborHoodName: '', // 小区名称【不超过50字】
+        agencyId: '', // 所属组织ID
+        agencyName: '',
+        gridId: '', //所属网格ID
+        propertyId: '', //关联物业
+        address: '', //详细地址
+        remark: '', //备注【最大500字】
+        location: '', //坐标位置
+        longitude: '', //经度
+        latitude: '', //纬度
+        realBuilding: 0,
+        coding: '',
+        sysCoding: ''
+      },
+
+
+    }
+  },
+  components: {},
+  mounted () {
+
+  },
+
+  methods: {
+    handleCancle () {
+      this.diaDestroy()
+      this.$emit('diaDetailClose')
+
+    },
+    diaDestroy () {
+      if (map) {
+        // map.destroy()
+      }
+    },
+
+    async initForm (row) {
+      this.dataForm = JSON.parse(JSON.stringify(row))
+
+      let propertyShowList = []
+      this.dataForm.propertyList.forEach(element => {
+        propertyShowList.push(element.name)
+      });
+
+      this.dataForm.propertyShow = propertyShowList.join(',')
+
+      this.initLoading = true
+      let { latitude, longitude } = this.$store.state.user;
+      console.log('lat' + latitude + ',lon' + longitude)
+      if (this.dataForm.latitude && this.dataForm.longitude) {
+        latitude = this.dataForm.latitude
+        longitude = this.dataForm.longitude
+      }
+      if (!latitude || latitude == "" || latitude == "0") {
+        latitude = 39.9088810666821;
+        longitude = 116.39743841556731;
+      }
+
+      this.$nextTick(() => {
+        if (!map) {
+          this.initMap(latitude, longitude)
+        } else {
+          map.setCenter(latitude, longitude);
+          map.setMarker(latitude, longitude);
+        }
+
+      })
+
+    },
+
+    // 地图初始化函数，本例取名为init，开发者可根据实际情况定义
+    initMap (latitude, longitude) {
+
+      map = new daiMap(
+        document.getElementById("app_detail_community"),
+        { latitude, longitude },
+        {
+          zoom: 16.2, // 设置地图缩放级别
+          pitch: 43.5, // 设置俯仰角
+          rotation: 45, // 设置地图旋转角度
+        }
+      );
+
+      // // 监听地图平移结束
+      // map.on("dragend", (e) => {
+      //   this.handleMoveCenter(e);
+      // });
+
+      map.setCenter(latitude, longitude);
+      map.setMarker(latitude, longitude);
+
+    },
+
+
+
+    resetData () {
+
+      this.dataForm = {
+        neighborHoodName: '', // 小区名称【不超过50字】
+        agencyId: '', // 所属组织ID
+        agencyName: '',
+        gridId: '', //所属网格ID
+        propertyId: '', //关联物业
+        address: '', //详细地址
+        remark: '', //备注【最大500字】
+        location: '', //坐标位置
+        longitude: '', //经度
+        latitude: '', //纬度
+        realBuilding: 0,
+        coding: '',
+        sysCoding: ''
+      }
+
+    },
+    // 开启加载动画
+    startLoading () {
+      loading = Loading.service({
+        lock: true, // 是否锁定
+        text: '正在加载……', // 加载中需要显示的文字
+        background: 'rgba(0,0,0,.7)' // 背景颜色
+      })
+    },
+    // 结束加载动画
+    endLoading () {
+      // clearTimeout(timer);
+      if (loading) {
+        loading.close()
+      }
+    }
+  },
+  computed: {
+    dataRule () {
+      return {
+        neighborHoodName: [
+          { required: true, message: '小区名称不能为空', trigger: 'blur' },
+          {
+            min: 1,
+            max: 50,
+            message: '小区名称长度在 1 到 50个字符',
+            trigger: 'blur'
+          }
+        ],
+        agencyId: [
+          { required: true, message: '所属组织不能为空', trigger: 'blur' }
+        ],
+        gridId: [
+          { required: true, message: '所属网格不能为空', trigger: 'blur' }
+        ],
+        coding: [
+          { required: true, message: '小区编码不能为空', trigger: 'blur' }
+        ],
+        address: [
+          { required: true, message: '详细地址不能为空', trigger: 'blur' }
+        ],
+        longitude: [
+          { required: true, message: '坐标不能为空', trigger: 'blur' }
+        ]
+      }
+    },
+    propertyRule () {
+      name: [
+        { required: true, message: '物业名称不能为空', trigger: 'blur' }
+        // { min: 1, max: 50, message: '小区名称长度在 1 到 50个字符', trigger: 'blur' }
+      ]
+    }
+  },
+  props: {}
+}
+</script>
+<style lang="scss" scoped >
+@import "@/assets/scss/modules/management/detail-main.scss";
+</style>
+
+
+
diff --git a/src/views/modules/base/community/communityDetail.vue b/src/views/modules/base/community/communityDetail.vue
index f08478197..9eb8d5efa 100644
--- a/src/views/modules/base/community/communityDetail.vue
+++ b/src/views/modules/base/community/communityDetail.vue
@@ -3,53 +3,72 @@
     <div class="dialog-h-content scroll-h">
 
       <div v-if="initLoading"
-           class="m-row">
-        <div class="m-info">
-          <div class="info-prop">
-            <span class="info-title-2">所属组织：</span>
-            <span>{{ dataForm.agencyName }}</span>
+           class="d-row">
+        <div class="d-info">
+          <div class="d-info-prop">
+            <div class="d-title">所属组织：</div>
+            <div class="d-content">
+              <div class="d-content-in">{{ dataForm.agencyName }}</div>
+            </div>
           </div>
 
-          <div class="info-prop">
-            <span class="info-title-2">所属网格：</span>
-            <span>{{ dataForm.gridName?dataForm.gridName:'--' }}</span>
+          <div class="d-info-prop">
+            <div class="d-title">所属网格：</div>
+            <div class="d-content">
+              <div class="d-content-in">{{ dataForm.gridName?dataForm.gridName:'--' }}</div>
+            </div>
           </div>
 
-          <div class="info-prop">
-            <span class="info-title-2">小区名称：</span>
-            <span>{{ dataForm.neighborHoodName}}</span>
+          <div class="d-info-prop">
+            <div class="d-title">小区名称：</div>
+            <div class="d-content">
+              <div class="d-content-in">{{ dataForm.neighborHoodName}}</div>
+            </div>
           </div>
 
-          <div class="info-prop">
-            <span class="info-title-2">小区编码：</span>
-            <span>{{ dataForm.coding?dataForm.coding:'--'}}</span>
+          <div class="d-info-prop ">
+            <div class="d-title">小区编码：</div>
+            <div class="d-content">
+              <div class="d-content-in">{{ dataForm.coding?dataForm.coding:'--'}}</div>
+            </div>
           </div>
-
-          <div v-if="dataForm.qrcodeUrl"
-               style="display: flex;flex-direction: column;">
-            <img style="margin-left: 70px;width: 200px;"
-                 :src="dataForm.qrcodeUrl">
-            <a style="margin-left: 80px"
-               :href="dataForm.qrcodeUrl"
-               target="_blank">下载</a>
+          <div class="d-info-prop d-info-prop-pic">
+            <div class="d-title">小区二维码：</div>
+            <div class="d-content">
+              <div v-if="dataForm.qrcodeUrl"
+                   class="content-pic">
+                <img class="d-img"
+                     :src="dataForm.qrcodeUrl">
+                <a class="pic-btn"
+                   style="margin-left: 80px"
+                   :href="dataForm.qrcodeUrl"
+                   target="_blank">下载</a>
+              </div>
+            </div>
           </div>
 
-          <div class="info-prop">
-            <span class="info-title-2">关联物业：</span>
-            <span>{{ dataForm.propertyShow?dataForm.propertyShow:'--'}}</span>
+          <div class="d-info-prop">
+            <div class="d-title">关联物业：</div>
+            <div class="d-content">
+              <div class="d-content-in">{{ dataForm.propertyShow?dataForm.propertyShow:'--'}}</div>
+            </div>
           </div>
-          <div class="info-prop">
-            <span class="info-title-2">实有楼栋：</span>
-            <span>{{dataForm.realBuilding?dataForm.realBuilding:0 }}</span>
+          <div class="d-info-prop">
+            <div class="d-title">实有楼栋：</div>
+            <div class="d-content">
+              <div class="d-content-in">{{dataForm.realBuilding?dataForm.realBuilding:0 }}</div>
+            </div>
           </div>
 
-          <div class="info-prop">
-            <span class="info-title-2">详细地址：</span>
-            <span>{{ dataForm.address }}</span>
+          <div class="d-info-prop">
+            <div class="d-title">详细地址：</div>
+            <div class="d-content">
+              <div class="d-content-in">{{ dataForm.address }}</div>
+            </div>
           </div>
 
-          <div class="info-prop">
-            <span class="info-title-2">地图位置：</span>
+          <div class="d-info-prop">
+            <span class="d-title">地图位置：</span>
             <div class="div_map">
 
               <div id="app_detail_community"></div>
@@ -63,6 +82,7 @@
     </div>
     <div class="div-btn">
       <el-button size="small"
+                 class="diy-button--blue"
                  @click="handleCancle">关 闭</el-button>
 
     </div>
@@ -257,6 +277,26 @@ export default {
 </script>
 <style lang="scss" scoped >
 @import "@/assets/scss/modules/management/detail-main.scss";
+
+.content-pic {
+  display: flex;
+  justify-content: space-between;
+  padding: 11px 23px;
+  justify-items: center;
+}
+
+.pic-btn {
+  width: 75px;
+  height: 25px;
+  background: linear-gradient(0deg, #32adab 0%, #2ad0cc 100%);
+  border-radius: 3px;
+  font-size: 14px;
+  font-family: Source Han Serif CN;
+  font-weight: 500;
+  color: #ffffff;
+  line-height: 23px;
+  text-align: center;
+}
 </style>