- 新增分类
+ 新增分类
+ 取消
+ 提交
+
diff --git a/src/views/modules/workSys/resiCate.vue b/src/views/modules/workSys/resiCate.vue
index 4dfde7e2..0d150e89 100644
--- a/src/views/modules/workSys/resiCate.vue
+++ b/src/views/modules/workSys/resiCate.vue
@@ -36,7 +36,7 @@
+
+
+
+
+
+
+
diff --git a/src/views/modules/shequ/cpts/scroll-notice.vue b/src/views/modules/shequ/cpts/scroll-notice.vue
new file mode 100644
index 00000000..6945dacc
--- /dev/null
+++ b/src/views/modules/shequ/cpts/scroll-notice.vue
@@ -0,0 +1,125 @@
+
+
+
+
+
+
+
+
diff --git a/src/views/modules/shequ/index.vue b/src/views/modules/shequ/index.vue
index 7469479e..49c92e5f 100644
--- a/src/views/modules/shequ/index.vue
+++ b/src/views/modules/shequ/index.vue
@@ -1,422 +1,445 @@
+
+
+
-
-
-
-
- 
-
-
-
-
-
-
-
- {{{jumin:'居民', fangwu: '房屋', xuqiu:'需求'}[searchData.type]}}
-
-
- 居民
- 房屋
- 需求
-
-
-
-
-
-
- 
-
+
-
+
+
+
+
-
+
-
搜索
-
-
-
-
+
-
+
-
- {{ handleFilterSpan(scope.row, item) }}
-
-
-
-
- 查看
-
-
-
-
-
-
-
+ {{
+ { jumin: "居民", fangwu: "房屋", xuqiu: "需求" }[
+ searchData.type
+ ]
+ }}
+
+
+ 居民
+ 房屋
+ 需求
+
+
+
+
+
+
+
-
+
+
+ 搜索
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- 查看
-
-
-
-
-
-
+
-
+
-
+
+
+ {{ handleFilterSpan(scope.row, item) }}
+
+
+
+
+ 查看
+
+
+
+
+
+
+
+
-
-
-
-
- {{ handleFilterSpan(scope.row, item) }}
-
-
-
-
-
- 查看
-
-
-
-
-
-
+
-
+
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 查看
+
+
+
+
+
+
+
-
-
+
+
+
+
-
-
- 常用功能
-
-
-
-
+
+ {{ handleFilterSpan(scope.row, item) }}
+
+
-
-
-
- {{ item.menuName }}
-
-
-
- 
+
+
+ 查看
+
+
+
+
+
+
+
- 添加应用
-
-
-
- 人员预警
-
-
-
-
-
-
+
-
-
-
-
-
-
-
-
-
-
-
-
- 查看
-
-
-
-
-
+
常用功能
+
+
-
+
+
+
+
+
+ {{ item.menuName }}
+
+
+
+
+
+ 添加应用
+
-
-
-
常用功能
-
-
-
-
+
import { requestPost } from "@/js/dai/request";
-import panChart from "@/views/modules/shequ/cpts/pan-chart";
+import barChart from "@/views/modules/shequ/cpts/bar-chart";
+import warningList from "@/views/modules/warning/index";
import { mapGetters } from "vuex";
import nextTick from "dai-js/tools/nextTick";
import peopleMore from "@/views/modules/shequ/cpts/people-more";
import fangwuInfo from "@/views/modules/shequ/cpts/fangwu-info";
import xuqiuInfo from "@/views/modules/shequ/cpts/xuqiu-info";
+import scrollNotice from "@/views/modules/shequ/cpts/scroll-notice";
export default {
- components: { panChart, peopleMore, fangwuInfo, xuqiuInfo },
+ components: {
+ barChart,
+ peopleMore,
+ fangwuInfo,
+ xuqiuInfo,
+ warningList,
+ scrollNotice,
+ },
data() {
return {
@@ -673,6 +759,19 @@ export default {
// 显示人员详情
showedFangwuInfo: false,
showedXuqiuInfo: false,
+
+ noticeList: [
+ // {
+ // configId: "20211210153859_f070ac2dd01129da5d9a9f2329fbd9ea1",
+ // noticeContent: "市北区-抚顺第二网格中南国际2号楼低保人员超出预警!",
+ // },
+ ],
+
+ currentCategoryCode: "",
+
+ currentPage: "chaxun", //查询 预警
+ currentNoticeBuildingId: "",
+ currentNoticeConfigId: "",
};
},
computed: {
@@ -729,6 +828,13 @@ export default {
);
},
methods: {
+ changeCategoryCode({ code }) {
+ this.currentCategoryCode = code || "";
+
+ this.warningTb.pageNo = 1;
+ this.getWarningTb();
+ },
+
computedWidth(label) {
const wd = 20 * label.length;
return wd > 80 ? wd : 80;
@@ -851,6 +957,7 @@ export default {
this.getWarningList();
this.getWarningTb();
this.getSearchJuminHeader();
+ this.getNoticeList();
},
selectFuncItem(id) {
@@ -862,6 +969,30 @@ export default {
}
},
+ toNoticeInfo(item) {
+ console.log(item);
+ this.currentPage = "yujing";
+ if (item) {
+ this.currentNoticeBuildingId = item.buildingId;
+ this.currentNoticeConfigId = item.configId;
+ } else {
+ this.currentNoticeBuildingId = "";
+ this.currentNoticeConfigId = "";
+ }
+ },
+
+ async getNoticeList() {
+ const url = "/epmetuser/statsresiwarn/queryuserwarnnotice";
+ const { data, code, msg } = await requestPost(url, {
+ agencyId: this.$store.state.user.agencyId,
+ });
+ if (code === 0) {
+ this.noticeList = data || [];
+ } else {
+ // return this.$message.error("网络错误");
+ }
+ },
+
async getSearchJuminHeader() {
const url = "/oper/customize/icform/tableheaders";
const { data, code, msg } = await requestPost(url, {
@@ -952,6 +1083,7 @@ export default {
const { data, code, msg } = await requestPost(url, {
pageSize,
pageNo,
+ categoryCode: this.currentCategoryCode,
});
if (code === 0) {
console.log("列表请求成功！！！！！！！！！！！！！！");
@@ -978,6 +1110,7 @@ export default {
this.warningChart.total = data.total;
this.warningChart.list = data.list.map((item) => {
return {
+ code: item.typeCode,
name: item.typeName,
count: item.typeCount,
const: "const",
diff --git a/src/views/modules/warning/components/screen-loading/index.vue b/src/views/modules/warning/components/screen-loading/index.vue
new file mode 100644
index 00000000..cc8bda6f
--- /dev/null
+++ b/src/views/modules/warning/components/screen-loading/index.vue
@@ -0,0 +1,68 @@
+
+ {{importBtnTitle}}
{{ exportBtnTitle }}
- 下载模板
+ @click="handleExportModule('room')">下载模板 -->
+
-
+
-
+
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 查看
+
+
+
+
-
+
+
+
{{ item.menuName }}
-
+ 所有功能
-
+
+
+
-
-
- {{ menu.name }}
+ 常用功能
-
+
@@ -428,19 +451,73 @@
- {{ item.name }}
+{{ item.menuName }}
- 返回
- 确认
+
+
+
+ 所有功能
+
+
+
+ {{ menu.name }}
+
+
+
+
+
+
+
+
+
+
+
+ {{ item.name }}
+
+ 返回
+ 确认
+
+
+
+ 社区查询
+ >
+ 人员预警
+
+
+
+
+
+
+
+
+
+
diff --git a/src/views/modules/warning/components/screen-table/index.vue b/src/views/modules/warning/components/screen-table/index.vue
new file mode 100644
index 00000000..6f0da3ed
--- /dev/null
+++ b/src/views/modules/warning/components/screen-table/index.vue
@@ -0,0 +1,392 @@
+
+
+
+
+
+
+
+
+
+
diff --git a/src/views/modules/warning/index.vue b/src/views/modules/warning/index.vue
new file mode 100644
index 00000000..00121565
--- /dev/null
+++ b/src/views/modules/warning/index.vue
@@ -0,0 +1,200 @@
+
+
+
+
+
+
+
+
+
+ {{ item.title }}
+
+
+ 加载中
+
+
+
+
+
+
+
+ {{ rIndex != 0 ? "、" : "" }}
+ {{
+ resi.residentName
+ }}
+
+
+ {{ item }}
+
+ 更多>
+
+
+ {{ rIndex != 0 ? "、" : "" }}
+ {{
+ resi.residentName
+ }}
+
+
+
+
+ 
+
+
+
+
+
+
+
+
+
From ce5302d206d325163ee42e603515af0d8866514b Mon Sep 17 00:00:00 2001
From: 13176889840 <13176889840@163.com>
Date: Mon, 14 Mar 2022 10:33:08 +0800
Subject: [PATCH 3/3] dd
---
src/views/modules/base/resi.vue | 3 ++-
src/views/modules/communityParty/elegant/index.vue | 4 ++--
2 files changed, 4 insertions(+), 3 deletions(-)
diff --git a/src/views/modules/base/resi.vue b/src/views/modules/base/resi.vue
index 76ac5305..50c5f181 100644
--- a/src/views/modules/base/resi.vue
+++ b/src/views/modules/base/resi.vue
@@ -492,6 +492,7 @@ export default {
await this.$http
.post(url, params)
.then(res => {
+ console.log('res----dddd', res)
// this.download(res.data, title + '.xls')
if (res.headers["content-disposition"]) {
let fileName = window.decodeURI(res.headers["content-disposition"].split(";")[1].split("=")[1])
@@ -1015,7 +1016,7 @@ export default {
if (res.code !== 0) {
return this.$message.error(res.msg)
} else {
- // console.log('获取查询详情成功', res.data)
+ console.log('获取查询详情成功--sss', res)
this.searchList = res.data
res.data.forEach((item) => {
if (item.optionSourceType === 'remote') {
diff --git a/src/views/modules/communityParty/elegant/index.vue b/src/views/modules/communityParty/elegant/index.vue
index c5a9d56b..521aac20 100644
--- a/src/views/modules/communityParty/elegant/index.vue
+++ b/src/views/modules/communityParty/elegant/index.vue
@@ -63,10 +63,10 @@
+
+
+
+
+ ![]()
+
+
+ {{ item.label }}
+ {{ item.count }}
+
+
+
+
+
+ {{ item.level1 }}-{{ item.level2 }}人
+
+ 
+
+ {{ item.levelCount1 }}栋
+
+
+
+ {{ item.level2 }}人以上
+
+
+
+ {{ item.levelCount2 }}栋
+
+
+
+
+
+
+
+