-
+ @click="handleAdd">新增
@@ -198,7 +198,17 @@
class="div-table-button--edit"
size="small"
@click="handleAttention(scope.row)">同步
+ 修改
+ 删除
+
+
+
+
+
+
+
+
+
+
diff --git a/src/views/modules/base/epidemic/veroFocus/veroFocusAdd.vue b/src/views/modules/base/epidemic/veroFocus/veroFocusAdd.vue
index 578e0b10b..49d16f319 100644
--- a/src/views/modules/base/epidemic/veroFocus/veroFocusAdd.vue
+++ b/src/views/modules/base/epidemic/veroFocus/veroFocusAdd.vue
@@ -128,6 +128,7 @@
+
-
-
-
-
- {{ breadcrumb.name }}
- {{ breadcrumb.name }}
- 修改
-
-
-
-
-
-
-
-
-
- 新增
-
-
- 进入
-
-
-
-
-
-
-
-
- 新增
-
-
- 进入
-
-
-
-
-
-
-
-
- 新增
-
-
- 进入
-
-
-
-
-
-
-
-
- {{ role }}
-
-
-
-
- 新增
-
-
- 修改
- 查看
- 调动
- 禁用
-
-
-
-
-
-
-
-
- {{ role }}
-
-
-
-
- 新增
-
-
- 修改
- 查看
- 调动
- 禁用
-
-
-
-
-
-
-
-
- {{ role }}
-
-
-
-
- 新增
-
-
- 修改
- 查看
- 调动
- 禁用
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- 取 消
- 确 定
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
当前点击坐标为：
-
- 取 消
- 确 定
-
-
+
+
+
+
+ {{ breadcrumb.name }}
+ {{ breadcrumb.name }}
+ 修改
+
+
+
+
+
+
+
+
+
+ 新增
+
+
+ 进入
+
+
+
+
+
+
+
+
+ 新增
+
+
+ 进入
+
+
+
+
+
+
+
+
+ 新增
+
+
+ 进入
+
+
+
+
+
+
+
+
+ {{ role }}
+
+
+
+
+ 新增
+
+
+ 修改
+ 查看
+ 调动
+ 禁用
+
+
+
+
+
+
+
+
+ {{ role }}
+
+
+
+
+ 新增
+
+
+ 修改
+ 查看
+ 调动
+ 禁用
+
+
+
+
+
+
+
+
+ {{ role }}
+
+
+
+
+ 新增
+
+
+ 修改
+ 查看
+ 调动
+ 禁用
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/src/views/modules/cabaseinfo/carotators-binding-house.vue b/src/views/modules/cabaseinfo/carotators-binding-house.vue
index cdeaf9688..276d1eb46 100644
--- a/src/views/modules/cabaseinfo/carotators-binding-house.vue
+++ b/src/views/modules/cabaseinfo/carotators-binding-house.vue
@@ -1,10 +1,10 @@
-
+
+ 取 消
+ 确 定
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
- 当前点击坐标为：
+
+ 取 消
+ 确 定
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- 禁用后该用户将无法登录系统，是否继续？
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 禁用后该用户将无法登录系统，是否继续？
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
- 取 消
- 确 定
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
+ 取 消
+ 确 定
+
- 取 消
- 确 定
-
-
- 取 消
- 确 定
-
-
- 关 闭
-
-
+ 取 消
+ 确 定
+
+
+ 取 消
+ 确 定
+
+
+ 关 闭
+
+
- 取 消
- 确 定
-
-
- 取 消
- 确 定
-
-
- 取 消
- 确 定
-
-
- 取 消
- 确 定
-
-
- 取 消
- 确 定
-
-
- 取 消
- 确 定
-
-
+ 取 消
+ 确 定
+
+
+
+
+
+ 取 消
+ 确 定
+
+
+ 取 消
+ 确 定
+
+
+ 取 消
+ 确 定
+
+
+ 取 消
+ 确 定
+
+
+ 取 消
+ 确 定
+
+
-
+
+
+
+
@@ -293,7 +321,7 @@
import { mapGetters } from 'vuex'
import { Loading } from 'element-ui' // 引入Loading服务
import { requestPost } from '@/js/dai/request'
-
+import personList from "../policy/personList";
var map
@@ -326,22 +354,11 @@ export default {
btnDisable: false,
keyWords: '',
- formData: {
- unitName: '',
- serviceMatterList: [],
- type: '',
- contact: '',
- contactMobile: '',
- memberCount: 0,
- remark: '', //备注【最大500字】
- address: '', //详细地址
- longitude: 36.0722275, //经度
- latitude: 120.38945519 //纬度
- },
+ formData: {},
feedbackFormData: {
serviceProjectId: '',// 服务项目id
- serviceProjectName: '',
+ serviceName: '',
serviceGoal: '',// 服务目标
serviceEffect: '',// 服务效果
servicePeopleNumber: null,// 服务人数
@@ -350,7 +367,7 @@ export default {
longitude: '',// 经度
latitude: '',// 维度
address: '',
- attachmentList: [],// 附件列表
+ fileList: [],// 附件列表
},
serviceList: [],//服务list
@@ -360,14 +377,19 @@ export default {
startPickerOptions: {
disabledDate: startDisabledDate
},
-
+ policyList: [],
projectList: [],
fileList: [],
uploadUlr: window.SITE_CONFIG['apiURL'] + '/oss/file/uploadvariedfile',
+
+ policyId: '',
+ showPersonList: false,
+ ruleList: []
}
},
- components: {},
+ components: { personList },
mounted () {
+ this.getPolicyList()
if (this.serviceRecordId) {//详情
this.loadInfo()
@@ -378,28 +400,82 @@ export default {
methods: {
+ //加载组织数据
+ async handlePersonList () {
+ if (!this.formData.policyId) {
+ this.$message.info('请先选择政策')
+ return false
+ }
+
+ this.policyId = this.formData.policyId
+ await this.loadRuleList()
+
+ this.showPersonList = true;
+ },
+
+ async loadRuleList () {
+
+ const url = "/heart/policy/rulelist/" + this.policyId
+
+ let params = {}
+
+ const { data, code, msg } = await requestPost(url, params)
+
+ if (code === 0) {
+ this.ruleList = data
+
+ } else {
+ this.$message.error(msg)
+ }
+ },
+
+ handleClose () {
+ this.showPersonList = false
+
+
+ },
+ handleOk () {
+ this.showPersonList = false
+
+ },
+
+ async getPolicyList () {
+ const url = '/heart/policy/policyListSelect'
+
+ let params = {}
+
+ const { data, code, msg } = await requestPost(url, params)
+
+ if (code === 0) {
+ this.policyList = data
+ } else {
+ this.$message.error(msg)
+ }
+ },
//加载组织
async loadInfo () {
- const url = `/heart/icServiceProject/service/detail/${this.serviceRecordId}`
- // const url = 'http://yapi.elinkservice.cn/mock/245/heart/icpartyunit/detail' + this.serviceRecordId
- let params = {}
+ const url = '/heart/icServiceRecordV2/detail'
+
+ let params = {
+ serviceRecordId: this.serviceRecordId
+ }
const { data, code, msg } = await requestPost(url, params)
if (code === 0) {
this.formData = { ...data }
this.formData.serviceRecordId = this.serviceRecordId
- this.feedbackFormData = { ...data.feedBack }
- this.feedbackFormData.servicePeopleNumber = this.formData.servicePeopleNumber
+ this.feedbackFormData = { ...data.feedback }
+
this.fileList = []
- if (data.feedBack.attachmentList && data.feedBack.attachmentList.length > 0) {
- data.feedBack.attachmentList.forEach(element => {
+ if (data.feedback && data.feedback.fileList && data.feedback.fileList.length > 0) {
+ data.feedback.fileList.forEach(element => {
let obj = {
- name: element.attachmentName,
- format: element.attachmentFormat,
- url: element.attachmentUrl,
+ name: element.name,
+ format: element.format,
+ url: element.url,
}
this.fileList.push(obj)
});
@@ -431,7 +507,7 @@ export default {
},
async editFuwu () {
const regPhone = /^1(3|4|5|6|7|8|9)\d{9}$/; //手机号码
- if (regPhone.test(this.formData.principalContact) === false) {
+ if (this.formData.principalContact && regPhone.test(this.formData.principalContact) === false) {
this.btnDisable = false
this.$message({
type: 'warning',
@@ -440,7 +516,7 @@ export default {
return false;
}
- let url = '/heart/icServiceProject/service/update'
+ let url = '/heart/icServiceRecordV2/edit'
// let url = "http://yapi.elinkservice.cn/mock/245/heart/icServiceProject/service/update"
@@ -593,18 +669,7 @@ export default {
resetData () {
- this.formData = {
- serviceCategoryKey: '',//服务分类id
- serviceProjectId: '',//服务项目id
- serviceOrgId: '',//服务组织id
- serviceScope: [],//
- principalName: '',//经办人(责任人)姓名
- principalContact: '',//经办人联系方式
- serviceTimeStart: '',//服务起始时间yyyy-MM-dd
- serviceTimeEnd: '',//服务截止时间yyyy-MM-dd
- remark: '',//
-
- }
+ this.formData = {}
},
// 开启加载动画
startLoading () {
@@ -626,22 +691,11 @@ export default {
dataRule () {
return {
- serviceCategoryKey: [
- { required: true, message: '服务类别不能为空', trigger: 'blur' },
- ],
- serviceProjectId: [
- { required: true, message: '服务项目不能为空', trigger: 'blur' }
- ],
- serviceOrgId: [
- { required: true, message: '服务组织不能为空', trigger: 'blur' }
- ],
serviceTimeStart: [
{ required: true, message: '服务时间不能为空', trigger: 'blur' }
],
- serviceScope: [
- { required: true, message: '服务范围不能为空', trigger: 'blur' }
- ],
+
}
},
@@ -652,17 +706,15 @@ export default {
type: String,
required: true
},
- formType: {//表单操作类型 add新增，edit编辑，detail详情,feedback反馈
+ serviceOrgName: {
type: String,
required: true
},
- categrayArray: {
- type: Array,
- required: true,
- default () {
- return []
- }
+ formType: {//表单操作类型 add新增，edit编辑，detail详情,feedback反馈
+ type: String,
+ required: true
},
+
satisfyArray: {
type: Array,
default () {
diff --git a/src/views/modules/communityService/fuwujilu/fuwuList.vue b/src/views/modules/communityService/fuwujilu/fuwuList.vue
index 2309bd626..aacc936b8 100644
--- a/src/views/modules/communityService/fuwujilu/fuwuList.vue
+++ b/src/views/modules/communityService/fuwujilu/fuwuList.vue
@@ -8,23 +8,9 @@
:label-width="'80px'">
-
-
-
- {{formData.serviceProjectName}}
+ {{formData.serviceName}}
+
+
+
+
+
+
+ 预览
+
+
-
@@ -96,8 +100,9 @@
prop="principalContact"
label-width="150px"
style="display: block">
-
@@ -105,7 +110,8 @@
-
至
-
-
-
已完成
-
无附件
@@ -286,6 +296,24 @@
:disabled="btnDisable"
@click="handleComfirm">确 定
+
+
-
-
-
-
-
-
-
-
+
-
-
+ prop="serviceOrgType">
+
+
+
+
+ -
+
+
+
+
@@ -59,7 +62,7 @@
class="item_width_2 data-tag"
size="small"
type="date"
- value-format="yyyy-MM-dd HH:mm:ss"
+ value-format="yyyy-MM-dd"
value="yyyy-MM-dd"
placeholder="结束时间">
@@ -132,15 +135,8 @@
align="center"
width="50" />
-
-
-
-
@@ -155,7 +151,7 @@
@@ -183,7 +179,7 @@
+ width="220">
反馈
+ 人员名单
+
+
+
+
@@ -273,13 +293,15 @@ import axios from "axios";
import addForm from "./addForm";
import detailForm from "./detailForm";
import feedBackForm from "./addForm";
+import personList from "../policy/personList";
export default {
- components: { addForm, detailForm, feedBackForm },
+ components: { addForm, detailForm, feedBackForm, personList },
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
@@ -299,7 +321,7 @@ export default {
agencyId: '',
tableData: [],
- categrayArray: [],
+
statusArray: [
{
value: "in_service",
@@ -327,9 +349,10 @@ export default {
],
formData: {
- serviceCategoryKey: '',//服务类别id
- serviceProjectName: '',//项目名称
- serviceOrgName: '',//服务组织名称
+
+ serviceName: '',//项目名称
+ serviceOrgType: '',//服务组织类型
+ serviceOrgId: '',//服务组织Id
serviceTimeStart: '',//服务开始时间yyyy-MM-dd
serviceTimeEnd: '',//服务结束时间yyyy-MM-dd
serviceStatus: '',//服务状态。in_service服务中；completed:已完成
@@ -346,7 +369,8 @@ export default {
disabledDate: startDisabledDate
},
serviceRecordId: '',
- serviceProjectName: '',
+ serviceName: '',
+ serviceOrgName: '',
showAdd: false,
showDetail: false,
@@ -355,6 +379,12 @@ export default {
addDiaTitle: '发起服务',
detailDiaTitle: '服务详情',
+ serviceOptions: [],
+ serviceOptiondList: [],
+
+ policyId: '',
+ showPersonList: false,
+ ruleList: []
};
},
computed: {
@@ -366,19 +396,19 @@ export default {
...mapGetters(["clientHeight", "iframeHeight"]),
},
watch: {
- "formData.serviceTimeEnd": function (val) {
- if (val && val != '') {
- let arrayTemp = val.split(' ')
- this.formData.serviceTimeEnd = arrayTemp[0] + ' 23:59:59'
- }
+ // "formData.serviceTimeEnd": function (val) {
+ // if (val && val != '') {
+ // let arrayTemp = val.split(' ')
+ // this.formData.serviceTimeEnd = arrayTemp[0] + ' 23:59:59'
+ // }
- },
+ // },
},
mounted () {
console.log(this.$store.state)
this.user = this.$store.state.user
this.agencyId = this.user.agencyId
- this.getCategrayList()
+ this.getDictOptions()
this.getTableData();
},
methods: {
@@ -388,23 +418,83 @@ export default {
this.pageNo = 1;
this.getTableData();
},
- // 字典
- async getCategrayList () {
+ // 获取服务组织
+ async getDictOptions () {
const url = "/sys/dict/data/dictlist"
let params = {
- dictType: 'ic_service_type'
+ dictType: 'user_demand_service_type'
}
const { data, code, msg } = await requestPost(url, params)
if (code === 0) {
- this.categrayArray = data
+ this.serviceOptions = data;
} else {
this.$message.error(msg)
}
},
+ handleServiceChange (type, val) {
+ this.formData.serviceOrgId = ''
+ if (val === "social_org") {
+ if (type === "add") {
+ this.getServiceuserList(val, "add_demand");
+ } else {
+ this.getServiceuserList(val, "query_demand");
+ }
+ } else {
+ this.getServiceuserList(val, "");
+ }
+ },
+
+ async getServiceuserList (serviceType, query) {
+ if (!serviceType) return false;
+
+ const params = {
+ serviceName: "",
+ serviceType: serviceType,
+ queryPurpose: query,
+ };
+ await this.$http
+ .post("/heart/userdemand/servicelist", params)
+ .then(({ data: res }) => {
+ if (res.code !== 0) {
+ return this.$message.error(res.msg);
+ } else {
+ this.serviceOptiondList = res.data
+ }
+ })
+ .catch(() => {
+ return this.$message.error("网络错误");
+ });
+ },
+ //加载组织数据
+ async handlePersonList (row) {
+
+ this.policyId = row.policyId
+ await this.loadRuleList()
+ this.formType = 'personList'
+ this.showPersonList = true;
+ },
+
+ async loadRuleList () {
+
+ const url = "/heart/policy/rulelist/" + this.policyId
+
+ let params = {}
+
+ const { data, code, msg } = await requestPost(url, params)
+
+ if (code === 0) {
+ this.ruleList = data
+
+ } else {
+ this.$message.error(msg)
+ }
+
+ },
+
async handleAdd () {
this.addDiaTitle = '发起服务'
@@ -413,14 +503,18 @@ export default {
},
async handleDetail (row) {
+ this.detailDiaTitle = "服务详情"
this.serviceRecordId = row.serviceRecordId
+ this.serviceOrgName = row.serviceOrgName
this.formType = 'detail'
this.showDetail = true
},
async handleEdit (row) {
+ this.detailDiaTitle = "编辑服务"
this.serviceRecordId = row.serviceRecordId
+ this.serviceOrgName = row.serviceOrgName
this.formType = 'edit'
this.showDetail = true
@@ -430,7 +524,7 @@ export default {
async handleFeedback (row) {
this.serviceRecordId = row.serviceRecordId
- this.serviceProjectName = row.serviceProjectName
+ this.serviceName = row.serviceName
this.addDiaTitle = '服务反馈'
this.formType = 'feedback'
this.showAdd = true;
@@ -476,16 +570,16 @@ export default {
});
-
-
},
async cancelFuwu () {
- const url = `/heart/icServiceProject/service/cancel/${this.serviceRecordId}`;
-
+ const url = '/heart/icServiceRecordV2/cancel';
+ let params = {
+ serviceRecordId: this.serviceRecordId
+ }
- const { data, code, msg } = await requestPost(url, {});
+ const { data, code, msg } = await requestPost(url, params);
if (code === 0) {
this.$message.success("取消成功！");
@@ -497,12 +591,13 @@ export default {
async getTableData () {
this.tableLoading = true
- const url = "/heart/icServiceProject/service/recordList";
- // const url = "http://yapi.elinkservice.cn/mock/245/heart/icServiceProject/service/recordList";
+ const url = "/heart/icServiceRecordV2/list";
+
const { pageSize, pageNo, formData } = this;
const { data, code, msg } = await requestPost(url, {
pageSize,
pageNo,
+ serviceCategoryKey: this.serviceCategoryKey,
...formData,
});
@@ -511,23 +606,9 @@ export default {
this.total = data.total || 0;
this.tableData = data.list
- ? data.list.map((item) => {
- return item;
- })
- : [];
-
- this.tableData.forEach(item => {
- if (item.operationType === '2') {
- item.operationTypeShow = '已转需求'
- }
- if (item.operationType === '1') {
- item.operationTypeShow = '已立项'
- }
- if (item.operationType === '0') {
- item.operationTypeShow = '已回复'
- }
- });
+
+
} else {
this.$message.error(msg);
}
@@ -582,20 +663,29 @@ export default {
resetSearch () {
this.formData = {
- serviceCategoryKey: '',
- serviceProjectName: '',
- serviceOrgName: '',
- serviceTimeStart: '',
- serviceTimeEnd: '',
- serviceStatus: '',
- satisfaction: ''
+ serviceName: '',//项目名称
+ serviceOrgType: '',//服务组织类型
+ serviceOrgId: '',//服务组织Id
+ serviceTimeStart: '',//服务开始时间yyyy-MM-dd
+ serviceTimeEnd: '',//服务结束时间yyyy-MM-dd
+ serviceStatus: '',//服务状态。in_service服务中；completed:已完成
+ satisfaction: '',//满意度.不满意:bad、基本满意:good、非常满意:perfect
}
this.pageNo = 1
- // this.getTableData()
+ this.getTableData()
},
},
+
+ props: {
+
+ serviceCategoryKey: {
+ type: String,
+ required: 'true'
+ },
+
+ }
};
diff --git a/src/views/modules/communityService/fuwujilu/fuwuList00.vue b/src/views/modules/communityService/fuwujilu/fuwuList00.vue
new file mode 100644
index 000000000..6fb615f8f
--- /dev/null
+++ b/src/views/modules/communityService/fuwujilu/fuwuList00.vue
@@ -0,0 +1,51 @@
+
+
+
+
+
+
+
+
diff --git a/src/views/modules/communityService/fuwujilu/fuwuList01.vue b/src/views/modules/communityService/fuwujilu/fuwuList01.vue
new file mode 100644
index 000000000..84a766dbd
--- /dev/null
+++ b/src/views/modules/communityService/fuwujilu/fuwuList01.vue
@@ -0,0 +1,51 @@
+
+
+
+
+
+
+
+
diff --git a/src/views/modules/communityService/fuwujilu/fuwuList02.vue b/src/views/modules/communityService/fuwujilu/fuwuList02.vue
new file mode 100644
index 000000000..0490cfa91
--- /dev/null
+++ b/src/views/modules/communityService/fuwujilu/fuwuList02.vue
@@ -0,0 +1,51 @@
+
+
+
+
+
+
+
+
diff --git a/src/views/modules/communityService/fuwujilu/fuwuList03.vue b/src/views/modules/communityService/fuwujilu/fuwuList03.vue
new file mode 100644
index 000000000..8985e32ac
--- /dev/null
+++ b/src/views/modules/communityService/fuwujilu/fuwuList03.vue
@@ -0,0 +1,51 @@
+
+
+
+
+
+
+
+
diff --git a/src/views/modules/communityService/fuwujilu/fuwuList04.vue b/src/views/modules/communityService/fuwujilu/fuwuList04.vue
new file mode 100644
index 000000000..1dcca1d4c
--- /dev/null
+++ b/src/views/modules/communityService/fuwujilu/fuwuList04.vue
@@ -0,0 +1,51 @@
+
+
+
+
+
+
+
+
diff --git a/src/views/modules/communityService/fuwujilu/fuwuList05.vue b/src/views/modules/communityService/fuwujilu/fuwuList05.vue
new file mode 100644
index 000000000..9015eeb63
--- /dev/null
+++ b/src/views/modules/communityService/fuwujilu/fuwuList05.vue
@@ -0,0 +1,51 @@
+
+
+
+
+
+
+
+
diff --git a/src/views/modules/communityService/fuwujilu/fuwuList06.vue b/src/views/modules/communityService/fuwujilu/fuwuList06.vue
new file mode 100644
index 000000000..ef9930ad5
--- /dev/null
+++ b/src/views/modules/communityService/fuwujilu/fuwuList06.vue
@@ -0,0 +1,51 @@
+
+
+
+
+
+
+
+
diff --git a/src/views/modules/communityService/fuwujilu/fuwuList07.vue b/src/views/modules/communityService/fuwujilu/fuwuList07.vue
new file mode 100644
index 000000000..8b9b37b4f
--- /dev/null
+++ b/src/views/modules/communityService/fuwujilu/fuwuList07.vue
@@ -0,0 +1,51 @@
+
+
+
+
+
+
+
+
diff --git a/src/views/modules/communityService/fuwujiluOld/addForm.vue b/src/views/modules/communityService/fuwujiluOld/addForm.vue
new file mode 100644
index 000000000..8cb7c9c7e
--- /dev/null
+++ b/src/views/modules/communityService/fuwujiluOld/addForm.vue
@@ -0,0 +1,960 @@
+
+
+
+
+
+
+
+
+
diff --git a/src/views/modules/communityService/fuwujiluOld/detailForm.vue b/src/views/modules/communityService/fuwujiluOld/detailForm.vue
new file mode 100644
index 000000000..6125199cc
--- /dev/null
+++ b/src/views/modules/communityService/fuwujiluOld/detailForm.vue
@@ -0,0 +1,693 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 至
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ {{feedbackFormData.serviceProjectName}}
+ --
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 已完成
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 点击上传
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 查询
+
+ 支持图片、word、pdf
+
+ 取 消
+ 确 定
+
+
+
+
+
+
+
+
+
diff --git a/src/views/modules/communityService/fuwujiluOld/fuwuList.vue b/src/views/modules/communityService/fuwujiluOld/fuwuList.vue
new file mode 100644
index 000000000..c670f259b
--- /dev/null
+++ b/src/views/modules/communityService/fuwujiluOld/fuwuList.vue
@@ -0,0 +1,607 @@
+
+
+
+
+
+
+ {{formData.serviceCategoryName}}
+
+
+
+
+
+ {{formData.serviceProjectName}}
+
+
+
+
+ {{formData.serviceOrgName}}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 至
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ {{item.objectName}}
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 已完成
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 无附件
+
+
+
+
+ 反馈内容
+ +
+ 取 消
+ 确 定
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/src/views/modules/communityService/measure/index.vue b/src/views/modules/communityService/measure/index.vue
index f42f18f97..ce8cd0a63 100644
--- a/src/views/modules/communityService/measure/index.vue
+++ b/src/views/modules/communityService/measure/index.vue
@@ -1,39 +1,35 @@
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 至
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 查询
+ 重置
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ {{scope.row.serviceTimeStart}}-{{scope.row.serviceTimeEnd}}
+
+
+
+
+
+ {{scope.row.serviceStatus==='in_service'?'进行中':'已完成'}}
+
+
+
+
+
+
+
+
+ 详情
+ 编辑
+ 反馈
+ 取消
+
+
+
+
+
+
+
+
+ 发起服务
+
+
+
+
+
+
+
+
+
+
-
+
+
+
+
@@ -145,7 +148,8 @@ export default {
getDataListURL: '/epmetuser/changeWelfare/page',
getDataListIsPage: true,
deleteURL: '/epmetuser/changeWelfare',
- deleteIsBatch: true
+ deleteIsBatch: true,
+ exportURL: '/epmetuser/changeWelfare/export'
},
dataForm: {
id: ''
@@ -178,6 +182,34 @@ export default {
}
},
methods: {
+ exportHandle () {
+ const url = this.mixinViewModuleOptions.exportURL
+ this.$http({
+ method: 'GET',
+ url,
+ responseType: 'blob',
+ params: this.dataForm
+ }).then(res => {
+ // this.download(res.data, title + '.xls')
+ if (res.headers["content-disposition"]) {
+ let fileName = window.decodeURI(res.headers["content-disposition"].split(";")[1].split("=")[1])
+ console.log('filename', fileName)
+ let blob = new Blob([res.data], { type: 'application/vnd.ms-excel' })
+ var url = window.URL.createObjectURL(blob)
+ var aLink = document.createElement('a')
+ aLink.style.display = 'none'
+ aLink.href = url
+ aLink.setAttribute('download', fileName)
+ document.body.appendChild(aLink)
+ aLink.click()
+ document.body.removeChild(aLink) //下载完成移除元素
+ window.URL.revokeObjectURL(url) //释放掉blob对象
+ } else this.$message.error('下载失败')
+ }).catch(err => {
+ console.log('err', err)
+ return this.$message.error('网络错误')
+ })
+ },
resetForm(formName) {
for(const n in this.dataForm) {
this.dataForm[n] = ''
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 }}
+
+
+
+
+
-
其他
-
+ -->
-
+
+
+
+
+ 查看
+
+ 修改
+ 取消
+
+ 指派
+
+ 完成
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ -
+
+
+
+
+
+
+
+ {{ form.cancelTime }}
+
+
+
+
+
+
+
+ 已解决
+ 未解决
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/src/views/modules/communityService/measure/info.vue b/src/views/modules/communityService/measure/info.vue
index 5d84e0cde..7c4b3dd85 100644
--- a/src/views/modules/communityService/measure/info.vue
+++ b/src/views/modules/communityService/measure/info.vue
@@ -1,30 +1,37 @@
-
-
-
-
- 查看
-
- 修改
- 取消
-
- 指派
-
- 完成
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- -
-
-
-
-
-
-
-
- {{ form.cancelTime }}
-
-
-
-
-
+ 完成
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
- 已解决
- 未解决
+
+
-
-
+
-
-
+
-
-
-
-
-
+
+ {{ form.cancelTime }}
-
-
-
+
+
+
+
+ 已解决
+ 未解决
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/src/views/modules/communityService/policy/detailForm.vue b/src/views/modules/communityService/policy/detailForm.vue
new file mode 100644
index 000000000..6125199cc
--- /dev/null
+++ b/src/views/modules/communityService/policy/detailForm.vue
@@ -0,0 +1,693 @@
+
+
-
+
@@ -152,194 +129,157 @@
-
+
+
-
+
{{ handleFilterSpan(scope.row, item) }}
-
+
- 指派
+ type="text"
+ size="small"
+ @click="handleAppoint(scope.row, 'appoint')">指派
-
-
+ 完成情况
+ type="text"
+ size="small"
+ @click="handleFinish(scope.row, 'finish')">完成情况
- 完成情况
+ type="text"
+ size="small"
+ @click="handleFinish(scope.row, 'finish')">完成情况
- 修改
-
- 修改
+
+ 取消
+ slot="reference"
+ type="text"
+ size="small"
+ class="btn-color-del">取消
- 查看
+ 查看
-
-
-
-
+
+
+
-
+
+
-
-
+
-
-
-
+
+
+
-
-
+
-
-
+
-
-
+
+
-
-
-
+
+
+
-
-
+
+
-
-
+
-
+ label="服务方"
+ prop="serviceType">
-
-
+
+
-
-
-
+
+
-
+
{{ form.cancelTime }}
-
-
-
+ ">
+
+
-
- 已解决
- 未解决
+
+ 已解决
+ 未解决
-
-
+
-
-
+
-
-
+
+
-
@@ -617,7 +514,7 @@ import info from "./info";
export default {
components: { info },
- data() {
+ data () {
return {
tableLoading: false,
btnLoading: false,
@@ -879,13 +776,13 @@ export default {
},
computed: {
...mapGetters(["clientHeight", "iframeHeight"]),
- tableHeight() {
+ tableHeight () {
const h = this.clientHeight - this.searchH - 280 + this.iframeHeigh;
const _h = this.clientHeight - 280 - this.searchH;
return this.$store.state.inIframe ? h : _h;
},
},
- async created() {
+ async created () {
this.customerId = localStorage.getItem("customerId");
this.getTableData();
@@ -897,24 +794,24 @@ export default {
}, 200);
this.pageLoading = true;
},
- mounted() {
+ mounted () {
this.$nextTick(() => {
this.searchH = this.$refs.searchCard.$el.offsetHeight;
console.log("tableHeight", this.tableHeight);
});
},
methods: {
- handleSizeChange(val) {
+ handleSizeChange (val) {
console.log(`每页 ${val} 条`);
this.pageSize = val;
this.getTableData();
},
- handleCurrentChange(val) {
+ handleCurrentChange (val) {
console.log(`当前页: ${val}`);
this.currentPage = val;
this.getTableData();
},
- handleFilterSpan(row, item) {
+ handleFilterSpan (row, item) {
let _val = "";
if (item.options && item.options.length > 0) {
item.options.forEach((n) => {
@@ -923,11 +820,11 @@ export default {
}
return _val || row[item.columnName];
},
- filterEdit(id) {
+ filterEdit (id) {
const { user } = this.$store.state;
return id === user.agencyId;
},
- resetForm(formName) {
+ resetForm (formName) {
this.searchForm.reportStartTime = "";
this.searchForm.reportEndTime = "";
this.searchForm.wantServiceStartTime = "";
@@ -939,12 +836,12 @@ export default {
this.$refs[formName].resetFields();
this.handleSearch();
},
- handleCateCHange(val) {
+ handleCateCHange (val) {
console.log("val", val);
this.searchForm.categoryCode = val[1] || val[0];
this.searchForm.level = val.length;
},
- handleCateSlect(val) {
+ handleCateSlect (val) {
console.log("val", val);
if (val.length === 1) {
this.demandOptions.forEach((item) => {
@@ -956,14 +853,14 @@ export default {
this.form.categoryCode = val[1];
}
},
- handleDemandChange(val) {
+ handleDemandChange (val) {
console.log("val", val, this.selectDemandUser);
this.selectDemandUser = val.label;
this.form.demandUserName = val.demandUserName;
this.form.demandUserMobile = val.demandUserMobile;
this.form.demandUserId = val.demandUserId;
},
- handleSearch(val) {
+ handleSearch (val) {
console.log("searchhh--", val);
this.currentPage = 1;
if (Array.isArray(this.reportTime) && this.reportTime.length > 0) {
@@ -976,27 +873,27 @@ export default {
}
this.getTableData();
},
- handelBlurServiceTime(val) {
+ handelBlurServiceTime (val) {
console.log("val", val);
if (val.length > 0) {
this.form.serviceStartTime = val[0];
this.form.serviceEndTime = val[1];
}
},
- handleServiceChange(type, val) {
+ handleServiceChange (type, val) {
if (val === "social_org") {
if (type === "add") this.getServiceuserList(val, "add_demand");
else this.getServiceuserList(val, "query_demand");
} else this.getServiceuserList(val, "");
},
- handleGridChange(val) {
+ handleGridChange (val) {
this.getDemandUserList();
},
- handleAdd(addType) {
+ handleAdd (addType) {
this.addType = addType;
this.dialogVisible = true;
},
- handlerCancle() {
+ handlerCancle () {
// this.form.categoryCode = ''
// this.form.parentCode = ''
// this.form.demandUserName = ''
@@ -1012,7 +909,7 @@ export default {
// this.$refs.ruleForm.resetFields()
this.dialogVisible = false;
},
- async formatRowForm(row, addType, disabled) {
+ async formatRowForm (row, addType, disabled) {
this.form = { ...row, categoryCode: [row.parentCode, row.categoryCode] };
this.addType = addType;
@@ -1053,16 +950,16 @@ export default {
this.dialogVisible = true;
},
- async handleLook(row, type) {
+ async handleLook (row, type) {
await this.formatRowForm(row, type, true);
},
- async handleAppoint(row, type) {
+ async handleAppoint (row, type) {
await this.formatRowForm(row, type, true);
},
- async handleFinish(row, type) {
+ async handleFinish (row, type) {
await this.formatRowForm(row, type, true);
},
- async handleEdit(row, type) {
+ async handleEdit (row, type) {
await this.formatRowForm(row, type, false);
// this.form = { ...row, categoryCode: [row.parentCode, row.categoryCode] }
// this.addType = addType
@@ -1076,12 +973,12 @@ export default {
// console.log('selectDemandUser', this.selectDemandUser)
// this.dialogVisible = true
},
- formatRowForm2(row, type) {
+ formatRowForm2 (row, type) {
this.visitableInfo = true;
this.currDemandId = row.demandRecId;
this.infoAddType = type;
},
- async addNew() {
+ async addNew () {
const _form = {
...this.form,
};
@@ -1100,7 +997,7 @@ export default {
});
this.btnLoading = false;
},
- async appointAjax() {
+ async appointAjax () {
const _form = {
demandRecId: this.form.demandRecId,
serviceType: this.form.serviceType,
@@ -1121,7 +1018,7 @@ export default {
});
this.btnLoading = false;
},
- async finishAjax() {
+ async finishAjax () {
const { reportType, serviceShowFlag, serviceType } = this.form;
const _form = {
demandRecId: this.form.demandRecId,
@@ -1147,7 +1044,7 @@ export default {
});
this.btnLoading = false;
},
- async editCate() {
+ async editCate () {
const categoryCode = this.form.categoryCode;
if (Array.isArray(categoryCode)) {
if (categoryCode.length === 1) {
@@ -1180,7 +1077,7 @@ export default {
});
this.btnLoading = false;
},
- handleSUbmit() {
+ handleSUbmit () {
this.$refs.ruleForm.validate(async (valid) => {
if (valid) {
this.btnLoading = true;
@@ -1194,7 +1091,7 @@ export default {
}
});
},
- handleDel(row) {
+ handleDel (row) {
let params = {
demandRecId: row.demandRecId,
};
@@ -1216,7 +1113,7 @@ export default {
return this.$message.error("网络错误");
});
},
- getTreeData(data) {
+ getTreeData (data) {
if (!Array.isArray(data)) return [];
let arr = data.map((item) => {
let _item = {};
@@ -1231,7 +1128,7 @@ export default {
});
return arr;
},
- getFlagData(data, flag) {
+ getFlagData (data, flag) {
if (!Array.isArray(data)) return [];
let arr1 = data.filter((item) => item[flag]);
let arr2 = arr1.map((item) => {
@@ -1242,7 +1139,7 @@ export default {
// console.log('arrr-oppp', arr2)
return arr2;
},
- async getGridList(type, agencyId) {
+ async getGridList (type, agencyId) {
const { user } = await this.$store.state;
console.log("user---ppp", user);
// addorupdate query
@@ -1265,7 +1162,7 @@ export default {
return this.$message.error("网络错误");
});
},
- async getDemandUserList() {
+ async getDemandUserList () {
const { user } = await this.$store.state;
console.log("user---ppp", user);
const params = {
@@ -1289,7 +1186,7 @@ export default {
});
},
- async getDemandOptions() {
+ async getDemandOptions () {
this.$http
.post("/heart/icresidemanddict/demandoption")
.then(({ data: res }) => {
@@ -1307,7 +1204,7 @@ export default {
return this.$message.error("网络错误");
});
},
- async getServiceuserList(serviceType, query) {
+ async getServiceuserList (serviceType, query) {
if (!serviceType) return false;
const { demandUserId } = this.form;
const params = {
@@ -1330,7 +1227,7 @@ export default {
return this.$message.error("网络错误");
});
},
- async getDictOptions() {
+ async getDictOptions () {
this.$http
.post("/sys/dict/data/dictlist", { dictType: "user_demand_status" })
.then(({ data: res }) => {
@@ -1373,7 +1270,7 @@ export default {
return this.$message.error("网络错误");
});
},
- async getTableData() {
+ async getTableData () {
this.tableLoading = true;
let params = {
...this.searchForm,
diff --git a/src/views/modules/communityService/measure/info copy.vue b/src/views/modules/communityService/measure/info copy.vue
new file mode 100644
index 000000000..5d84e0cde
--- /dev/null
+++ b/src/views/modules/communityService/measure/info copy.vue
@@ -0,0 +1,923 @@
+
+
-
-
-
+
+
+
-
-
+
-
-
+
-
-
-
+
+
+
-
-
+
+
-
-
-
+
+
+
-
-
+
+
-
-
+
+
- 查询
+ 查询
- 重置
+ 重置
- 新增
+ 新增
-
-
+
- {{
+ {{
addType != "look" ? "取消" : "关闭"
}}
- 提交
+ 提交
+ 关闭
+ 提交
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ -
+
+
+
+
+
+
- 关闭
- 提交
-
-
+
+
+
+
+
+
+
+
+
+
+ 关闭
+ 提交
+
+
+
+
+
+
+
+
+
diff --git a/src/views/modules/communityService/policy/personList.vue b/src/views/modules/communityService/policy/personList.vue
new file mode 100644
index 000000000..e8d1ff80b
--- /dev/null
+++ b/src/views/modules/communityService/policy/personList.vue
@@ -0,0 +1,113 @@
+
+
+
+
+
+
+ {{formData.serviceCategoryName}}
+
+
+
+
+
+ {{formData.serviceProjectName}}
+
+
+
+
+ {{formData.serviceOrgName}}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 至
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ {{item.objectName}}
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 已完成
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 无附件
+
+
+
+
+ 反馈内容
+ +
+ 取 消
+ 确 定
+
+
+
+
+
+
+
+
+
+
+
diff --git a/src/views/modules/communityService/policy/personListItem.vue b/src/views/modules/communityService/policy/personListItem.vue
new file mode 100644
index 000000000..225f674a6
--- /dev/null
+++ b/src/views/modules/communityService/policy/personListItem.vue
@@ -0,0 +1,627 @@
+
+
+
+
+
+ {{'政策细则'+(index+1)}}：{{item.ruleName}}
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/src/views/modules/communityService/policy/policyList.vue b/src/views/modules/communityService/policy/policyList.vue
new file mode 100644
index 000000000..1fbfa97ca
--- /dev/null
+++ b/src/views/modules/communityService/policy/policyList.vue
@@ -0,0 +1,506 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 查询
+ 重置
+ 导出
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/src/views/modules/communityService/policy/rule.vue b/src/views/modules/communityService/policy/rule.vue
new file mode 100644
index 000000000..902653cb9
--- /dev/null
+++ b/src/views/modules/communityService/policy/rule.vue
@@ -0,0 +1,1242 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 查询
+ 重置
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ {{scope.row.startDate}}-{{scope.row.endDate}}
+
+
+
+
+
+ {{scope.row.expiredFlag==='1'?'已过期':'未过期'}}
+
+
+
+
+
+ 详情
+ 编辑
+ 复制
+ 人员名单
+ 删除
+
+
+
+
+
+
+
+
+ 新增政策
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/src/views/modules/communityService/sqzzz/index.vue b/src/views/modules/communityService/sqzzz/index.vue
index 6193674c7..036e9d149 100644
--- a/src/views/modules/communityService/sqzzz/index.vue
+++ b/src/views/modules/communityService/sqzzz/index.vue
@@ -1,147 +1,139 @@
+ 预览
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 
+ 
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
-
-
+
+
+
+
-
-
+
+
-
-
+
+
- 查询
- 重置
+ 查询
+ 重置
-
+
+
-
+
{{ scope.row.organizationName }}
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
- 积分记录
-
- 修改
-
-
- 删除
+ 积分记录
+
+ 修改
+ 同步
+ 取消同步
+
+
+ 删除
-
-
+
-
-
+
@@ -244,7 +225,7 @@ import scoreRecord from "../../../components/scoreRecord.vue";
export default {
components: { editForm, scoreRecord },
- data() {
+ data () {
return {
openSearch: false,
@@ -274,7 +255,7 @@ export default {
};
},
computed: {
- maxTableHeight() {
+ maxTableHeight () {
return this.$store.state.inIframe
? this.clientHeight - 360 + this.iframeHeigh
: this.clientHeight - 360;
@@ -292,11 +273,11 @@ export default {
}
},
},
- mounted() {
+ mounted () {
this.getTableData();
},
methods: {
- async handleExportModule() {
+ async handleExportModule () {
let url = "/heart/iccommunityselforganization/import-template-download";
let params = {};
@@ -333,18 +314,18 @@ export default {
});
},
// 上传大图标成功
- handleExcelSuccess(res, file) {
+ handleExcelSuccess (res, file) {
if (res.code === 0 && res.msg === "success") {
console.log("resss---ppp", res);
} else {
this.$message.error(res.msg);
}
},
- handleProgress(event, file, fileList) {
+ handleProgress (event, file, fileList) {
console.log("percentage", file.percentage);
},
- beforeExcelUpload(file) {
+ beforeExcelUpload (file) {
console.log("file", file);
const isType = file.type === "application/vnd.ms-excel";
const isTypeComputer =
@@ -361,7 +342,7 @@ export default {
}
return fileType && isLt1M;
},
- async uploadHttpRequest(file) {
+ async uploadHttpRequest (file) {
this.importLoading = true;
this.importBtnTitle = "正在上传中...";
this.$message({
@@ -416,38 +397,38 @@ export default {
this.$refs.upload.clearFiles();
},
- handleSizeChange(val) {
+ handleSizeChange (val) {
console.log(`每页 ${val} 条`);
this.pageSize = val;
window.localStorage.setItem("pageSize", val);
this.getTableData();
},
- handleCurrentChange(val) {
+ handleCurrentChange (val) {
console.log(`当前页: ${val}`);
this.pageNo = val;
this.getTableData();
},
- handleClose() {
+ handleClose () {
this.formShow = false;
},
- handleSearch(val) {
+ handleSearch (val) {
console.log(this.fmData);
this.pageNo = 1;
this.getTableData();
},
- resetForm(formName) {
+ resetForm (formName) {
this.$refs[formName].resetFields();
this.handleSearch();
},
- async handleAdd() {
+ async handleAdd () {
this.formShow = true;
await nextTick();
console.log(this.$refs);
this.$refs.eleEditForm.initForm("add");
},
- async handleChu() {
+ async handleChu () {
const url =
"/heart/iccommunityselforganization/exportcommunityselforganization";
const { pageSize, pageNo, fmData } = this;
@@ -483,23 +464,117 @@ export default {
});
},
- async handleWatch(rowIndex) {
+ async handleWatch (rowIndex) {
this.formShow = true;
await nextTick();
this.$refs.eleEditForm.initForm("detail", this.tableData[rowIndex]);
},
- async handleEdit(rowIndex) {
+ async handleSync (row) {
+
+ this.$confirm("确认同步到通讯录？", "提示", {
+ confirmButtonText: "确定",
+ cancelButtonText: "取消",
+ type: "warning"
+ })
+ .then(() => {
+ this.syncUnit(row)
+ })
+ .catch(err => {
+ if (err == "cancel") {
+
+ }
+
+ });
+ },
+ async handleNoSync (row) {
+
+ this.$confirm("确认取消同步?", "提示", {
+ confirmButtonText: "确定",
+ cancelButtonText: "取消",
+ type: "warning"
+ })
+ .then(() => {
+ this.noSyncUnit(row)
+ })
+ .catch(err => {
+ if (err == "cancel") {
+
+ }
+
+ });
+ },
+
+ async syncUnit (row) {
+ const url = "/gov/org/department/syncdept"
+
+ let params = {
+ id: row.orgId,
+ deptName: row.organizationName,
+ mobile: row.principalPhone,
+ personName: row.principalName,
+ deptType: 'community_org',
+ }
+
+ const { data, code, msg } = await requestPost(url, params)
+
+ if (code === 0) {
+ if (data.type) {
+ this.$message({
+ type: "success",
+ message: data.msg || "同步成功"
+ });
+
+ this.loadTable()
+
+ } else {
+ this.$message.error(data.msg)
+ }
+
+ } else {
+ this.$message.error(msg)
+ }
+ },
+
+ async noSyncUnit (row) {
+ const url = "/gov/org/department/notsyncdept"
+ // const url = "http://yapi.elinkservice.cn/mock/245/heart/icpartyunit/delete"
+
+ let params = {
+ id: row.orgId,
+ deptId: row.deptId,
+ deptStaffId: row.deptStaffId,
+ deptType: 'community_org',
+ }
+
+ const { data, code, msg } = await requestPost(url, params)
+
+ if (code === 0) {
+ if (data.type) {
+ this.$message({
+ type: "success",
+ message: "取消同步成功"
+ });
+ this.getTableData();
+ } else {
+ this.$message.error(data.msg)
+ }
+ } else {
+ this.$message.error(msg)
+ }
+ },
+
+ async handleEdit (rowIndex) {
this.formShow = true;
await nextTick();
this.$refs.eleEditForm.initForm("edit", this.tableData[rowIndex]);
},
- handleEditSuccess() {
+ handleEditSuccess () {
this.handleClose();
this.getTableData();
},
- async handleDel(rowData, rowIndex) {
+ async handleDel (rowData, rowIndex) {
console.log(rowData, rowIndex);
const url =
"/heart/iccommunityselforganization/delcommunityselforganization";
@@ -518,7 +593,7 @@ export default {
}
},
- async getTableData() {
+ async getTableData () {
const url =
"/heart/iccommunityselforganization/communityselforganizationlist";
const { pageSize, pageNo, fmData } = this;
@@ -532,8 +607,8 @@ export default {
this.total = data.total || 0;
this.tableData = data.list
? data.list.map((item) => {
- return item;
- })
+ return item;
+ })
: [];
} else {
this.$message.error(msg);
@@ -541,14 +616,14 @@ export default {
},
//积分记录
- handleScore(row) {
+ handleScore (row) {
this.scoreDiaShow = true;
this.$nextTick(() => {
this.$refs.ref_score.initForm(row.orgId);
});
},
- diaClose() {
+ diaClose () {
this.scoreDiaShow = false;
},
},
diff --git a/src/views/modules/plugins/.gitkeep b/src/views/modules/plugins/.gitkeep
deleted file mode 100644
index e69de29bb..000000000
diff --git a/src/views/modules/plugins/change/changewelfare.vue b/src/views/modules/plugins/change/changewelfare.vue
index 921f93f3d..fe4ecbd6e 100644
--- a/src/views/modules/plugins/change/changewelfare.vue
+++ b/src/views/modules/plugins/change/changewelfare.vue
@@ -54,8 +54,11 @@
- 新增
- 下载模板
-
- {{ importBtnTitle }}
+ 新增
+ 下载模板
+
+ {{ importBtnTitle }}
- 导出
+ 导出
-
-
+
- {{ $t('add') }}
+ {{ $t('export') }}
+
-
+
{
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/plugins/point/icpointvaccinesinoculation-add-or-update.vue b/src/views/modules/plugins/point/icpointvaccinesinoculation-add-or-update.vue
index d33f449a2..ed8684a6f 100644
--- a/src/views/modules/plugins/point/icpointvaccinesinoculation-add-or-update.vue
+++ b/src/views/modules/plugins/point/icpointvaccinesinoculation-add-or-update.vue
@@ -320,20 +320,20 @@ export default {
this.afterTime = null;
return false;
}
- if (hour_0 == 12) {
- if (minute_0 == 0 && second_0 == 0) {
- this.$message.error("请选择12:01-23:59时间段的时间");
- this.afterTime = null;
- return false;
- }
- }
- if (hour_1 == 12) {
- if (minute_1 == 0 && second_1 == 0) {
- this.$message.error("请选择12:01-23:59时间段的时间");
- this.afterTime = null;
- return false;
- }
- }
+ // if (hour_0 == 12) {
+ // if (minute_0 == 0 && second_0 == 0) {
+ // this.$message.error("请选择12:01-23:59时间段的时间");
+ // this.afterTime = null;
+ // return false;
+ // }
+ // }
+ // if (hour_1 == 12) {
+ // if (minute_1 == 0 && second_1 == 0) {
+ // this.$message.error("请选择12:01-23:59时间段的时间");
+ // this.afterTime = null;
+ // return false;
+ // }
+ // }
this.dataForm.afStartTime = this.afterTime[0];
this.dataForm.afEndTime = this.afterTime[1];
}
diff --git a/src/views/modules/plugins/rent/rentcontractinfo-add-or-update.vue b/src/views/modules/plugins/rent/rentcontractinfo-add-or-update.vue
index 7dae7f23b..db7b029ed 100644
--- a/src/views/modules/plugins/rent/rentcontractinfo-add-or-update.vue
+++ b/src/views/modules/plugins/rent/rentcontractinfo-add-or-update.vue
@@ -1,159 +1,311 @@
-
+
-
-
+
-
-
+
-
-
-
+
-
+
-
+
-
-
-
+
-
+
-
+
-
+
-
-
+
-
-
-
+
-
-
+
-
-
-
+
- -
-
+
+
+
-
-
-
+
+
+
-
-
+
+
+
-
-
-
-
-
-
-
+
+
-
![]()
-
-
@@ -380,7 +924,34 @@ export default {
+
diff --git a/src/views/modules/plugins/rent/rentcontractinfo-look-or-check.vue b/src/views/modules/plugins/rent/rentcontractinfo-look-or-check.vue
new file mode 100644
index 000000000..34a0af067
--- /dev/null
+++ b/src/views/modules/plugins/rent/rentcontractinfo-look-or-check.vue
@@ -0,0 +1,386 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ +
+
+
+
+
+
+
+
+
+
+
+
+
+ + +
+
+
+
+
+
+
+
+ +
+
+
+
+
+
+
+
+
+
+
+ ![]()
+
+
+
+
+
+
+
+
+
diff --git a/src/views/modules/plugins/rent/rentcontractinfo.vue b/src/views/modules/plugins/rent/rentcontractinfo.vue
index aaa68df24..e1cb6b30b 100644
--- a/src/views/modules/plugins/rent/rentcontractinfo.vue
+++ b/src/views/modules/plugins/rent/rentcontractinfo.vue
@@ -199,7 +199,7 @@
+
diff --git a/src/views/modules/plugins/union/customerrelation-add-or-update.vue b/src/views/modules/plugins/union/customerrelation-add-or-update.vue
new file mode 100644
index 000000000..cb6e13b4e
--- /dev/null
+++ b/src/views/modules/plugins/union/customerrelation-add-or-update.vue
@@ -0,0 +1,186 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ {{ $t('cancel') }}
+ {{ $t('confirm') }}
+
+
+
+
+
diff --git a/src/views/modules/plugins/union/customerrelation.vue b/src/views/modules/plugins/union/customerrelation.vue
new file mode 100644
index 000000000..7ec832446
--- /dev/null
+++ b/src/views/modules/plugins/union/customerrelation.vue
@@ -0,0 +1,139 @@
+
+
+
+
+
+
diff --git a/src/views/modules/plugins/visit/visitor-add-or-update.vue b/src/views/modules/plugins/visit/visitor-add-or-update.vue
new file mode 100644
index 000000000..528af1fb9
--- /dev/null
+++ b/src/views/modules/plugins/visit/visitor-add-or-update.vue
@@ -0,0 +1,144 @@
+
+
+
+
+
+
+
+
+
+ {{ $t('user.gender1') }}
+ {{ $t('user.gender0') }}
+
+
+
+
+
+
+ {{ '访客' }}
+ {{ '租客' }}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ {{ $t('cancel') }}
+
+
+
+
+
+
+
+
diff --git a/src/views/modules/plugins/visit/visitvisitor-add-or-update.vue b/src/views/modules/plugins/visit/visitvisitor-add-or-update.vue
new file mode 100644
index 000000000..528af1fb9
--- /dev/null
+++ b/src/views/modules/plugins/visit/visitvisitor-add-or-update.vue
@@ -0,0 +1,144 @@
+
+
+
+
+
+
+
+
+
+ {{ $t('user.gender1') }}
+ {{ $t('user.gender0') }}
+
+
+
+
+
+
+ {{ '访客' }}
+ {{ '租客' }}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ {{ $t('cancel') }}
+
+
+
+
+
+
+
+
diff --git a/src/views/modules/plugins/visit/visitvisitor.vue b/src/views/modules/plugins/visit/visitvisitor.vue
new file mode 100644
index 000000000..b51e5d20d
--- /dev/null
+++ b/src/views/modules/plugins/visit/visitvisitor.vue
@@ -0,0 +1,351 @@
+
+
+
+
+
+
+
+
+
diff --git a/src/views/modules/shequzhili/csgltc/csgl.vue b/src/views/modules/shequzhili/csgltc/csgl.vue
index 4fb809e53..23ed5ca4b 100644
--- a/src/views/modules/shequzhili/csgltc/csgl.vue
+++ b/src/views/modules/shequzhili/csgltc/csgl.vue
@@ -118,10 +118,24 @@
label="地址"
mix-width="230">
+
+
+
+
@@ -270,31 +284,31 @@ export default {
responseType: "blob",
data: params,
})
- .then((res) => {
- // this.download(res.data, title + '.xls')
- if (res.headers["content-disposition"]) {
- let fileName = window.decodeURI(
- res.headers["content-disposition"].split(";")[1].split("=")[1]
- );
- console.log("filename", fileName);
- let blob = new Blob([res.data], {
- type: "application/vnd.ms-excel",
- });
- var url = window.URL.createObjectURL(blob);
- var aLink = document.createElement("a");
- aLink.style.display = "none";
- aLink.href = url;
- aLink.setAttribute("download", fileName);
- document.body.appendChild(aLink);
- aLink.click();
- document.body.removeChild(aLink); //下载完成移除元素
- window.URL.revokeObjectURL(url); //释放掉blob对象
- } else this.$message.error("下载失败");
- })
- .catch((err) => {
- console.log("err", err);
- return this.$message.error("网络错误");
- });
+ .then((res) => {
+ // this.download(res.data, title + '.xls')
+ if (res.headers["content-disposition"]) {
+ let fileName = window.decodeURI(
+ res.headers["content-disposition"].split(";")[1].split("=")[1]
+ );
+ console.log("filename", fileName);
+ let blob = new Blob([res.data], {
+ type: "application/vnd.ms-excel",
+ });
+ var url = window.URL.createObjectURL(blob);
+ var aLink = document.createElement("a");
+ aLink.style.display = "none";
+ aLink.href = url;
+ aLink.setAttribute("download", fileName);
+ document.body.appendChild(aLink);
+ aLink.click();
+ document.body.removeChild(aLink); //下载完成移除元素
+ window.URL.revokeObjectURL(url); //释放掉blob对象
+ } else this.$message.error("下载失败");
+ })
+ .catch((err) => {
+ console.log("err", err);
+ return this.$message.error("网络错误");
+ });
},
//获取服务事项下拉框
diff --git a/src/views/modules/shequzhili/csgltc/csglDetail.vue b/src/views/modules/shequzhili/csgltc/csglDetail.vue
index af3dff975..39a61f484 100644
--- a/src/views/modules/shequzhili/csgltc/csglDetail.vue
+++ b/src/views/modules/shequzhili/csgltc/csglDetail.vue
@@ -26,14 +26,26 @@
prop="areaCovered"
label-width="150px"
style="display: block">
- {{formData.areaCovered}}
+ {{formData.areaCovered+' '}}平方公里
- {{formData.capacity}}
+ {{formData.capacity+' '}}人
+
+
+ {{formData.principal?formData.principal:'无'}}
+
+
+ {{formData.mobile?formData.mobile:'无'}}
@@ -76,7 +89,7 @@ export default {
},
components: {},
async mounted () {
- await this.initMap()
+ await this.initMap()
},
methods: {
@@ -100,7 +113,7 @@ export default {
initMap () {
// 定义地图中心点坐标
let { latitude, longitude } = this.$store.state.user;
- console.log('lat'+latitude+',lon'+longitude)
+ console.log('lat' + latitude + ',lon' + longitude)
if (!latitude || latitude == "" || latitude == "0") {
latitude = 39.9088810666821;
longitude = 116.39743841556731;
diff --git a/src/views/modules/shequzhili/csgltc/csglForm.vue b/src/views/modules/shequzhili/csgltc/csglForm.vue
index a39a2b949..be715825f 100644
--- a/src/views/modules/shequzhili/csgltc/csglForm.vue
+++ b/src/views/modules/shequzhili/csgltc/csglForm.vue
@@ -76,24 +76,41 @@
v-model="formData.capacity"
:min="0"
:max="9999"
- label="容纳人数">
+ label="容纳人数">人
+
+
+
+
+
+
@@ -141,7 +158,9 @@ export default {
capacity: 0,//容纳人数
address: '', //详细地址
longitude: 36.0722275, //经度
- latitude: 120.38945519 //纬度
+ latitude: 120.38945519, //纬度
+ principal: '',
+ mobile: ''
},
cityManagement: {
@@ -205,14 +224,14 @@ export default {
const { data, code, msg } = await requestPost(url, params)
if (code === 0) {
- if (null != data){
- data : this.cityManagement
+ if (null != data) {
+ data: this.cityManagement
}
this.formData = { ...data }
// let { latitude, longitude } = this.$store.state.user;
// const lat = this.formData.latitude === null || this.formData.latitude === '' ? latitude : this.formData.latitude;
// const lon = this.formData.longitude === null || this.formData.longitude === '' ? longitude : this.formData.longitude;
- if (this.formData.latitude !== null && this.formData.latitude !== '' && this.formData.longitude !== null && this.formData.longitude !== ''){
+ if (this.formData.latitude !== null && this.formData.latitude !== '' && this.formData.longitude !== null && this.formData.longitude !== '') {
map.setCenter(new TMap.LatLng(this.formData.latitude, this.formData.longitude))
this.setMarker(this.formData.latitude, this.formData.longitude)
}
@@ -243,9 +262,9 @@ export default {
},
async addUnit () {
let url = ''
- if (this.formType === 'add'){
+ if (this.formType === 'add') {
url = '/gov/org/icCityManagement/add'
- }else {
+ } else {
url = '/gov/org/icCityManagement/edit'
}
const { data, code, msg, internalMsg } = await requestPost(url, this.formData)
@@ -273,7 +292,7 @@ export default {
initMap () {
// 定义地图中心点坐标
let { latitude, longitude } = this.$store.state.user;
- console.log('lat'+latitude+',lon'+longitude)
+ console.log('lat' + latitude + ',lon' + longitude)
if (!latitude || latitude == "" || latitude == "0") {
latitude = 39.9088810666821;
longitude = 116.39743841556731;
diff --git a/src/views/modules/shequzhili/event/cpts/event-detail.vue b/src/views/modules/shequzhili/event/cpts/event-detail.vue
index f0e8adc77..acb18f05f 100644
--- a/src/views/modules/shequzhili/event/cpts/event-detail.vue
+++ b/src/views/modules/shequzhili/event/cpts/event-detail.vue
@@ -1,25 +1,26 @@
-
-
+
+
+
-
-
+
+
+
+
-
-
+
+
-
-
房屋信息
+ @keyup.enter.native="dataFormSubmitHandle()" label-width="100px">
+ 房屋信息
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
+添加成员
+
-
+
{{scope.$index+1}}
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
+
-
+
+
+ 删除
- 居住成员信息
+ 居住成员信息
+ +
- ![]()
-
+
- ![]()
-
+ 合同信息
+ 合同信息
出租人信息
- -
-
-
承租人信息
- -
-
- -
合同内容
- 合同内容
+ -
-
- {{ $t('cancel') }}
- {{ $t('checkBTGBtn') }}
- {{ $t('checkTGBtn') }}
+ {{ $t('cancel') }}
+ 提交
+
+
+
+
+
+
+
+
+
+
+ 房屋信息
+ +
+
+
+
+ {{scope.$index+1}}
+
+
+
+
+
+
+
+
+
+
+ 居住成员信息
+
+ ![]()
+
+
+
+ ![]()
+
+
+ 合同信息
+ 出租人信息
+ +
+
+
+ +
承租人信息
+ +
+
+ + +
合同内容
+ +
+ +
+ {{ $t('cancel') }}
+ {{ $t('checkBTGBtn') }}
+ {{ $t('checkTGBtn') }}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ {{ $t('query') }}
+
+
+
+
+
+
+ {{scope.row.type === '0' ? '访客' : '租客'}}
+
+
+
+
+
+
+
+ {{ $t('delete') }}
+
+
+
+
+
+
+
+
+
+
+ +
+
{{formData.address}}
-
+
-
+
- 查询
-
+ 查询
+
-
-
+
事件详情
+事件详情
-
+
所属网格：
{{ info.gridName }}
-
+
上报时间：
{{ info.createdTime }}
-
+
事件内容：
{{ info.eventContent }}
+ :class="['info-prop',{'info-prop-vis':source==='visiual'}]">
图片：
![]()
+ :class="['info-prop',{'info-prop-vis':source==='visiual'}]">
语音：
-
+
反映渠道：
{{ info.sourceTypeName }}
-
+
地址：
{{ info.address }}
-
+
报事人：
{{ info.name }}
-
+
@@ -39,15 +40,17 @@
:type="pageType"
:eventId="eventId"
:eventDetailData="eventDetailData"
+ :source="source"
@handleToProject="handleToProject"
@handleToDemand="handleToDemand"
@handleClose="handleClose">
手机号：
{{ info.mobile }}
-
+
+
-
身份证号：
{{ info.idCard?info.idCard:'--' }}
-
+
-
-
痛点难点：
{{ info.difficultPointName }}
+ :class="['info-prop',{'info-prop-vis':source==='visiual'}]">
已立项：
查看项目
+ :class="['info-prop',{'info-prop-vis':source==='visiual'}]">
已转需求：
查看需求
+ :class="['info-prop',{'info-prop-vis':source==='visiual'}]">
满意度：
@@ -93,14 +94,11 @@
@click="handleCloseEvent">关闭
{{info.satisfactionName}}
满意度评价
@@ -125,15 +123,16 @@
+
关闭
- 确定
-
+
-
+
+
关闭
确定
+
@@ -222,6 +222,10 @@ export default {
return {}
}
},
+ source: {//展示来源：manage 管理平台 visiual 可视化平台
+ type: String,
+ default: 'manage'
+ }
},
components: {
@@ -234,6 +238,10 @@ export default {
watch: {
+ },
+ created () {
+
+
},
mounted () {
@@ -346,9 +354,7 @@ export default {
},
};
+
-
diff --git a/src/views/modules/shequzhili/event/cpts/event-info.vue b/src/views/modules/shequzhili/event/cpts/event-info.vue
index e270ce25c..b4acb9e06 100644
--- a/src/views/modules/shequzhili/event/cpts/event-info.vue
+++ b/src/views/modules/shequzhili/event/cpts/event-info.vue
@@ -27,6 +27,7 @@
size="small"
@click="handleComfirm">确定
-
-
+
+
处理
+处理
-
-
事件处理进展
+
+
{{ item.assistanceUnitName }}
-
+ -->
+ -->
-
+
-
-
+
-
-
-
-
+
@@ -118,41 +137,47 @@
-
-
-
-
-
- -
-
-
-
-
+
@@ -197,7 +222,7 @@ function iniFmData () {
serviceLocation: '',//事件地址
latitude: '',// 经度
longitude: '',//维度
- categoryId: ''
+ // categoryId: ''
};
}
export default {
@@ -236,9 +261,9 @@ export default {
dataRule () {
return {
- categoryId: [
- { required: true, message: "请填写事件分类", trigger: "blur" },
- ],
+ // categoryId: [
+ // { required: true, message: "请填写事件分类", trigger: "blur" },
+ // ],
content: [
{ required: true, message: "服务内容不能为空", trigger: "blur" },
],
@@ -292,6 +317,11 @@ export default {
}
},
+ source: {//展示来源：manage 管理平台 visiual 可视化平台
+ type: String,
+ default: 'manage'
+ }
+
},
watch: {
demandUserName: function (val) {
@@ -308,6 +338,10 @@ export default {
this.formData.demandUserId = val
},
+ },
+ created () {
+
+
},
async mounted () {
@@ -330,15 +364,15 @@ export default {
this.formData.demandUserMobile = this.eventDetailCopy.mobile
if (this.eventDetailCopy.parentCategoryId && this.eventDetailCopy.categoryId) {
- this.selCategoryArray = []
- this.selCategoryArray.push(this.eventDetailCopy.parentCategoryId)
- this.selCategoryArray.push(this.eventDetailCopy.categoryId)
- this.formData.categoryId = this.eventDetailCopy.categoryId
-
- this.selCateObj = {
- name: this.eventDetailCopy.categoryName,
- id: this.eventDetailCopy.categoryId
- }
+ // this.selCategoryArray = []
+ // this.selCategoryArray.push(this.eventDetailCopy.parentCategoryId)
+ // this.selCategoryArray.push(this.eventDetailCopy.categoryId)
+ // this.formData.categoryId = this.eventDetailCopy.categoryId
+
+ // this.selCateObj = {
+ // name: this.eventDetailCopy.categoryName,
+ // id: this.eventDetailCopy.categoryId
+ // }
}
} else {
@@ -653,12 +687,11 @@ export default {
},
};
-
+
diff --git a/src/views/modules/shequzhili/event/cpts/process-form-project.vue b/src/views/modules/shequzhili/event/cpts/process-form-project.vue
index 8309e9307..3be3b4a8b 100644
--- a/src/views/modules/shequzhili/event/cpts/process-form-project.vue
+++ b/src/views/modules/shequzhili/event/cpts/process-form-project.vue
@@ -7,45 +7,55 @@
label-width="100px">
-
-
-
+
-
-
-
-
+
-
-
-
-
-
-
+
-
-
+
-
-
+
-
+
+ 
处理进展
@@ -109,13 +114,13 @@
- {{ item.departmentName }}
协办单位：
说 明：
@@ -186,6 +191,7 @@
+
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+ -
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ -->
+
+
+
+
+
+
{{ item.name }}
@@ -165,8 +191,11 @@
@click="updateProjectTag">关闭
- 选择
+
@@ -313,6 +342,10 @@ export default {
return {}
}
},
+ source: {//展示来源：manage 管理平台 visiual 可视化平台
+ type: String,
+ default: 'manage'
+ }
},
watch: {
gridId: function (val) {
@@ -362,6 +395,11 @@ export default {
this.tagList = this.tagList.filter((item) => item.id);
console.log(this.tagList)
},
+ },
+ created () {
+
+
+
},
async mounted () {
@@ -582,18 +620,17 @@ export default {
},
};
-
+
-
+
+
diff --git a/src/views/modules/shequzhili/event/cpts/process-form.vue b/src/views/modules/shequzhili/event/cpts/process-form.vue
index 754af4c7f..560b8aeda 100644
--- a/src/views/modules/shequzhili/event/cpts/process-form.vue
+++ b/src/views/modules/shequzhili/event/cpts/process-form.vue
@@ -1,6 +1,6 @@
选择
-
+
-
暂不处理
@@ -25,12 +27,14 @@
-
+
diff --git a/src/views/modules/shequzhili/event/eventList.vue b/src/views/modules/shequzhili/event/eventList.vue
index 058eb24e9..1790d751b 100644
--- a/src/views/modules/shequzhili/event/eventList.vue
+++ b/src/views/modules/shequzhili/event/eventList.vue
@@ -578,8 +578,6 @@ export default {
},
async handleWatch (row) {
- this.eventId = row.icEventId
-
this.eventId = row.icEventId
const url = "/gov/project/icEvent/detail";
// const url = "http://yapi.elinkservice.cn/mock/245/gov/project/icEvent/detail";
diff --git a/src/views/modules/shequzhili/ggfwtc/ggfw.vue b/src/views/modules/shequzhili/ggfwtc/ggfw.vue
index 9e781de2b..f1c7e7fad 100644
--- a/src/views/modules/shequzhili/ggfwtc/ggfw.vue
+++ b/src/views/modules/shequzhili/ggfwtc/ggfw.vue
@@ -116,9 +116,23 @@
label="地址"
mix-width="230">
+
+
+
+
@@ -276,31 +290,31 @@ export default {
responseType: "blob",
data: params,
})
- .then((res) => {
- // this.download(res.data, title + '.xls')
- if (res.headers["content-disposition"]) {
- let fileName = window.decodeURI(
- res.headers["content-disposition"].split(";")[1].split("=")[1]
- );
- console.log("filename", fileName);
- let blob = new Blob([res.data], {
- type: "application/vnd.ms-excel",
- });
- var url = window.URL.createObjectURL(blob);
- var aLink = document.createElement("a");
- aLink.style.display = "none";
- aLink.href = url;
- aLink.setAttribute("download", fileName);
- document.body.appendChild(aLink);
- aLink.click();
- document.body.removeChild(aLink); //下载完成移除元素
- window.URL.revokeObjectURL(url); //释放掉blob对象
- } else this.$message.error("下载失败");
- })
- .catch((err) => {
- console.log("err", err);
- return this.$message.error("网络错误");
- });
+ .then((res) => {
+ // this.download(res.data, title + '.xls')
+ if (res.headers["content-disposition"]) {
+ let fileName = window.decodeURI(
+ res.headers["content-disposition"].split(";")[1].split("=")[1]
+ );
+ console.log("filename", fileName);
+ let blob = new Blob([res.data], {
+ type: "application/vnd.ms-excel",
+ });
+ var url = window.URL.createObjectURL(blob);
+ var aLink = document.createElement("a");
+ aLink.style.display = "none";
+ aLink.href = url;
+ aLink.setAttribute("download", fileName);
+ document.body.appendChild(aLink);
+ aLink.click();
+ document.body.removeChild(aLink); //下载完成移除元素
+ window.URL.revokeObjectURL(url); //释放掉blob对象
+ } else this.$message.error("下载失败");
+ })
+ .catch((err) => {
+ console.log("err", err);
+ return this.$message.error("网络错误");
+ });
},
//获取服务事项下拉框
@@ -619,8 +633,8 @@ export default {
}
diff --git a/src/views/modules/shequzhili/ggfwtc/ggfwForm.vue b/src/views/modules/shequzhili/ggfwtc/ggfwForm.vue
index 53de80d47..11ccaa900 100644
--- a/src/views/modules/shequzhili/ggfwtc/ggfwForm.vue
+++ b/src/views/modules/shequzhili/ggfwtc/ggfwForm.vue
@@ -60,22 +60,38 @@
:max="9999"
label="容纳人数">
+
+
+
+
+
@@ -94,357 +110,359 @@
diff --git a/src/views/modules/shequzhili/statics/cEvent.vue b/src/views/modules/shequzhili/statics/cEvent.vue
new file mode 100644
index 000000000..80b02473b
--- /dev/null
+++ b/src/views/modules/shequzhili/statics/cEvent.vue
@@ -0,0 +1,400 @@
+
+
-
+
- 查询
-
+ 查询
+
+
+
+
+
+
+
+
+
+
+ 查询
+ 重置
+
+
+
+
+
+
+
+
+ {{scope.row.orgName}}
+ {{scope.row.orgName}}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/src/views/modules/shequzhili/statics/gridEvent.vue b/src/views/modules/shequzhili/statics/gridEvent.vue
new file mode 100644
index 000000000..55cf91432
--- /dev/null
+++ b/src/views/modules/shequzhili/statics/gridEvent.vue
@@ -0,0 +1,396 @@
+
+
+ 总计
+ 导出
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 查询
+ 重置
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/src/views/modules/shequzhili/tuceng/anquan/xuncha/cpts/record.vue b/src/views/modules/shequzhili/tuceng/anquan/xuncha/cpts/record.vue
index fa9b1d7c4..29a783b6d 100644
--- a/src/views/modules/shequzhili/tuceng/anquan/xuncha/cpts/record.vue
+++ b/src/views/modules/shequzhili/tuceng/anquan/xuncha/cpts/record.vue
@@ -1,243 +1,200 @@
-
+
+ 导出
+
+
+
+
+
+
+
巡查记录
-
- 新增
+
-
+
+
-
+
-
+
-
-
+
-
-
+
+
-
-
+
-
-
+
-
-
+
+
-
-
+
-
-
+
+ 新增
- {{ scope.row.patrolTime }}
+ {{ scope.row.patrolTime }}
{{ scope.row.staffName }}
+ {{ scope.row.staffName }}
{{ scope.row.mobile }}
+ {{ scope.row.mobile }}
{{ scope.row.resultName }}
+ {{ scope.row.resultName }}
{{ scope.row.detailed }}
+ {{ scope.row.detailed }}
-
+
最多三张图片
-
-
+
-
+
-
-
+
- 保存
- 取消
+ 保存
+ 取消
- 修改
-
- 删除
+ 修改
+
+ 删除
@@ -267,8 +224,12 @@ export default {
type: String,
default: "",
},
+ source: {//展示来源：manage 管理平台 visiual 可视化平台
+ type: String,
+ default: 'manage'
+ }
},
- data() {
+ data () {
return {
uploadUrl: window.SITE_CONFIG["apiURL"] + "/oss/file/uploadqrcodeV2",
customerId: localStorage.getItem("customerId"),
@@ -299,7 +260,7 @@ export default {
},
computed: {
- allowOperate() {
+ allowOperate () {
const {
enterpriseInfo: { agencyId },
} = this;
@@ -308,7 +269,7 @@ export default {
},
watch: {
enterpriseId: {
- handler(val) {
+ handler (val) {
console.log("val------points", val);
if (val.length > 0) {
this.btnDisabled = false;
@@ -319,12 +280,12 @@ export default {
},
},
- created() {
+ created () {
this.getOptionStaff();
},
methods: {
- beforeImgUpload(file) {
+ beforeImgUpload (file) {
console.log(file);
const isLt1M = file.size / 1024 / 1024 < 10;
const srcType = file.type;
@@ -341,7 +302,7 @@ export default {
return true;
},
- handleImgSuccess(res, row) {
+ handleImgSuccess (res, row) {
console.log("handleImgSuccess", res);
if (res.code === 0 && res.msg === "success") {
row.imgList.push(res.data.url);
@@ -351,13 +312,13 @@ export default {
}
},
- computeImgShowList(row) {
+ computeImgShowList (row) {
row.imgShowList = row.imgList.map((url) => {
return { name: "", url };
});
},
- handleImgRemove(file, row) {
+ handleImgRemove (file, row) {
console.log("handleImgRemove", file);
let url = file.url || file.response.data.url;
if (url) {
@@ -366,13 +327,13 @@ export default {
}
},
- getRowClass({ rowIndex, columnIndex }) {
+ getRowClass ({ rowIndex, columnIndex }) {
if (rowIndex === 0) {
return "background: #2195fe; color: #fff;";
}
},
- handleChange(row, type) {
+ handleChange (row, type) {
console.log("type----", type);
if (type == "cancle") {
row = { ...this.tempRow };
@@ -388,7 +349,7 @@ export default {
this.isEdit = !this.isEdit;
},
- handleChangeStaff(row) {
+ handleChangeStaff (row) {
const { staffId } = row;
const { optionStaff } = this;
let item = optionStaff.find((item) => item.value == staffId);
@@ -398,7 +359,7 @@ export default {
}
},
- async getOptionStaff() {
+ async getOptionStaff () {
let url = `/data/aggregator/org/staff-select-list/${this.$store.state.user.agencyId}`;
const { data, code, msg } = await requestPost(url, {});
@@ -409,12 +370,12 @@ export default {
}
},
- async handleEdit(row) {
+ async handleEdit (row) {
if (this.btnType == "add") this.save(row);
else this.edit(row);
},
- handleAdd() {
+ handleAdd () {
this.btnType = "add";
this.isEdit = true;
@@ -433,7 +394,7 @@ export default {
this.tableData.push(item);
},
- async save(row) {
+ async save (row) {
const params = {
partyMemberId: this.enterpriseId,
...row,
@@ -457,7 +418,7 @@ export default {
});
},
- async edit(row) {
+ async edit (row) {
const params = {
...row,
};
@@ -480,7 +441,7 @@ export default {
});
},
- async del(row) {
+ async del (row) {
await this.$http
.post(`/gov/org/enterprise/del-patrol/${row.patrolId}`)
.then(({ data: res }) => {
@@ -497,7 +458,7 @@ export default {
});
},
- async getList() {
+ async getList () {
const { enterpriseId } = this;
const params = {};
diff --git a/src/views/modules/shequzhili/tuceng/zhonghe/baseTotal.vue b/src/views/modules/shequzhili/tuceng/zhonghe/baseTotal.vue
new file mode 100644
index 000000000..b0bd49d61
--- /dev/null
+++ b/src/views/modules/shequzhili/tuceng/zhonghe/baseTotal.vue
@@ -0,0 +1,926 @@
+
+
+
- {{ scope.row.patrolTime }}
+ {{ scope.row.patrolTime }}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 查看
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/src/views/modules/shequzhili/xiangmu/cpts/project-info.vue b/src/views/modules/shequzhili/xiangmu/cpts/project-info.vue
index 4860e5939..28e4ffcfc 100644
--- a/src/views/modules/shequzhili/xiangmu/cpts/project-info.vue
+++ b/src/views/modules/shequzhili/xiangmu/cpts/project-info.vue
@@ -1,400 +1,361 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 查询
+ 重置
+
+
+
+ 导出
+
+
+
+
+
+
-
+
-
-
+
项目详情
+项目详情
-
+
项目标题：
{{ projectInfo.projectTitle }}
-
+
项目背景：
{{ projectInfo.backGround || "--" }}
-
+
项目方案：
{{ projectInfo.publicReply }}
-
+
内部备注：
{{ projectInfo.internalRemark || "--" }}
-
+
当前处理部门：
{{ projectInfo.departmentNameList.join("、") }}
-
-
+
-
+
分类：
-
-
+
+
- --
-
-
-
{{ item.name }}
+ --
+
+
+
确定
+ clearable>
+ 确定
- 更改分类
-
- 更改
+ 更改
+
+
更改
+
标签：
-
-
+
+
- --
-
-
-
-
{{ item.name }}
+ --
+
+
+
+
-
+
-
+
- 确定
+ 确定
更改标签
-
- 更改
+ 更改
+
+
更改
- 关闭
+
+
+
+
-
+ 关闭
+
+
+
+
+
关闭
+
+ 处理
-
-
+
+
处理/响应
结案
转其他机关/科室
- 退回
+ 退回
-
-
-
+
+
+
-
-
+
+
-
-
-
+
+
+
+
+
-
-
-
+
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
- 关闭
- 确定
+
+
+
+ 关闭
+ 确定
+
+
+
关闭
+ 确定
+
+
-
-
处理进展
+
+
处理进展
+
-
+
{{ item.processName }}
@@ -407,25 +368,22 @@
- {{ item.departmentName }}
+
-
+
{{ item.publicReply }}
-
说 明：
+
{{ 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/404.vue b/src/views/modules/visual/404.vue
new file mode 100644
index 000000000..047aec709
--- /dev/null
+++ b/src/views/modules/visual/404.vue
@@ -0,0 +1,16 @@
+
+
内部备注：
页面未找到或无权访问
+
+
+
+
+
diff --git a/src/views/modules/visual/basicinfo/basicInfoMain-备份.vue b/src/views/modules/visual/basicinfo/basicInfoMain-备份.vue
new file mode 100644
index 000000000..c57aaef37
--- /dev/null
+++ b/src/views/modules/visual/basicinfo/basicInfoMain-备份.vue
@@ -0,0 +1,1017 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/src/views/modules/visual/basicinfo/basicInfoMain.vue b/src/views/modules/visual/basicinfo/basicInfoMain.vue
index 6f7b19380..b0275579a 100644
--- a/src/views/modules/visual/basicinfo/basicInfoMain.vue
+++ b/src/views/modules/visual/basicinfo/basicInfoMain.vue
@@ -1,271 +1,171 @@
+
+
+
+
+ {{item.name}}>
+
+ {{orgData.name}}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ {{item.name}}
+
+
+ 
+
+
+
+
+
+
+
+
+
+
+
+
+ 
+
+
+
+ 分类列表
+
+ 加载中
+
+
+
+
+
+
+
+
+
+
+
+ ![]()
+
+
+
+
+ {{colItem.label}}
+ {{colItem.count}}
+
-
-
- {{item.name}}>
-
- {{orgData.name}}
+ {{ item.name }}>
+
+ {{ orgData.name }}
-
-
-
+
+
+
-
-
-
+
+
diff --git a/src/views/modules/visual/basicinfo/people.vue b/src/views/modules/visual/basicinfo/people.vue
index e0a9cea6f..81190d694 100644
--- a/src/views/modules/visual/basicinfo/people.vue
+++ b/src/views/modules/visual/basicinfo/people.vue
@@ -1,12 +1,11 @@
+
+
-
+
-
-
-
-
-
+
-
{{item.name}}
-
+
+
+
{{ item.name }}
-
+
+
-
-
-
-
+
-
+
-
+
分类列表
+
加载中
-
-
-
+
-
\ No newline at end of file
+
diff --git a/src/views/modules/visual/basicinfo/houseStatic/houseStatic.vue b/src/views/modules/visual/basicinfo/houseStatic/houseStatic.vue
index 893f8c5bb..462110fa1 100644
--- a/src/views/modules/visual/basicinfo/houseStatic/houseStatic.vue
+++ b/src/views/modules/visual/basicinfo/houseStatic/houseStatic.vue
@@ -12,7 +12,7 @@
{{orgName}}
-
-
+
+
-
-
-
- ![]()
+
-
+
+ ![]()
-
-
{{colItem.label}}
- {{colItem.count}}
+ {{ colItem.label }}
+ {{ colItem.count }}
diff --git a/src/views/modules/visual/basicinfo/people.vue b/src/views/modules/visual/basicinfo/people.vue
index e0a9cea6f..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 @@
人员情况
-
人员情况
查看更多
+ 查看更多
- 
+
@@ -135,14 +134,10 @@
+
{{ info.name }}
@@ -119,13 +120,11 @@
-
@@ -119,13 +120,11 @@
- 
- 
+
+
-
+
+
{{
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 }}
-
+
+
-
-
+
-
+
+
+
-
+
- {{ item.topicContent }}
{{ item.releaseTime }}
-
+
+
-
-
+
@@ -443,12 +372,10 @@
+
+
-
@@ -555,7 +474,7 @@ export default {
},
},
- data() {
+ data () {
return {
breadList: [],
showedMoreInfo: false,
@@ -659,7 +578,7 @@ export default {
computed: {},
- beforeRouteEnter(to, from, next) {
+ beforeRouteEnter (to, from, next) {
console.log("让我看看", to);
if (from) {
const arr = [{ ...from }, { ...to, meta: { title: "个人详情" } }];
@@ -671,14 +590,14 @@ export default {
}
},
watch: {
- uid(id) {
+ uid (id) {
this.userId = id;
},
- userId() {
+ userId () {
this.getApiData();
window.scrollTo(0, 0);
},
- $route(route) {
+ $route (route) {
// if you go to the redirect page, do not update the breadcrumbs
if (route.path.startsWith("/redirect/")) {
return;
@@ -687,21 +606,21 @@ export default {
},
},
- async mounted() {
+ async mounted () {
this.userId = this.uid;
console.log(this.$router);
this.getApiData();
},
- deactivated() {
+ deactivated () {
this.breadList = [];
console.log("breadList-----", this.breadList);
},
- destroyed() {
+ destroyed () {
this.breadList = [];
console.log("breadList-----", this.breadList);
},
methods: {
- getBreadcrumb() {
+ getBreadcrumb () {
// only show routes with meta.title
console.log("routest----", this.$route);
let matched = this.$route.matched.filter(
@@ -717,16 +636,16 @@ export default {
(item) => item.meta && item.meta.title && item.meta.breadcrumb !== false
);
},
- isDashboard(route) {
+ isDashboard (route) {
const name = route && route.name;
if (!name) {
return false;
}
return name.trim().toLocaleLowerCase() === "Home".toLocaleLowerCase();
},
- handleSearch() {},
+ handleSearch () { },
- async getApiData() {
+ async getApiData () {
await this.getInfo();
this.getHouseInfo();
this.getDemandData();
@@ -735,12 +654,12 @@ export default {
this.getPointData();
},
- toUserInfo(uid) {
+ toUserInfo (uid) {
this.$router.push({ path: `/main-shuju/visual-basicinfo-people/${uid}` });
},
//加载组织数据
- async getInfo() {
+ async getInfo () {
const url = "/epmetuser/icresiuser/persondata";
let params = {
userId: this.userId,
@@ -756,7 +675,7 @@ export default {
},
//加载组织数据
- async getHouseInfo() {
+ async getHouseInfo () {
const url = "/epmetuser/icresiuser/ownerrelation";
let params = {
userId: this.userId,
@@ -771,20 +690,25 @@ export default {
}
},
- handlePageNoChangeDemand(val) {
+ handlePageNoChangeDemand (val) {
this.demand.pageNo = val;
this.getDemandData();
},
- handleOperateDemandList(index, type) {
+ handleOperateDemandList (index, type) {
if (type == "查看") {
this.showedDemandInfo = true;
this.demand.currentIndex = index;
}
},
+ //指派成功后刷新
+ handleAssignOk () {
+ this.getDemandData();
+ },
+
//加载组织数据
- async getDemandData() {
+ async getDemandData () {
const url = "/heart/userdemand/mydemand";
let params = {
epmetUserIdList: this.info.epmetUserIdList,
@@ -814,18 +738,18 @@ export default {
}
},
- handlePageNoChangeIncident(val) {
+ handlePageNoChangeIncident (val) {
this.incident.pageNo = val;
this.getIncidentData();
},
- handleClickIncident(index) {
+ handleClickIncident (index) {
this.incident.showedInfo = true;
this.incident.currentIndex = index;
},
//加载组织数据
- async getIncidentData() {
+ async getIncidentData () {
let url = "/gov/project/icEvent/icevent-pageuserreported";
// 市北沿用旧接口
@@ -853,18 +777,18 @@ export default {
}
},
- handlePageNoChangeTopic(val) {
+ handlePageNoChangeTopic (val) {
this.topic.pageNo = val;
this.getTopicData();
},
- handleClickTopic(index) {
+ handleClickTopic (index) {
this.topic.showedInfo = true;
this.topic.currentIndex = index;
},
//加载组织数据
- async getTopicData() {
+ async getTopicData () {
const url = "/data/aggregator/resigroup/pageusertopic";
let params = {
epmetUserIdList: this.info.epmetUserIdList,
@@ -884,18 +808,18 @@ export default {
}
},
- handlePageNoChangePoint(val) {
+ handlePageNoChangePoint (val) {
this.point.pageNo = val;
this.getPointData();
},
- handleClickPoint(index) {
+ handleClickPoint (index) {
this.point.showedInfo = true;
this.point.currentIndex = index;
},
//加载组织数据
- async getPointData() {
+ async getPointData () {
const url = "/point/resi/point/pageuserpoint";
let params = {
epmetUserIdList: this.info.epmetUserIdList,
diff --git a/src/views/modules/visual/basicinfo/peopleList.vue b/src/views/modules/visual/basicinfo/peopleList.vue
index abad7f683..837582511 100644
--- a/src/views/modules/visual/basicinfo/peopleList.vue
+++ b/src/views/modules/visual/basicinfo/peopleList.vue
@@ -69,7 +69,7 @@
+
-
-
{{ item.point }}
@@ -461,23 +388,22 @@
-
+
+
-
-
+
@@ -485,40 +411,33 @@
+
+
-
-
-
+
+
diff --git a/src/views/modules/visual/communityGovern/duoyuanfuwu/duoyuanfuwufenxi.vue b/src/views/modules/visual/communityGovern/duoyuanfuwu/duoyuanfuwufenxi.vue
index 1f646b050..293161946 100644
--- a/src/views/modules/visual/communityGovern/duoyuanfuwu/duoyuanfuwufenxi.vue
+++ b/src/views/modules/visual/communityGovern/duoyuanfuwu/duoyuanfuwufenxi.vue
@@ -1,5 +1,5 @@
-
+
多元主体分析
@@ -35,7 +35,7 @@
+
+
+
+
+
+
+
diff --git a/src/views/modules/visual/command/cpts/eventInfo.vue b/src/views/modules/visual/command/cpts/eventInfo.vue
new file mode 100644
index 000000000..fc7ddf580
--- /dev/null
+++ b/src/views/modules/visual/command/cpts/eventInfo.vue
@@ -0,0 +1,178 @@
+
+
+
+
+
+
+
+ 新增需求
+
+
+
+ 新增需求
+
+ 
+
+
+
+
+
+
+
+
+
+
+
diff --git a/src/views/modules/visual/command/cpts/map.vue b/src/views/modules/visual/command/cpts/map.vue
new file mode 100644
index 000000000..fccd8c225
--- /dev/null
+++ b/src/views/modules/visual/command/cpts/map.vue
@@ -0,0 +1,764 @@
+
+
+
+
+
+
+
+ 事件详情
+
+
+
+ 事件详情
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/src/views/modules/visual/command/cpts/popup.vue b/src/views/modules/visual/command/cpts/popup.vue
new file mode 100644
index 000000000..a655c49f9
--- /dev/null
+++ b/src/views/modules/visual/command/cpts/popup.vue
@@ -0,0 +1,840 @@
+
+
+ 切换深色模式
+
+ 切换浅色模式
+
+
+
+
+
+
+
+
diff --git a/src/views/modules/visual/command/cpts/qsydw.vue b/src/views/modules/visual/command/cpts/qsydw.vue
new file mode 100644
index 000000000..11f7e780c
--- /dev/null
+++ b/src/views/modules/visual/command/cpts/qsydw.vue
@@ -0,0 +1,226 @@
+
+
+
+
+
+
+ 居民信息
+
+ 姓名：
+ {{ info.icUserName || "--" }}
+
+
+ 所属网格：
+ {{ info.gridName || "--" }}
+
+
+ 所属小区：
+ {{ info.villageName || "--" }}
+
+
+ 本地户籍：
+ {{ info.isBdhjShow || "--" }}
+
+
+
+ 手机：
+ {{ info.mobile || "--" }}
+
+
+ 性别：
+ {{ info.genderShow || "--" }}
+
+
+ 身份证号：
+ {{ info.idCard || "--" }}
+
+
+
+ 工作单位：
+ {{ info.gzdw || "--" ? info.gzdw : "--" }}
+
+
+ 人户状况：
+ {{ info.rhzkShow || "--" }}
+
+
+ 人员类别：
+ {{ info.resiCategoryNames || "--" }}
+
+
+
+ 查看更多
+
+ 发布需求
+
+
+
+
+ 企业信息
+
+ 企业名称：
+ {{ info.name || "--" }}
+
+
+ 企业类型：
+ {{ info.categoryName || "--" }}
+
+
+ 周边安全距离：
+ {{ info.safeDistance || "--" }}
+
+
+ 危化品种类：
+ {{ info.dangerTypeName || "--" }}
+
+
+ 负责人：
+ {{ info.principalName || "--" }}
+
+
+ 联系电话：
+ {{ info.principalMobile || "--" }}
+
+
+ 经营地址：
+ {{ info.address || "--" }}
+
+
+ 备注：
+ {{ info.remark || "--" }}
+
+
+
+
+ 场所信息
+
+ 场所名称：
+ {{ info.name || "--" }}
+
+
+ 场所分类：
+ {{ info.categoryName || "--" }}
+
+
+ 占地面积：
+ {{ info.areaCovered || "--" }}
+
+
+ 容纳人数：
+ {{ info.capacity || "--" }}
+
+
+ 地址：
+ {{ info.address || "--" }}
+
+
+ 负责人：
+ {{ info.principal || "--" }}
+
+
+ 联系电话：
+ {{ info.mobile || "--" }}
+
+
+
+
+ 难点痛点
+
+ 所属网格：
+ {{ info.gridName || "--" }}
+
+
+ 发生时间：
+ {{ info.happenTime || "--" }}
+
+
+ 事件内容：
+ {{ info.eventContent || "--" }}
+
+
+
+ 图片：
+
+
+
+ ![]()
+
+
+ 音频：
+
+
+
+
+
+
+ 反映渠道：
+ {{ info.sourceTypeName || "--" }}
+
+
+ 地址：
+ {{ info.address || "--" }}
+
+
+ 报事人：
+ {{ info.name || "--" }}
+
+
+ 手机号：
+ {{ info.mobile || "--" }}
+
+
+ 身份证号：
+ {{ info.idCard || "--" }}
+
+
+
+
+ 查看详情
+
+
+
+ 组织信息
+
+ 组织名称：
+ {{ info.organizationName || "--" }}
+
+
+ 组织分类：
+ {{ info.categoryName || "--" }}
+
+
+ 组织人数：
+ {{ info.organizationPersonCount || "--" }}
+
+
+ 组织成员：
+ {{ info.organizationPersonnelShow || "--" }}
+
+
+ 服务事项：
+ {{ info.serviceItem || "--" }}
+
+
+ 负责人：
+ {{ info.principalName || "--" }}
+
+
+ 联系电话：
+ {{ info.principalPhone || "--" }}
+
+
+ 创建时间：
+ {{ info.organizationCreatedTime || "--" }}
+
+
+
+
+ 房屋信息
+
+ 房屋名称：
+ {{ info.houseName || "--" }}
+
+
+ 房屋类型：
+ {{ info.houseTypeName || "--" }}
+
+
+ 房屋用途：
+ {{ info.purposeName || "--" }}
+
+
+ 房屋状态：
+ {{ info.rentName || "--" }}
+
+
+ 房主姓名：
+ {{ info.ownerName || "--" }}
+
+
+ 联系方式：
+ {{ info.ownerPhone || "--" }}
+
+
+ 房主身份证：
+ {{ info.ownerIdCard || "--" }}
+
+
+
+
+ 企事业信息
+
+ 场所类型：
+ {{ info.placeTypeName || "--" }}
+
+
+ 场所区域：
+ {{ info.gridName || "--" }}
+
+
+ 场所名称：
+ {{ info.placeOrgName || "--" }}
+
+
+ 场所地址：
+ {{ info.address || "--" }}
+
+
+ 规模：
+ {{ info.scale || "--" }}
+
+
+ 负责人：
+ {{ info.personInCharge || "--" }}
+
+
+ 联系电话：
+ {{ info.mobile || "--" }}
+
+
+
+
+
+ 查看更多
+
+
+
+
+ 联建单位信息
+
+ 单位名称：
+ {{ info.unitName || "--" }}
+
+
+ 分类：
+ {{ info.typeName || "--" }}
+
+
+ 服务事项：
+ {{ info.serviceMatterListShow || "--" }}
+
+
+ 联系人：
+ {{ info.contact || "--" }}
+
+
+ 联系电话：
+ {{ info.contactMobile || "--" }}
+
+
+ 在职党员：
+ {{ info.memberCount || "--" }}
+
+
+ 备注：
+ {{ info.remark || "--" }}
+
+
+ 地理位置：
+ {{ info.address || "--" }}
+
+
+
+
+
+
+
+ 发起服务
+
+
+
+ 列表
+
+
+
+ {{ index + 1 }}、{{ item.content }}
+
+
+
+
+
+
+
+
+
diff --git a/src/views/modules/visual/command/cpts/serviceInfo.vue b/src/views/modules/visual/command/cpts/serviceInfo.vue
new file mode 100644
index 000000000..4fe108cad
--- /dev/null
+++ b/src/views/modules/visual/command/cpts/serviceInfo.vue
@@ -0,0 +1,172 @@
+
+
+
+
+
+
+
+ 企事业单位巡查详情
+
+
+
+ 企事业单位巡查详情
+
+
+
+
+
+
+
+
+
+
+
+ 场所类型：
+ {{ eventDetailData.placeTypeName }}
+
+
+ 场所名称：
+ {{ eventDetailData.placeOrgName }}
+
+
+ 规模：
+ {{ eventDetailData.scaleName }}
+
+
+ 联系电话：
+ {{ eventDetailData.mobile }}
+
+
+
+
+
+
+ 场所区域：
+ {{ eventDetailData.agencyName+eventDetailData.gridName }}
+
+
+ 场所地址：
+ {{ eventDetailData.address }}
+
+
+ 负责人：
+ {{ eventDetailData.personInCharge }}
+
+
+
+
+
+ 关闭
+
+
+
+
+
+
+
+
+
diff --git a/src/views/modules/visual/command/cpts/sidemenu-left.vue b/src/views/modules/visual/command/cpts/sidemenu-left.vue
new file mode 100644
index 000000000..4efcf3374
--- /dev/null
+++ b/src/views/modules/visual/command/cpts/sidemenu-left.vue
@@ -0,0 +1,261 @@
+
+
+
+
+
+
+
+ 发起服务
+
+
+
+ 发起服务
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/src/views/modules/visual/command/cpts/sidemenu.vue b/src/views/modules/visual/command/cpts/sidemenu.vue
new file mode 100644
index 000000000..574c9047c
--- /dev/null
+++ b/src/views/modules/visual/command/cpts/sidemenu.vue
@@ -0,0 +1,308 @@
+
+
+
+
+
+
+
+
+
+ ![]()
+
+
+
+ {{ item.categoryName || item.placeTypeName }}
+ ({{ item.quantity }})
+
+
+
+ 
+
+
+
+
+
+
+
+ ![]()
+
+
+
+ {{ granditem.categoryName }}
+ ({{ granditem.quantity }})
+
+
+
+
+
+
+
+
diff --git a/src/views/modules/visual/command/index.vue b/src/views/modules/visual/command/index.vue
new file mode 100644
index 000000000..dd29faae3
--- /dev/null
+++ b/src/views/modules/visual/command/index.vue
@@ -0,0 +1,849 @@
+
+
+
+
+
+
+
+
+
+ {{ item.coverageName }}
+ ({{ item.quantity }})
+
+
+
+
+
+
+
+
+
+
+
+
+ ![]()
+
+
+
+ {{ granditem.categoryName }}
+ ({{ granditem.quantity }})
+
+
+
+
+
+
+
+ 
+ 
+ 
+ 
+ 
+ 
+ 
+ 
+
+
+
+
+
+
+
+
+
+
+
+ {{ subitem.placeTypeName }}
+ ({{ subitem.quantity }})
+
+
+
+
+
+
+
+
+
+
+
+ ![]()
+
+
+
+ {{ granditem.categoryName }}
+ ({{ granditem.quantity }})
+
+
+
+
+
+
+
+
+
diff --git a/src/views/modules/visual/communityGovern/distributionAnalyze.vue b/src/views/modules/visual/communityGovern/distributionAnalyze.vue
index 5cc619961..f4b1669fb 100644
--- a/src/views/modules/visual/communityGovern/distributionAnalyze.vue
+++ b/src/views/modules/visual/communityGovern/distributionAnalyze.vue
@@ -1,5 +1,5 @@
-
+
+
+
+
+ {{ item.name }}>
+
+ {{ orgData.name }}
+
+
+
+
+
+
+
+
+
+
+
+ 
+
+ 
+
+
+
+
+ 搜索
+
+
+
+
+
+
+ {{ item.title }}
+
+ 更多
+
+
+
+
+
+ {{
+ li.name + " " + li.address
+ }}
+ {{
+ li.name + "（" + li.idCard + "）"
+ }}
+ {{
+ li.eventContent
+ }}
+ {{ li.name }}
+
+
+
+ {{ item.title }}
+
+
+
+ {{
+ li.name + " " + li.address
+ }}
+ {{
+ li.name + "（" + li.idCard + "）"
+ }}
+ {{
+ li.eventContent
+ }}
+ {{ li.name }}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ {{ item.name }}
+
+
+
+
+
+
+
+
+
+
+ 指挥调度
+
+
+
+ 指挥调度
+
+
+
diff --git a/src/views/modules/visual/communityGovern/duoyuanfuwu/duoyuanfuwufenxi.vue b/src/views/modules/visual/communityGovern/duoyuanfuwu/duoyuanfuwufenxi.vue
index 1f646b050..293161946 100644
--- a/src/views/modules/visual/communityGovern/duoyuanfuwu/duoyuanfuwufenxi.vue
+++ b/src/views/modules/visual/communityGovern/duoyuanfuwu/duoyuanfuwufenxi.vue
@@ -1,5 +1,5 @@
-
多元主体分析
@@ -35,7 +35,7 @@
-
+
+
+
+
+
+
+
+
diff --git a/src/views/modules/visual/communityGovern/fivelayers/fuwuInfo.vue b/src/views/modules/visual/communityGovern/fivelayers/fuwuInfo.vue
new file mode 100644
index 000000000..2c84b082f
--- /dev/null
+++ b/src/views/modules/visual/communityGovern/fivelayers/fuwuInfo.vue
@@ -0,0 +1,175 @@
+
+
+
+
+
+
+
+ 需求详情
+
+
+
+ 需求详情
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/src/views/modules/visual/communityGovern/fivelayers/mapIndex copy 2.vue b/src/views/modules/visual/communityGovern/fivelayers/mapIndex copy 2.vue
index 7ee8f5f85..050beb36c 100644
--- a/src/views/modules/visual/communityGovern/fivelayers/mapIndex copy 2.vue
+++ b/src/views/modules/visual/communityGovern/fivelayers/mapIndex copy 2.vue
@@ -92,7 +92,7 @@
+
+
+
+
+
+ 发起服务
+
+
+
+ 发起服务
+
+
+
+
+
+
-
-
-
-
-
-
+
居民热议分析
@@ -54,7 +54,7 @@
-
-
- ![]()
- {{item.label}}
+
+
-
+
+
-
+ ![]()
+ {{item.label}}
+
-
-
+
+
+
+ :key="index"
+ class="category_item">
-
-
-
+ :key="colIndex"
+ class="list_item"
+ @click="handleClickCategory(index,colIndex)">
![]()
+ alt />
{{colItem.categoryName}}
@@ -59,49 +56,50 @@
-
@@ -638,6 +636,7 @@ const vueGis = {
'ep_lg': require('../../../../../assets/img/shuju/fiveLayer/ep_lg.png'),
'sr_xfz': require('../../../../../assets/img/shuju/fiveLayer/sr_xfz.png'),
'pu_jgzsbm': require('../../../../../assets/img/shuju/fiveLayer/pu_jgzsbm.png'),
+ 'ep_qt': require('../../../../../assets/img/shuju/fiveLayer/ep_qt.png'),
'gr_czw': require('../../../../../assets/img/shuju/fiveLayer/gr_czw.png'),
'ep_cycs': require('../../../../../assets/img/shuju/fiveLayer/ep_cycs.png'),
@@ -923,7 +922,7 @@ const vueGis = {
// const url = "http://yapi.elinkservice.cn/mock/245/gov/org/icDangerousChemicals/detail"
let params = {
- icSuperiorResourceId: info.id
+ icDangerousChemicalsId: info.id
}
const { data, code, msg } = await requestPost(url, params)
@@ -1637,7 +1636,7 @@ const vueGis = {
this.zoom = 13
} else if (agencyLevel === 'community') {
this.zoom = 14
- }else{
+ } else {
this.zoom = 11
}
diff --git a/src/views/modules/visual/communityGovern/fivelayers/qsydw.vue b/src/views/modules/visual/communityGovern/fivelayers/qsydw.vue
new file mode 100644
index 000000000..9bf2dd8c0
--- /dev/null
+++ b/src/views/modules/visual/communityGovern/fivelayers/qsydw.vue
@@ -0,0 +1,223 @@
+
+
-
-
- 
-
-
-
-
+
-
- 搜索
+
+
+
+
+
+
+
+
-
+
+ 搜索
-
+
+
-
+
-
-
+
+
+
+
+
-
-
-
-
+
+
+
+
+
+
+
diff --git a/src/views/modules/visual/communityGovern/fivelayers/serviceInfo.vue b/src/views/modules/visual/communityGovern/fivelayers/serviceInfo.vue
new file mode 100644
index 000000000..b35437118
--- /dev/null
+++ b/src/views/modules/visual/communityGovern/fivelayers/serviceInfo.vue
@@ -0,0 +1,186 @@
+
+
+
+
+
+
+
+ 企事业单位巡查详情
+
+
+
+ 企事业单位巡查详情
+
+
+
+
+
+
+
+
+
+
+
+ 场所类型：
+ {{ eventDetailData.placeTypeName }}
+
+
+ 场所名称：
+ {{ eventDetailData.placeOrgName }}
+
+
+ 规模：
+ {{ eventDetailData.scaleName }}
+
+
+ 联系电话：
+ {{ eventDetailData.mobile }}
+
+
+
+
+
+
+ 场所区域：
+ {{ eventDetailData.agencyName+eventDetailData.gridName }}
+
+
+ 场所地址：
+ {{ eventDetailData.address }}
+
+
+ 负责人：
+ {{ eventDetailData.personInCharge }}
+
+
+
+
+
+ 关闭
+
+
+
+
+
+
+
+
+
diff --git a/src/views/modules/visual/communityGovern/resibuzz.vue b/src/views/modules/visual/communityGovern/resibuzz.vue
index 86b46c880..6b3ea9c4b 100644
--- a/src/views/modules/visual/communityGovern/resibuzz.vue
+++ b/src/views/modules/visual/communityGovern/resibuzz.vue
@@ -1,5 +1,5 @@
-
+
+
+
+
+
+ 新增需求
+
+
+
+ 新增需求
+
+
+
+
+
+
+
+
居民热议分析
@@ -54,7 +54,7 @@
-
-
-
+
事件处理分析
@@ -103,7 +103,7 @@
事件处理分析
@@ -103,7 +103,7 @@
-
-
+
事件分类分析
@@ -90,7 +90,7 @@
事件分类分析
@@ -90,7 +90,7 @@
-
-
+
事件分类分析
@@ -55,7 +55,7 @@
事件分类分析
@@ -55,7 +55,7 @@
-
-
![]()
-
+ ![]()
-
-
-
- 
- 
- 
+
+
-
-
+
+
+
+
+
{{ index + 1 }}
- {{ btn }}
- {{ item.name }}
+
+ {{ btn }}
+ {{ item.name }}
-
+
+
{{ index + 1 }}
+
加载中
-
+
@@ -77,7 +91,6 @@
+
+
+
diff --git a/src/views/modules/visual/shundeju/screen-table.vue b/src/views/modules/visual/shundeju/screen-table.vue
new file mode 100644
index 000000000..041d687b3
--- /dev/null
+++ b/src/views/modules/visual/shundeju/screen-table.vue
@@ -0,0 +1,346 @@
+
+
-
+
+
+
+
+
+
+
+
diff --git a/src/views/modules/visual/test/l7.vue b/src/views/modules/visual/test/l7.vue
new file mode 100644
index 000000000..951fd7b71
--- /dev/null
+++ b/src/views/modules/visual/test/l7.vue
@@ -0,0 +1,547 @@
+
+
+
+
+
+
+ {{ item.title }}
+
+
+ 操作
+
+
+ 加载中
+
+
+
+
+
+
+ ![]()
+
+
+ {{ value[item.coulmn] }}
+
+
+ 查看
+
+ 
+
+
+
+
+
+
+
+
+
+
+
diff --git a/src/views/modules/visual/warning/components/screen-table/index.vue b/src/views/modules/visual/warning/components/screen-table/index.vue
index b0e0df0d6..bc25aff0b 100644
--- a/src/views/modules/visual/warning/components/screen-table/index.vue
+++ b/src/views/modules/visual/warning/components/screen-table/index.vue
@@ -1,45 +1,56 @@
-
+
+
+
-
-
-
- {{ item.title }}
+
+
+
+
import ScreenLoading from "../screen-loading/index";
-import Vue from "vue";
import peopleList from "./people-list";
+import cptTb from "@/views/modules/visual/cpts/tb";
export default {
name: "warning-table",
components: {
ScreenLoading,
peopleList,
+ cptTb,
},
props: {
headerList: {
@@ -133,22 +145,8 @@ export default {
type: Boolean,
default: true,
},
- // // 表格平均分的份数
- // ava: {
- // type: Number,
- // default: 8
- // },
- // // 表头高度--默认占比10%
- // headerHeightAva: {
- // type: String,
- // default: '10%'
- // },
- // // 表格主体平均分成的份数
- // tableContentAva: {
- // type: Number,
- // default: 5
- // },
},
+
data() {
return {
// 显示人员详情
@@ -158,6 +156,22 @@ export default {
gridName: "",
};
},
+
+ computed: {
+ cptTbData() {
+ return this.tableData.map((item) => {
+ return item.map((subitem) => {
+ if (subitem.type && subitem.type == "btn") {
+ subitem.type = "operate";
+ subitem.list = [subitem.name];
+ }
+ console.log(subitem);
+ return subitem;
+ });
+ });
+ },
+ },
+
watch: {},
mounted() {},
@@ -165,6 +179,11 @@ export default {
created() {},
methods: {
+ handleOperate(index) {
+ let item = this.tableData[index];
+ this.handleClickBtn(item[item.length - 1]);
+ },
+
handleClickBtn(item) {
this.showedPeopleList = true;
this.buildingId = item.buildingId;
diff --git a/src/views/modules/visual/warning/components/screen-table/people-list.vue b/src/views/modules/visual/warning/components/screen-table/people-list.vue
index 0cc25b6b9..742e13c72 100644
--- a/src/views/modules/visual/warning/components/screen-table/people-list.vue
+++ b/src/views/modules/visual/warning/components/screen-table/people-list.vue
@@ -22,7 +22,7 @@
-
-
+
@@ -53,7 +53,7 @@
:visibleLoading="visibleLoading"
>
-
-
+
diff --git a/src/views/pages/index.vue b/src/views/pages/index.vue
index a39cfff50..d550411f3 100644
--- a/src/views/pages/index.vue
+++ b/src/views/pages/index.vue
@@ -29,21 +29,21 @@
diff --git a/src/views/pages/login.vue b/src/views/pages/login.vue
index 6db09b136..10cf96a93 100644
--- a/src/views/pages/login.vue
+++ b/src/views/pages/login.vue
@@ -247,7 +247,7 @@ export default {
localStorage.setItem("userType", "work");
localStorage.setItem("showHeader", "0");
localStorage.setItem("token", res.data.token);
- this.$router.replace({ name: "home" });
+ this.$router.replace({ name: "index" });
})
.catch(() => {});
// epmet-ext9.elinkservice.cn/platform-admin
+
+
+
+
+
+
+
+
+
+
diff --git a/src/views/modules/workSys/role/roleForm.vue b/src/views/modules/workSys/role/roleForm.vue
new file mode 100644
index 000000000..8b21186db
--- /dev/null
+++ b/src/views/modules/workSys/role/roleForm.vue
@@ -0,0 +1,359 @@
+
+
+
+
+
+
+
+
+
+
+
+ 查询
+ 重置
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 查看
+ 修改
+
+ 删除
+
+
+
+
+
+
+
+
+ 新增
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/src/views/pages/404.vue b/src/views/pages/404.vue
index 5d49d6434..e7796ec66 100644
--- a/src/views/pages/404.vue
+++ b/src/views/pages/404.vue
@@ -2,11 +2,11 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 取 消
+ 确 定
+
+
+
-