diff --git a/src/assets/styles/index.scss b/src/assets/styles/index.scss index 689c073..28a0fac 100644 --- a/src/assets/styles/index.scss +++ b/src/assets/styles/index.scss @@ -254,4 +254,40 @@ aside { .dialog-main { min-height: auto; } + .info-container { + margin-top: 15px; + display: flex; + flex-wrap: wrap; + box-sizing: border-box; + & > div { + font-size: 14px; + color: #fff; + width: 20%; + height: 45px; + border-bottom: 1px solid #0059a2; + text-align: center; + line-height: 45px; + .grid-item-main { + justify-content: left; + } + } + & > div:nth-child(odd) { + border-right: 1px solid #0059a2; + border-left: 1px solid #0059a2; + } + .no-left { + border-left: 0 !important; + } + .border-top { + border-top: 1px solid #0059a2; + } + & > div:nth-child(even) { + border-right: 1px solid #0059a2; + + width: 30%; + background: #042854; + text-align: left; + padding: 0 10px; + } + } } diff --git a/src/assets/styles/isTable.scss b/src/assets/styles/isTable.scss index b7a7af8..3337040 100644 --- a/src/assets/styles/isTable.scss +++ b/src/assets/styles/isTable.scss @@ -144,9 +144,11 @@ .body-rows { display: flex; align-items: center; + cursor: pointer; & > div { text-align: center; } + .table-cell0 { width: 50px; } @@ -162,5 +164,8 @@ justify-content: center; } } + .body-rows:hover { + background: #0265cb !important; + } } } diff --git a/src/components/ColorCell/index.vue b/src/components/ColorCell/index.vue index e6a9c67..b5972d1 100644 --- a/src/components/ColorCell/index.vue +++ b/src/components/ColorCell/index.vue @@ -105,5 +105,8 @@ export default { border: 0.03rem solid white; } } + .house-color { + margin-left: 3px; + } } diff --git a/src/components/NavigationBar/logCentre.vue b/src/components/NavigationBar/logCentre.vue index 98996c1..fd25b49 100644 --- a/src/components/NavigationBar/logCentre.vue +++ b/src/components/NavigationBar/logCentre.vue @@ -195,6 +195,7 @@ class="body-rows" v-for="(item, index) in list" :key="'rows' + index" + @click="getInfo(item)" >
{{ index + 1 }}
{{ item.name }}
@@ -214,6 +215,56 @@ + + +
+
详情
+
+
社区名称
+
{{ infoData.shequ_name }}
+
姓名
+
{{ infoData.name }}
+
小区名称
+
{{ infoData.xiaoqu_name }}
+
身份证号
+
{{ infoData.credentialNo }}
+
网格名称
+
{{ infoData.parentname }}
+
手机号码
+
{{ infoData.phone }}
+
苑名称
+
{{ infoData.deptname }}
+
户口类型
+
{{ infoData.typename }}
+
楼栋名称
+
{{ infoData.buildingname }}
+
分色
+
+ {{ infoData.color }} +
+
住户名称
+
{{ infoData.housename }}
+
社保缴纳单位
+
{{ "/" }}
+
实际工作单位
+
{{ infoData.workunit || "/" }}
+
操作人
+
{{ infoData.operateUserName || "/" }}
+
操作时间
+
{{ infoData.operateTime || "/" }}
+
操作类型
+
{{ infoData.type | filterType }}
+
备注
+
{{ infoData.remark || "/" }}
+
+
+
@@ -223,7 +274,7 @@ import { handleTreeId } from "@/utils/findTreeId.js"; import { treeselect, getsszxBh } from "@/api/system/dept"; //部门 import { mapGetters } from "vuex"; import ColorCell from "@/components/ColorCell"; - +import { handleColor } from "@/utils/myFuntion.js"; export default { // dicts: ["b_color_type"], components: { ColorCell }, @@ -243,6 +294,8 @@ export default { }, data() { return { + openInfo: false, + infoData: {}, loading: true, show_shequ_xiaoqu: true, currentIndex: 0, @@ -321,6 +374,14 @@ export default { this.getDeptList(); }, methods: { + /** + * 详情 + */ + getInfo(item) { + this.infoData = handleColor([item])[0]; + this.openInfo = true; + }, + //时间选择器 changeyearTimer(e) { if (e) { @@ -482,6 +543,9 @@ export default { let arr = list.map((item) => { item.personInfo = JSON.parse(item.personInfo); item.personInfo.type = item.type; + item.personInfo.operateTime = item.operateTime; + item.personInfo.operateUserName = item.operateUserName; + // item.personInfo.personId = item.id; if (!item.personInfo.color) { item.personInfo.leftColor = "#7b75ff"; diff --git a/src/components/NavigationBar/peopleCentre.vue b/src/components/NavigationBar/peopleCentre.vue index a7cd406..b8c6810 100644 --- a/src/components/NavigationBar/peopleCentre.vue +++ b/src/components/NavigationBar/peopleCentre.vue @@ -183,6 +183,7 @@ class="body-rows" v-for="(item, index) in list" :key="'rows' + index" + @click="getInfo(item)" >
{{ index + 1 }}
{{ item.name }}
@@ -205,6 +206,57 @@ + + + +
+
详情
+
+
社区名称
+
{{ infoData.shequ_name }}
+
姓名
+
{{ infoData.name }}
+
小区名称
+
{{ infoData.xiaoqu_name }}
+
身份证号
+
{{ infoData.credentialNo }}
+
网格名称
+
{{ infoData.parentname }}
+
手机号码
+
{{ infoData.phone }}
+
苑名称
+
{{ infoData.deptname }}
+
户口类型
+
{{ infoData.typename }}
+
楼栋名称
+
{{ infoData.buildingname }}
+
分色
+
+ {{ infoData.color }} +
+
住户名称
+
{{ infoData.housename }}
+
社保缴纳单位
+
{{ "/" }}
+
实际工作单位
+
{{ infoData.workunit || "/" }}
+
数据更新人员
+
{{ infoData.updateBy || "/" }}
+
数据更新时间
+
{{ infoData.updateTime || "/" }}
+
未更新天数
+
{{ infoData.daycount || "/" }} 天
+
备注
+
{{ infoData.remark || "/" }}
+
+
+
@@ -216,6 +268,8 @@ import { mapGetters } from "vuex"; import ColorCell from "@/components/ColorCell"; import { exportSearch } from "@/api/home/index.js"; //预警 import { listHouse } from "@/api/taicangpop/house"; //户 +import { handleColor } from "@/utils/myFuntion.js"; + export default { dicts: ["b_color_type"], components: { ColorCell }, @@ -224,6 +278,8 @@ export default { }, data() { return { + openInfo: false, + infoData: {}, show_shequ_xiaoqu: true, show_net: false, loading: true, @@ -301,6 +357,13 @@ export default { this.getDeptList(); }, methods: { + /** + * 详情 + */ + getInfo(item) { + this.infoData = handleColor([item])[0]; + this.openInfo = true; + }, /**获取树部门 */ async getDeptList() { let result = await treeselect(); diff --git a/src/components/NavigationBar/recycleCentre.vue b/src/components/NavigationBar/recycleCentre.vue index c0495b7..46ac45c 100644 --- a/src/components/NavigationBar/recycleCentre.vue +++ b/src/components/NavigationBar/recycleCentre.vue @@ -189,6 +189,7 @@ class="body-rows" v-for="(item, index) in list" :key="'rows' + index" + @click="getInfo(item)" >
{{ index + 1 }}
{{ item.name }}
@@ -210,6 +211,58 @@ + + +
+
详情
+
+
社区名称
+
{{ infoData.shequ_name }}
+
姓名
+
{{ infoData.name }}
+
小区名称
+
{{ infoData.xiaoqu_name }}
+
身份证号
+
{{ infoData.credentialNo }}
+
网格名称
+
{{ infoData.parentname }}
+
手机号码
+
{{ infoData.phone }}
+
苑名称
+
{{ infoData.deptname }}
+
户口类型
+
{{ infoData.typename }}
+
楼栋名称
+
{{ infoData.buildingname }}
+
分色
+
+ {{ infoData.color }} +
+
住户名称
+
{{ infoData.housename }}
+
社保缴纳单位
+
{{ "/" }}
+
实际工作单位
+
{{ infoData.workunit || "/" }}
+
删除人
+
{{ infoData.deleteUserName || "/" }}
+
删除时间
+
{{ infoData.deleteTime || "/" }}
+
恢复操作
+
+ 恢复 +
+
备注
+
{{ infoData.remark || "/" }}
+
+
+
@@ -226,6 +279,7 @@ import { handleTreeId } from "@/utils/findTreeId.js"; import { treeselect, getsszxBh } from "@/api/system/dept"; //部门 import { mapGetters } from "vuex"; import ColorCell from "@/components/ColorCell"; +import { handleColor } from "@/utils/myFuntion.js"; export default { dicts: ["b_color_type"], components: { ColorCell }, @@ -239,6 +293,8 @@ export default { }, data() { return { + openInfo: false, + infoData: {}, loading: true, show_shequ_xiaoqu: true, currentIndex: 0, @@ -312,8 +368,13 @@ export default { }, methods: { /** - * 恢复 + * 详情 */ + getInfo(item) { + console.log(item); + this.infoData = handleColor([item])[0]; + this.openInfo = true; + }, /**恢复 */ addClcik(item) { // console.warn("恢复数据", item.deleteUserId, this.userId); @@ -491,8 +552,11 @@ export default { handleColor(list) { let arr = list.map((item) => { item.personInfo = JSON.parse(item.personInfo); + console.log(item); item.personInfo.deleteUserId = item.deleteUserId; item.personInfo.personId = item.id; + item.personInfo.deleteUserName = item.deleteUserName; + item.personInfo.deleteTime = item.deleteTime; if (!item.personInfo.color) { item.personInfo.leftColor = "#7b75ff"; item.personInfo.rightTopColor = "#7b75ff"; diff --git a/src/components/NavigationBar/warningCentre.vue b/src/components/NavigationBar/warningCentre.vue index 822ca98..e738751 100644 --- a/src/components/NavigationBar/warningCentre.vue +++ b/src/components/NavigationBar/warningCentre.vue @@ -188,6 +188,7 @@ class="body-rows" v-for="(item, index) in list" :key="'rows' + index" + @click="getInfo(item)" >
{{ index + 1 }}
{{ item.parentname }}
@@ -209,6 +210,56 @@ + + +
+
详情
+
+
社区名称
+
{{ infoData.shequ_name }}
+
姓名
+
{{ infoData.name }}
+
小区名称
+
{{ infoData.xiaoqu_name }}
+
身份证号
+
{{ infoData.credentialNo }}
+
网格名称
+
{{ infoData.parentname }}
+
手机号码
+
{{ infoData.phone }}
+
苑名称
+
{{ infoData.deptname }}
+
户口类型
+
{{ infoData.typename }}
+
楼栋名称
+
{{ infoData.buildingname }}
+
分色
+
+ {{ infoData.color }} +
+
住户名称
+
{{ infoData.housename }}
+
社保缴纳单位
+
{{ "/" }}
+
实际工作单位
+
{{ infoData.workunit || "/" }}
+
数据更新人员
+
{{ infoData.updateBy || "/" }}
+
数据更新时间
+
{{ infoData.updateTime || "/" }}
+
未更新天数
+
{{ infoData.daycount || "/" }} 天
+
备注
+
{{ infoData.remark || "/" }}
+
+
+
@@ -219,6 +270,7 @@ import { treeselect, getsszxBh } from "@/api/system/dept"; //部门 import { mapGetters } from "vuex"; import ColorCell from "@/components/ColorCell"; import { exportyujing } from "@/api/home/index.js"; //预警 +import { handleColor } from "@/utils/myFuntion.js"; export default { dicts: ["b_color_type"], components: { ColorCell }, @@ -227,6 +279,8 @@ export default { }, data() { return { + openInfo: false, + infoData: {}, loading: true, show_shequ_xiaoqu: true, currentIndex: 0, @@ -298,6 +352,13 @@ export default { this.getDeptList(); }, methods: { + /** + * 详情 + */ + getInfo(item) { + this.infoData = handleColor([item])[0]; + this.openInfo = true; + }, /**获取树部门 */ async getDeptList() { let result = await treeselect(); diff --git a/src/views/components/IndexModel/left.vue b/src/views/components/IndexModel/left.vue index 2ad52da..e577e8b 100644 --- a/src/views/components/IndexModel/left.vue +++ b/src/views/components/IndexModel/left.vue @@ -4,35 +4,51 @@
地名
-
{{ xiaoquIntroduce.intro.shequ.diming }}
+
+ {{ xiaoquIntroduce.intro.shequ.diming || "/" }} +
隶属
-
{{ xiaoquIntroduce.intro.shequ.lishu }}
+
+ {{ xiaoquIntroduce.intro.shequ.lishu || "/" }} +
行政代码
-
{{ xiaoquIntroduce.intro.shequ.xzdaima }}
+
+ {{ xiaoquIntroduce.intro.shequ.xzdaima || "/" }} +
身份证前6位
-
{{ xiaoquIntroduce.intro.shequ.id6 }}
+
+ {{ xiaoquIntroduce.intro.shequ.id6 || "/" }} +
长途区号
-
{{ xiaoquIntroduce.intro.shequ.ctquhao }}
+
+ {{ xiaoquIntroduce.intro.shequ.ctquhao || "/" }} +
邮政编码
-
{{ xiaoquIntroduce.intro.shequ.youzheng }}
+
+ {{ xiaoquIntroduce.intro.shequ.youzheng || "/" }} +
车牌号码
-
{{ xiaoquIntroduce.intro.shequ.chep }}
+
+ {{ xiaoquIntroduce.intro.shequ.chep || "/" }} +
行政级别
-
{{ xiaoquIntroduce.intro.shequ.jibie }}
+
+ {{ xiaoquIntroduce.intro.shequ.jibie || "/" }} +
@@ -68,20 +84,20 @@ export default { .community-table { margin-top: 20px; - border: 1px solid #1b4296; + border: 1px solid #1d5acc; border-radius: 6px; .table-row { display: flex; align-items: center; font-family: "Alibaba-PuHuiTi-Regular.otf"; - border-bottom: 1px solid #1b4296; + border-bottom: 1px solid #1d5acc; .row-lable { padding: 5px 0; width: 30%; text-align: center; font-size: 14px; color: #00ff9c; - border-right: 1px solid #1b4296; + border-right: 1px solid #1d5acc; overflow: hidden; } .row-value { diff --git a/src/views/components/foldpanelLeft/index.vue b/src/views/components/foldpanelLeft/index.vue index 97b358d..e25bccb 100644 --- a/src/views/components/foldpanelLeft/index.vue +++ b/src/views/components/foldpanelLeft/index.vue @@ -49,9 +49,9 @@ export default { filterImage() { let isTrue = this.isShare ? this.panel.leftPanel : this.panelSate; if (isTrue) { - return require("@/assets/images/ui/arrow_right.jpg"); - } else { return require("@/assets/images/ui/arrow_left.jpg"); + } else { + return require("@/assets/images/ui/arrow_right.jpg"); } }, }, diff --git a/src/views/components/xiaoqu/house.vue b/src/views/components/xiaoqu/house.vue index b3f24ff..f78f37b 100644 --- a/src/views/components/xiaoqu/house.vue +++ b/src/views/components/xiaoqu/house.vue @@ -856,41 +856,4 @@ div { margin-right: 12px; } } - -.info-container { - margin-top: 15px; - display: flex; - flex-wrap: wrap; - box-sizing: border-box; - & > div { - font-size: 14px; - color: #fff; - width: 20%; - height: 45px; - border-bottom: 1px solid #0059a2; - text-align: center; - line-height: 45px; - .grid-item-main { - justify-content: left; - } - } - & > div:nth-child(odd) { - border-right: 1px solid #0059a2; - border-left: 1px solid #0059a2; - } - .no-left { - border-left: 0 !important; - } - .border-top { - border-top: 1px solid #0059a2; - } - & > div:nth-child(even) { - border-right: 1px solid #0059a2; - - width: 30%; - background: #042854; - text-align: left; - padding: 0 10px; - } -}