From 7ab02d9a0604183458c0c87a76af1d549b3a3695 Mon Sep 17 00:00:00 2001 From: Joker_Yxin <2509699647@qq.com> Date: Thu, 21 Nov 2024 14:51:55 +0800 Subject: [PATCH] 问卷完成，最新 --- admin-web-master/src/components/dajuanTongji/index.vue | 6 +++++- admin-web-master/src/layout/index.vue | 8 ++++---- admin-web-master/src/main.js | 3 +++ admin-web-master/src/utils/request.js | 10 +++++++--- admin-web-master/src/views/ads/fangli/addform.vue | 39 +++++++++++++++++++++------------------ admin-web-master/src/views/ads/fangli/bianform.vue | 102 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++----------------------------------- admin-web-master/src/views/ads/fangli/index.vue | 44 +++++++++++++++++++++++++++++--------------- admin-web-master/src/views/detect/admap.vue | 3 ++- admin-web-master/src/views/detect/analyse.vue | 5 +++-- admin-web-master/src/views/detect/information.vue | 7 +++++-- admin-web-master/src/views/detect/map.vue | 6 +++++- admin-web-master/src/views/investigation/answerSheet.vue | 37 +++++++++++++++++++++++++++++-------- admin-web-master/src/views/investigation/index.vue | 67 +++++++++++++++++++++++++++++++++++++++++++++++-------------------- admin-web-master/src/views/investigation/question.vue | 7 +++++-- admin-web-master/src/views/scheme/planningBz.vue | 8 +++++++- admin-web-master/src/views/scheme/planningPar.vue | 85 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++------- admin-web-master/src/views/scheme/sam.vue | 43 ++++++++++++++++++++++++++++++++----------- admin-web-master/src/views/scheme/samXin.vue | 52 ++++++++++++++++++++++++++++++++++++++++------------ admin-web-master/vue.config.js | 2 +- ceres-uniapp-master/config/api.js | 12 ++++++++---- ceres-uniapp-master/manifest.json | 2 +- ceres-uniapp-master/pages_category_page1/question/question.vue | 23 ++++++++++++----------- ceres-uniapp-master/unpackage/dist/build/web/index.html | 2 +- ceres-uniapp-master/unpackage/dist/build/web/static/js/index.1955fe10.js | 1 - ceres-uniapp-master/unpackage/dist/build/web/static/js/pages_category_page1-question-question.e685a4a2.js | 1 - 25 files changed, 412 insertions(+), 163 deletions(-) delete mode 100644 ceres-uniapp-master/unpackage/dist/build/web/static/js/index.1955fe10.js delete mode 100644 ceres-uniapp-master/unpackage/dist/build/web/static/js/pages_category_page1-question-question.e685a4a2.js diff --git a/admin-web-master/src/components/dajuanTongji/index.vue b/admin-web-master/src/components/dajuanTongji/index.vue index 9e5bd09..eb574be 100644 --- a/admin-web-master/src/components/dajuanTongji/index.vue +++ b/admin-web-master/src/components/dajuanTongji/index.vue @@ -1,6 +1,6 @@ - + - + - + @@ -123,15 +123,15 @@ {{scope.$index + 1}} - + - + - + @@ -391,7 +391,12 @@ required: true, message: '请输入方案名称', trigger: 'blur' - }] + }], + planningScheme:[{ + required: true, + message: '请选择规划方案', + trigger: 'change' + }], }, tableData: [], fileData: [], @@ -520,19 +525,17 @@ multipleSelection:[], console.log(err); }); } else { - this.$message({ - message: '请填写数据', - customClass: 'custom-message', - offset: 100 - }); + this.$message({ + message: '请填写完整信息', + type: 'error' + }) return false; } }else { - this.$message({ - message: '请填写数据', - customClass: 'custom-message', - offset: 100 - }) + this.$message({ + message: '请填写完整信息', + type: 'error' + }) return false; } diff --git a/admin-web-master/src/views/ads/fangli/bianform.vue b/admin-web-master/src/views/ads/fangli/bianform.vue index bded8e9..a7ac0b7 100644 --- a/admin-web-master/src/views/ads/fangli/bianform.vue +++ b/admin-web-master/src/views/ads/fangli/bianform.vue @@ -2,15 +2,12 @@
- + - @@ -30,10 +27,10 @@
-
招商内容
- +
@@ -80,7 +77,7 @@ +点击上传 -
{{ruleForm.attachmentInfo.name}}下载
+
{{ruleForm.attachmentInfo.name}}下载
@@ -110,26 +107,31 @@ @selection-change="handleSelectionChange" tooltip-effect="dark" :header-cell-style="{fontSize: '14px',color:'#0009',fontWeight: 'normal',backgroundColor:'#F2F3F5'}" style="width: 100%"> - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + +
@@ -219,14 +221,19 @@ contractGetAll } from '../../../api/planningBz.js' import { - getAlls - } from '../../../api/information.js' - import { getAlls as map1 } from '../../../api/map1' import { ceGetAll } from '../../../api/sam.js' + import { + getAlls, + changAlls + } from '../../../api/information.js' + import { + duiyingAll, + duiyingAdd + } from '../../../api/newZiyuan.js' // import { Editor, Toolbar } from '@wangeditor/editor-for-vue' import wangEditor from "@/components/editor/index" import upimg from "@/components/ImageUpload/index" @@ -280,7 +287,19 @@ guihuaDate:[], celueMing:false, celueSel:null, celueData:[], - index:null + index:null, + rules: { + planName: [{ + required: true, + message: '请输入方案名称', + trigger: 'blur' + }], + planningScheme:[{ + required: true, + message: '请选择规划方案', + trigger: 'change' + }], + }, } }, watch: { @@ -363,11 +382,16 @@ guihuaDate:[], } const { pageNumber, pageSize, ...rest } = this.ruleForm -this.ruleForm = rest - +// this.ruleForm = rest +// console.log(this.ruleForm) +// return // 将剩余的字段存储到this.zhong对象中 fangEdit(this.ruleForm).then(res=>{ + this.$message({ + message: '保存成功', + type: 'success' + }) this.$emit('bianClose', false) }) @@ -422,6 +446,14 @@ this.ruleForm = rest celueChenge(val){ this.celueSel = val; }, + async addziyuan(){ + const ziyuan = await getAlls(this.pageindex) + const ggw = await map1(this.pageindex) + const changdi = await changAlls(this.pageindex) + this.tableData = [...ziyuan.data.content,...ggw.data.content,...changdi.data.content] + this.addMing = true + + } } } diff --git a/admin-web-master/src/views/ads/fangli/index.vue b/admin-web-master/src/views/ads/fangli/index.vue index 4a58b67..bf31a2e 100644 --- a/admin-web-master/src/views/ads/fangli/index.vue +++ b/admin-web-master/src/views/ads/fangli/index.vue @@ -22,8 +22,8 @@ - @@ -90,26 +90,26 @@ label="涵盖资源数" min-width="120" > - + - + - + { + item.cereResourceStrategy.forEach(strategy => { + // 复制原始数据的部分字段 + let newItem = { + planName: item.planName, + cereInvestmentPlanningManagement: item.cereInvestmentPlanningManagement, + auditStatus: item.auditStatus, + // ...其他需要合并显示的字段 + }; + // 添加cereResourceStrategy中的字段 + newItem.cereResourceStrategy = strategy; + result.push(newItem); + }) + }) this.tableData = res.data.content this.total = res.data.content.length @@ -316,9 +330,8 @@ export default { forms.planName = this.formSel.planName } if(this.plan_Time.length!=0){ - this.tableData = [] - this.total = 0 - return + forms.implementationStartTime = this.plan_Time[0] + forms.implementationEndTime = this.plan_Time[1] } const res = await fangGetAll(forms) this.tableData = res.data.content @@ -423,6 +436,7 @@ export default { .tableBtn { display: inline-block; margin-right: 10px; + cursor: pointer; } .formSearch { diff --git a/admin-web-master/src/views/detect/admap.vue b/admin-web-master/src/views/detect/admap.vue index 29c3182..5976ddd 100644 --- a/admin-web-master/src/views/detect/admap.vue +++ b/admin-web-master/src/views/detect/admap.vue @@ -44,7 +44,7 @@ -
+
查询 @@ -1552,6 +1552,7 @@ HandMapItem(item){ .tableBtn { display: inline-block; margin-right: 10px; + cursor: pointer; } .formSearch { diff --git a/admin-web-master/src/views/detect/analyse.vue b/admin-web-master/src/views/detect/analyse.vue index 09970c4..2d82f51 100644 --- a/admin-web-master/src/views/detect/analyse.vue +++ b/admin-web-master/src/views/detect/analyse.vue @@ -17,7 +17,7 @@ --> - 检索 @@ -735,7 +735,8 @@ charDam9(){ }, resetting(){ - + this.FormTime = [] + this.getAll() }, async onSubmit(){ diff --git a/admin-web-master/src/views/detect/information.vue b/admin-web-master/src/views/detect/information.vue index 6931ce5..3bd3fb8 100644 --- a/admin-web-master/src/views/detect/information.vue +++ b/admin-web-master/src/views/detect/information.vue @@ -182,7 +182,7 @@ -
+
@@ -673,7 +673,10 @@ components: {MapMark,MapXian,upimg,upvidio}, }) } else { - console.log('error submit!!'); + this.$message({ + message: '请填写完整信息', + type: 'error' + }) return false; } }) diff --git a/admin-web-master/src/views/detect/map.vue b/admin-web-master/src/views/detect/map.vue index 074eb63..65f14ac 100644 --- a/admin-web-master/src/views/detect/map.vue +++ b/admin-web-master/src/views/detect/map.vue @@ -941,7 +941,10 @@ }) } else { - console.log('error submit!!'); + this.$message({ + message: '请填写完整信息', + type: 'error' + }) return false; } }) @@ -1121,6 +1124,7 @@ .tableBtn { display: inline-block; margin-right: 10px; + cursor: pointer; } .formSearch { diff --git a/admin-web-master/src/views/investigation/answerSheet.vue b/admin-web-master/src/views/investigation/answerSheet.vue index 0b7e6f5..9ee7939 100644 --- a/admin-web-master/src/views/investigation/answerSheet.vue +++ b/admin-web-master/src/views/investigation/answerSheet.vue @@ -176,19 +176,24 @@ :header-cell-style="{fontSize: '14px',color:'#0009',fontWeight: 'normal',backgroundColor:'#F2F3F5'}"> - + + - + - + + - + @@ -767,12 +772,28 @@ let strDate = year + '-' + dateArr[0] + '-' + dateArr[1] return strDate }, +objectToArray(obj) { + return Object.keys(obj).map(key => { + const item = obj[key]; + return { + id: key, + ...item + } + }) +}, //详情 details(val, item) { this.detbox = true - this.wenData = item.cereQuestionManagements this.secondData = item + if(typeof item.question =='string'){ + item.question = JSON.parse(item.question) + + } + const array = this.objectToArray(item.question) + + this.wenData = array + }, handleSizeChange(val) { diff --git a/admin-web-master/src/views/investigation/index.vue b/admin-web-master/src/views/investigation/index.vue index 54f6be5..0813985 100644 --- a/admin-web-master/src/views/investigation/index.vue +++ b/admin-web-master/src/views/investigation/index.vue @@ -85,7 +85,7 @@
禁用
统计
-
删除
+
删除
预览
@@ -106,7 +106,7 @@
-
{{secondData.title}}
+
{{secondData.title}}
答卷数量：{{tongjiSshu.length || 0}}
起止时间：{{secondData.startDate}} 至 {{secondData.endDate}}
@@ -181,7 +181,7 @@
题目统计
- @@ -354,16 +354,18 @@ {{scope.$index +1}} - + + - + - + + - - +