From 1ede52cddbad427c14e033fdefcbf27f4e9471bc Mon Sep 17 00:00:00 2001
From: jiangyy <jiang478938504@126.com>
Date: Wed, 11 Jan 2023 09:01:26 +0800
Subject: [PATCH] fangwuguanli

---
 .../images/shuju/renfang/rkfx-bg-sel.png      | Bin 0 -> 655 bytes
 src/assets/images/shuju/renfang/rkfx-bg.png   | Bin 0 -> 654 bytes
 src/views/dataBoard/renfang/cpts/rkfx.vue     | 269 +++++++++++++-----
 .../dataBoard/renfang/cpts/rkfxPieOption.js   |  32 +++
 .../modules/base/community/buildForm.vue      |   4 +-
 .../modules/base/community/buildTable.vue     |   4 +-
 .../modules/base/community/communityForm.vue  |  33 ++-
 .../modules/base/community/communityTable.vue |   4 +-
 src/views/modules/base/community/roomForm.vue |   4 +-
 .../modules/base/community/roomTable.vue      |   6 +-
 10 files changed, 275 insertions(+), 81 deletions(-)
 create mode 100644 src/assets/images/shuju/renfang/rkfx-bg-sel.png
 create mode 100644 src/assets/images/shuju/renfang/rkfx-bg.png
 create mode 100644 src/views/dataBoard/renfang/cpts/rkfxPieOption.js

diff --git a/src/assets/images/shuju/renfang/rkfx-bg-sel.png b/src/assets/images/shuju/renfang/rkfx-bg-sel.png
new file mode 100644
index 0000000000000000000000000000000000000000..8752a0463bc3cdb3f699fe1b3ee3d1a0f5476bf4
GIT binary patch
literal 655
zcmeAS@N?(olHy`uVBq!ia0vp^AAs0_gAGWk%>VTqNHG=%xjQkeJ16s!fq}`>)5S5Q
zBJS<w)4t4(BCHoTx`<6s^k!;MnIm+>QAuLsh86+&>R+O(jeqa+w_0p<N6w#rc0WU7
zz2J_U+ooUtefaaw8+Si``LZpyzq((ZWzY0;)=a-y)Re_O?5lqu+Nj#NvV(Qc7ik-{
z4e<#|NsRBmf1h+<(}AobOmY8M**Mm4u5r<MU|PMNvxnnNZ^QxRKW-drxZiX}9C-as
zjH8D$MtWnz@fW;;GX!_2B{80#5v^#TRgigvNiNmgEy3@>qz+b_=eeB+b{vQo<gS==
zN1-vY@xGGShc#PGnK}>n3vydLH1kS`d$1d*?tRWg2el8TNsQ@N+Bi*^<|~U8B<D<Z
z&?@MQIH0+?kZJA#_ajX2YIKE9u(He%wsu$`EKrc1J<~x?;lZ36j7)PI8myyFvlKBh
zK0m@I@PdWq&dn&b3EUhO>SYZM>Ix6eT{CKoaX4VPk(tGck+FQ+G|neXOy@df6)tdc
z?AW~3M?qYm!0!!1qo2cpxocCIb~ZE=C$V#sFfqN$86H;dVcu}-XXNVS#V3F%jKR~@
K&t;ucLK6VlIQ<R)

literal 0
HcmV?d00001

diff --git a/src/assets/images/shuju/renfang/rkfx-bg.png b/src/assets/images/shuju/renfang/rkfx-bg.png
new file mode 100644
index 0000000000000000000000000000000000000000..9993929f3fe7134518b3223326fdf32beadada88
GIT binary patch
literal 654
zcmeAS@N?(olHy`uVBq!ia0vp^AAs0_gAGWk%>VTqNHG=%xjQkeJ16s!fq}`x)5S5Q
zBJS<w(?Etq%f+2D+78Z`a8Y7`k4hJ};}LiJRoSI!w%hA0&X(Km+hcq84~M`C4x2l9
z-+zDpI?Jkz)50~g{lE+dqa?=unZLywS2$=TF}lw`D$!Wj=yHTf?)x`?rozU%9jr3-
zLd`7CSjv>dKFrx#FKnT-L26?|zfF4}(`P1aLGFrsH^o`{IM2B0JV^FWoN-{*0iPpG
zamL?78y7Pz7Ucf%!dOCmgPwuV#)j*)wVn@l9H<8h{t&isNbrBKzJqm7`s-{a(Z>5q
zVg;@D1(|*`*}LjIs14_4$zr;%ELPBaPmxKoalIh7MRHcFL+AtJB*yTYvdR;Le{@6~
zu=Mw4dBw!EZnCw9g1W+kIZIWUN*NiipOjUZAS_UD?vhaBu7-x!PxypRaB^6rXLdTo
zIvgl1V&{Cq!ZK&`7MBHj3J<JyHnS8lF`bKyQVI|kD42W4k;#&g@wtw!;0kVz9e(c=
z8s{`L6i=JRafOv7M!kH3gP+3zOYh-iZDaZO9ov5Yb7i*$CNKt1S3j3^P6<r_!r=Iq

literal 0
HcmV?d00001

diff --git a/src/views/dataBoard/renfang/cpts/rkfx.vue b/src/views/dataBoard/renfang/cpts/rkfx.vue
index 6a368cac9..cd67cb530 100644
--- a/src/views/dataBoard/renfang/cpts/rkfx.vue
+++ b/src/views/dataBoard/renfang/cpts/rkfx.vue
@@ -1,14 +1,38 @@
 <template>
   <div class="rkyj-main">
-    <div class="title">
-      <div>预警居民类别</div>
-      <div>黄色预警(5-10人)<img class="img"
-             src="@/assets/images/shuju/renfang/remark.png"
-             alt /></div>
-      <div>红色预警(10人以上)<img class="img"
-             src="@/assets/images/shuju/renfang/remark.png"
-             alt /></div>
+    <div class="list">
+      <div v-for="(dataitem,index) in listData"
+           :key="index"
+           :class="['item',{'item-sel':dataitem.sel}]"
+           @click="selItem(dataitem,index)">
+        {{dataitem.name}}
 
+      </div>
+
+    </div>
+    <div class="pie-main">
+      <div class="legend">
+        <div class="legend-row">
+
+          <div class="sexblue">男性</div>
+          <div class="content">
+            <div class="num">15632</div>
+            <div class="unit">人</div>
+          </div>
+        </div>
+        <div class="legend-row">
+
+          <div class="sexyellow">女性</div>
+          <div class="content">
+            <div class="num">142632</div>
+            <div class="unit">人</div>
+          </div>
+        </div>
+      </div>
+      <div class="pie">
+        <screen-echarts-frame @myChartMethod="pieInitOk"
+                              ref="pieChart"></screen-echarts-frame>
+      </div>
     </div>
 
   </div>
@@ -16,6 +40,8 @@
 
 <script>
 import { requestPost } from "@/js/dai/request";
+import screenEchartsFrame from "@/views/dataBoard/cpts/screen-echarts-frame/index";
+import { pieOption } from './rkfxPieOption.js'
 
 export default {
   props: {
@@ -26,100 +52,211 @@ export default {
   },
   data () {
     return {
+      showNoData: false,
+      timer: null,
+      pieChart: '',
+      pieOption: {},
+      pieInitState: false,
+      pieData: [],
       listData: [
         {
-          type: '低保人员',
-          yellow: 200,
-          red: 5,
+          name: '性别',
+          sel: true
+        },
+        {
+          name: '户籍',
+          sel: false
         },
         {
-          type: '失业人员',
-          yellow: 2,
-          red: 500,
+          name: '入户状况',
+          sel: false
         },
         {
-          type: '老年人',
-          yellow: 2000,
-          red: 5,
+          name: '年龄',
+          sel: false
         },
         {
-          type: '空巢老人',
-          yellow: 2,
-          red: 5,
+          name: '志愿者类别',
+          sel: false
         },
         {
-          type: '大病',
-          yellow: 2,
-          red: 5,
+          name: '党员文化程度',
+          sel: false
         },
         {
-          type: '慢病',
-          yellow: 2,
-          red: 5,
+          name: '下级人口分布',
+          sel: false
         },
+
       ]
     }
   },
-  mounted () { },
-  methods: {},
+  components: {
+    screenEchartsFrame
+  },
+  mounted () {
+    this.getPie()
+  },
+  methods: {
+    selItem (selItem, selIndex) {
+      this.listData.forEach((element, index) => {
+        if (index === selIndex) {
+          element.sel = true
+        } else {
+          element.sel = false
+        }
+
+      });
+    },
+
+    pieInitOk () {
+      this.pieInitState = true
+    },
+    getPie () {
+      if (this.pieInitState) {
+        this.getPieChart()
+      } else {
+        setTimeout(() => {
+          this.getPie()
+        }, 500)
+      }
+    },
+    // 获取饼状图
+    async getPieChart () {
+
+      this.$refs.pieChart.clear()
+      // this.$refs.pieChart.showLoading()
+
+      // 获取pieChart配置
+      this.pieOption = pieOption()
+
+      // 设置三个配置值
+
+      this.pieData = [
+        { value: 40, name: 'rose 1' },
+        { value: 38, name: 'rose 2' },
+      ]
+      this.pieOption.series[0].data = this.pieData;
+      // this.$refs.pieChart.hideLoading()
+      this.$refs.pieChart.setOption(this.pieOption)
+    },
+
+  },
 };
 </script>
 
 <style lang="scss" scoped>
 .rkyj-main {
-  .title {
-    margin: 24px 0 24px 24px;
+  .list {
+    margin-top: 8px;
     display: flex;
-    justify-content: space-between;
+    flex-wrap: wrap;
 
-    font-size: 16px;
-    font-family: PingFangSC-Medium, PingFang SC;
-    font-weight: 500;
-    color: #ffffff;
+    .item {
+      margin-top: 8px;
+      background-image: url(../../../../assets/images/shuju/renfang/rkfx-bg.png);
+      background-size: cover;
+      flex: 0 0 117px;
 
-    .img {
-      margin-left: 4px;
-      width: 15px;
-      height: 15px;
+      height: 32px;
+      margin-right: 2px;
+      text-align: center;
+      align-items: center;
+      font-size: 14px;
+      font-family: PingFangSC-Medium, PingFang SC;
+      font-weight: 500;
+      color: #ffffff;
+      line-height: 32px;
+      cursor: pointer;
     }
-  }
 
-  .list {
-    /deep/ .el-scrollbar__wrap {
-      // width: 100% !important;
-      overflow-x: hidden !important;
+    .item-sel {
+      background-image: url(../../../../assets/images/shuju/renfang/rkfx-bg-sel.png);
+      background-size: cover;
     }
-    .g-scrollar {
-      // width: 100%;
-      height: 168px;
-
-      .item {
-        padding: 12px 20px 12px 24px;
-        font-size: 14px;
-        font-family: PingFangSC-Regular, PingFang SC;
-        font-weight: 400;
-        color: #ffffff;
+  }
+
+  .pie-main {
+    display: flex;
+    justify-content: space-between;
+    margin-left: 25px;
+
+    .legend {
+      // flex: 0 0 140px;
+      margin-top: 40px;
+
+      .legend-row {
+        margin-top: 15px;
         display: flex;
         justify-content: space-between;
         align-items: center;
 
-        .item-title {
-          flex: 0 0 60px;
+        .sexblue {
+          position: relative;
+
+          margin-left: 5px;
+          font-size: 12px;
+          font-family: PingFangSC-Regular, PingFang SC;
+          font-weight: 400;
+          color: rgba(255, 255, 255, 0.65);
+          line-height: 17px;
+
+          &::before {
+            content: "";
+            position: absolute;
+            top: 4px;
+            left: -15px;
+            width: 8px;
+            height: 8px;
+            background: #1a95ff;
+          }
         }
+        .sexyellow {
+          position: relative;
+
+          margin-left: 5px;
+          font-size: 12px;
+          font-family: PingFangSC-Regular, PingFang SC;
+          font-weight: 400;
+          color: rgba(255, 255, 255, 0.65);
+          line-height: 17px;
 
-        .item-num {
-          flex: 0 0 100px;
-          // text-align: right;
-          .img {
-            width: 32px;
-            height: 32px;
-            margin-right: 8px;
+          &::before {
+            content: "";
+            position: absolute;
+            top: 4px;
+            left: -15px;
+            width: 8px;
+            height: 8px;
+            background: #ff6138;
           }
         }
+
+        .content {
+          margin-left: 24px;
+          display: flex;
+          align-items: flex-end;
+
+          font-family: PingFangSC-Medium, PingFang SC;
+          font-weight: 500;
+          color: #ffffff;
+        }
+
+        .num {
+          font-size: 20px;
+        }
+
+        .unit {
+          margin-left: 5px;
+          font-size: 14px;
+        }
       }
-      .item:nth-child(1) {
-        background: rgba(26, 149, 255, 0.15);
-      }
+    }
+
+    .pie {
+      margin-top: 32px;
+      flex: 0 0 280px;
+      height: 270px;
     }
   }
 }
diff --git a/src/views/dataBoard/renfang/cpts/rkfxPieOption.js b/src/views/dataBoard/renfang/cpts/rkfxPieOption.js
new file mode 100644
index 000000000..02d08cd24
--- /dev/null
+++ b/src/views/dataBoard/renfang/cpts/rkfxPieOption.js
@@ -0,0 +1,32 @@
+import * as echarts from 'echarts'
+export function pieOption() {
+  const center = ["50%", "170px"];
+  return {
+    color:  ['#1A95FF', '#FF6138'],
+    series: [
+      {
+        name: 'Nightingale Chart',
+        type: 'pie',
+        radius: [40, 130],
+        center: ['50%', '50%'],
+        roseType: 'area',
+        itemStyle: {
+          borderRadius: 1
+        },
+        label:{
+          normal:{
+            position:'inner',
+            show:true,
+            formatter:'{d}%',
+            fontSize:24,
+            color: "#FFFFFF",
+          }
+        },
+        data: [
+        
+        
+        ]
+      }
+    ]
+  };
+}
diff --git a/src/views/modules/base/community/buildForm.vue b/src/views/modules/base/community/buildForm.vue
index 9f46c9d95..91ebd8662 100644
--- a/src/views/modules/base/community/buildForm.vue
+++ b/src/views/modules/base/community/buildForm.vue
@@ -285,9 +285,9 @@ export default {
 
       let url = ''
       if (this.formType === 'add') {
-        url = '/gov/org/building/buildingadd'
+        url = '/actual/base/communityBuilding/saveCommunityBuilding'
       } else {
-        url = '/gov/org/building/buildingupdate'
+        url = '/actual/base/communityBuilding/updateCommunityBuilding'
 
         this.dataForm.buildingId = this.buildingId
       }
diff --git a/src/views/modules/base/community/buildTable.vue b/src/views/modules/base/community/buildTable.vue
index 54afa203c..4647e1930 100644
--- a/src/views/modules/base/community/buildTable.vue
+++ b/src/views/modules/base/community/buildTable.vue
@@ -599,7 +599,7 @@ export default {
         ids.push(element.buildingId)
       });
 
-      const url = "/gov/org/house/delete"
+      const url = "/actual/base/communityHouse/deleteCommunityInfoByIds"
 
       let params = {
         type: 'building',
@@ -629,7 +629,7 @@ export default {
     },
 
     async deleteBuild (row) {
-      const url = "/gov/org/building/buildingdel"
+      const url = "/actual/base/communityBuilding/deleteBuilding"
 
       let params = {
         buildingId: row.buildingId
diff --git a/src/views/modules/base/community/communityForm.vue b/src/views/modules/base/community/communityForm.vue
index 7423759fb..cbd58b039 100644
--- a/src/views/modules/base/community/communityForm.vue
+++ b/src/views/modules/base/community/communityForm.vue
@@ -20,7 +20,8 @@
                        v-model="dataForm.gridId"
                        placeholder="请选择"
                        clearable>
-              <el-option v-for="item in gridList"
+              <el-option v-for="(item,index) in gridList"
+                         @click.native="handleSelGrid(index)"
                          :key="item.gridId"
                          :label="item.gridName"
                          :value="item.gridId">
@@ -38,6 +39,16 @@
                       v-model="dataForm.neighborHoodName">
             </el-input>
           </el-form-item>
+          <el-form-item label="居民区类型"
+                        prop="quartersType"
+                        style="display: block">
+            <el-radio-group v-model="quartersType">
+
+              <el-radio :label="'0'">小区</el-radio>
+              <el-radio :label="'1'">片区</el-radio>
+            </el-radio-group>
+          </el-form-item>
+
           <el-form-item label="小区编码"
                         prop="coding"
                         style="display: block">
@@ -213,11 +224,13 @@ export default {
       btnDisable: false,
 
       neighborHoodId: '', //小区ID
+      quartersType: '0',
       dataForm: {
         neighborHoodName: '', // 小区名称【不超过50字】
         agencyId: '', // 所属组织ID
         agencyName: '',
         gridId: '', //所属网格ID
+        gridName: '',
         propertyId: '', //关联物业
         address: '', //详细地址
         remark: '', //备注【最大500字】
@@ -226,7 +239,8 @@ export default {
         latitude: '', //纬度
         realBuilding: 0,
         coding: '',
-        sysCoding: ''
+        sysCoding: '',
+        quartersType: ''// 居民区类型（0小区；1片区）
       },
 
       propertyFormShow: false,
@@ -244,6 +258,9 @@ export default {
   },
 
   methods: {
+    handleSelGrid (index) {
+      this.dataForm.gridName = this.gridList[index].gridName
+    },
     async initForm (type, row, agencyObj) {
       this.$refs.ref_form.resetFields();
       this.agencyObj = agencyObj
@@ -253,6 +270,7 @@ export default {
         this.dataForm = JSON.parse(JSON.stringify(row))
         this.dataForm.neighborHoodId = this.dataForm.id
         this.neighborHoodId = this.dataForm.neighborHoodId
+        this.quartersType = this.dataForm.quartersType
 
       } else {
         this.dataForm.latitude = latitude
@@ -301,7 +319,7 @@ export default {
 
       let { msg, data } = await map.getAddress(lat, lng);
       if (msg == "success") {
-        debugger
+
         this.dataForm.address = data.address
         this.searchValue = data.address
         this.searchOptions = []
@@ -421,6 +439,7 @@ export default {
         setTimeout(() => {
           this.btnDisable = false
         }, 10000)
+        this.dataForm.quartersType = this.quartersType
         this.$refs['ref_form'].validate((valid, messageObj) => {
           if (!valid) {
             app.util.validateRule(messageObj)
@@ -504,11 +523,13 @@ export default {
       this.searchOptions = []
       this.resultList = []
       this.neighborHoodId = '' //小区ID
+      this.quartersType = '1'
       this.dataForm = {
         neighborHoodName: '', // 小区名称【不超过50字】
         agencyId: '', // 所属组织ID
         agencyName: '',
         gridId: '', //所属网格ID
+        gridName: '',
         propertyId: '', //关联物业
         address: '', //详细地址
         remark: '', //备注【最大500字】
@@ -517,7 +538,8 @@ export default {
         latitude: '', //纬度
         realBuilding: 0,
         coding: '',
-        sysCoding: ''
+        sysCoding: '',
+        quartersType: ''
       }
       this.propertyFormShow = false
     },
@@ -549,6 +571,9 @@ export default {
             trigger: 'blur'
           }
         ],
+        quartersType: [
+          { required: true, message: '居民区类型不能为空', trigger: 'blur' }
+        ],
         agencyId: [
           { required: true, message: '所属组织不能为空', trigger: 'blur' }
         ],
diff --git a/src/views/modules/base/community/communityTable.vue b/src/views/modules/base/community/communityTable.vue
index 542f948bf..a6ccd4b67 100644
--- a/src/views/modules/base/community/communityTable.vue
+++ b/src/views/modules/base/community/communityTable.vue
@@ -677,7 +677,7 @@ export default {
         ids.push(element.neighborHoodId)
       });
 
-      const url = "/gov/org/house/delete"
+      const url = "/actual/base/communityHouse/deleteCommunityInfoByIds"
 
       let params = {
         type: 'neighborHood',
@@ -706,7 +706,7 @@ export default {
       }
     },
     async deleteCommunity (row) {
-      const url = "/gov/org/neighborhood/neighborhooddel"
+      const url = "/actual/base/communityQuarters/deleteQuarters"
 
       let params = {
         neighborHoodId: row.neighborHoodId
diff --git a/src/views/modules/base/community/roomForm.vue b/src/views/modules/base/community/roomForm.vue
index 81c0daade..5fa40ca18 100644
--- a/src/views/modules/base/community/roomForm.vue
+++ b/src/views/modules/base/community/roomForm.vue
@@ -358,9 +358,9 @@ export default {
       let url = ''
 
       if (this.formType === 'add') {
-        url = '/gov/org/house/houseadd'
+        url = '/actual/base/communityHouse/saveCommunityHouse'
       } else {
-        url = '/gov/org/house/houseupdate'
+        url = '/actual/base/communityHouse/updateCommunityHouse'
         this.dataForm.houseId = this.houseId
       }
 
diff --git a/src/views/modules/base/community/roomTable.vue b/src/views/modules/base/community/roomTable.vue
index cba87a4dc..b5e91b7f6 100644
--- a/src/views/modules/base/community/roomTable.vue
+++ b/src/views/modules/base/community/roomTable.vue
@@ -522,7 +522,7 @@ export default {
         houseId: this.houseId,
       };
 
-      const url = "/gov/org/house/houselist";
+      const url = "/actual/base/communityHouse/listHouses";
 
       const { data, code, msg } = await requestPost(url, params);
 
@@ -656,7 +656,7 @@ export default {
         ids.push(element.houseId);
       });
 
-      const url = "/gov/org/house/delete";
+      const url = "/actual/base/communityHouse/deleteCommunityInfoByIds";
 
       let params = {
         type: "house",
@@ -686,7 +686,7 @@ export default {
     },
 
     async deleteRoom (row) {
-      const url = "/gov/org/house/housedel";
+      const url = "/actual/base/communityHouse/deleteHouse";
 
       let params = {
         houseId: row.houseId,