-
-
-
-
- {{ breadcrumb.name }}
- {{ breadcrumb.name }}
- 修改
-
-
-
-
-
-
-
-
-
- 新增
-
-
- 进入
-
-
-
-
-
-
-
-
- 新增
-
-
- 进入
-
-
-
-
-
-
-
-
- 新增
-
-
- 进入
-
-
-
-
-
-
-
-
- {{ role }}
-
-
-
-
- 新增
-
-
- 修改
- 查看
- 调动
- 禁用
-
-
-
-
-
-
-
-
- {{ role }}
-
-
-
-
- 新增
-
-
- 修改
- 查看
- 调动
- 禁用
-
-
-
-
-
-
-
-
- {{ role }}
-
-
-
-
- 新增
-
-
- 修改
- 查看
- 调动
- 禁用
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- 取 消
- 确 定
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+ [],
+ uploadUrl: window.SITE_CONFIG["apiURL"] + "/oss/file/article/upload",
supKeys: ["imgUrlArr", "imgUrl"],
- supValues: [[], ""],
+ supValues: [() => [], ""],
beforeImgUpload(file, item, that) {
console.log(file);
const isLt1M = file.size / 1024 / 1024 < 10;
@@ -129,7 +131,7 @@ export default {
type: "cascader",
value: [],
supKeys: ["publishRangeDesc"],
- supValues: [[]],
+ supValues: [""],
optionUrl: "/gov/org/customeragency/agencygridtree",
optionUrlParams: {
agencyId: this.$store.state.user.agencyId,
@@ -217,8 +219,8 @@ export default {
label: "以组织名义",
optionList: [
{
- label: agencyId,
- value: agencyName,
+ label: agencyName,
+ value: agencyId,
type: "agency",
},
],
@@ -310,6 +312,7 @@ export default {
},
editElseRules: {},
editConfig: {
+ confirmBtnName: "发布",
cookInfoFn(data) {
if (data.richTextFlag == "0") {
data.content = data.contentList
@@ -326,7 +329,10 @@ export default {
})
.join(" ");
} else {
- data.content = data.contentList[0].content;
+ data.content =
+ Array.isArray(data.contentList) && data.contentList.length > 0
+ ? data.contentList[0].content
+ : "";
}
if (data.imgUrl) {
data.imgArr = [
diff --git a/src/views/modules/communityParty/article/index.vue b/src/views/modules/communityParty/article/index.vue
index 18c6f8db0..f0530a571 100644
--- a/src/views/modules/communityParty/article/index.vue
+++ b/src/views/modules/communityParty/article/index.vue
@@ -151,6 +151,8 @@ export default {
"agencyId",
"subAgencyList"
)[vals.length - 1]["level"];
+ item["supValues"][1] =
+ item["supValues"][1] == "grid" ? "grid" : "agency";
} else {
item["supValues"][0] = "";
item["supValues"][1] = "";
@@ -161,7 +163,7 @@ export default {
field: "发布时间",
keyName: "publishTime",
type: "date-range",
- supKeys: ["startTime", "endTime"],
+ supKeys: ["startDate", "endDate"],
supValues: ["", ""],
},
],
@@ -221,9 +223,11 @@ export default {
keyName: "imgArr",
type: "upload",
limit: 1,
+ listType: "picture-card",
editDisabled: true,
rules: [],
value: () => [],
+ uploadUrl: window.SITE_CONFIG["apiURL"] + "/oss/file/article/upload",
supKeys: ["imgUrlArr", "imgUrl"],
supValues: [() => [], ""],
beforeImgUpload(file, item, that) {
@@ -248,7 +252,7 @@ export default {
type: "cascader",
value: () => [],
supKeys: ["publishRangeDesc"],
- supValues: [() => []],
+ supValues: [""],
optionUrl: "/gov/org/customeragency/agencygridtree",
optionUrlParams: {
agencyId: this.$store.state.user.agencyId,
@@ -429,6 +433,7 @@ export default {
},
editElseRules: {},
editConfig: {
+ confirmBtnName: "发布",
cookInfoFn(data) {
if (data.richTextFlag == "0") {
data.content = data.contentList
diff --git a/src/views/modules/communityParty/heart/heartAudit.vue b/src/views/modules/communityParty/heart/heartAudit.vue
index c8260e08b..d8361e867 100644
--- a/src/views/modules/communityParty/heart/heartAudit.vue
+++ b/src/views/modules/communityParty/heart/heartAudit.vue
@@ -32,7 +32,7 @@
align="center"
label="姓名"
:show-overflow-tooltip="true"
- width="150">
+ min-width="100">
+ width="180">
+ min-width="100">
+ width="90">
diff --git a/src/views/modules/communityParty/heart/heartFinish.vue b/src/views/modules/communityParty/heart/heartFinish.vue
index 0c7fc05f7..bdf0a988b 100644
--- a/src/views/modules/communityParty/heart/heartFinish.vue
+++ b/src/views/modules/communityParty/heart/heartFinish.vue
@@ -3,9 +3,10 @@
+ class="div_form mgl10">
+ min-width="320">
@@ -359,10 +360,17 @@ export default {
.div_table {
display: flex;
- justify-content: center;
+ justify-content: flex-start;
.m_table {
flex: 0 0 1200px;
// padding: 20px;
}
}
+.div_form {
+ width: 90%;
+ margin-top: 20px;
+}
+.mgl10 {
+ margin-left: 20px;
+}
\ No newline at end of file
diff --git a/src/views/modules/communityParty/heart/heartForm.vue b/src/views/modules/communityParty/heart/heartForm.vue
index 14650b472..8f3c9bfe5 100644
--- a/src/views/modules/communityParty/heart/heartForm.vue
+++ b/src/views/modules/communityParty/heart/heartForm.vue
@@ -50,6 +50,7 @@
:action="uploadUlr"
list-type="picture-card"
:on-exceed="exceedPic"
+ :before-upload="beforeAvatarUpload"
:on-remove="removePic"
:file-list="replayImgList"
:on-change="handleEditChange"
@@ -84,7 +85,8 @@
prop="actQuota"
style="display: block"
label-width="150px">
-
@@ -93,7 +95,8 @@
prop="reward"
style="display: block"
label-width="150px">
-
@@ -115,7 +118,7 @@
label-width="150px"
style="display: block">
@@ -141,7 +144,7 @@
style="display: block"
prop="signUpEndTime"
label-width="150px">
-
@@ -187,7 +190,8 @@
prop="signInRadius"
style="display: block"
label-width="150px">
-
@@ -42,7 +42,7 @@
-
@@ -100,6 +102,7 @@
@@ -110,6 +113,7 @@
@@ -117,18 +121,20 @@
header-align="center"
align="center"
label="状态"
+ :show-overflow-tooltip="true"
min-width="100">
@@ -266,7 +272,7 @@
:close-on-click-modal="false"
:close-on-press-escape="false"
:title="'报名审核'"
- width="1450px"
+ width="90%"
top="5vh"
class="dialog-h"
@closed="auditDiaClose">
@@ -278,11 +284,12 @@
:close-on-click-modal="false"
:close-on-press-escape="false"
:title="'查看人员'"
- width="1550px"
+ width="90%"
top="5vh"
class="dialog-h"
@closed="personDiaClose">
+ width="120">
@@ -37,7 +37,7 @@
header-align="center"
align="center"
label="身份证"
- min-width="180">
+ width="180">
+ min-width="100">
+ width="90">
+ width="90">
+ width="90">
+
@@ -220,6 +225,9 @@ export default {
this.cancleShow = true
},
+ handleCancle () {
+ this.$emit('personDiaClose')
+ },
// 开启加载动画
startLoading () {
@@ -278,6 +286,6 @@ export default {
.div_btn {
margin-top: 10px;
display: flex;
- justify-content: flex-end;
+ justify-content: center;
}
diff --git a/src/views/modules/communityService/fuwujilu/fuwuList.vue b/src/views/modules/communityService/fuwujilu/fuwuList.vue
index 2309bd626..c670f259b 100644
--- a/src/views/modules/communityService/fuwujilu/fuwuList.vue
+++ b/src/views/modules/communityService/fuwujilu/fuwuList.vue
@@ -280,6 +280,7 @@ export default {
data () {
let endDisabledDate = (time) => {//这个关键属性我们一定要写在data的里面并且return的外面，这是动态改变区间的关键
let nowData = Date.now()
+
if (this.formData.serviceTimeStart) {
let serviceTimeStart = new Date(this.formData.serviceTimeStart)
return time.getTime() > nowData || time.getTime() < serviceTimeStart || time.getTime() === serviceTimeStart
diff --git a/src/views/modules/cpts/base/cpts/edit.vue b/src/views/modules/cpts/base/cpts/edit.vue
index 9a2226ef3..f68dc9f78 100644
--- a/src/views/modules/cpts/base/cpts/edit.vue
+++ b/src/views/modules/cpts/base/cpts/edit.vue
@@ -122,6 +122,7 @@
:multiple="item.multiple || false"
:filterable="item.filterable || false"
:allowCreate="item.allowCreate || false"
+ :collapse-tags="item.collapseTags || false"
default-first-option
@change="(e) => handleChangeSelect(e, item)"
>
@@ -183,6 +184,7 @@
:options="item.optionList"
:props="item.optionProps || {}"
:show-all-levels="false"
+ :collapse-tags="item.collapseTags || false"
size="small"
clearable
class="item-select"
@@ -198,24 +200,24 @@
"
ref="upload"
class="avatar-uploader"
- :action="uploadUrl"
+ :class="{ 'z-full': fmData[item.keyName].length >= item.limit }"
+ :action="item.uploadUrl || uploadUrl"
:data="{ customerId: customerId }"
:show-file-list="true"
:list-type="item.listType || 'picture'"
:limit="item.limit || 100"
:file-list="fmData[item.keyName]"
:on-success="(res, file) => handleImgSuccess(res, file, item)"
+ :on-error="(res, file) => handleImgError(res, file, item)"
:on-remove="(res) => handleImgRemove(res, item)"
:on-exceed="(res) => handleImgExceed(res, item)"
:before-upload="(file) => beforeImgUpload(file, item)"
>
- 点击上传
+ 点击上传
当前点击坐标为：
-
- 取 消
- 确 定
-
-
+
+
+
+
+ {{ breadcrumb.name }}
+ {{ breadcrumb.name }}
+ 修改
+
+
+
+
+
+
+
+
+
+ 新增
+
+
+ 进入
+
+
+
+
+
+
+
+
+ 新增
+
+
+ 进入
+
+
+
+
+
+
+
+
+ 新增
+
+
+ 进入
+
+
+
+
+
+
+
+
+ {{ role }}
+
+
+
+
+ 新增
+
+
+ 修改
+ 查看
+ 调动
+ 禁用
+
+
+
+
+
+
+
+
+ {{ role }}
+
+
+
+
+ 新增
+
+
+ 修改
+ 查看
+ 调动
+ 禁用
+
+
+
+
+
+
+
+
+ {{ role }}
+
+
+
+
+ 新增
+
+
+ 修改
+ 查看
+ 调动
+ 禁用
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/src/views/modules/communityParty/article/drafts.vue b/src/views/modules/communityParty/article/drafts.vue
index d134279b8..eb9eda4d3 100644
--- a/src/views/modules/communityParty/article/drafts.vue
+++ b/src/views/modules/communityParty/article/drafts.vue
@@ -25,7 +25,7 @@
>
+ 取 消
+ 确 定
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
- 当前点击坐标为：
+
+ 取 消
+ 确 定
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- 禁用后该用户将无法登录系统，是否继续？
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 禁用后该用户将无法登录系统，是否继续？
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
- 取 消
- 确 定
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
+ 取 消
+ 确 定
+
- 取 消
- 确 定
-
-
- 取 消
- 确 定
-
-
- 关 闭
-
-
+ 取 消
+ 确 定
+
+
+ 取 消
+ 确 定
+
+
+ 关 闭
+
+
- 取 消
- 确 定
-
-
- 取 消
- 确 定
-
-
- 取 消
- 确 定
-
-
- 取 消
- 确 定
-
-
- 取 消
- 确 定
-
-
- 取 消
- 确 定
-
-
+ 取 消
+ 确 定
+
+
+
+
+
+ 取 消
+ 确 定
+
+
+ 取 消
+ 确 定
+
+
+ 取 消
+ 确 定
+
+
+ 取 消
+ 确 定
+
+
+ 取 消
+ 确 定
+
+
+ 关 闭
+
+
- 取 消
+ {{
+ editConfig.cancelBtnName || "取消"
+ }}
确 定 {{ editConfig.confirmBtnName || "确定" }}
- 取 消
+ {{
+ editConfig.cancelBtnName || "取消"
+ }}
确 定 {{ editConfig.confirmBtnName || "确定" }}
{
- fmData[item.keyName] =
- typeof item.value == "function" ? item.value() : "";
+ if (typeof item.value == "function") {
+ fmData[item.keyName] = item.value();
+ } else if (
+ typeof item.value == "string" ||
+ typeof item.value == "number" ||
+ typeof item.value == "boolean"
+ ) {
+ fmData[item.keyName] = item.value;
+ } else if (typeof item.value == "undefined") {
+ fmData[item.keyName] = "";
+ } else {
+ fmData[item.keyName] = item.value || "";
+ console.error(
+ "不应该直接传入数组或对象的值，这样会导致传入的值被子组件修改。editParams-------------cpts/base/cpts/edit.vue",
+ item
+ );
+ }
+
if (item.supValues) {
item.supValues.forEach((value, index) => {
- fmData[item.supKeys[index]] =
- typeof value == "function" ? value() : "";
+ if (typeof value == "function") {
+ fmData[item.supKeys[index]] = value();
+ } else if (
+ typeof value == "string" ||
+ typeof value == "number" ||
+ typeof value == "boolean"
+ ) {
+ fmData[item.supKeys[index]] = value;
+ } else if (typeof value == "undefined") {
+ fmData[item.supKeys[index]] = "";
+ } else {
+ fmData[item.supKeys[index]] = value;
+ console.error(
+ "不应该直接传入数组或对象的值，这样会导致传入的值被子组件修改。editParams-------------cpts/base/cpts/edit.vue",
+ item
+ );
+ }
});
}
@@ -504,7 +541,7 @@ export default {
beforeImgUpload(file, item) {
if (typeof item.beforeImgUpload == "function") {
- return item.beforeImgUpload(file, item, this);
+ if (!item.beforeImgUpload(file, item, this)) return false;
}
return true;
},
@@ -532,7 +569,7 @@ export default {
},
handleImgExceed(res, item) {
- console.log(e);
+ console.log(res);
// this.$message({
// type: "warning",
// message: "文件数量最多不超过三个",
@@ -575,6 +612,10 @@ export default {
}
},
+ handleImgError(res, file, item) {
+ console.log(res);
+ },
+
// 地图初始化函数，本例取名为init，开发者可根据实际情况定义
initMap(item) {
let { latitude, longitude } = this.$store.state.user;
@@ -690,6 +731,7 @@ export default {
let { data, code, msg } = await requestPost(url, params);
if (code === 0) {
const { editConfig } = this;
+ console.log("xxxxxxxxxxxxxxxxxxxxxx", editConfig);
if (editConfig && typeof editConfig.cookInfoFn == "function") {
data = editConfig.cookInfoFn(data);
}
@@ -874,7 +916,28 @@ export default {
}
}
}
+ .avatar-uploader {
+ &.z-full {
+ /deep/ .el-upload.el-upload--picture-card {
+ display: none !important;
+ }
+ }
+ a {
+ display: flex;
+ align-items: center;
+ justify-content: center;
+ color: #65a5f9;
+ i {
+ margin-right: 4px;
+ color: #65a5f9;
+ font-size: 18px;
+ }
+ &:hover {
+ text-decoration: none;
+ }
+ }
+ }
.item-rich-text {
width: 600px;
height: 500px;
diff --git a/src/views/modules/cpts/base/index.vue b/src/views/modules/cpts/base/index.vue
index 896153ac6..d6660da39 100644
--- a/src/views/modules/cpts/base/index.vue
+++ b/src/views/modules/cpts/base/index.vue
@@ -93,10 +93,7 @@
-
+
"编辑",
+ default: () => "修改",
},
delAuth: {
type: Function,
@@ -447,6 +445,11 @@ export default {
this.computeSearchHeight();
},
+ activated() {
+ console.log("-------------activated");
+ this.$refs["ref_table"].doLayout();
+ },
+
methods: {
computeSearchHeight() {
this.ref_search_height = this.$refs["ref_search"].clientHeight;
@@ -512,6 +515,7 @@ export default {
}
return fileType && isLt1M;
},
+
async uploadHttpRequest(file) {
let { importUrl: url } = this;
if (!url) return;
@@ -722,8 +726,23 @@ export default {
},
resetSearch() {
+ console.log("----------------resetSearch", this.searchParams);
this.searchParams.forEach((item) => {
- item.value = "";
+ if (typeof item.value == "string") {
+ item.value = "";
+ } else if (Array.isArray(item.value)) {
+ item.value = [];
+ }
+ if (item.supValues) {
+ item.supValues = item.supValues.map((value, index) => {
+ if (typeof value == "string") {
+ return "";
+ } else if (Array.isArray(value)) {
+ return [];
+ }
+ return value;
+ });
+ }
});
},
},
diff --git a/src/views/modules/plugins/change/verify.vue b/src/views/modules/plugins/change/verify.vue
index 52b8043a0..76385675f 100644
--- a/src/views/modules/plugins/change/verify.vue
+++ b/src/views/modules/plugins/change/verify.vue
@@ -287,14 +287,17 @@
>查看
- 审核
+
+
+ 审核
+
@@ -447,6 +450,10 @@ export default {
console.log('searchH----', this.$refs.searchCard.$el.offsetHeight)
},
methods: {
+ filterEdit (id) {
+ const { user } = this.$store.state
+ return id === user.agencyId
+ },
handleClearVillage() {
this.fmData.buildId = ''
this.fmData.homeId = ''
diff --git a/src/views/modules/plugins/change/verifyForm.vue b/src/views/modules/plugins/change/verifyForm.vue
index 99c19afec..1efb046ac 100644
--- a/src/views/modules/plugins/change/verifyForm.vue
+++ b/src/views/modules/plugins/change/verifyForm.vue
@@ -34,7 +34,7 @@
{{ detailInfo.villageName + detailInfo.buildName + detailInfo.unitName + detailInfo.homeName }}
-
{{ detailInfo.moveOutDate }}
-
+ -->
-
当前人员已不在该房屋
+
+
+ 需要
+ 不需要
+
+
@@ -126,9 +139,35 @@
-->
-
+
+
+
+
+ {{ detailInfo.newGridName }}
+
+
+ {{ detailInfo.newHomeName }}
+
+
+
+
+ {{ detailInfo.moveOutDate }}
+
+
+
+
+
-
其他
-
+ -->
-
+
-
+
{
this.loadingForm = false
@@ -500,9 +542,9 @@ export default {
async getAgencylist() {
const url = '/gov/org/customeragency/rootagencygridtree'
-
+ const { agencyId } = this.$store.state.user
const params = {
- agencyId: this.rootAgency.id
+ agencyId: agencyId
}
const { data, code, msg } = await requestPost(url, params)
if (code === 0) {
@@ -663,6 +705,10 @@ export default {
setTimeout(() => {
this.btnDisable = false
}, 2000)
+ if (this.isMoveOut == 0) {
+ this.saveForm()
+ return
+ }
this.$refs['ref_form'].validate((valid, messageObj) => {
if (!valid) {
// app.util.validateRule(messageObj)
@@ -690,6 +736,7 @@ export default {
let params = {
id: this.detailInfo.id,
confirmResult: this.confirmResult,
+ isMoveOut: this.isMoveOut,
reason: this.reason
}
if (this.confirmResult == 1 && this.detailInfo.isInHome) {
@@ -700,7 +747,8 @@ export default {
buildName: this.dataForm.buildName,
unitName: this.dataForm.unitName,
homeName: this.dataForm.homeName,
- xxdz: this.dataForm.address
+ xxdz: this.dataForm.address,
+ moveOutDate: this.dataForm.outOfTime
}
}
@@ -715,12 +763,15 @@ export default {
}
},
async saveForm() {
- const url = '/epmetuser/changeRelocation/moveOutHome'
+ const url = '/epmetuser/changeRelocation/moveOutHomeConfirm'
let noData = new Date()
noData = util.dateFormatter(noData, 'time')
this.dataForm.transferTime = noData
-
- const { data, code, msg } = await requestPost(url, this.dataForm)
+ const _data = {
+ ...this.dataForm,
+ isMoveOut: this.isMoveOut
+ }
+ const { data, code, msg } = await requestPost(url, _data)
if (code === 0) {
// this.$message.success('调动成功')
diff --git a/src/views/modules/visual/basicinfo/basicInfoMain.vue b/src/views/modules/visual/basicinfo/basicInfoMain.vue
index 6f7b19380..c57aaef37 100644
--- a/src/views/modules/visual/basicinfo/basicInfoMain.vue
+++ b/src/views/modules/visual/basicinfo/basicInfoMain.vue
@@ -354,6 +354,7 @@ const vueGis = {
const { data, code, msg } = await requestPost(url, params)
this.infoLoading = false
if (code === 0) {
+
this.listData = data
// this.listData = this.listData1
this.listDatashow = []
@@ -365,6 +366,9 @@ const vueGis = {
if (index % 2 === 0) {//偶数
itemArray.push(item)
+ if ((index + 1) === this.listData.length) {
+ this.listDatashow.push(itemArray)
+ }
} else {
itemArray.push(item)
this.listDatashow.push(itemArray)
@@ -782,6 +786,8 @@ const vueGis = {
this.zoom = 13
} else if (agencyLevel === 'community') {
this.zoom = 14
+ } else {
+ this.zoom = 11
}
},
diff --git a/src/views/modules/visual/communityGovern/fivelayers/mapIndex copy 2.vue b/src/views/modules/visual/communityGovern/fivelayers/mapIndex copy 2.vue
new file mode 100644
index 000000000..7ee8f5f85
--- /dev/null
+++ b/src/views/modules/visual/communityGovern/fivelayers/mapIndex copy 2.vue
@@ -0,0 +1,2063 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/src/views/modules/visual/communityGovern/fivelayers/mapIndex copy.vue b/src/views/modules/visual/communityGovern/fivelayers/mapIndex copy.vue
new file mode 100644
index 000000000..efc340ebf
--- /dev/null
+++ b/src/views/modules/visual/communityGovern/fivelayers/mapIndex copy.vue
@@ -0,0 +1,1987 @@
+
+
+
+
+
+
+
+
+ 五大图层
+
+ 五大图层>
+
+ 个人档案
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ ![]()
+ {{item.label}}
+
+
+
+
+
+
+
+
+
+
+
+ ![]()
+
+
+ {{colItem.categoryName}}
+
+
+
+
+
+
+
+
+
+ 
+
+
+
+
+
+
+ 搜索
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/src/views/modules/visual/communityGovern/fivelayers/mapIndex-baidu.vue b/src/views/modules/visual/communityGovern/fivelayers/mapIndex-baidu.vue
new file mode 100644
index 000000000..049037cdb
--- /dev/null
+++ b/src/views/modules/visual/communityGovern/fivelayers/mapIndex-baidu.vue
@@ -0,0 +1,2071 @@
+
+
+
+
+
+
+
+
+ 五大图层
+
+ 五大图层>
+
+ 个人档案
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ ![]()
+ {{item.label}}
+
+
+
+
+
+
+
+
+
+
+
+ ![]()
+
+
+ {{colItem.categoryName}}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 搜索
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/src/views/modules/visual/communityGovern/fivelayers/mapIndex.vue b/src/views/modules/visual/communityGovern/fivelayers/mapIndex.vue
index 194a4d761..35664c135 100644
--- a/src/views/modules/visual/communityGovern/fivelayers/mapIndex.vue
+++ b/src/views/modules/visual/communityGovern/fivelayers/mapIndex.vue
@@ -373,6 +373,8 @@
import 'ol/ol.css'
import { Map, View } from 'ol'
import TileLayer from 'ol/layer/Tile.js';
+import ImageLayer from 'ol/layer/Image';
+import { Raster as RasterSource } from 'ol/source';
import XYZ from 'ol/source/XYZ.js';
import VectorLayer from 'ol/layer/Vector.js';
import VectorSource from 'ol/source/Vector.js';
@@ -489,6 +491,28 @@ var polygonStyleFunction = (function () {
};
})()
+//定义颜色转换方法
+let reverseFunc = function (pixelsTemp) {
+ //蓝色
+ for (var i = 0; i < pixelsTemp.length; i += 4) {
+ var r = pixelsTemp[i];
+ var g = pixelsTemp[i + 1];
+ var b = pixelsTemp[i + 2];
+ //运用图像学公式，设置灰度值
+ var grey = r * 0.3 + g * 0.59 + b * 0.11;
+ //将rgb的值替换为灰度值
+ pixelsTemp[i] = grey;
+ pixelsTemp[i + 1] = grey;
+ pixelsTemp[i + 2] = grey;
+
+ //基于灰色，设置为蓝色，这几个数值是我自己试出来的，可以根据需求调整
+ pixelsTemp[i] = 55 - pixelsTemp[i];
+ pixelsTemp[i + 1] = 255 - pixelsTemp[i + 1];
+ pixelsTemp[i + 2] = 305 - pixelsTemp[i + 2];
+ }
+};
+
+
const vueGis = {
name: 'HomeMap',
data () {
@@ -1613,7 +1637,7 @@ const vueGis = {
this.zoom = 13
} else if (agencyLevel === 'community') {
this.zoom = 14
- }else{
+ } else {
this.zoom = 11
}
@@ -1644,9 +1668,13 @@ const vueGis = {
url: 'http://wprd0{1-4}.is.autonavi.com/appmaptile?lang=zh_cn&size=1&style=7&x={x}&y={y}&z={z}',
wrapX: true//x方向平铺，也可以选择false
}),
- zIndex: 20
+ zIndex: 20,
+ crossOrigin: 'anonymous'
});
+
+
+
mapView = new View({
//中心点坐标
center: this.centerPoint,
@@ -1676,6 +1704,8 @@ const vueGis = {
});
map.removeInteraction(dblClickInteraction);
+
+
},
//添加标注图层
addParentLayer () {
diff --git a/src/views/modules/visual/components/screen-map/index.vue b/src/views/modules/visual/components/screen-map/index.vue
index 21c95ff9e..d2f86e50c 100644
--- a/src/views/modules/visual/components/screen-map/index.vue
+++ b/src/views/modules/visual/components/screen-map/index.vue
@@ -136,7 +136,7 @@ var polygonStyleFunction = (function () {
const vueGis = {
name: "HomeMap",
- data() {
+ data () {
return {
centerPoint: [], //中心点位置
zoom: 14, //缩放范围：区14
@@ -198,14 +198,14 @@ const vueGis = {
isChangeCenter: true, //是否根据多边形改变数组
};
},
- async mounted() {},
+ async mounted () { },
methods: {
- showPosition() {
+ showPosition () {
let array = [this.input_lat, this.input_lon];
map.getView().setCenter(array);
},
//加载地图:地图基本信息，多边形区域信息，多边形icon
- loadMap(
+ loadMap (
mapInfo,
polygonArray,
polIconUrlArray,
@@ -257,7 +257,7 @@ const vueGis = {
},
//刷新地图:地图信息，多边形数组，标注数组，是否根据多边形改变中心点
- async refreshMap(mapInfo, polygonArray, iconArrays, isChangeCenter) {
+ async refreshMap (mapInfo, polygonArray, iconArrays, isChangeCenter) {
this.mapInfo = mapInfo;
this.polygonArray = [];
this.polygonArray = polygonArray;
@@ -293,7 +293,7 @@ const vueGis = {
},
//加载区域多边形
- loadPolygon() {
+ loadPolygon () {
polygonSource.clear(); //清空多边形标注
// iconSource.clear()
let featureData = []; //多边形数据数据
@@ -352,7 +352,7 @@ const vueGis = {
},
//加载区域多边形的icon
- loadPolIcon(feature) {
+ loadPolIcon (feature) {
polIconSource.clear();
let polyIconFeatures = [];
// console.log('feature-----', feature)
@@ -390,7 +390,7 @@ const vueGis = {
},
//加载icon图标
- loadIcon() {
+ loadIcon () {
iconSource.clear(); //清空多边形标注
if (this.iconArrays && this.iconArrays.length > 0) {
let iconFeatures = [];
@@ -413,7 +413,7 @@ const vueGis = {
// imgSize: [32, 32],
// scale: 0.5,
// src: oneIcon.urlIndex && this.iconUrlArray[oneIcon.urlIndex] || this.iconUrlArray[0] || this.iconUrlArray[0]
- src: (oneIcon.urlIndex && this.iconUrlArray[oneIcon.urlIndex]) || (oneIcon.index &&this.iconUrlArray[oneIcon.index]) || this.iconUrlArray[0]
+ src: (oneIcon.urlIndex && this.iconUrlArray[oneIcon.urlIndex]) || (oneIcon.index && this.iconUrlArray[oneIcon.index]) || this.iconUrlArray[0]
}),
// text: createTextStyle(oneIcon)
});
@@ -436,7 +436,7 @@ const vueGis = {
},
//计算和中心点距离
- computedDistance(lon, lat, max) {
+ computedDistance (lon, lat, max) {
let c1 = [2];
c1[0] = lon;
c1[1] = lat;
@@ -451,7 +451,7 @@ const vueGis = {
},
//初始化地图
- initMap() {
+ initMap () {
this.firstCentermap();
gaodeMapLayer = new TileLayer({
title: "地图",
@@ -598,18 +598,20 @@ const vueGis = {
},
//根据组织层级设置缩放级别
- setZoom(level) {
- if (level === "district") {
- this.zoom = 11;
- } else if (level === "street") {
- this.zoom = 12;
- } else if (level === "community") {
- this.zoom = 13;
+ setZoom (level) {
+ if (level === 'district') {
+ this.zoom = 12
+ } else if (level === 'street') {
+ this.zoom = 13
+ } else if (level === 'community') {
+ this.zoom = 14
+ } else {
+ this.zoom = 11
}
},
//初始化多边形标注图层
- initPolygonLayer() {
+ initPolygonLayer () {
polygonSource = new VectorSource({
// features: (new GeoJSON()).readFeatures(geojsonObject)
wrapX: false,
@@ -655,14 +657,14 @@ const vueGis = {
map.addLayer(polygonLayer)
if (this.$route.path == '/main-shuju/visual-communityGovern-duoyuanfuwu-duoyuanfuwufenxi' || this.$route.path == '/main-shuju/visual-communityParty-gridParty' || this.$route.path == '/main-shuju/visual-communityParty-community') { // 2022.6.9 网格党建平面图 联建单位分析页面 点位点击以后会消失，屏蔽这段代码以后可以解决
- console.log('去掉默认点击')
+ console.log('去掉默认点击')
} else {
- map.addInteraction(select);
+ map.addInteraction(select);
}
},
//初始化多边形icon图层
- initPolIconLayer() {
+ initPolIconLayer () {
polIconSource = new VectorSource({
//features: (new GeoJSON()).readFeatures(geojsonObject)
wrapX: false,
@@ -677,7 +679,7 @@ const vueGis = {
},
//初始化icon图层
- initIconLayer() {
+ initIconLayer () {
iconSource = new VectorSource({
//features: (new GeoJSON()).readFeatures(geojsonObject)
wrapX: false,
@@ -699,7 +701,7 @@ const vueGis = {
},
//添加覆盖层
- addOverlay() {
+ addOverlay () {
// 使用变量存储弹窗所需的 DOM 对象
var container = document.getElementById("popup");
var closer = document.getElementById("popup-closer");
@@ -737,7 +739,7 @@ const vueGis = {
},
//注册地图点击事件
- addMapClick() {
+ addMapClick () {
let _that = this;
map.on("click", function (evt) {
@@ -757,7 +759,7 @@ const vueGis = {
});
},
- handleShowPopup(showData, coordinate, isShowMore) {
+ handleShowPopup (showData, coordinate, isShowMore) {
if (isShowMore) {
document.getElementById("popup-goMore").style.display = "block";
} else {
@@ -773,19 +775,19 @@ const vueGis = {
//把 overlay 显示到指定的 x,y坐标
},
// 关闭弹窗
- handleClosePopup() {
+ handleClosePopup () {
this.overlay.setPosition(undefined);
document.getElementById("popup-closer").blur();
return false;
},
//取随机数
- getRndBetween(lowerLimit, upperLimit) {
+ getRndBetween (lowerLimit, upperLimit) {
return Math.floor(Math.random() * (upperLimit - lowerLimit + 1)) + lowerLimit;
},
//开启加载动画
- startLoading() {
+ startLoading () {
loading = Loading.service({
lock: true, //是否锁定
text: "正在加载……", //加载中需要显示的文字
@@ -794,7 +796,7 @@ const vueGis = {
},
//结束加载动画
- endLoading() {
+ endLoading () {
//clearTimeout(timer);
if (loading) {
loading.close();
@@ -839,7 +841,7 @@ const vueGis = {
},
},
computed: {
- mapHeight() {
+ mapHeight () {
return this.clientHeight - 120;
},
diff --git a/src/views/modules/workSys/mapConfig.vue b/src/views/modules/workSys/mapConfig.vue
index 967164693..9a1097cd7 100644
--- a/src/views/modules/workSys/mapConfig.vue
+++ b/src/views/modules/workSys/mapConfig.vue
@@ -622,7 +622,7 @@ const vueGis = {
this.zoom = 13
} else if (agencyLevel === 'community') {
this.zoom = 14
- }else{
+ } else {
this.zoom = 11
}
diff --git a/src/views/modules/workSys/role/role.vue b/src/views/modules/workSys/role/role.vue
new file mode 100644
index 000000000..f61225cde
--- /dev/null
+++ b/src/views/modules/workSys/role/role.vue
@@ -0,0 +1,383 @@
+
+
+
+
+
+
+
+
+ 五大图层
+
+ 五大图层>
+
+ 个人档案
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ ![]()
+ {{item.label}}
+
+
+
+
+
+
+
+
+
+
+
+ ![]()
+
+
+ {{colItem.categoryName}}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 搜索
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/src/views/modules/workSys/role/roleForm.vue b/src/views/modules/workSys/role/roleForm.vue
new file mode 100644
index 000000000..c7b4f1855
--- /dev/null
+++ b/src/views/modules/workSys/role/roleForm.vue
@@ -0,0 +1,390 @@
+
+
+
+
+
+
+
+
+
+
+
+ 查询
+ 重置
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 查看
+ 修改
+
+ 删除
+
+
+
+
+
+
+
+
+ 新增
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 取 消
+ 确 定
+
+
+