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

Merge remote-tracking branch 'origin/jw_feature_dev' into jw_feature_dev

feature
战立标 2 years ago
parent
7820a425ac 15c8b800ed
commit
53c61ecef4
4 changed files with 37 additions and 16 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 19
      src/components/JwTree/nodeWrap.vue
  2. 18
      src/components/Tree/nodeWrap.vue
  3. 1
      src/views/dataBoard/organizational/dangTree/index.vue
  4. 15
      src/views/dataBoard/organizational/personalPage/index.vue

19
src/components/JwTree/nodeWrap.vue
View File

@ -5,7 +5,7 @@
<div class="node-box-after">
<div class="nodeBoxTop">
<div :title="getAllName(nodeConfig.organizationName)">{{ spliceNameFun(nodeConfig.organizationName, 8) }}</div>
<div @click="gotoPersonnel" :title="getAllName(nodeConfig.name)">{{ spliceNameFun(nodeConfig.name, 12) }}</div>
<div @click="gotoPersonnel(nodeConfig.resiId)" :title="getAllName(nodeConfig.name)">{{ spliceNameFun(nodeConfig.name, 12) }}</div>
</div>
</div>
</div>
@ -20,17 +20,17 @@
<div v-if="getOnerSixLevelFlag(item)">
<div class="wgdzb">
<div :title="getAllName(item.organizationName)">{{ spliceNameFun(item.organizationName, 8) }}</div>
<div @click="gotoPersonnel" :title="getAllName(item.name)">{{ spliceNameFun(item.name, 12) }}</div>
<div class="gotoDesc" @click="gotoPersonnel(item.resiId)" :title="getAllName(item.name)">{{ spliceNameFun(item.name, 12) }}</div>
</div>
</div>
<div v-if="item.level === 'building_chief'">
<div class="lydxz">
<div :title="getAllName(item.organizationName)">{{ spliceNameFun(item.organizationName, 8) }}</div>
<div @click="gotoPersonnel" :title="getAllName(item.name)">{{ spliceNameFun(item.name, 12) }}</div>
<div class="gotoDesc" @click="gotoPersonnel(item.resiId)" :title="getAllName(item.name)">{{ spliceNameFun(item.name, 12) }}</div>
</div>
</div>
<div v-if="item.level === 'unit_chief' || item.level === 'public_welfare_post'">
<div @click="gotoPersonnel" class="dyzxh" :title="item.name">
<div @click="gotoPersonnel(item.resiId)" class="dyzxh gotoDesc" :title="item.name">
{{ spliceNameFun(item.name, 3) }}
</div>
</div>
@ -79,8 +79,15 @@ export default {
return this.sixLevelArr.includes(item.level);
},
gotoPersonnel() {
this.$router.push("/organizational/orgPersonnel");
gotoPersonnel(id) {
if (id) {
this.$router.push("/organizational/orgPersonnel");
} else {
this.$message({
message: "无法跳转",
type: "error",
});
}
},
},
};

18
src/components/Tree/nodeWrap.vue
View File

@ -6,7 +6,7 @@
<!-- {{ spliceNameFun(nodeConfig, 18) }} -->
<div class="nodeBoxTop">
<div :title="getAllName(nodeConfig.partyOrgName)">{{ spliceNameFun(nodeConfig.partyOrgName, 8) }}</div>
<div @click="gotoPersonnel" :title="getAllName(nodeConfig.principalName)">{{ spliceNameFun(nodeConfig.principalName, 12) }}</div>
<div @click="gotoPersonnel(nodeConfig.resiId)" :title="getAllName(nodeConfig.principalName)">{{ spliceNameFun(nodeConfig.principalName, 12) }}</div>
</div>
</div>
</div>
@ -21,19 +21,19 @@
<div v-if="item.laneLevel >= 2 && item.laneLevel <= 7 && item.partyOrgLevel < 8">
<div class="wgdzb">
<div :title="getAllName(item.partyOrgName)">{{ spliceNameFun(item.partyOrgName, 8) }}</div>
<div class="gotoDesc" @click="gotoPersonnel" :title="getAllName(item.principalName)">{{ spliceNameFun(item.principalName, 12) }}</div>
<div class="gotoDesc" @click="gotoPersonnel(item.resiId)" :title="getAllName(item.principalName)">{{ spliceNameFun(item.principalName, 12) }}</div>
</div>
</div>
<div v-if="item.partyOrgLevel === 8">
<div class="lydxz">
<div :title="getAllName(item.partyOrgName)">{{ spliceNameFun(item.partyOrgName, 8) }}</div>
<div class="gotoDesc" @click="gotoPersonnel" :title="getAllName(item.principalName)">{{ spliceNameFun(item.principalName, 12) }}</div>
<div class="gotoDesc" @click="gotoPersonnel(item.resiId)" :title="getAllName(item.principalName)">{{ spliceNameFun(item.principalName, 12) }}</div>
</div>
</div>
<div v-if="item.partyOrgLevel === 9">
<div class="dyzxh">
<!-- <div :title="getAllName(item.partyOrgName)">{{ spliceNameFun(item.partyOrgName, 3) }}</div> -->
<div class="gotoDesc" @click="gotoPersonnel" :title="getAllName(item.principalName)">{{ spliceNameFun(item.principalName, 3) }}</div>
<div class="gotoDesc" @click="gotoPersonnel(item.resiId)" :title="getAllName(item.principalName)">{{ spliceNameFun(item.principalName, 3) }}</div>
</div>
</div>
<div class="lxjtWrap" v-if="item.partyOrgLevel === 10">
@ -53,7 +53,7 @@
<span>空巢老人</span>
</div> -->
</div>
<div @click="gotoPersonnel" @mouseover="getHomeTypes(item.id)" slot="reference" class="lxjt gotoDesc" :title="item.principalName">
<div @click="gotoPersonnel(item.resiId)" @mouseover="getHomeTypes(item.id)" slot="reference" class="lxjt gotoDesc" :title="item.principalName">
{{ spliceNameFun(item.principalName, 3) }}
<img src="@/assets/images/home/cjr.png" alt="" />
</div>
@ -145,8 +145,12 @@ export default {
});
},
gotoPersonnel() {
this.$router.push("/organizational/orgPersonnel");
gotoPersonnel(id) {
if (id) {
this.$router.push({ path: "/organizational/orgPersonnel", query: { user_id: id } });
} else {
this.$message.error("无法跳转！");
}
},
},
};

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

@ -46,7 +46,6 @@ export default {
if (orgId) {
this.getTreeData();
}
this.getTextMap();
},
methods: {
getLevelArrNum(myArray) {

15
src/views/dataBoard/organizational/personalPage/index.vue
View File

@ -1,7 +1,7 @@
<template>
<div class="personalWrap">
<div class="bread">
<bread-crumb />
<bread-crumb :list="list" />
</div>
<div class="wrap-content">
<personnel-person />
@ -19,7 +19,18 @@ export default {
PersonnelPerson,
},
data() {
return {};
return {
list: [
{
path: "/organizational/dangTree",
name: "党组织架构",
},
{
path: "",
name: "人员信息",
},
],
};
},
};
</script>

Write Preview
Loading…
Cancel
Save