elink-star
/
epmet-work-pc
7
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

组织架构去掉舰艇orangid

V1.0
SongZhen 2 years ago
parent
0879d620b9
commit
1463064bc3
4 changed files with 90 additions and 164 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 11
      src/views/dataBoard/organizational/dangTree/index.vue
  2. 11
      src/views/dataBoard/organizational/gridTree/index.vue
  3. 11
      src/views/dataBoard/organizational/jwTree/index.vue
  4. 221
      src/views/dataBoard/overview/index.vue

11
src/views/dataBoard/organizational/dangTree/index.vue
View File

@ -42,10 +42,11 @@ export default {
}, },
computed: {}, computed: {},
mounted() { mounted() {
const orgId = this.$store.state.chooseArea.chooseName.orgId; // const orgId = this.$store.state.chooseArea.chooseName.orgId;
if (orgId) { // if (orgId) {
this.getTreeData(); // this.getTreeData();
} // }
this.getTreeData();
}, },
methods: { methods: {
getLevelArrNum(myArray) { getLevelArrNum(myArray) {
@ -76,7 +77,7 @@ export default {
//获取树状结构 //获取树状结构
getTreeData() { getTreeData() {
this.loading = true; 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 { const {
data: { code, msg, data }, data: { code, msg, data },
} = res; } = res;

11
src/views/dataBoard/organizational/gridTree/index.vue
View File

@ -41,10 +41,11 @@ export default {
}, },
}, },
mounted() { mounted() {
const orgId = this.$store.state.chooseArea.chooseName.orgId; // const orgId = this.$store.state.chooseArea.chooseName.orgId;
if (orgId) { // if (orgId) {
this.getTreeData(); // this.getTreeData();
} // }
this.getTreeData();
}, },
methods: { methods: {
getLevelArrNum(myArray) { getLevelArrNum(myArray) {
@ -84,7 +85,7 @@ export default {
//获取树状结构 //获取树状结构
getTreeData() { getTreeData() {
this.loading = true; 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 { const {
data: { code, msg, data }, data: { code, msg, data },
} = res; } = res;

11
src/views/dataBoard/organizational/jwTree/index.vue
View File

@ -41,10 +41,11 @@ export default {
}, },
}, },
mounted() { mounted() {
const orgId = this.$store.state.chooseArea.chooseName.orgId; // const orgId = this.$store.state.chooseArea.chooseName.orgId;
if (orgId) { // if (orgId) {
this.getTreeData(); // this.getTreeData();
} // }
this.getTreeData();
}, },
methods: { methods: {
getLevelArrNum(myArray) { getLevelArrNum(myArray) {
@ -86,7 +87,7 @@ export default {
//获取树状结构 //获取树状结构
getTreeData() { getTreeData() {
this.loading = true; 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 { const {
data: { code, msg, data }, data: { code, msg, data },
} = res; } = res;

221
src/views/dataBoard/overview/index.vue
View File

@ -8,167 +8,91 @@
<div class="g-row"> <div class="g-row">
<div class="g-left"> <div class="g-left">
<div class="m-box"> <div class="m-box">
<title-box <title-box :text="`${currentLevel === 'district' ? '区' : currentLevel === 'street' ? '街道' : currentLevel === 'community' ? '社区' : currentLevel === 'grid' ? '网格' : ''}介绍`" />
:text="`${ <jdjs :currentLevelData="currentLevelData" />
currentLevel === 'district'
? '区'
: currentLevel === 'street'
? '街道'
: currentLevel === 'community'
? '社区'
: currentLevel === 'grid'
? '网格'
: ''
}介绍`"
/>
<jdjs :currentLevelData="currentLevelData"/>
</div> </div>
<div class="m-box"> <div class="m-box">
<title-box <title-box :text="`${currentLevel === 'district' ? '区' : currentLevel === 'street' ? '街道' : currentLevel === 'community' ? '社区' : currentLevel === 'grid' ? '网格' : ''}图谱画像`" />
:text="`${ <jdtphx :currentLevelData="currentLevelData" :id="orgId" />
currentLevel === 'district'
? '区'
: currentLevel === 'street'
? '街道'
: currentLevel === 'community'
? '社区'
: currentLevel === 'grid'
? '网格'
: ''
}图谱画像`"
/>
<jdtphx :currentLevelData="currentLevelData" :id="orgId"/>
</div> </div>
</div> </div>
<div class="g-center"> <div class="g-center">
<div class="m-map" style="overflow: hidden"> <div class="m-map" style="overflow: hidden">
<map-top <map-top :currentLevelData="currentLevelData" @changeType="changeType" :level="currentLevel" />
:currentLevelData="currentLevelData"
@changeType="changeType"
:level="currentLevel"
/>
<div v-if="breadList.length > 1" class="go-back" @click="goBackMap"> <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> </div>
<grid-map <grid-map ref="map" @clickAgency="clickAgencyItem" :srcGridData="orgData" @clickDotBtn="handleClickDotBtn" :level="currentLevel" />
ref="map"
@clickAgency="clickAgencyItem"
:srcGridData="orgData"
@clickDotBtn="handleClickDotBtn"
:level="currentLevel"
/>
</div> </div>
<div class="m-box m-rybox"> <div class="m-box m-rybox">
<title-box :text="`${customerName}${peopleList[peopleType]}`"/> <title-box :text="`${customerName}${peopleList[peopleType]}`" />
<jdwgy <jdwgy :peopleType="peopleType" :currentLevelData="currentLevelData" @setNum="setNum" @setPoint="setPoint" />
:peopleType="peopleType"
:currentLevelData="currentLevelData"
@setNum="setNum"
@setPoint="setPoint"
/>
</div> </div>
</div> </div>
<div class="g-right"> <div class="g-right">
<div class="m-box"> <div class="m-box">
<title-box text="人房数据统计"/> <title-box text="人房数据统计" />
<rfsjtj :currentLevelData="currentLevelData"/> <rfsjtj :currentLevelData="currentLevelData" />
</div> </div>
<!-- 街道概览 --> <!-- 街道概览 -->
<div v-if="currentLevel === 'street' || currentLevel === 'district'" class="m-box"> <div v-if="currentLevel === 'street' || currentLevel === 'district'" class="m-box">
<title-box text="各社区人房数据更新排行"> <title-box text="各社区人房数据更新排行">
<span class="date-span"> <span class="date-span">
<el-date-picker v-model="rfphDate" format="yyyy-MM" value-format="yyyy-MM" @change="changeDate" <el-date-picker v-model="rfphDate" format="yyyy-MM" value-format="yyyy-MM" @change="changeDate" type="month" :clearable="false" placeholder="选择月"> </el-date-picker>
type="month" :clearable="false" placeholder="选择月"> </el-date-picker>
</span> </span>
</title-box> </title-box>
<sqrfph :currentLevelData="currentLevelData" :date="rfphDate"/> <sqrfph :currentLevelData="currentLevelData" :date="rfphDate" />
</div> </div>
<div v-if="currentLevel === 'street' || currentLevel === 'district'" class="m-box"> <div v-if="currentLevel === 'street' || currentLevel === 'district'" class="m-box">
<title-box text="各社区12345投诉事件统计"> <title-box text="各社区12345投诉事件统计">
<span class="date-span"> <span class="date-span">
<el-date-picker v-model="sq12345Date" format="yyyy-MM" value-format="yyyy-MM" type="month" <el-date-picker v-model="sq12345Date" format="yyyy-MM" value-format="yyyy-MM" type="month" :clearable="false" placeholder="选择月" />
:clearable="false" placeholder="选择月"/>
</span> </span>
</title-box> </title-box>
<sq12345 :currentLevelData="currentLevelData" :date="sq12345Date"/> <sq12345 :currentLevelData="currentLevelData" :date="sq12345Date" />
</div> </div>
<!-- 社区&网格--> <!-- 社区&网格-->
<div <div v-if="currentLevel === 'community' || currentLevel === 'grid'" class="m-box">
v-if="currentLevel === 'community' || currentLevel === 'grid'" <title-box text="人房数据动态更新" />
class="m-box" <Tabs v-model="dynamicType" :list="dynamicTypeList" v-if="currentLevel === 'community'" @changeVal="dynamicTypeChange" />
> <DynamicHumanRoomData :currentLevelData="currentLevelData" v-if="dynamicType === 1" />
<title-box text="人房数据动态更新"/> <GridUpdateRanking :currentLevelData="currentLevelData" v-if="dynamicType === 2" />
<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>
<!-- 社区概览--> <!-- 社区概览-->
<div v-if="currentLevel === 'community'" class="m-box"> <div v-if="currentLevel === 'community'" class="m-box">
<title-box text="社区满意度自查结果"> <title-box text="社区满意度自查结果">
<span class="date-span"> <span class="date-span">
<el-date-picker v-model="sqzcDate" format="yyyy-MM" value-format="yyyy-MM" type="month" :clearable="false" <el-date-picker v-model="sqzcDate" format="yyyy-MM" value-format="yyyy-MM" type="month" :clearable="false" placeholder="选择月" />
placeholder="选择月"/>
</span> </span>
</title-box> </title-box>
<CommunityResult <CommunityResult :currentLevelData="currentLevelData" :date="sqzcDate" />
:currentLevelData="currentLevelData"
:date="sqzcDate"
/>
</div> </div>
<div v-if="currentLevel === 'community'" class="m-box"> <div v-if="currentLevel === 'community'" class="m-box">
<title-box text="事件&回访"> <title-box text="事件&回访">
<span class="date-span"> <span class="date-span">
<el-date-picker v-model="sjhfDate" format="yyyy-MM" value-format="yyyy-MM" @change="changeDate" <el-date-picker v-model="sjhfDate" format="yyyy-MM" value-format="yyyy-MM" @change="changeDate" type="month" :clearable="false" placeholder="选择月" />
type="month" :clearable="false" placeholder="选择月"/>
</span> </span>
</title-box> </title-box>
<Tabs <Tabs v-model="eventType" :list="eventTypeList" @changeVal="eventTypeChange" />
v-model="eventType" <EventAndFollowUp :currentLevelData="currentLevelData" :date="sjhfDate" v-if="eventType === 1" />
:list="eventTypeList" <FollowUp :currentLevelData="currentLevelData" :date="sjhfDate" v-if="eventType === 2" />
@changeVal="eventTypeChange"
/>
<EventAndFollowUp
:currentLevelData="currentLevelData"
:date="sjhfDate"
v-if="eventType === 1"
/>
<FollowUp
:currentLevelData="currentLevelData"
:date="sjhfDate"
v-if="eventType === 2"
/>
</div> </div>
<!-- 网格 --> <!-- 网格 -->
<div v-if="currentLevel === 'grid'" class="m-box"> <div v-if="currentLevel === 'grid'" class="m-box">
<title-box text="社区网格数据更新情况排行"> <title-box text="社区网格数据更新情况排行">
<span class="date-span"> <span class="date-span">
<el-date-picker v-model="sqwggxDate" format="yyyy-MM" value-format="yyyy-MM" @change="changeDate" <el-date-picker v-model="sqwggxDate" format="yyyy-MM" value-format="yyyy-MM" @change="changeDate" type="month" :clearable="false" placeholder="选择月" />
type="month" :clearable="false" placeholder="选择月"/>
</span> </span>
</title-box> </title-box>
<RankingGridData <RankingGridData :currentLevelData="currentLevelData" :date="sqwggxDate" />
:currentLevelData="currentLevelData"
:date="sqwggxDate"
/>
</div> </div>
</div> </div>
</div> </div>
<cpt-loading v-show="false"/> <cpt-loading v-show="false" />
</div> </div>
</template> </template>
@ -193,8 +117,8 @@ import RankingGridData from "@/views/dataBoard/overview/components/RankingGridDa
import FollowUp from "@/views/dataBoard/overview/components/FollowUp.vue"; import FollowUp from "@/views/dataBoard/overview/components/FollowUp.vue";
import Tabs from "@/views/dataBoard/satisfactionEval/components/Tabs/index.vue"; import Tabs from "@/views/dataBoard/satisfactionEval/components/Tabs/index.vue";
import {requestPostBi} from "@/js/dai/request-bipass"; import { requestPostBi } from "@/js/dai/request-bipass";
import {requestPost} from "@/js/dai/request"; import { requestPost } from "@/js/dai/request";
export default { export default {
name: "renfang", name: "renfang",
@ -237,7 +161,7 @@ export default {
currentLevelData: { currentLevelData: {
orgId: this.$store.state.chooseArea.chooseName.orgId, orgId: this.$store.state.chooseArea.chooseName.orgId,
orgLevel: this.$store.state.chooseArea.chooseName.level, orgLevel: this.$store.state.chooseArea.chooseName.level,
meta: {title: "人房总览"}, meta: { title: "人房总览" },
}, },
breadList: [ breadList: [
{ {
@ -245,7 +169,7 @@ export default {
orgLevel: "", orgLevel: "",
id: "", id: "",
level: "", level: "",
meta: {title: "人房总览"}, meta: { title: "人房总览" },
}, },
], ],
peopleList: { peopleList: {
@ -310,10 +234,13 @@ export default {
}, },
}, },
mounted() {
this.getMapData();
},
methods: { methods: {
changeCustomerName() { changeCustomerName() {
this.customerName = this.customerName = localStorage.getItem("customerNameDataBoard") || "数据分析可视化平台";
localStorage.getItem("customerNameDataBoard") || "数据分析可视化平台";
}, },
changeType(e) { changeType(e) {
this.peopleType = e; this.peopleType = e;
@ -351,12 +278,12 @@ export default {
} }
}, },
clickBreadItem({item}) { clickBreadItem({ item }) {
this.toBread(item); this.toBread(item);
}, },
clickAgencyItem(item) { clickAgencyItem(item) {
this.$refs.map.clearMarkert() this.$refs.map.clearMarkert();
if (item.id) { if (item.id) {
this.customerName = item.name || item.meta.title; this.customerName = item.name || item.meta.title;
this.currentLevelData = { this.currentLevelData = {
@ -364,8 +291,7 @@ export default {
orgLevel: item.level, orgLevel: item.level,
}; };
} else { } else {
this.customerName = this.customerName = localStorage.getItem("customerNameDataBoard") || "数据分析可视化平台";
localStorage.getItem("customerNameDataBoard") || "数据分析可视化平台";
this.currentLevelData = { this.currentLevelData = {
...this.$store.state.chooseArea.chooseName, ...this.$store.state.chooseArea.chooseName,
orgLevel: this.$store.state.chooseArea.chooseName.level, orgLevel: this.$store.state.chooseArea.chooseName.level,
@ -374,7 +300,7 @@ export default {
this.toBread({ this.toBread({
orgId: item.id, orgId: item.id,
orgLevel: item.level, orgLevel: item.level,
meta: {title: item.name}, meta: { title: item.name },
}); });
}, },
goBackMap() { goBackMap() {
@ -382,13 +308,13 @@ export default {
this.clickAgencyItem(item); this.clickAgencyItem(item);
}, },
toBread(item) { toBread(item) {
const {orgId} = item; const { orgId } = item;
const {breadList} = this; const { breadList } = this;
let index = breadList.findIndex((val) => val.orgId === orgId); let index = breadList.findIndex((val) => val.orgId === orgId);
if (index >= 0) { if (index >= 0) {
this.breadList = breadList.slice(0, index + 1); this.breadList = breadList.slice(0, index + 1);
} else { } else {
breadList.push({...item, id: item.orgId, level: item.orgLevel}); breadList.push({ ...item, id: item.orgId, level: item.orgLevel });
this.breadList = breadList; this.breadList = breadList;
} }
this.getMapData(item.orgId, item.orgLevel); this.getMapData(item.orgId, item.orgLevel);
@ -402,48 +328,45 @@ export default {
this.$refs.map.setDotMarker(item, [parseFloat(item.longitude), parseFloat(item.latitude)]); this.$refs.map.setDotMarker(item, [parseFloat(item.longitude), parseFloat(item.latitude)]);
}, },
setNum(data) { setNum(data) {
console.log(this.orgData,data,'111') console.log(this.orgData, data, "111");
// data // data
let params = [] let params = [];
let org = this.orgData.children let org = this.orgData.children;
org.forEach(item => { org.forEach((item) => {
data.forEach(item2 => { data.forEach((item2) => {
if (item2.orgId === item.id && item.coordinates) { if (item2.orgId === item.id && item.coordinates) {
params.push({ params.push({
...item2, ...item2,
peopleType: this.peopleList[this.peopleType], peopleType: this.peopleList[this.peopleType],
latitude: item.latitude, latitude: item.latitude,
longitude: item.longitude longitude: item.longitude,
}) });
} }
}) });
}) });
if (params.length) { if (params.length) {
this.$refs.map.setNum(params) this.$refs.map.setNum(params);
} }
}, },
setPoint(data) { setPoint(data) {
if (data) { if (data) {
this.$refs.map.setPoint(data) this.$refs.map.setPoint(data);
} }
}, },
//获取地图上显示的组织数据 //获取地图上显示的组织数据
async getMapData( async getMapData(orgId = this.$store.state.chooseArea.chooseName.orgId, level = this.$store.state.chooseArea.chooseName.level) {
orgId = this.$store.state.chooseArea.chooseName.orgId,
level = this.$store.state.chooseArea.chooseName.level
) {
const url = "org_map"; 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.orgData = data;
this.orgId = this.orgData.id; this.orgId = this.orgData.id;
console.log(this.orgId) console.log(this.orgId);
this.orgLevel = this.orgData.level; this.orgLevel = this.orgData.level;
this.currentLevel = this.orgData.agencyLevel; this.currentLevel = this.orgData.agencyLevel;
this.currentLevelData = { this.currentLevelData = {
orgId: this.orgId, orgId: this.orgId,
orgLevel: this.currentLevel, orgLevel: this.currentLevel,
}; };
this.peopleType = this.currentLevel === 'grid'?'unit':'staffAgency'; this.peopleType = this.currentLevel === "grid" ? "unit" : "staffAgency";
}); });
}, },
@ -451,20 +374,20 @@ export default {
async getSubMapData() { async getSubMapData() {
const url = "sub_org_map"; const url = "sub_org_map";
const {data, code, msg} = await requestPostBi( const { data, code, msg } = await requestPostBi(
url, url,
{ {
queryParam: { queryParam: {
org_id: this.orgId, org_id: this.orgId,
},
}, },
{ },
// mockId: 61831860, {
} // mockId: 61831860,
}
); );
if (code === 0) { if (code === 0) {
const {orgData} = this; const { orgData } = this;
orgData.children = data.map((item) => { orgData.children = data.map((item) => {
return { return {
...item, ...item,
@ -475,7 +398,7 @@ export default {
coordinates: item.coordinates || "", coordinates: item.coordinates || "",
}; };
}); });
this.orgData = {...orgData}; this.orgData = { ...orgData };
} else { } else {
this.$message.error(msg); this.$message.error(msg);
} }
@ -489,7 +412,7 @@ export default {
level: this.orgLevel, level: this.orgLevel,
}; };
const {data, code, msg} = await requestPost(url, params); const { data, code, msg } = await requestPost(url, params);
if (code === 0) { if (code === 0) {
this.orgData = data; this.orgData = data;
this.orgId = this.orgId; this.orgId = this.orgId;

Write Preview
Loading…
Cancel
Save