Browse Source

人民建议bug的修改

xiaowang-featrue
是小王呀\24601 9 months ago
parent
commit
ff889f05bf
  1. 3
      package.json
  2. 84
      src/views/modules/base/orgUnitManger/add.vue
  3. 2
      src/views/modules/base/orgUnitManger/index.vue
  4. 2
      src/views/modules/communityService/ninePlaces/places/places.vue
  5. 2
      src/views/modules/home/index.vue
  6. 2
      src/views/modules/shequ/index.vue
  7. 330
      src/views/modules/solicitationSpecial/cpts/add.vue
  8. 1
      src/views/modules/solicitationSpecial/index.vue
  9. 2
      src/views/modules/volunteer/activityArchive/add.vue
  10. 2
      src/views/modules/workPc/guidance/add.vue

3
package.json

@ -7,8 +7,9 @@
"dev": "node --max_old_space_size=4096 node_modules/@vue/cli-service/bin/vue-cli-service.js serve",
"serve": "vue-cli-service serve",
"build": "vue-cli-service build",
"build:sit": "vue-cli-service build --mode production.sit",
"build:sit": " set NODE_OPTIONS=--max_old_space_size=4096 && vue-cli-service build --mode production.sit",
"build:uat": "vue-cli-service build --mode production.uat",
"build:development": "set NODE_OPTIONS=--max_old_space_size=4096 && vue-cli-service build --mode development",
"build:preview": "set NODE_OPTIONS=--max_old_space_size=4096 && vue-cli-service build --mode preview",
"build:prod": "vue-cli-service build --mode production",
"build:test": "set NODE_OPTIONS=--max_old_space_size=4096 && vue-cli-service build --mode test",

84
src/views/modules/base/orgUnitManger/add.vue

@ -6,25 +6,22 @@
<el-form ref="ref_form" :inline="true" :model="formData" :rules="dataRule" class="form">
<el-row>
<el-col :span="8">
<el-form-item label="所属区域" prop="typeName" label-width="120px">
<el-select v-model="formData.positionId" placeholder="请选择" clearable
class="u-item-width-normal">
<el-option v-for="item in orgOptions" :props="orgOptionProps" :key="item.id"
:label="item.name" :value="item.id">
</el-option>
</el-select>
<el-form-item label="所属区域" prop="agencyId" label-width="120px">
<el-cascader class="u-item-width-normal" ref="myCascader" clearable
v-model.trim="formData.agencyId" :options="orgOptions" :props="orgOptionProps"
@change="handleChangeAgency1"></el-cascader>
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="组织类型" prop="ownerPhone">
<el-select class="u-item-width-normal-left" v-model="formData.classKey" placeholder="请选择"
<el-select class="u-item-width-normal-left" v-model="formData.type" placeholder="请选择"
clearable>
<el-option v-for="item in optionsStatus" :key="item.value" :label="item.lable"
:value="item.value">
</el-option>
</el-select>
<el-select class="u-item-width-normal-left" style="margin-left: 8px;" v-model="formData.classKey" placeholder="请选择"
clearable>
<el-select class="u-item-width-normal-left" style="margin-left: 8px;"
v-model="formData.classKey" placeholder="请选择" clearable>
<el-option v-for="item in optionsStatus" :key="item.value" :label="item.lable"
:value="item.value">
</el-option>
@ -33,7 +30,7 @@
</el-col>
<el-col :span="8">
<el-form-item label="企业性质" label-width="120px" prop="name">
<el-select class="u-item-width-normal" v-model="formData.classKey" placeholder="请选择"
<el-select class="u-item-width-normal" v-model="formData.classKey" placeholder="请选择"
clearable>
<el-option v-for="item in optionsStatus" :key="item.value" :label="item.lable"
:value="item.value">
@ -69,19 +66,19 @@
</el-select>
</el-form-item>
</el-col>
<el-col :span="8">
<!-- <el-col :span="8">
<el-form-item label="法人证件号码" prop="linkPhone" label-width="120px">
<el-input v-model.trim="formData.name" size="small" clearable placeholder="请输入活动名称"
:disabled="showdisabled" class="u-item-width-normal"></el-input>
:disabled="showdisabled" class="u-item-width-normal"></el-input>
</el-form-item>
</el-col>
</el-col> -->
<el-col :span="8">
<el-form-item label="法人联系方式" label-width="120px" prop="name">
<el-input v-model.trim="formData.name" size="small" clearable placeholder="请输入活动名称"
:disabled="showdisabled" class="u-item-width-normal"></el-input>
</el-form-item>
</el-col>
<el-col :span="8">
<!-- <el-col :span="8">
<el-form-item label="是否重点单位" prop="linkPhone" label-width="120px">
<el-select class="u-item-width-normal" v-model="formData.classKey" placeholder="请选择"
clearable>
@ -90,7 +87,7 @@
</el-option>
</el-select>
</el-form-item>
</el-col>
</el-col> -->
<el-col :span="8">
<el-form-item label="重点单位类型" prop="linkPhone" label-width="120px">
<el-select class="u-item-width-normal" v-model="formData.classKey" placeholder="请选择"
@ -111,7 +108,7 @@
<el-form-item label="九小场所类型" prop="linkPhone" label-width="120px">
<el-select class="u-item-width-normal" v-model="formData.classKey" placeholder="请选择"
clearable>
<el-option v-for="item in optionsStatus" :key="item.value" :label="item.lable"
<el-option v-for="item in placeTypeList" :key="item.value" :label="item.label"
:value="item.value">
</el-option>
</el-select>
@ -128,19 +125,21 @@
</el-form-item>
</el-col>
<el-col :span="24">
<el-form-item label="活动地点" prop="searchValue" label-width="120px">
<div style="width: 940px;">
<el-select v-model.trim="searchValue" filterable style="width: 940px;" remote :reserve-keyword="true"
placeholder="请输入关键词" :remote-method="remoteMethod" :loading="loading">
<el-option v-for="(item, index) in searchOptions" @click.native="handleClickKey(index)"
style="width: 400px;" :key="item.value || index" :label="item.label" :value="item.value">
</el-option>
</el-select>
<div id="app_activity" class="div_map"></div>
</div>
</el-form-item>
</el-col>
<el-form-item label="活动地点" prop="searchValue" label-width="120px">
<div style="width: 940px;">
<el-select v-model.trim="searchValue" filterable style="width: 940px;" remote
:reserve-keyword="true" placeholder="请输入关键词" :remote-method="remoteMethod"
:loading="loading">
<el-option v-for="(item, index) in searchOptions"
@click.native="handleClickKey(index)" style="width: 400px;"
:key="item.value || index" :label="item.label" :value="item.value">
</el-option>
</el-select>
<div id="app_activity" class="div_map"></div>
</div>
</el-form-item>
</el-col>
</el-row></el-form>
<div class="div_btn">
<el-button size="small" @click="handleCancle"> </el-button>
@ -170,7 +169,16 @@
export default {
data() {
return {
placeTypeList:[],//
orgOptions: [],//
orgOptionProps: {
value: 'agencyId',
label: 'agencyName',
children: 'subAgencyList',
emitPath: false,
multiple: false,
checkStrictly: true
},//
showdisabled:false,
searchOptions:[],
fileList:[],
@ -210,9 +218,23 @@
this.formData.latitude = latitude;
this.formData.longitude = longitude;
this.activityType()
this.loadplaceType()
},
methods: {
//
async loadplaceType() {
const url = '/sys/dict/data/dictlist';
let params = {
dictType: "nine_small_places"
};
const { data, code, msg } = await requestPost(url, params);
if (code === 0) {
this.placeTypeList = data;
} else {
this.$message.error(msg);
}
},
async handleMoveCenter(e) {
//
// const { lat, lng } = map.getCenter();

2
src/views/modules/base/orgUnitManger/index.vue

@ -546,7 +546,7 @@
//
getOrgTreeList() {
this.$http
.post("/gov/org/customeragency/agencygridtree", {orgTypeFilter:this.orgTypeFilter})
.post("/gov/org/customerAgencyUnit/page", {page:"",limit:""})
.then(({ data: res }) => {
if (res.code !== 0) {
return this.$message.error(res.msg);

2
src/views/modules/communityService/ninePlaces/places/places.vue

@ -66,7 +66,7 @@
v-model.trim="formData.ninePlaceVal"
placeholder="请选择"
clearable>
<el-option v-for="item in placeTypeList"
<el-option v-for="item in placeyTpeList"
:key="item.value"
:label="item.label"
:value="item.value">

2
src/views/modules/home/index.vue

@ -855,7 +855,7 @@ this.getStatistics()
const { data, code, msg } = await requestPost(url, {
pageSize,
pageNo,
categoryCode: this.currentCategoryCode,
categoryCode:"IS_YLFN",
});
if (code === 0) {

2
src/views/modules/shequ/index.vue

@ -1123,9 +1123,7 @@ export default {
async getWarningList() {
const url = "/epmetuser/icstatsresiwarn/personwarn/leftpie";
let params = {};
const { data, code, msg } = await requestPost(url, params);
if (code === 0) {
this.warningChart.loading = true;
this.warningChart.total = data.total;

330
src/views/modules/solicitationSpecial/cpts/add.vue

@ -47,7 +47,7 @@
<el-col :span="24">
<el-form-item label="开始征集
" style="display: block" prop="peopleCount" label-width="150px">
<el-switch v-model="formData.status" :active-value="0" :inactive-value="1"
<el-switch v-model="formData.status" :active-value="1" :inactive-value="0"
@change="handleSwitchChange"></el-switch>
</el-form-item>
</el-col>
@ -60,55 +60,55 @@
</div>
</div>
</template>
<script>
import { mapGetters } from 'vuex'
import { requestPost } from '@/js/dai/request'
import Tinymce from '@c/tinymce2/index.vue'
import daiMap from "@/utils/dai-map";
import util from '@js/util.js';
// import UploadImage from './upload-image.vue'
import UploadImage from '@/views/modules/plugins/rent/upload-image.vue'
var map
var search
var markers
var infoWindowList
var geocoder //
export default {
<script>
import { mapGetters } from 'vuex'
import { requestPost,requestGet } from '@/js/dai/request'
import Tinymce from '@c/tinymce2/index.vue'
import daiMap from "@/utils/dai-map";
import util from '@js/util.js';
// import UploadImage from './upload-image.vue'
import UploadImage from '@/views/modules/plugins/rent/upload-image.vue'
var map
var search
var markers
var infoWindowList
var geocoder //
export default {
data() {
return {
attachmentList: [],//
fileList:[],
fileList: [],
SpecialList: [
{ value: 0, label: "消息发布" },
{ value: 1, label: "志愿风采" },
{ value: 0, label: "消息发布" },
{ value: 1, label: "志愿风采" },
],
formData:
{
subjectTitle:'',
subjectContent:"",
typeCode:"",
status:"0",
id:"",
attachmentList:[]
},
uploadUrl: `${window.SITE_CONFIG['apiURL']}/oss/file/uploadqrcodeV2`,
customerId: localStorage.getItem('customerId'),
formData:
{
subjectTitle: '',
subjectContent: "",
typeCode: "",
status: 1,
id: "",
attachmentList: []
},
uploadUrl: `${window.SITE_CONFIG['apiURL']}/oss/file/uploadqrcodeV2`,
customerId: localStorage.getItem('customerId'),
}
},
components: { Tinymce, UploadImage },
mounted() {
this.getSpecialList()
this.getSpecialList()
},
methods: {
//
beforeImgUpload(file) {
@ -131,26 +131,26 @@
type: 'warning',
message: '文件数量最多不超过一个'
});
},
//
handleImgRemove(file) {
console.log('handleImgRemove', file);
if (file.response) {
let index =this.formData.attachmentList.findIndex(item => item.url == file.response.data.url);
let index = this.formData.attachmentList.findIndex(item => item.url == file.response.data.url);
this.formData.attachmentList.splice(index, 1);
} else if (file.url) {
let index = this.formData.attachmentList.findIndex(item => item.url == file.url);
this.formData.attachmentList.splice(index, 1);
}
console.log(this.formData.attachmentList,"sdjflskdfjklds");
console.log(this.formData.attachmentList, "sdjflskdfjklds");
},
//
handleImgSuccess(res, file, fileList) {
console.log(res,file,fileList,"dsfkljsdklfj");
//
handleImgSuccess(res, file, fileList) {
console.log(res, file, fileList, "dsfkljsdklfj");
if (res.code === 0 && res.msg === 'success') {
// let format = file.name.split('.').pop();
// let srcType = file.raw.type;
@ -161,46 +161,65 @@
// type = 'video';
// }
this.formData.attachmentList.push(res.data.url);
console.log( this.formData.attachmentList,":sdfkjslk");
if(this.formData.attachmentList.length>=3){
console.log(this.formData.attachmentList, ":sdfkjslk");
if (this.formData.attachmentList.length >= 3) {
const element = document.querySelector('.el-upload--picture-card'); //
if (element) {
element.style.display = 'none';
}
}
}
} else {
this.$message.error(res.msg);
}
},
//
handleImgPreview(file) {
//
handleImgPreview(file) {
console.log(file);
window.open(file.url || file.response.data.url);
},
//
async getSpecialList() {
const url = "/sys/dict/data/dictlist";
const url = "/sys/dict/data/dictlist";
const { data, code, msg } = await requestPost(url, {
dictType: "solicitation_fields",
});
const { data, code, msg } = await requestPost(url, {
dictType: "solicitation_fields",
});
if (code === 0) {
this.SpecialList = data || [];
} else {
this.$message.error(msg);
}
},
if (code === 0) {
this.SpecialList = data || [];
} else {
this.$message.error(msg);
}
},
async initForm(type, activityId) {
this.formType = type
if (type === 'edit') {
this.formData = activityId
}
this.getDetail(activityId)
}
},
getDetail(activityId){
const url = '/governance/icEventSpecialSubject/getDetail'
let params = {
id: activityId.id
}
requestGet(url, params).then(res=>{
console.log(res,"sdkljklsdf");
this.formData=res.data
this.formData.status=Number(this.formData.status)
console.log(this.formData,"dsfgjsldg");
})
},
//
async loadFormData() {
@ -209,62 +228,48 @@
let params = {
id: this.activityId
}
const { data, code, msg } = await requestPost(url, params)
if (code === 0) {
this.formData = data
let style_img = "style='width:50px;height:40px;' "
if (this.formData.content) {
// this.formData.content = this.formData.content.replace(/<img/g, "<img style='width:200px;height:240px;'")
// let array=this.formData.content.split('<img')
}
} else {
this.$message.error(msg)
}
},
async handleComfirm() {
if (!this.formData.subjectTitle) {
this.$message.error('请输入专题标题');
return;
}
if (!this.formData.subjectContent) {
this.$message.error('请输入专题内容');
return;
}
if (!this.formData.typeCode) {
this.$message.error('请输入领域编码');
return;
}
// if (!this.formData.status) {
// this.$message.error('');
// return;
// }
console.log(this.formData,"this.formData");
this.addSpecial()
this.$message.error('请输入专题标题');
return;
}
if (!this.formData.subjectContent) {
this.$message.error('请输入专题内容');
return;
}
if (!this.formData.typeCode) {
this.$message.error('请输入领域编码');
return;
}
// if (!this.formData.status) {
// this.$message.error('');
// return;
// }
console.log(this.formData, "this.formData");
this.addSpecial()
},
async addSpecial() {
if(this.formType=="edit"){
let url = '/governance/icEventSpecialSubject/update'
const { data, code, msg } = await requestPost(url, this.formData)
if (code === 0) {
this.$message({
type: 'success',
message: '操作成功'
})
} else {
this.$message.error(msg)
}
console.log("sdlkfjklsdf ");
this.$emit('showAddClose')
}else{
let url = '/governance/icEventSpecialSubject/save'
if (this.formType == "edit") {
let url = '/governance/icEventSpecialSubject/update'
const { data, code, msg } = await requestPost(url, this.formData)
if (code === 0) {
this.$message({
@ -276,105 +281,122 @@
}
console.log("sdlkfjklsdf ");
this.$emit('showAddClose')
} else {
let url = '/governance/icEventSpecialSubject/save'
const { data, code, msg } = await requestPost(url, this.formData)
if (code === 0) {
this.$message({
type: 'success',
message: '操作成功'
})
} else {
this.$message.error(msg)
}
console.log("sdlkfjklsdf ");
this.$emit('showAddClose')
}
},
handleCancle() {
this.$emit('showAddClose')
},
},
computed: {
dataRule() {
return {
columnId: [
{ required: true, message: '请选择所属栏目', trigger: 'blur' }
subjectTitle: [
{ required: true, message: '所属专题不能为空', trigger: 'blur' }
],
content: [
{ required: true, message: '活动详情不能为空', trigger: 'blur' }
typeCode: [
{ required: true, message: '征集领域不能为空', trigger: 'blur' }
],
title: [
{ required: true, message: '文章标题不能为空', trigger: 'blur' }
subjectContent: [
{ required: true, message: '征集内容不能为空', trigger: 'blur' }
],
fileList: [
{ required: true, message: '请选择活动照片', trigger: 'blur' }
]
}
},
},
props: {
},
destroyed () {
map = null
}
}
</script>
<style lang="scss" scoped>
@import "@/assets/scss/modules/visual/communityManageForm.scss";
</style>
<style lang="scss" scoped>
destroyed() {
map = null
}
}
</script>
<style lang="scss" scoped>
@import "@/assets/scss/modules/visual/communityManageForm.scss";
</style>
<style lang="scss" scoped>
/deep/ .el-upload--picture-card {
width: 60px;
height: 60px;
line-height: 70px;
}
/deep/ .el-upload-list--picture-card .el-upload-list__item {
/deep/ .el-upload-list--picture-card .el-upload-list__item {
width: 60px;
height: 60px;
}
/deep/ .el-upload-dragger{
/deep/ .el-upload-dragger {
width: 60px;
height: 60px;
}
.item_width_1 {
.item_width_1 {
width: 634px;
/deep/.tox .tox-dialog {
z-index: 20000;
}
}
.u-item-width-normal{
}
.u-item-width-normal {
width: 222px;
}
.tinymce_view {
}
.tinymce_view {
::v-deep .tox .tox-dialog {
z-index: 2000000000;
}
}
.div_map {
}
.div_map {
position: relative;
}
.div_searchmap {
}
.div_searchmap {
z-index: 5000;
position: absolute;
top: 5px;
left: 5px;
}
.tinymce_view {
}
.tinymce_view {
height: 400px;
overflow: auto;
}
.text_p {
}
.text_p {
margin: 0;
padding: 0 10px;
border: 1px solid #d9d9d9;
border-radius: 5px;
>p {
margin: 0;
}
}
</style>
}
</style>

1
src/views/modules/solicitationSpecial/index.vue

@ -485,6 +485,7 @@ export default {
},
showAddClose(){
this.showSupervise=false
this.getTableData()
},
handleEventType(val) {
const nodes = this.$refs.cascaderEvent.getCheckedNodes();

2
src/views/modules/volunteer/activityArchive/add.vue

@ -5,7 +5,7 @@
<el-form ref="ref_form" :inline="true" :model="formData" class="form" label-width="120px" :rules="rules">
<el-row>
<el-col :span="12"> <el-form-item label="主办方" prop="agencyId" required>
<el-cascader class="list_item_width_1" ref="myCascader" clearable style="width: 280px;"
<el-cascader class="list_item_width_1" ref="myCascader" clearable style="width: 280px"
v-model.trim="formData.agencyId" :options="orgOptions" :props="orgOptionProps"
@change="handleChangeAgency"></el-cascader>
</el-form-item>

2
src/views/modules/workPc/guidance/add.vue

@ -121,7 +121,7 @@ export default {
keyWords: '',
activityId: '',
formData: {
orgId: "",//
orgId: this.$store.state.user.agencyId,//
categoryCode: "",//
title: "",//
coverPic: "",//

Loading…
Cancel
Save