内部备注：
{{ item.internalRemark }}
@@ -433,12 +391,10 @@
@@ -490,7 +440,7 @@ import eventInfo from "./event-info";
import projectEvaluation from "./project-evaluation";
import dateFormat from "dai-js/tools/dateFormat";
-function iniData() {
+function iniData () {
return {
pageType: "info",
uploadUrl: window.SITE_CONFIG["apiURL"] + "/oss/file/uploadqrcodeV2",
@@ -620,6 +570,10 @@ export default {
type: String,
default: "info",
},
+ source: {//展示来源：manage 管理平台 visiual 可视化平台
+ type: String,
+ default: 'manage'
+ }
},
components: {
@@ -633,7 +587,7 @@ export default {
data: iniData,
computed: {
- dataRule() {
+ dataRule () {
const {
fmData: { operateType },
} = this;
@@ -679,13 +633,13 @@ export default {
return obj;
},
- styleFullHeight() {
+ styleFullHeight () {
return {
maxHeight: "calc(100vh - 120px)",
};
},
- styleHalfHeight() {
+ styleHalfHeight () {
return {
maxHeight: "calc((100vh - 140px) / 2)",
};
@@ -693,7 +647,7 @@ export default {
},
watch: {
- projectId() {
+ projectId () {
let data = iniData();
Object.keys(data).forEach((k) => {
this[k] = data[k];
@@ -720,7 +674,7 @@ export default {
)["departmentName"];
}
},
- selectedCateData(val) {
+ selectedCateData (val) {
const { cateOptions } = this;
this.projectCate = val
.filter((arr) => arr.length > 0)
@@ -733,7 +687,7 @@ export default {
};
});
},
- async selectedTagData(val) {
+ async selectedTagData (val) {
const { tagOptions } = this;
this.projectTag = await Promise.all(
val.map(async (id) => {
@@ -761,14 +715,19 @@ export default {
this.projectTag = this.projectTag.filter((item) => item.id);
},
},
+ created () {
+
+
+ },
+
- mounted() {
+ mounted () {
console.log(this.projectIdCopy);
this.getApiData();
},
methods: {
- beforeImgUpload(file) {
+ beforeImgUpload (file) {
console.log(file);
const isLt1M = file.size / 1024 / 1024 < 10;
const srcType = file.type;
@@ -782,7 +741,7 @@ export default {
srcType.indexOf("image") == -1 &&
srcType.indexOf("video") == -1 &&
["doc", "docx", "xls", "xlsx", "ppt", "pptx", "pdf"].indexOf(format) ==
- -1
+ -1
) {
this.$message.error("文档仅限pdf和office文件!");
return false;
@@ -790,7 +749,7 @@ export default {
return true;
},
- handleImgSuccess(res, file, fileList) {
+ handleImgSuccess (res, file, fileList) {
console.log("handleImgSuccess", file);
if (res.code === 0 && res.msg === "success") {
let format = file.name.split(".").pop();
@@ -815,7 +774,7 @@ export default {
}
},
- handleImgRemove(file) {
+ handleImgRemove (file) {
console.log("handleImgRemove", file);
if (file.response) {
let index = this.fmData.internalFile.findIndex(
@@ -825,15 +784,15 @@ export default {
}
},
- watchImg(src) {
+ watchImg (src) {
window.open(src);
},
- handleClose() {
+ handleClose () {
this.$emit("close");
},
- handleSubmit() {
+ handleSubmit () {
this.$refs["fm"].validate((valid, messageObj) => {
if (valid) {
this.beforeSubmit();
@@ -842,7 +801,7 @@ export default {
});
},
- beforeSubmit() {
+ beforeSubmit () {
const {
fmData: { operateType },
} = this;
@@ -859,14 +818,14 @@ export default {
}
},
- handleWatchOrigin() {
+ handleWatchOrigin () {
this.pageType = "origin-info";
},
- handleBackInfo() {
+ handleBackInfo () {
this.pageType = "info";
},
- async submitBack() {
+ async submitBack () {
const url = "/gov/project/trace/return-v2";
const { fmData } = this;
@@ -896,7 +855,7 @@ export default {
}
},
- async submitClose() {
+ async submitClose () {
const url = "/gov/project/trace/closeproject-v2";
const { fmData } = this;
@@ -928,7 +887,7 @@ export default {
}
},
- async submitTurn() {
+ async submitTurn () {
const url = "/gov/project/trace/transfer-v2";
const { fmData } = this;
@@ -961,7 +920,7 @@ export default {
}
},
- async submitDispose() {
+ async submitDispose () {
const url = "/gov/project/trace/response-v2";
const { fmData } = this;
@@ -992,14 +951,14 @@ export default {
}
},
- async getApiData() {
+ async getApiData () {
await this.getProjectInfo();
this.getProjectCate();
this.getProjectProcess();
},
//加载组织数据
- async getProjectInfo() {
+ async getProjectInfo () {
const url = "/gov/project/trace/projectdetail";
const { data, code, msg } = await requestPost(url, {
@@ -1021,7 +980,7 @@ export default {
},
//加载组织数据
- async getReturnableList() {
+ async getReturnableList () {
const url = "/gov/project/trace/returnablelist";
const { data, code, msg } = await requestPost(url, {
@@ -1036,7 +995,7 @@ export default {
},
//加载组织数据
- async getMyDepartmentList() {
+ async getMyDepartmentList () {
const url = "/gov/project/trace/mydepartmentlist";
const { data, code, msg } = await requestPost(url, {
@@ -1054,7 +1013,7 @@ export default {
},
//加载组织数据
- async getAssistanceUnitList() {
+ async getAssistanceUnitList () {
const url = "/heart/icpartyunit/assistanceUnitList";
const { data, code, msg } = await requestPost(url, {
@@ -1069,7 +1028,7 @@ export default {
},
//加载组织数据
- async getIssueInfo() {
+ async getIssueInfo () {
const url = "/resi/hall/issue/detail";
const { data, code, msg } = await requestPost(url, {
@@ -1084,7 +1043,7 @@ export default {
},
//加载组织数据
- async getIssueTrend() {
+ async getIssueTrend () {
const url = "/resi/hall/issue/votingtrend";
const { data, code, msg } = await requestPost(url, {
@@ -1117,7 +1076,7 @@ export default {
},
//加载组织数据
- async getEventInfo() {
+ async getEventInfo () {
const url = "/gov/project/resievent/eventdetail-icdata";
const { data, code, msg } = await requestPost(url, {
@@ -1138,7 +1097,7 @@ export default {
},
//加载组织数据
- async getProjectProcess() {
+ async getProjectProcess () {
const url = "/gov/project/trace/processlist-v2";
const { data, code, msg } = await requestPost(url, {
@@ -1158,7 +1117,7 @@ export default {
}
},
- async getProjectCate() {
+ async getProjectCate () {
const url = "/gov/project/projectcategory/categorytaglist";
const { data, code, msg } = await requestPost(url, {
@@ -1177,7 +1136,7 @@ export default {
}
},
- async getCateOptions() {
+ async getCateOptions () {
const url = "/gov/issue/issueprojectcategorydict/list";
const { data, code, msg } = await requestPost(url, {});
@@ -1194,7 +1153,7 @@ export default {
}
},
- async updateProjectCate() {
+ async updateProjectCate () {
const url = "/gov/project/projectcategory/save";
const { projectCate } = this;
if (projectCate.length == 0) {
@@ -1215,11 +1174,11 @@ export default {
}
},
- handleTagChange(val) {
+ handleTagChange (val) {
console.log(val);
},
- async createTag(tagName) {
+ async createTag (tagName) {
const url = "/gov/issue/issuetags/add";
const { data, code, msg } = await requestPost(url, {
@@ -1236,7 +1195,7 @@ export default {
}
},
- async getTagOptions() {
+ async getTagOptions () {
const url = "/gov/issue/issueprojecttagdict/list";
const { data, code, msg } = await requestPost(url, {
@@ -1254,7 +1213,7 @@ export default {
}
},
- async updateProjectTag() {
+ async updateProjectTag () {
const url = "/gov/project/projecttags/save";
const { projectTag } = this;
@@ -1271,13 +1230,13 @@ export default {
}
},
- toUserInfo(item) {
+ toUserInfo (item) {
this.$router.push({
path: `/main-shuju/visual-basicinfo-people/${item.icResiUserId}`,
});
},
- toProjectInfo(item) {
+ toProjectInfo (item) {
console.log(item);
this.projectIdCopy = item.projectId;
// let data = iniData();
diff --git a/src/views/modules/visual/basicinfo/basicInfoMain.vue b/src/views/modules/visual/basicinfo/basicInfoMain.vue
index 3a0e2ccee..b0275579a 100644
--- a/src/views/modules/visual/basicinfo/basicInfoMain.vue
+++ b/src/views/modules/visual/basicinfo/basicInfoMain.vue
@@ -135,7 +135,7 @@ import BasicInfoCommunity from "./basicInfoCommunity";
import People from "./people";
import cptCard from "@/views/modules/visual/cpts/card";
-import gridMap from "@/views/modules/visual/basicinfo/cpts/grid-map";
+import gridMap from "@/views/modules/visual/cpts/map/index";
import ScreenLoading from "@/views/modules/visual/cpts/loading";
let loading; //加载动画
diff --git a/src/views/modules/visual/basicinfo/cpts/grid-map.vue b/src/views/modules/visual/basicinfo/cpts/grid-map.vue
deleted file mode 100644
index b830be4c8..000000000
--- a/src/views/modules/visual/basicinfo/cpts/grid-map.vue
+++ /dev/null
@@ -1,371 +0,0 @@
-
-
-
-
- 切换深色模式
-
-
切换浅色模式
-
-
-
-
-
diff --git a/src/views/modules/visual/basicinfo/people.vue b/src/views/modules/visual/basicinfo/people.vue
index 2fe8caee8..81190d694 100644
--- a/src/views/modules/visual/basicinfo/people.vue
+++ b/src/views/modules/visual/basicinfo/people.vue
@@ -1,12 +1,11 @@
-
+
-
+
{{ item.meta.title }}
@@ -20,9 +19,11 @@
人员情况
-
查看更多
+
查看更多
-
+
{{ info.name }}
@@ -119,13 +120,11 @@
-
+
@@ -135,14 +134,10 @@
-
-
+
+
{{
houseInfo && houseInfo.ownerName
@@ -153,23 +148,15 @@
（户主）
-
-
-
-
+
+
+
+
{{ houseInfo.userList[0].relation }}
@@ -179,23 +166,15 @@
-
-
-
-
+
+
+
+
{{ houseInfo.userList[1].relation }}
@@ -205,23 +184,15 @@
-
-
-
-
+
+
+
+
{{ houseInfo.userList[2].relation }}
@@ -231,23 +202,15 @@
-
-
-
-
+
+
+
+
{{ houseInfo.userList[3].relation }}
@@ -257,23 +220,15 @@
-
-
-
-
+
+
+
+
{{ houseInfo.userList[4].relation }}
@@ -283,23 +238,15 @@
-
-
-
-
+
+
+
+
{{ houseInfo.userList[5].relation }}
@@ -321,23 +268,21 @@
-
-
-
@@ -349,86 +294,70 @@
-
+
-
+
{{ item.eventContent }}
{{ item.reportTime }}
-
+ 
+ 
+ 
+ 
+ 
+ 
+ 
+ 
+ 
+ 
+ 
+
+ 
+ 
+