@@ -108,6 +108,7 @@ export default {
data() {
return {
item: {},
+ logList: [],
loading: false,
loading1: false,
activities: [],
@@ -147,6 +148,7 @@ export default {
const { code, data, msg } = res.data;
if (code === 0) {
this.item = data;
+ this.logList = data.logList;
this.loading = false;
} else {
this.loading = false;
diff --git a/src/views/dataBoard/satisfactionEval/potentialPeople/index.vue b/src/views/dataBoard/satisfactionEval/potentialPeople/index.vue
index 996e2437b..835aae8d9 100644
--- a/src/views/dataBoard/satisfactionEval/potentialPeople/index.vue
+++ b/src/views/dataBoard/satisfactionEval/potentialPeople/index.vue
@@ -1,10 +1,10 @@
-
+
-
+
@@ -13,10 +13,15 @@
-
-
+
+
-
+
@@ -24,36 +29,46 @@
-
+
- {{ row.eventCount }}
+
+ {{ row.eventCount }}
+
- {{ row.demandCount }}
+
+ {{ row.demandCount }}
+
- {{ row.serviceCount }}
+
+ {{ row.serviceCount }}
+
{{ row.countAll }}
+ >{{ row.countAll }}
-
+
@@ -64,9 +79,10 @@ import Title from "@/views/dataBoard/satisfactionEval/components/Title";
export default {
name: "dissatisfied",
- components: { Breadcrumb, Pagination, Title },
+ components: {Breadcrumb, Pagination, Title},
data() {
return {
+ loading: true,
queryParams: {
month: "",
org: "",
@@ -90,11 +106,18 @@ export default {
},
],
monthOptions: new Array(12).fill(0).map((_, index) => {
- return { label: index - 0 + 1 + "月", value: index - 0 + 1 };
+ return {label: index - 0 + 1 + "月", value: index - 0 + 1};
}),
list: [],
};
},
+ watch: {
+ "$route.query.countType" () {
+ if(this.$route.path === '/dataBoard/satisfactionEval/potentialPeople') {
+ this.getList();
+ }
+ }
+ },
mounted() {
this.getOrg();
},
@@ -109,9 +132,9 @@ export default {
level: this.$store.state.chooseArea.chooseName.level,
};
- this.$http.post(`/gov/org/agency/maporg`, params).then(async ({ data: { data } }) => {
+ this.$http.post(`/gov/org/agency/maporg`, params).then(async ({data: {data}}) => {
this.queryParams.agencyId = this.$store.state.chooseArea.chooseName.orgId;
- let parent = { value: data.id, label: data.name };
+ let parent = {value: data.id, label: data.name};
this.orgOptions = [
parent,
...data.children.map((item) => {
@@ -125,12 +148,19 @@ export default {
});
},
getList() {
- this.$http.get("/governance/satisfactionDetailList/getPotentialDissatisfiedCountDetail?" + this.$paramsFormat(this.queryParams)).then(({ data: { data } }) => {
+ this.loading = true
+ let params = {
+ ...this.queryParams,
+ countType: this.$route.query.countType
+ }
+ this.$http.get("/governance/satisfactionDetailList/getPotentialDissatisfiedCountDetail?" + this.$paramsFormat(params)).then(({data: {data}}) => {
this.list = data.list;
this.total = data.total;
+ this.loading = false
});
},
- handleView(id) {},
+ handleView(id) {
+ },
},
};
diff --git a/src/views/dataBoard/satisfactionEval/potentialPeople/sjwjj.vue b/src/views/dataBoard/satisfactionEval/potentialPeople/sjwjj.vue
index c7d744611..58393b690 100644
--- a/src/views/dataBoard/satisfactionEval/potentialPeople/sjwjj.vue
+++ b/src/views/dataBoard/satisfactionEval/potentialPeople/sjwjj.vue
@@ -2,7 +2,12 @@
-
+
@@ -70,6 +75,7 @@ export default {
list: [],
showDialog: false,
rowId: "",
+ loading: true
};
},
activated() {
@@ -83,9 +89,11 @@ export default {
this.getList();
},
getList() {
+ this.loading = true
this.$http.get("/governance/satisfactionDetailList/getEventUnSolvedByUserId?" + this.$paramsFormat(this.queryParams)).then(({ data: { data } }) => {
this.list = data.list;
this.total = data.total;
+ this.loading = false
});
},
handleView({ id }) {
diff --git a/src/views/dataBoard/satisfactionEval/potentialPeople/xqwmz.vue b/src/views/dataBoard/satisfactionEval/potentialPeople/xqwmz.vue
index 74f306f9b..f66662fca 100644
--- a/src/views/dataBoard/satisfactionEval/potentialPeople/xqwmz.vue
+++ b/src/views/dataBoard/satisfactionEval/potentialPeople/xqwmz.vue
@@ -3,7 +3,12 @@
-
+
+ label="需求人电话">
+
+ {{ $sensitive(scope.row.demandUserMobile, 3, 7) }}
+
+
{
this.list = data.list;
this.total = data.total;
+ this.loading = false
})
},
- handleView({name,id}) {
+ handleView({name, id}) {
this.showDialog = true
this.rowId = id
},
diff --git a/src/views/dataBoard/satisfactionEval/potentialPeople/yxwxfw.vue b/src/views/dataBoard/satisfactionEval/potentialPeople/yxwxfw.vue
index 7c6d2607f..f91d7777a 100644
--- a/src/views/dataBoard/satisfactionEval/potentialPeople/yxwxfw.vue
+++ b/src/views/dataBoard/satisfactionEval/potentialPeople/yxwxfw.vue
@@ -1,11 +1,16 @@
-
+
-
-
+
+
-
+
@@ -13,13 +18,13 @@
-
+
-
+
-
-
-
+
+
+
查看
@@ -28,8 +33,9 @@
-
-
+
+
@@ -41,7 +47,7 @@ import yxwxfw from "@/views/dataBoard/satisfactionEval/potentialPeople/details/y
export default {
name: "dissatisfied",
- components: { Breadcrumb, Pagination, Title, yxwxfw },
+ components: {Breadcrumb, Pagination, Title, yxwxfw},
data() {
return {
queryParams: {
@@ -67,6 +73,7 @@ export default {
list: [],
showDialog: false,
rowId: "",
+ loading: true
};
},
activated() {
@@ -80,13 +87,15 @@ export default {
this.getList();
},
getList() {
- this.$http.get("/governance/satisfactionDetailList/getServiceNotEnjoyedByUserId?" + this.$paramsFormat(this.queryParams)).then(({ data: { data } }) => {
+ this.loading = true
+ this.$http.get("/governance/satisfactionDetailList/getServiceNotEnjoyedByUserId?" + this.$paramsFormat(this.queryParams)).then(({data: {data}}) => {
this.list = data.list;
this.total = data.total;
+ this.loading = false
});
},
- handleView({ id }) {
+ handleView({id}) {
this.showDialog = true;
this.rowId = id;
},
From c8592ff90d318f64336d29044735feef616a44ea Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=88=98=E7=AB=8B=E6=A0=87?= <2658037827@qq.com>
Date: Sat, 7 Oct 2023 10:39:59 +0800
Subject: [PATCH 04/11] =?UTF-8?q?=E9=9A=90=E8=97=8F=E4=B8=8B=E6=8B=89?=
=?UTF-8?q?=E7=BD=91=E6=A0=BC=E6=9E=9A=E4=B8=BE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
src/views/dataBoardMain/main-navbar.vue | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/views/dataBoardMain/main-navbar.vue b/src/views/dataBoardMain/main-navbar.vue
index ad7f321a4..234e0d13b 100644
--- a/src/views/dataBoardMain/main-navbar.vue
+++ b/src/views/dataBoardMain/main-navbar.vue
@@ -6,7 +6,7 @@
{{ customerName }}数据智能分析平台
-
+
+
@@ -103,7 +103,7 @@ export default {
key: 2,
},
{
- name: "统治人群",
+ name: "综治人群",
ifActive: false,
key: 3,
},
diff --git a/vue.config.js b/vue.config.js
index 6f69d351d..df9755280 100644
--- a/vue.config.js
+++ b/vue.config.js
@@ -44,7 +44,7 @@ module.exports = {
target: "http://bipaas.elinkservice.cn", // 我们要代理的真实接口地址
},
"/api": {
- target: "http://219.146.91.110:30801", // 后端接口地址
+ target: "http://localhost:8080", // 后端接口地址
changeOrigin: true,
pathRewrite: {
"^api": "",
From 881f47d7c7adde6be1c458d067e92eed4bd6eb6c Mon Sep 17 00:00:00 2001
From: SongZhen <>
Date: Sat, 7 Oct 2023 10:28:46 +0800
Subject: [PATCH 06/11] =?UTF-8?q?=E5=88=A0=E9=99=A4json=E6=8F=90=E4=BA=A4?=
=?UTF-8?q?=E6=96=87=E4=BB=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
...SON校验格式化工具(Be JSON).html | 4148 -----
.../1.js | 41 -
.../banner.gif | Bin 245100 -> 0 bytes
.../bejson-q.png | Bin 5207 -> 0 bytes
.../bejson_index20200722.min.js | 12678 ----------------
.../common.css | 150 -
.../csharp-q.png | Bin 6595 -> 0 bytes
.../global.min.css | 12 -
.../global.min.js | 1 -
.../hm.js | 67 -
.../indexCodeMirror.min.css | 1 -
.../indexCodeMirror.min.js | 7 -
.../java-q.png | Bin 8939 -> 0 bytes
.../jsonlint.js | 544 -
.../logo.png | Bin 11186 -> 0 bytes
.../lz-string-1.4.4.js | 501 -
.../lzma.js | 131 -
.../php-q.png | Bin 8181 -> 0 bytes
.../suspend.gif | Bin 379084 -> 0 bytes
.../swiper.min.css | 13 -
.../swiper.min.js | 14 -
.../upyun_300.png | Bin 11186 -> 0 bytes
vue.config.js | 3 +-
23 files changed, 2 insertions(+), 18309 deletions(-)
delete mode 100644 src/assets/images/home/在线JSON校验格式化工具(Be JSON).html
delete mode 100644 src/assets/images/home/在线JSON校验格式化工具(Be JSON)_files/1.js
delete mode 100644 src/assets/images/home/在线JSON校验格式化工具(Be JSON)_files/banner.gif
delete mode 100644 src/assets/images/home/在线JSON校验格式化工具(Be JSON)_files/bejson-q.png
delete mode 100644 src/assets/images/home/在线JSON校验格式化工具(Be JSON)_files/bejson_index20200722.min.js
delete mode 100644 src/assets/images/home/在线JSON校验格式化工具(Be JSON)_files/common.css
delete mode 100644 src/assets/images/home/在线JSON校验格式化工具(Be JSON)_files/csharp-q.png
delete mode 100644 src/assets/images/home/在线JSON校验格式化工具(Be JSON)_files/global.min.css
delete mode 100644 src/assets/images/home/在线JSON校验格式化工具(Be JSON)_files/global.min.js
delete mode 100644 src/assets/images/home/在线JSON校验格式化工具(Be JSON)_files/hm.js
delete mode 100644 src/assets/images/home/在线JSON校验格式化工具(Be JSON)_files/indexCodeMirror.min.css
delete mode 100644 src/assets/images/home/在线JSON校验格式化工具(Be JSON)_files/indexCodeMirror.min.js
delete mode 100644 src/assets/images/home/在线JSON校验格式化工具(Be JSON)_files/java-q.png
delete mode 100644 src/assets/images/home/在线JSON校验格式化工具(Be JSON)_files/jsonlint.js
delete mode 100644 src/assets/images/home/在线JSON校验格式化工具(Be JSON)_files/logo.png
delete mode 100644 src/assets/images/home/在线JSON校验格式化工具(Be JSON)_files/lz-string-1.4.4.js
delete mode 100644 src/assets/images/home/在线JSON校验格式化工具(Be JSON)_files/lzma.js
delete mode 100644 src/assets/images/home/在线JSON校验格式化工具(Be JSON)_files/php-q.png
delete mode 100644 src/assets/images/home/在线JSON校验格式化工具(Be JSON)_files/suspend.gif
delete mode 100644 src/assets/images/home/在线JSON校验格式化工具(Be JSON)_files/swiper.min.css
delete mode 100644 src/assets/images/home/在线JSON校验格式化工具(Be JSON)_files/swiper.min.js
delete mode 100644 src/assets/images/home/在线JSON校验格式化工具(Be JSON)_files/upyun_300.png
diff --git a/src/assets/images/home/在线JSON校验格式化工具(Be JSON).html b/src/assets/images/home/在线JSON校验格式化工具(Be JSON).html
deleted file mode 100644
index 27860e560..000000000
--- a/src/assets/images/home/在线JSON校验格式化工具(Be JSON).html
+++ /dev/null
@@ -1,4148 +0,0 @@
-
-
-
-
-
-在线JSON校验格式化工具(Be JSON)
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
格式化校验
-
-
-
-
-
-
_files/banner.gif)
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
Bejson的日常
Bejson的日常
BeJSON一群
群号:238329389 复制群号
Bejson的日常
BeJSON二群
群号:274298671 复制群号
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
_files/suspend.gif)
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/src/assets/images/home/在线JSON校验格式化工具(Be JSON)_files/1.js b/src/assets/images/home/在线JSON校验格式化工具(Be JSON)_files/1.js
deleted file mode 100644
index 590abf9c5..000000000
--- a/src/assets/images/home/在线JSON校验格式化工具(Be JSON)_files/1.js
+++ /dev/null
@@ -1,41 +0,0 @@
-function jiazai_dag_all(blockid){
- switch (blockid){
- case 'INDEX_PC_HENGFU':{
- document.writeln("