合并songzhen分支代码

src/components/GridTree/nodeWrap.vue

@@ -27,7 +27,7 @@
                     </div>
                   </div>
                   <div v-if="item.level === 'unit_chief'">
-                    <div @click="gotoPersonnel(item)" class="dyzxh" :title="item.organizationName">
+                    <div @click="gotoPersonnel(item)" :class="[item.categoryWarn === 'red' ? 'dyzxhRed' : item.categoryWarn === 'yellow' ? 'dyzxhYellow' : item.categoryWarn === 'green' ? 'dyzxhGreen' : 'dyzxh']" :title="item.organizationName">
                       <!-- {{ spliceNameFun(item.organizationName, 3) }} -->
                       {{ item.organizationName }}
                     </div>
@@ -116,6 +116,18 @@ export default {
   justify-content: space-around;
 }
 
+@mixin lastLevel {
+  @include spanLevel;
+  @include normalLevel;
+  height: 118px;
+  width: 30px;
+  margin-top: -12px;
+  background-size: 100%;
+  cursor: pointer;
+  writing-mode: tb-rl;
+  text-orientation: upright;
+}
+
 .name_more {
   span {
     &:hover {
@@ -163,15 +175,20 @@ export default {
     background-size: 100%;
   }
   .dyzxh {
-    @include spanLevel;
-    @include normalLevel;
-    height: 118px;
-    width: 30px;
-    writing-mode: tb-rl;
-    margin-top: -12px;
+    @include lastLevel;
     background-image: url(~@/assets/images/home/dyzxhTree.png);
-    background-size: 100%;
-    cursor: pointer;
+  }
+  .dyzxhGreen {
+    @include lastLevel;
+    background-image: url(~@/assets/images/home/gridGreen.png);
+  }
+  .dyzxhRed {
+    @include lastLevel;
+    background-image: url(~@/assets/images/home/gridRed.png);
+  }
+  .dyzxhYellow {
+    @include lastLevel;
+    background-image: url(~@/assets/images/home/gridYellow.png);
   }
   .lxjt {
     @include spanLevel;

src/components/JwTree/nodeWrap.vue

@@ -27,8 +27,8 @@
                     </div>
                   </div>
                   <div v-if="item.level === 'unit_chief' || item.level === 'public_welfare_post'">
-                    <div @click="gotoPersonnel(item.resiId, '居委组织架构')" class="dyzxh gotoDesc" :title="item.name">
-                      {{ spliceNameFun(item.name, 3) }}
+                    <div @click="gotoPersonnel(item.resiId, '居委组织架构')" class="dyzxh gotoDesc" :title="item.organizationName">
+                      {{ spliceNameFun(item.organizationName, 3) }}
                     </div>
                   </div>
                 </div>

src/components/Tree/nodeWrap.vue

@@ -17,12 +17,12 @@
               <div class="condition-node-box">
                 <div class="auto-judge">
                   <div v-if="item.laneLevel >= 2 && item.laneLevel <= 7 && item.partyOrgLevel < 8">
-                    <div class="wgdzb">
+                    <div class="wgdzb" @click="getChildrenData(item)">
                       <nameSplit :item="item" areaName="partyOrgName" peopleName="principalName" pageName="党组织架构" />
                     </div>
                   </div>
                   <div v-if="item.partyOrgLevel === 8">
-                    <div class="lydxz">
+                    <div class="lydxz" @click="">
                       <nameSplit :item="item" areaName="partyOrgName" peopleName="principalName" pageName="党组织架构" />
                     </div>
                   </div>
@@ -62,7 +62,16 @@ export default {
   mounted() {},
   computed: {},
   watch: {},
-  methods: {},
+  methods: {
+    getChildrenData(item) {
+      // if (item.children) {
+      //   item._children = item.children;
+      //   item.children = null;
+      // } else {
+      //   item.children = item._children;
+      // }
+    },
+  },
 };
 </script>
 <style scoped lang="scss">

src/views/dataBoard/organizational/dangTree/index.vue

@@ -36,16 +36,17 @@ export default {
       if (n.orgId) {
         this.levelArr = [];
         this.nodeConfig = {};
-        this.getTreeData();
+        // this.getTreeData();
       }
     },
   },
   computed: {},
   mounted() {
-    const orgId = this.$store.state.chooseArea.chooseName.orgId;
-    if (orgId) {
+    // const orgId = this.$store.state.chooseArea.chooseName.orgId;
+    // if (orgId) {
+    //   this.getTreeData();
+    // }
     this.getTreeData();
-    }
   },
   methods: {
     getLevelArrNum(myArray) {
@@ -76,7 +77,7 @@ export default {
     //获取树状结构
     getTreeData() {
       this.loading = true;
-      this.$http.get(`/actual/base/organizational/structure/partyCommitteeOrg?agencyId=${this.$store.state.chooseArea.chooseName.orgId}`).then((res) => {
+      this.$http.get(`/actual/base/organizational/structure/partyCommitteeOrg?agencyId=`).then((res) => {
         const {
           data: { code, msg, data },
         } = res;

src/views/dataBoard/organizational/gridTree/index.vue

@@ -36,15 +36,16 @@ export default {
       if (n.orgId) {
         this.levelArr = [];
         this.nodeConfig = {};
-        this.getTreeData();
+        // this.getTreeData();
       }
     },
   },
   mounted() {
-    const orgId = this.$store.state.chooseArea.chooseName.orgId;
-    if (orgId) {
+    // const orgId = this.$store.state.chooseArea.chooseName.orgId;
+    // if (orgId) {
+    //   this.getTreeData();
+    // }
     this.getTreeData();
-    }
   },
   methods: {
     getLevelArrNum(myArray) {
@@ -84,7 +85,7 @@ export default {
     //获取树状结构
     getTreeData() {
       this.loading = true;
-      this.$http.get(`/gov/org/organizational/neighborhood/getGridCommitteeOrgTreeList?agencyId=${this.$store.state.chooseArea.chooseName.orgId}`).then((res) => {
+      this.$http.get(`/gov/org/organizational/neighborhood/getGridCommitteeOrgTreeList?agencyId=`).then((res) => {
         const {
           data: { code, msg, data },
         } = res;

src/views/dataBoard/organizational/jwTree/index.vue

@@ -36,15 +36,16 @@ export default {
       if (n.orgId) {
         this.levelArr = [];
         this.nodeConfig = {};
-        this.getTreeData();
+        // this.getTreeData();
       }
     },
   },
   mounted() {
-    const orgId = this.$store.state.chooseArea.chooseName.orgId;
-    if (orgId) {
+    // const orgId = this.$store.state.chooseArea.chooseName.orgId;
+    // if (orgId) {
+    //   this.getTreeData();
+    // }
     this.getTreeData();
-    }
   },
   methods: {
     getLevelArrNum(myArray) {
@@ -86,7 +87,7 @@ export default {
     //获取树状结构
     getTreeData() {
       this.loading = true;
-      this.$http.get(`/gov/org/organizational/neighborhood/getNeighborhoodCommitteeOrgTreeList?agencyId=${this.$store.state.chooseArea.chooseName.orgId}`).then((res) => {
+      this.$http.get(`/gov/org/organizational/neighborhood/getNeighborhoodCommitteeOrgTreeList?agencyId=`).then((res) => {
         const {
           data: { code, msg, data },
         } = res;

src/views/dataBoard/overview/index.vue

@@ -8,180 +8,86 @@
     <div class="g-row">
       <div class="g-left">
         <div class="m-box">
-          <title-box
-              :text="`${
-              currentLevel === 'district'
-                ? '区'
-                : currentLevel === 'street'
-                ? '街道'
-                : currentLevel === 'community'
-                ? '社区'
-                : currentLevel === 'grid'
-                ? '网格'
-                : ''
-            }介绍`"
-          />
-          <jdjs :currentLevelData="currentLevelData"/>
+          <title-box :text="`${currentLevel === 'district' ? '区' : currentLevel === 'street' ? '街道' : currentLevel === 'community' ? '社区' : currentLevel === 'grid' ? '网格' : ''}介绍`" />
+          <jdjs :currentLevelData="currentLevelData" />
         </div>
 
         <div class="m-box">
-          <title-box
-              :text="`${
-              currentLevel === 'district'
-                ? '区'
-                : currentLevel === 'street'
-                ? '街道'
-                : currentLevel === 'community'
-                ? '社区'
-                : currentLevel === 'grid'
-                ? '网格'
-                : ''
-            }图谱画像`"
-          />
-          <jdtphx :currentLevelData="currentLevelData" :id="orgId"/>
+          <title-box :text="`${currentLevel === 'district' ? '区' : currentLevel === 'street' ? '街道' : currentLevel === 'community' ? '社区' : currentLevel === 'grid' ? '网格' : ''}图谱画像`" />
+          <jdtphx :currentLevelData="currentLevelData" :id="orgId" />
         </div>
       </div>
       <div class="g-center">
         <div class="m-map" style="overflow: hidden">
-          <map-top
-              :currentLevelData="currentLevelData"
-              @changeType="changeType"
-              :level="currentLevel"
-          />
+          <map-top :currentLevelData="currentLevelData" @changeType="changeType" :level="currentLevel" />
           <div v-if="breadList.length > 1" class="go-back" @click="goBackMap">
-            <img src="~@/assets/images/shuju/overview/go-back.png"/>
+            <img src="~@/assets/images/shuju/overview/go-back.png" />
           </div>
-          <grid-map
-              ref="map"
-              @clickAgency="clickAgencyItem"
-              :srcGridData="orgData"
-              @clickDotBtn="handleClickDotBtn"
-              :level="currentLevel"
-          />
+          <grid-map ref="map" @clickAgency="clickAgencyItem" :srcGridData="orgData" @clickDotBtn="handleClickDotBtn" :level="currentLevel" />
         </div>
         <div class="m-box m-rybox">
-          <title-box :text="`${customerName}${peopleList[peopleType]}`"/>
-          <jdwgy
-              :peopleType="peopleType"
-              :currentLevelData="currentLevelData"
-              @setNum="setNum"
-              @setPoint="setPoint"
-          />
+          <title-box :text="`${customerName}${peopleList[peopleType]}`" />
+          <jdwgy :peopleType="peopleType" :currentLevelData="currentLevelData" @setNum="setNum" @setPoint="setPoint" />
         </div>
       </div>
 
       <div class="g-right">
         <div class="m-box">
-          <title-box text="人房数据统计"/>
-          <rfsjtj :currentLevelData="currentLevelData"/>
+          <title-box text="人房数据统计" />
+          <rfsjtj :currentLevelData="currentLevelData" />
         </div>
         <!-- 街道概览 -->
         <div v-if="currentLevel === 'street' || currentLevel === 'district'" class="m-box">
           <title-box text="各社区人房数据更新排行">
             <span class="date-span">
-              <el-date-picker v-model="rfphDate" format="yyyy-MM" value-format="yyyy-MM" @change="changeDate"
-                              type="month" :clearable="false" placeholder="选择月"> </el-date-picker>
+              <el-date-picker v-model="rfphDate" format="yyyy-MM" value-format="yyyy-MM" @change="changeDate" type="month" :clearable="false" placeholder="选择月"> </el-date-picker>
             </span>
           </title-box>
-          <sqrfph :currentLevelData="currentLevelData" :date="rfphDate"/>
+          <sqrfph :currentLevelData="currentLevelData" :date="rfphDate" />
         </div>
         <div v-if="currentLevel === 'street' || currentLevel === 'district'" class="m-box">
           <title-box text="各社区12345投诉事件统计">
             <span class="date-span">
-              <el-date-picker v-model="sq12345Date" format="yyyy-MM" value-format="yyyy-MM" type="month"
-                              :clearable="false" placeholder="选择月"/>
+              <el-date-picker v-model="sq12345Date" format="yyyy-MM" value-format="yyyy-MM" type="month" :clearable="false" placeholder="选择月" />
             </span>
           </title-box>
-          <sq12345 :currentLevelData="currentLevelData" :date="sq12345Date"/>
+          <sq12345 :currentLevelData="currentLevelData" :date="sq12345Date" />
         </div>
 
         <!-- 社区&网格-->
-        <div
-            v-if="currentLevel === 'community' || currentLevel === 'grid'"
-            class="m-box"
-        >
-          <title-box text="人房数据动态更新"/>
-          <Tabs
-              v-model="dynamicType"
-              :list="dynamicTypeList"
-              v-if="currentLevel === 'community'"
-              @changeVal="dynamicTypeChange"
-          />
-          <DynamicHumanRoomData
-              :currentLevelData="currentLevelData"
-              v-if="dynamicType === 1"
-          />
-          <GridUpdateRanking
-              :currentLevelData="currentLevelData"
-              v-if="dynamicType === 2"
-          />
+        <div v-if="currentLevel === 'community' || currentLevel === 'grid'" class="m-box">
+          <title-box text="人房数据动态更新" />
+          <Tabs v-model="dynamicType" :list="dynamicTypeList" v-if="currentLevel === 'community'" @changeVal="dynamicTypeChange" />
+          <DynamicHumanRoomData :currentLevelData="currentLevelData" v-if="dynamicType === 1" />
+          <GridUpdateRanking :currentLevelData="currentLevelData" v-if="dynamicType === 2" />
         </div>
         <!-- 社区概览-->
         <div v-if="currentLevel === 'community'" class="m-box">
           <title-box text="社区满意度自查结果">
             <span class="date-span">
-              <el-date-picker v-model="sqzcDate" format="yyyy-MM" value-format="yyyy-MM" type="month" :clearable="false"
-                              placeholder="选择月"/>
+              <el-date-picker v-model="sqzcDate" format="yyyy-MM" value-format="yyyy-MM" type="month" :clearable="false" placeholder="选择月" />
             </span>
           </title-box>
-          <CommunityResult
-            :currentLevelData="currentLevelData"
-            :date="sqzcDate"
-          />
+          <CommunityResult :currentLevelData="currentLevelData" :date="sqzcDate" />
         </div>
         <div v-if="currentLevel === 'community'" class="m-box">
           <title-box text="事件&回访">
             <span class="date-span">
-              <el-date-picker
-                popper-class="date-current-weiyi"
-                :append-to-body="false"
-                v-model="sjhfDate"
-                format="yyyy-MM"
-                value-format="yyyy-MM"
-                @change="changeDate"
-                type="month"
-                :clearable="false"
-                placeholder="选择月"
-              />
+              <el-date-picker v-model="sjhfDate" format="yyyy-MM" value-format="yyyy-MM" @change="changeDate" type="month" :clearable="false" placeholder="选择月" />
             </span>
           </title-box>
-          <Tabs
-            v-model="eventType"
-            :list="eventTypeList"
-            @changeVal="eventTypeChange"
-          />
-          <EventAndFollowUp
-            :currentLevelData="currentLevelData"
-            :date="sjhfDate"
-            v-if="eventType === 1"
-          />
-          <FollowUp
-            :currentLevelData="currentLevelData"
-            :date="sjhfDate"
-            v-if="eventType === 2"
-          />
+          <Tabs v-model="eventType" :list="eventTypeList" @changeVal="eventTypeChange" />
+          <EventAndFollowUp :currentLevelData="currentLevelData" :date="sjhfDate" v-if="eventType === 1" />
+          <FollowUp :currentLevelData="currentLevelData" :date="sjhfDate" v-if="eventType === 2" />
         </div>
         <!-- 网格 -->
         <div v-if="currentLevel === 'grid'" class="m-box">
           <title-box text="社区网格数据更新情况排行">
             <span class="date-span">
-              <el-date-picker
-                popper-class="date-current-weiyi"
-                :append-to-body="false"
-                v-model="sqwggxDate"
-                format="yyyy-MM"
-                value-format="yyyy-MM"
-                @change="changeDate"
-                type="month"
-                :clearable="false"
-                placeholder="选择月"
-              />
+              <el-date-picker v-model="sqwggxDate" format="yyyy-MM" value-format="yyyy-MM" @change="changeDate" type="month" :clearable="false" placeholder="选择月" />
             </span>
           </title-box>
-          <RankingGridData
-            :currentLevelData="currentLevelData"
-            :date="sqwggxDate"
-          />
+          <RankingGridData :currentLevelData="currentLevelData" :date="sqwggxDate" />
         </div>
       </div>
     </div>
@@ -324,15 +230,18 @@ export default {
           ...val,
           orgLevel: val.level,
         };
-        this.getMapData();
+        // this.getMapData();
       }
     },
   },
 
+  mounted() {
+    this.getMapData();
+  },
+
   methods: {
     changeCustomerName() {
-      this.customerName =
-        localStorage.getItem("customerNameDataBoard") || "数据分析可视化平台";
+      this.customerName = localStorage.getItem("customerNameDataBoard") || "数据分析可视化平台";
     },
     changeType(e) {
       this.peopleType = e;
@@ -383,8 +292,7 @@ export default {
           orgLevel: item.level,
         };
       } else {
-        this.customerName =
-          localStorage.getItem("customerNameDataBoard") || "数据分析可视化平台";
+        this.customerName = localStorage.getItem("customerNameDataBoard") || "数据分析可视化平台";
         this.currentLevelData = {
           ...this.$store.state.chooseArea.chooseName,
           orgLevel: this.$store.state.chooseArea.chooseName.level,
@@ -459,10 +367,10 @@ export default {
       level = this.$store.state.chooseArea.chooseName.level
     ) {
       const url = "org_map";
-      this.$http.post(`/gov/org/agency/maporg`, {orgId, level}).then(({data: {data}}) => {
+      this.$http.post(`/gov/org/agency/maporg`, { orgId, level }).then(({ data: { data } }) => {
         this.orgData = data;
         this.orgId = this.orgData.id;
-        console.log(this.orgId)
+        console.log(this.orgId);
         this.orgLevel = this.orgData.level;
         this.currentLevel = this.orgData.agencyLevel;
         this.currentLevelData = {