diff --git a/src/assets/scss/dataBoardMain.scss b/src/assets/scss/dataBoardMain.scss index a7d3a4d66..473228d54 100644 --- a/src/assets/scss/dataBoardMain.scss +++ b/src/assets/scss/dataBoardMain.scss @@ -46,7 +46,7 @@ height: 101px; background-image: url(../images/home/top1.png); background-repeat: no-repeat; - background-position: top center; + background-position: top center; background-size: 100%; .back { @@ -66,8 +66,6 @@ left: 90px; right: 0; top: 0; - // margin: 0 auto; - // text-align: center; line-height: 70px; font-family: PingFang SC; font-weight: bold; @@ -76,6 +74,7 @@ // text-shadow: 0px 4px 3px rgba(18, 27, 70, 0.51); background: linear-gradient(0deg, #8FD4FF 0%, #FFFFFF 64.0380859375%); background-clip: text; + -webkit-background-clip: text; -webkit-text-fill-color: transparent; } diff --git a/src/components/GridTree/nodeWrap.vue b/src/components/GridTree/nodeWrap.vue index 0f046637d..90f4a3780 100644 --- a/src/components/GridTree/nodeWrap.vue +++ b/src/components/GridTree/nodeWrap.vue @@ -5,7 +5,12 @@
{{ spliceNameFun(nodeConfig.organizationName, 8) }}
-
{{ spliceNameFun(nodeConfig.name, 12) }}
+ +
{{ spliceNameFun(nodeConfig.name, 12) }}
+
+ {{ spliceNameFun(i, 12) }}{{ k === getItemNameArr(nodeConfig.name).length - 1 ? "" : "," }} + +
@@ -20,13 +25,23 @@
{{ spliceNameFun(item.organizationName, 8) }}
-
{{ spliceNameFun(item.name, 12) }}
+ +
{{ spliceNameFun(item.name, 12) }}
+
+ {{ spliceNameFun(i, 12) }}{{ k === getItemNameArr(item.name).length - 1 ? "" : "," }} + +
{{ spliceNameFun(item.organizationName, 8) }}
-
{{ spliceNameFun(item.name, 12) }}
+ +
{{ spliceNameFun(item.name, 12) }}
+
+ {{ spliceNameFun(i, 12) }}{{ k === getItemNameArr(item.name).length - 1 ? "" : "," }} + +
@@ -68,6 +83,10 @@ export default { return item; }, + getItemNameArr(str) { + return str.split(",").slice(0, 2); + }, + spliceNameFun(row, num) { if (row && row.length > num) { return row.substring(0, num) + "..."; @@ -113,6 +132,15 @@ export default { align-items: center; justify-content: space-around; } + +.name_more { + span { + &:hover { + font-weight: bold; + cursor: pointer; + } + } +} .node-box-after { .nodeBoxTop { font-size: 14px; diff --git a/src/components/JwTree/nodeWrap.vue b/src/components/JwTree/nodeWrap.vue index e6adc84e2..0f7eb7481 100644 --- a/src/components/JwTree/nodeWrap.vue +++ b/src/components/JwTree/nodeWrap.vue @@ -5,7 +5,11 @@
{{ spliceNameFun(nodeConfig.organizationName, 8) }}
-
{{ spliceNameFun(nodeConfig.name, 12) }}
+
{{ spliceNameFun(nodeConfig.name, 12) }}
+
+ {{ spliceNameFun(i, 12) }}{{ k === getItemNameArr(nodeConfig.name).length - 1 ? "" : "," }} + +
@@ -20,13 +24,23 @@
{{ spliceNameFun(item.organizationName, 8) }}
-
{{ spliceNameFun(item.name, 12) }}
+ +
{{ spliceNameFun(item.name, 12) }}
+
+ {{ spliceNameFun(i, 12) }}{{ k === getItemNameArr(item.name).length - 1 ? "" : "," }} + +
{{ spliceNameFun(item.organizationName, 8) }}
-
{{ spliceNameFun(item.name, 12) }}
+ +
{{ spliceNameFun(item.name, 12) }}
+
+ {{ spliceNameFun(i, 12) }}{{ k === getItemNameArr(item.name).length - 1 ? "" : "," }} + +
@@ -75,6 +89,10 @@ export default { return row; }, + getItemNameArr(str) { + return str.split(",").slice(0, 2); + }, + getOnerSixLevelFlag(item) { return this.sixLevelArr.includes(item.level); }, @@ -103,6 +121,15 @@ export default { align-items: center; justify-content: space-around; } + +.name_more { + span { + &:hover { + font-weight: bold; + cursor: pointer; + } + } +} .node-box-after { .nodeBoxTop { font-size: 14px; diff --git a/src/components/NameSplit/index.vue b/src/components/NameSplit/index.vue new file mode 100644 index 000000000..0acf7423b --- /dev/null +++ b/src/components/NameSplit/index.vue @@ -0,0 +1,56 @@ + + + diff --git a/src/components/PopHomeTip/index.vue b/src/components/PopHomeTip/index.vue new file mode 100644 index 000000000..60afce391 --- /dev/null +++ b/src/components/PopHomeTip/index.vue @@ -0,0 +1,57 @@ + + + diff --git a/src/components/PopTips/index.vue b/src/components/PopTips/index.vue new file mode 100644 index 000000000..c326e2ef4 --- /dev/null +++ b/src/components/PopTips/index.vue @@ -0,0 +1,41 @@ + + + diff --git a/src/components/Tree/nodeWrap.vue b/src/components/Tree/nodeWrap.vue index cf20c7ace..187e9e458 100644 --- a/src/components/Tree/nodeWrap.vue +++ b/src/components/Tree/nodeWrap.vue @@ -3,10 +3,8 @@
-
-
{{ spliceNameFun(nodeConfig.partyOrgName, 8) }}
-
{{ spliceNameFun(nodeConfig.principalName, 12) }}
+
@@ -21,19 +19,31 @@
{{ spliceNameFun(item.partyOrgName, 8) }}
-
{{ spliceNameFun(item.principalName, 12) }}
+ +
{{ spliceNameFun(item.principalName, 12) }}
+
+ {{ spliceNameFun(i, 12) }}{{ k === getItemNameArr(item.principalName).length - 1 ? "" : "," }} + +
{{ spliceNameFun(item.partyOrgName, 8) }}
-
{{ spliceNameFun(item.principalName, 12) }}
+
{{ spliceNameFun(item.principalName, 12) }}
+
+ {{ spliceNameFun(i, 12) }}{{ k === getItemNameArr(item.principalName).length - 1 ? "" : "," }} + +
- -
{{ spliceNameFun(item.principalName, 3) }}
+
{{ spliceNameFun(item.principalName, 12) }}
+
+ {{ spliceNameFun(i, 12) }}{{ k === getItemNameArr(item.principalName).length - 1 ? "" : "," }} + +
@@ -44,14 +54,6 @@ {{ getHomeTypesMap(item)[0] }}
-
{{ spliceNameFun(item.principalName, 3) }} @@ -96,6 +98,10 @@ export default { return item; }, + getItemNameArr(str) { + return str.split(",").slice(0, 2); + }, + spliceNameFun(row, num) { if (row && row.length > num) { return row.substring(0, num) + "..."; @@ -103,35 +109,6 @@ export default { return row; }, - // 家庭类别Map - getHomeTypesMap(item) { - const homeTypeMap = new Map([ - ["partyFlag", { name: "党员", icon: "dy" }], - ["subsistenceAllowanceFlag", { name: "低保人员", icon: "dbry" }], - ["ensureHouseFlag", { name: "保障房人员", icon: "bzfry" }], - ["unemployedFlag", { name: "失业人员", icon: "syry" }], - ["fertileWomanFlag", { name: "育龄妇女", icon: "ylfn" }], - ["veteranFlag", { name: "退役军人", icon: "tyjr" }], - ["unitedFrontFlag", { name: "统战人员", icon: "tzry" }], - ["petitionOfficerFlag", { name: "信访人员", icon: "xfry" }], - ["volunteerFlag", { name: "志愿者", icon: "zyz" }], - ["oldPeopleFlag", { name: "老年人", icon: "lnr" }], - ["emptyNesterFlag", { name: "空巢老人", icon: "kclr" }], - ["specialSupportFlag", { name: "特扶人员", icon: "tfry" }], - ["disabledFlag", { name: "失能人员", icon: "snry" }], - ["dementedFlag", { name: "失智人员", icon: "szry" }], - ["disabilityFlag", { name: "残疾人", icon: "cjr" }], - ["seriousIllnessFlag", { name: "大病人员", icon: "dbry" }], - ["chronicDiseaseFlag", { name: "慢性病人员", icon: "mxbry" }], - ["specialCrowdFlag", { name: "特殊人群", icon: "tsry" }], - ["tenantFlag", { name: "租户", icon: "zh" }], - ["floatingFlag", { name: "流动人员", icon: "ldry" }], - ["liveAloneFlag", { name: "独居老人", icon: "kclr" }], - ["publicWelfareFlag", { name: "公益岗人员", icon: "gyg" }], - ]); - return [homeTypeMap.get(item).name, homeTypeMap.get(item).icon]; - }, - getHomeTypes(id) { this.$http.get(`/actual/base/organizational/structure/getResidentCategoryByHouseId?houseId=${"1495582904602800129"}`).then((res) => { const { code, msg, data } = res.data; @@ -166,6 +143,15 @@ export default { align-items: center; justify-content: space-around; } + +.name_more { + span { + &:hover { + font-weight: bold; + cursor: pointer; + } + } +} .node-box-after { .nodeBoxTop { font-size: 14px; diff --git a/src/main.js b/src/main.js index a0549cc5d..afc7bd227 100644 --- a/src/main.js +++ b/src/main.js @@ -23,7 +23,7 @@ import { message } from "@/utils/message.js"; import http from "@/utils/request"; import cloneDeep from "lodash/cloneDeep"; // 引入工具类 -import './utils/jwTool' +import "./utils/jwTool"; // axios封装 import ajax from "@/js/ajax"; // service @@ -40,13 +40,18 @@ import NodeWrap from "@/components/Tree/nodeWrap.vue"; // import AddNode from "@/components/Tree/addNode.vue"; import NodeWrapJw from "@/components/JwTree/nodeWrap.vue"; import NodeWrapGrid from "@/components/GridTree/nodeWrap.vue"; +import PopTips from "@/components/PopTips/index.vue"; +import PopHomeTip from "@/components/PopHomeTip/index.vue"; +import NameSplit from "@/components/NameSplit/index.vue"; // import AddNodeJw from "@/components/JwTree/addNode.vue"; //按钮 Vue.component("nodeWrap", NodeWrap); // Vue.component("addNode", AddNode); Vue.component("nodeWrapJw", NodeWrapJw); Vue.component("nodeWrapGrid", NodeWrapGrid); -// Vue.component("addNodeJw", AddNodeJw); +Vue.component("popTips", PopTips); +Vue.component("popHomeTip", PopHomeTip); +Vue.component("nameSplit", NameSplit); // 兼容token传参登录 if (getQueryPara("token")) { @@ -105,7 +110,6 @@ window.SITE_CONFIG["storeState"] = cloneDeep(store.state); Vue.prototype.tableHeaderStyle = { background: "linear-gradient(0deg, #005EB3 0%, #0083F0 100%)", color: "#FFFFFF", padding: "6px 0px" }; - new Vue({ i18n, router,