elink-star
/
epdc-admin-yushan
12
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

修改新闻列表页面；其他

feature/yujt_analysis_pc
yujt 5 years ago
parent
92ae20a778
commit
6783802bb0
5 changed files with 325 additions and 384 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 69
      src/views/modules/news/allnews.vue
  2. 2
      src/views/modules/police/group-detail.vue
  3. 30
      src/views/modules/police/police.vue
  4. 38
      src/views/modules/property/property-add-or-update.vue
  5. 60
      src/views/modules/property/propertyproject-add-or-update.vue

69
src/views/modules/news/allnews.vue
View File

@ -5,7 +5,7 @@
<el-form :inline="true"
:model="dataForm"
@keyup.enter.native="getDataList()">
<el-form-item label="所属机构">
<el-form-item label="发布部门">
<el-cascader v-model="deptIdList"
:options="options"
:props="{ checkStrictly: true }"
@ -81,7 +81,7 @@
header-align="center"
align="center"></el-table-column>
<el-table-column prop="allDeptNames"
label="所属网格"
label="发布部门"
header-align="center"
align="center"></el-table-column>
<el-table-column prop="createdTime"
@ -144,10 +144,7 @@ export default {
deleteIsBatch: true
},
dataForm: {
id: '',
streetId: '',
communityId: '',
gridId: '',
deptId: '',
startTime: '',
endTime: '',
keyword: '',
@ -156,9 +153,6 @@ export default {
time: '',
options: [],
deptIdList: [],
streetList: [],
communityList: [],
gridList: [],
categorys: [],
onLine: {
id: '',
@ -176,7 +170,6 @@ export default {
this.options = res.data.options
})
.catch(() => { })
this.getDeptInfoList('street', localStorage.getItem('street') === null ? '1169154711480528897' : localStorage.getItem('street'))
this.getListCategory()
},
methods: {
@ -201,58 +194,6 @@ export default {
return '已下线'
}
},
// 获取部门列表
getDeptInfoList (dataReceiver, faDeptId) {
this.$http.get(`/sys/dept/sublist/` + faDeptId).then(({ data: res }) => {
if (res.code !== 0) {
return this.$message.error(res.msg)
}
if (dataReceiver === 'street') {
this.streetList = res.data
} else if (dataReceiver === 'community') {
this.communityList = res.data
} else if (dataReceiver === 'grid') {
this.gridList = res.data
}
}).catch(() => { })
},
changeStreet (event) {
if (this.dataForm.streetId === '') {
this.communityList = []
this.gridList = []
this.dataForm.communityId = ''
this.dataForm.gridId = ''
return
}
this.dataForm.streetId = event
let choosenItem = this.streetList.filter(item => item.id === this.dataForm.streetId)[0]
this.initDeptIdAndName(choosenItem)
this.dataForm.communityId = this.dataForm.gridId = null
this.communityList = this.gridList = []
this.getDeptInfoList('community', event)
},
changeCommunity (event) {
if (this.dataForm.communityId === '') {
this.gridList = []
this.dataForm.gridId = ''
return
}
this.communityId = event
let choosenItem = this.communityList.filter(item => item.id === this.dataForm.communityId)[0]
this.initDeptIdAndName(choosenItem)
this.dataForm.gridId = null
this.gridList = []
this.getDeptInfoList('grid', event)
},
changeGrid (event) {
this.dataForm.gridId = event
let choosenItem = this.gridList.filter(item => item.id === this.gridId)[0]
this.initDeptIdAndName(choosenItem)
},
initDeptIdAndName (choosenItem) {
this.dataForm.dept = choosenItem.name
this.dataForm.deptId = choosenItem.id
},
setRegistTime () {
console.log(this.time[0])
this.dataForm.startTime = this.time[0]
@ -349,9 +290,9 @@ export default {
watch: {
'deptIdList': function (val) {
if (val.length !== 0) {
this.dataForm.gridId = val[val.length - 1]
this.dataForm.deptId = val[val.length - 1]
} else {
this.dataForm.gridId = ''
this.dataForm.deptId = ''
}
}
}

2
src/views/modules/police/group-detail.vue
View File

@ -178,7 +178,7 @@ export default {
if (res.code !== 0) {
return this.$message.error(res.msg)
}
if (res.data.resultCode == 1) {
if (res.data.resultCode === 1) {
this.$confirm(res.data.resultMessage, '提示', {
confirmButtonText: '确定',
cancelButtonText: '取消',

30
src/views/modules/police/police.vue
View File

@ -88,12 +88,12 @@
</template>
<script>
import mixinViewModule from '@/mixins/view-module'
import AddOrUpdate from './police-add-or-update'
import mixinViewModule from '@/mixins/view-module'
import AddOrUpdate from './police-add-or-update'
export default {
export default {
mixins: [mixinViewModule],
data() {
data () {
return {
mixinViewModuleOptions: {
getDataListURL: '/property/police/page',
@ -104,21 +104,21 @@
dataForm: {
id: ''
},
options: [],
options: []
}
},
components: {
AddOrUpdate
},
mounted() {
mounted () {
// 获取下拉菜单
this.getByLoginUser()
},
methods: {
getByLoginUser() {
getByLoginUser () {
this.$http
.get(`/sys/user/deptOptions/getMiddleByLoginUser`)
.then(({data: res}) => {
.then(({ data: res }) => {
if (res.code !== 0) {
return this.$message.error(res.msg)
}
@ -127,19 +127,19 @@
.catch(() => {
})
},
handleChange(value) {
handleChange (value) {
this.dataForm.deptId = value.slice(-1).shift()
},
beforeDeleteHandle(id) {
beforeDeleteHandle (id) {
// this.$confirm('删除民警将会解散全部警民群，是否继续操作?', this.$t('prompt.title'), {
// confirmButtonText: this.$t('confirm'),
// cancelButtonText: this.$t('cancel'),
// type: 'warning'
// }).then(() => {
this.deleteHandle(id);
this.deleteHandle(id)
// })
},
supplementHandle(data) {
supplementHandle (data) {
if (!data && this.dataListSelections.length <= 0) {
return this.$message({
message: '请选择需要补建的社区',
@ -154,12 +154,12 @@
duration: 500
})
}
this.$confirm(this.$t('prompt.info', {'handle': '补建群'}), this.$t('prompt.title'), {
this.$confirm(this.$t('prompt.info', { 'handle': '补建群' }), this.$t('prompt.title'), {
confirmButtonText: this.$t('confirm'),
cancelButtonText: this.$t('cancel'),
type: 'warning'
}).then(() => {
this.$http.put('/property/police/supplement', data ? data : this.dataListSelections[0]).then(({data: res}) => {
this.$http.put('/property/police/supplement', data || this.dataListSelections[0]).then(({ data: res }) => {
if (res.code !== 0) {
return this.$message.error(res.msg)
}
@ -177,7 +177,7 @@
})
}
}
}
}
</script>
<style scoped>

38
src/views/modules/property/property-add-or-update.vue
View File

@ -24,10 +24,10 @@
</template>
<script>
import debounce from 'lodash/debounce'
import debounce from 'lodash/debounce'
export default {
data() {
export default {
data () {
return {
visible: false,
dataForm: {
@ -45,40 +45,40 @@
}
},
computed: {
dataRule() {
dataRule () {
return {
propertyName: [
{required: true, message: this.$t('validate.required'), trigger: 'blur'}
{ required: true, message: this.$t('validate.required'), trigger: 'blur' }
],
propertyCode: [
{required: true, message: this.$t('validate.required'), trigger: 'blur'}
{ required: true, message: this.$t('validate.required'), trigger: 'blur' }
],
effectiveFlag: [
{required: true, message: this.$t('validate.required'), trigger: 'blur'}
{ required: true, message: this.$t('validate.required'), trigger: 'blur' }
],
revision: [
{required: true, message: this.$t('validate.required'), trigger: 'blur'}
{ required: true, message: this.$t('validate.required'), trigger: 'blur' }
],
delFlag: [
{required: true, message: this.$t('validate.required'), trigger: 'blur'}
{ required: true, message: this.$t('validate.required'), trigger: 'blur' }
],
createdBy: [
{required: true, message: this.$t('validate.required'), trigger: 'blur'}
{ required: true, message: this.$t('validate.required'), trigger: 'blur' }
],
createdTime: [
{required: true, message: this.$t('validate.required'), trigger: 'blur'}
{ required: true, message: this.$t('validate.required'), trigger: 'blur' }
],
updatedBy: [
{required: true, message: this.$t('validate.required'), trigger: 'blur'}
{ required: true, message: this.$t('validate.required'), trigger: 'blur' }
],
updatedTime: [
{required: true, message: this.$t('validate.required'), trigger: 'blur'}
{ required: true, message: this.$t('validate.required'), trigger: 'blur' }
]
}
}
},
methods: {
init() {
init () {
this.visible = true
this.$nextTick(() => {
this.$refs['dataForm'].resetFields()
@ -88,8 +88,8 @@
})
},
// 获取信息
getInfo() {
this.$http.get(`/property/property/${this.dataForm.id}`).then(({data: res}) => {
getInfo () {
this.$http.get(`/property/property/${this.dataForm.id}`).then(({ data: res }) => {
if (res.code !== 0) {
return this.$message.error(res.msg)
}
@ -106,7 +106,7 @@
if (!valid) {
return false
}
this.$http[!this.dataForm.id ? 'post' : 'put']('/property/property/', this.dataForm).then(({data: res}) => {
this.$http[!this.dataForm.id ? 'post' : 'put']('/property/property/', this.dataForm).then(({ data: res }) => {
if (res.code !== 0) {
return this.$message.error(res.msg)
}
@ -122,7 +122,7 @@
}).catch(() => {
})
})
}, 1000, {'leading': true, 'trailing': false})
}
}, 1000, { 'leading': true, 'trailing': false })
}
}
</script>

60
src/views/modules/property/propertyproject-add-or-update.vue
View File

@ -45,10 +45,10 @@
</template>
<script>
import debounce from 'lodash/debounce'
import debounce from 'lodash/debounce'
export default {
data() {
export default {
data () {
return {
visible: false,
loading: true,
@ -68,42 +68,42 @@
}
},
computed: {
dataRule() {
dataRule () {
return {
projectName: [
{required: true, message: this.$t('validate.required'), trigger: 'blur'}
{ required: true, message: this.$t('validate.required'), trigger: 'blur' }
],
propertyName: [
{required: true, message: this.$t('validate.required'), trigger: 'blur'}
{ required: true, message: this.$t('validate.required'), trigger: 'blur' }
],
propertyTel: [
{required: true, message: this.$t('validate.required'), trigger: 'blur'}
{ required: true, message: this.$t('validate.required'), trigger: 'blur' }
],
propertyManager: [
{required: true, message: this.$t('validate.required'), trigger: 'blur'}
{ required: true, message: this.$t('validate.required'), trigger: 'blur' }
],
propertyAddress: [
{required: true, message: this.$t('validate.required'), trigger: 'blur'}
{ required: true, message: this.$t('validate.required'), trigger: 'blur' }
]
}
}
},
methods: {
init() {
init () {
// 获取下拉菜单
this.getByLoginUser();
this.getPropertyList();
this.visible = true;
this.getByLoginUser()
this.getPropertyList()
this.visible = true
this.$nextTick(() => {
this.$refs['dataForm'].resetFields();
this.$refs['dataForm'].resetFields()
if (this.dataForm.id) {
this.getInfo()
}
})
},
// 获取用物业列表
getPropertyList() {
this.$http.get(`/property/property/dict`).then(({data: res}) => {
getPropertyList () {
this.$http.get(`/property/property/dict`).then(({ data: res }) => {
if (res.code !== 0) {
return this.$message.error(res.msg)
}
@ -112,10 +112,10 @@
})
},
// 获取网格
getByLoginUser() {
getByLoginUser () {
this.$http
.get(`/sys/user/deptOptions/getBusinessDeptByUser`)
.then(({data: res}) => {
.then(({ data: res }) => {
if (res.code !== 0) {
return this.$message.error(res.msg)
}
@ -126,20 +126,20 @@
this.loading = false
})
},
deptHandleChange(value) {
this.dataForm.gridId = value.slice(-1).shift();
deptHandleChange (value) {
this.dataForm.gridId = value.slice(-1).shift()
},
propertyHandleChange(value) {
propertyHandleChange (value) {
console.log(value)
let obj = this.propertyList.find((item) => {
return item.dictValue === value;
});
return item.dictValue === value
})
console.log(obj.dictName)
this.dataForm.propertyName = obj.dictName;
this.dataForm.propertyName = obj.dictName
},
// 获取信息
getInfo() {
this.$http.get(`/property/project/${this.dataForm.id}`).then(({data: res}) => {
getInfo () {
this.$http.get(`/property/project/${this.dataForm.id}`).then(({ data: res }) => {
if (res.code !== 0) {
return this.$message.error(res.msg)
}
@ -155,12 +155,12 @@
},
// 表单提交
dataFormSubmitHandle: debounce(function () {
this.dataForm.allDeptNames = this.$refs['grid'].inputValue;
this.dataForm.allDeptNames = this.$refs['grid'].inputValue
this.$refs['dataForm'].validate((valid) => {
if (!valid) {
return false
}
this.$http[!this.dataForm.id ? 'post' : 'put']('/property/project/', this.dataForm).then(({data: res}) => {
this.$http[!this.dataForm.id ? 'post' : 'put']('/property/project/', this.dataForm).then(({ data: res }) => {
if (res.code !== 0) {
return this.$message.error(res.msg)
}
@ -176,7 +176,7 @@
}).catch(() => {
})
})
}, 1000, {'leading': true, 'trailing': false})
}
}, 1000, { 'leading': true, 'trailing': false })
}
}
</script>

Write Preview
Loading…
Cancel
Save