webapp / GreenwayWeb

Commit f8ac8baf0cc0ddc6aed22ae7f08ec92b339ab17c

Authored by wesley88
2 parents 25ccb2a3 8c0a2463

Merge branch 'master' of http://39.98.150.180/webapp/GreenwayWeb

Inline Side-by-side
Showing 16 changed files with 261 additions and 69 deletions
lvdao-miniapp/pages/accepting/accepting.vue
  View file @f8ac8ba
... ... @@ -4,7 +4,7 @@
4 4 <view class="record-list">
5 5 <view class="good-item">
6 6 <view class="img">
7   - <u-image width="100%" height="100%" :src="record.cereBasicInformationShop&&record.cereBasicInformationShop.displayMainImage?$img + record.cereBasicInformationShop.displayMainImage:record.cereBasicInformationVenue&&record.cereBasicInformationVenue.displayImage?$img + record.cereBasicInformationVenue.displayImage:record.cereAdvertisingInformation&&record.cereAdvertisingInformation.locationDiagram?$img + record.cereAdvertisingInformation.locationDiagram:''"></u-image>
  7 + <u-image width="100%" height="100%" border-radius="10" :src="record.cereBasicInformationShop&&record.cereBasicInformationShop.displayMainImage?$img + record.cereBasicInformationShop.displayMainImage:record.cereBasicInformationVenue&&record.cereBasicInformationVenue.displayImage?$img + record.cereBasicInformationVenue.displayImage:record.cereAdvertisingInformation&&record.cereAdvertisingInformation.locationDiagram?$img + record.cereAdvertisingInformation.locationDiagram:''"></u-image>
8 8 </view>
9 9 <view class="info">
10 10 <view class="title">{{
... ...
lvdao-miniapp/pages/complaint/complaint.vue
  View file @f8ac8ba
... ... @@ -143,13 +143,15 @@
143 143 }
144 144 this.ruleForm.applicationTime = this.currentTime()
145 145 this.ruleForm.createUser = uni.getStorageSync('user').phone
146   - this.ruleForm.onSitePhoto.map(item=>{
147   - item.replace(this.$img,'')
  146 + this.ruleForm.onSitePhoto = this.ruleForm.onSitePhoto.map(item=>{
  147 + return item.replace(this.$img,'');
148 148 })
  149 +
149 150 let info = {
150 151 ...this.ruleForm,
151 152 onSitePhoto:this.ruleForm.onSitePhoto.join(','),
152 153 }
  154 +
153 155 this.$http.sendRequest('/cereComplaintsSuggestions/add', 'POST',info,1).then(res => {
154 156 uni.navigateTo({
155 157 url: '/pages/serve/serve'
... ...
lvdao-miniapp/pages/marketing/marketingDetail/marketingDetail.scss
  View file @f8ac8ba
... ... @@ -86,7 +86,7 @@
86 86 .userForm {
87 87 margin: 0 40rpx ;
88 88 .form-box {
89   - padding: 28rpx;
  89 + padding: 18rpx 30rpx;
90 90  
91 91 }
92 92 .title {
... ...
lvdao-miniapp/pages/marketing/marketingDetail/marketingDetail.vue
  View file @f8ac8ba
... ... @@ -32,7 +32,7 @@
32 32 <text>客服</text>
33 33 </view> -->
34 34 <view class="footer-btn">
35   - <u-button type="success" style="width:90%" @click="joinShow = true">报名参加</u-button>
  35 + <u-button type="success" style="width:90%" @click="baoShow">报名参加</u-button>
36 36 </view>
37 37 <!-- <view class="footer-service">
38 38 <u-image :showLoading="true" :src="$imgUrl('/share-icon.png')" width="30rpx" height="30rpx"></u-image>
... ... @@ -40,12 +40,12 @@
40 40 </view> -->
41 41  
42 42 </view>
43   - <u-popup class="userForm" v-model="joinShow" mode="center" :closeable="true" width="90%" >
  43 + <u-popup class="userForm" v-model="joinShow" mode="center" border-radius="20" :closeable="true" width="90%" >
44 44 <u-form class="form-box" :model="form" ref="uForm" :label-width="120" >
45   - <view style="padding: 20rpx;">
  45 + <view style="padding: 10rpx;">
46 46 <view class="title">请填写您的报名信息</view>
47   - <u-form-item label="姓名"><u-input v-model="form.userName" /></u-form-item>
48   - <u-form-item label="电话"><u-input v-model="form.userPhone" /></u-form-item>
  47 + <u-form-item label="*姓名"><u-input v-model="form.userName" /></u-form-item>
  48 + <u-form-item label="*电话"><u-input v-model="form.userPhone" /></u-form-item>
49 49 <u-button type="success" @click="submit">提交</u-button>
50 50 </view>
51 51 </u-form>
... ... @@ -112,7 +112,28 @@ if(option.scene){
112 112  
113 113 },
114 114 methods: {
  115 + baoShow(){
  116 + this.joinShow = true
  117 + this.form.userName = ''
  118 + this.form.userPhone = ''
  119 + },
115 120 submit() {
  121 + if (!this.form.userName) {
  122 + uni.showToast({
  123 + icon: 'none',
  124 + title: '请输入姓名'
  125 + });
  126 + return
  127 + }
  128 +
  129 +
  130 + if (!this.form.userPhone) {
  131 + uni.showToast({
  132 + icon: 'none',
  133 + title: '请输入联系电话'
  134 + });
  135 + return
  136 + }
116 137 this.form.createTime = this.getCurrentDateTime()
117 138 this.$http.sendRequest('/cereEventRegistration/add', 'POST',this.form,1).then(res => {
118 139  
... ...
lvdao-miniapp/pages/record/record.vue
  View file @f8ac8ba
... ... @@ -28,20 +28,21 @@
28 28 return {
29 29 recordList:'',
30 30 pageindex: {
  31 + auditStatus:1,
31 32 pageNumber: 0,
32 33 pageSize: 10
33 34 },
34 35 activesType: [
35 36 {
36   - value: 0,
37   - label: '商铺申请记录'
38   - },{
39 37 value: 1,
40   - label: '场地申请记录'
  38 + label: '待审核'
  39 + },{
  40 + value:2,
  41 + label: '待签约'
41 42 },
42 43 {
43   - value: 2,
44   - label: '广告位申请记录'
  44 + value: 3,
  45 + label: '已驳回'
45 46 }
46 47 ],
47 48 typeShow:false,
... ... @@ -71,19 +72,9 @@
71 72 })
72 73 },
73 74 typeChange(e) {
74   -
75 75 this.pageindex.start = e[0].labels
76   - if(e[0].value == 2){
77   - this.$http.sendRequest('/cereAdvertiserInfo/queryByPage', 'POST', this.pageindex, 1).then(item => {
78   - this.recordList = item.data.data.content
79   - })
80   - }else{
81   - this.$http.sendRequest('/cereBusinessInfo/queryByPage', 'POST', this.pageindex,1).then(res => {
82   - this.recordList = res.data.data.content
83   - })
84   - }
85   -
86   - this.getALL()
  76 + this.pageindex.auditStatus = e[0].value
  77 + this.getALL()
87 78 },
88 79 }
89 80 }
... ...
lvdao-miniapp/pages/repair/repair.vue
  View file @f8ac8ba
... ... @@ -5,7 +5,7 @@
5 5 <view class="feedback-data">
6 6 <view>
7 7 <view class="title">
8   - <text style="font-weight: bold;">现场照片</text>
  8 + <text style="font-weight: bold;">*现场照片</text>
9 9  
10 10 </view>
11 11 </view>
... ... @@ -23,8 +23,8 @@
23 23 <view class="add-list">
24 24 <view class="list">
25 25 <view class="title">
26   - <text style="font-weight: bold;">设备名称</text>
27   - <!-- <text class="star">*</text> -->
  26 + <text style="font-weight: bold;">*设备名称</text>
  27 +
28 28 </view>
29 29 <view class="content">
30 30 <input type="text" placeholder="请输入" v-model="ruleForm.deviceName">
... ... @@ -32,8 +32,8 @@
32 32 </view>
33 33 <view class="list">
34 34 <view class="title">
35   - <text style="font-weight: bold;">设备类型</text>
36   - <!-- <text class="star">*</text> -->
  35 + <text style="font-weight: bold;">*设备类型</text>
  36 +
37 37 </view>
38 38 <view class="content" @click="choose(1)" style="width: 25%;">
39 39 <u-input v-model="ruleForm.deviceType" type="select" disabledColor="#ffffff"
... ... @@ -43,8 +43,8 @@
43 43 </view>
44 44 <view class="list">
45 45 <view class="title">
46   - <text style="font-weight: bold;">保修问题</text>
47   - <!-- <text class="star">*</text> -->
  46 + <text style="font-weight: bold;">*保修问题</text>
  47 +
48 48 </view>
49 49 <view class="content" @click="chooseLocation(1)" style="width: 25%;">
50 50 <u-input v-model="ruleForm.warrantyIssue" type="select" disabledColor="#ffffff"
... ... @@ -65,8 +65,8 @@
65 65 <view class="feedback-data">
66 66 <view>
67 67 <view class="title">
68   - <text style="font-weight: bold;">备注信息</text>
69   - <!-- <text class="star">*</text> -->
  68 + <text style="font-weight: bold;">*备注信息</text>
  69 +
70 70 </view>
71 71 </view>
72 72 <view class="voucher-img">
... ... @@ -94,7 +94,7 @@
94 94 return {
95 95 fileList:[],
96 96 ruleForm:{
97   - onSitePhoto:'',
  97 + onSitePhoto:[],
98 98 deviceName:'',
99 99 deviceType:'',
100 100 warrantyIssue:'',
... ... @@ -140,13 +140,58 @@
140 140 pops1(val) {
141 141 this.ruleForm.deviceType = val[0].label
142 142 },
  143 + check(){
  144 + if (this.ruleForm.onSitePhoto.length== 0) {
  145 + uni.showToast({
  146 + icon: 'none',
  147 + title: '请上传现场图片'
  148 + });
  149 + return false;
  150 + }
  151 + if (!this.ruleForm.deviceName) {
  152 + uni.showToast({
  153 + icon: 'none',
  154 + title: '请输入设备名称'
  155 + });
  156 + return false;
  157 + }
  158 + if (!this.ruleForm.deviceType) {
  159 + uni.showToast({
  160 + icon: 'none',
  161 + title: '请选择设备类型'
  162 + });
  163 + return false;
  164 + }
  165 + if (!this.ruleForm.warrantyIssue) {
  166 + uni.showToast({
  167 + icon: 'none',
  168 + title: '请选择保修问题'
  169 + });
  170 + return false;
  171 + }
  172 + if (!this.ruleForm.memo) {
  173 + uni.showToast({
  174 + icon: 'none',
  175 + title: '请输入备注信息'
  176 + });
  177 + return false;
  178 + }
  179 +
  180 + return true;
  181 + },
143 182 submit() {
144   -
  183 + let show = this.check()
  184 + if(show == false){
  185 + return
  186 + }
145 187 this.ruleForm.applicationTime = this.currentTime()
146 188 this.ruleForm.createUser = uni.getStorageSync('user').phone
  189 + this.ruleForm.onSitePhoto = this.ruleForm.onSitePhoto.map(item=>{
  190 + return item.replace(this.$img,'');
  191 + })
147 192 let info = {
148 193 ...this.ruleForm,
149   - onSitePhoto:this.ruleForm.onSitePhoto.replace(this.$img,''),
  194 + onSitePhoto:this.ruleForm.onSitePhoto.join(','),
150 195 }
151 196 this.$http.sendRequest('/cereReportIssuesRepairs/add', 'POST',info,1).then(res => {
152 197 uni.navigateTo({
... ... @@ -189,7 +234,7 @@
189 234 filePath: 'xcx', // 其他表单数据
190 235 },
191 236 success: (uploadFileRes) => {
192   - this.ruleForm.onSitePhoto= this.$img + JSON.parse(uploadFileRes.data).data
  237 + this.ruleForm.onSitePhoto.push(this.$img + JSON.parse(uploadFileRes.data).data)
193 238 uni.showToast({
194 239 title: '上传成功',
195 240 icon: 'success',
... ...
lvdao-miniapp/pages/serve/jiDed.vue
  View file @f8ac8ba
... ... @@ -17,7 +17,14 @@
17 17 <view class="label">备注信息</view>
18 18 <text>{{record.memo || record.remark}}</text>
19 19 </view>
20   -
  20 + <view style="padding: 5px 0;line-height: 36px;">
  21 + <view >评价信息</view>
  22 + </view>
  23 + <view style="padding: 10px 0; border-bottom: #eee solid 1rpx;">{{record.estimate || '无'}}</view>
  24 + <view style="padding: 5px 0;line-height: 36px;">现场照片</view>
  25 + <view class="imgList">
  26 + <u-image width="48%" height="280" border-radius="10" :src="$img+item" v-for="(item,index) in this.record.onSitePhoto"></u-image>
  27 + </view>
21 28 </view>
22 29  
23 30  
... ... @@ -35,6 +42,9 @@
35 42 const item = JSON.parse(decodeURIComponent(options.item));
36 43 console.log('Received item:', item);
37 44 this.record = item
  45 + if(typeof this.record.onSitePhoto == 'string'){
  46 + this.record.onSitePhoto = this.record.onSitePhoto.split(',')
  47 + }
38 48 },
39 49 methods: {
40 50  
... ... @@ -103,7 +113,7 @@
103 113 }
104 114 }
105 115 .msglist{
106   - padding: 0 30rpx;
  116 + padding: 0 30rpx 20rpx 30rpx;
107 117 background-color: #Fff;
108 118 border-radius: 14rpx;
109 119 margin-bottom: 20rpx;
... ... @@ -193,4 +203,9 @@
193 203 }
194 204 }
195 205 }
  206 + .imgList{
  207 + width: 100%;
  208 + display: flex;
  209 + justify-content: space-between;
  210 + }
196 211 </style>
... ...
lvdao-miniapp/pages/serve/serve.scss
  View file @f8ac8ba
... ... @@ -74,3 +74,25 @@
74 74 }
75 75 }
76 76 }
  77 + .content{
  78 + display: flex;
  79 + align-items: center;
  80 + text-align: right;
  81 + input{
  82 + width: 100%;
  83 + color: #222222;
  84 + font-size: 26rpx;
  85 + padding-top: 6rpx;
  86 + /* #ifdef MP */
  87 + padding-top: 5rpx;
  88 + /* #endif */
  89 + }
  90 + image {
  91 + width: 20rpx;
  92 + height: 20rpx;
  93 + margin-left: 10rpx;
  94 + /* #ifdef MP */
  95 + margin-top: 5rpx;
  96 + /* #endif */
  97 + }
  98 + }
... ...
lvdao-miniapp/pages/serve/serve.vue
  View file @f8ac8ba
... ... @@ -15,6 +15,9 @@
15 15 </view>
16 16 <view class="info-item">申请时间：{{item.applicationTime}}</view>
17 17 <view class="info-item">状态：<span style="color: #0FBB59;">{{item.status=='1'?'受理中':'已完成'}}</span></view>
  18 + <view style="margin-top: 10px;" v-if="item.status == '2'">
  19 + <u-button type="success" style="width:30%;height: 28px;margin: 0 10px 0 0;" @click="baoShow(0,item.id)">评价</u-button>
  20 + </view>
18 21 </view>
19 22 </view>
20 23 <view class="record-list-box" v-for="(item,index) in toushu" :key="index" @click="recordXq(item)">
... ... @@ -25,10 +28,25 @@
25 28 </view>
26 29 <view class="info-item">申请时间：{{item.applicationTime}}</view>
27 30 <view class="info-item">状态：<span style="color: #0FBB59;">{{item.status=='1'?'受理中':'已完成'}}</span></view>
  31 + <view style="margin-top: 10px;" v-if="item.status == '2'">
  32 + <u-button type="success" style="width:30%;height: 28px;margin: 0 10px 0 0;" @click="baoShow(1,item.id)">评价</u-button>
  33 + </view>
28 34 </view>
29 35 </view>
30 36 </view>
31 37 <u-select v-model="typeShow" :list="activesType" @confirm="typeChange"></u-select>
  38 + <u-popup class="userForm" v-model="joinShow" mode="center" border-radius="20" :closeable="true" width="90%" >
  39 + <view style="padding: 30rpx;">
  40 + <view style="text-align: center;font-size: 16px;font-weight: 600;margin-bottom: 30rpx;">评价</view>
  41 + <view class="" style="background-color: #F0F0F0;border-radius: 20rpx;margin-bottom: 15px;">
  42 + <textarea cols="30" rows="10" placeholder="请输入" maxlength="150" style="font-size: 24rpx;background-color: #F0F0F0;border-radius: 20rpx;width: 96%;margin: 0 auto;padding: 20rpx;" v-model="form.estimate"></textarea>
  43 + <p style="text-align: right; font-size: 24rpx; color: #666;padding:0 20rpx 10rpx 0;">
  44 + 剩余 {{ remainingCharacters }} 字
  45 + </p>
  46 + </view>
  47 + <u-button type="success" @click="submit">提交</u-button>
  48 + </view>
  49 + </u-popup>
32 50 </view>
33 51 </template>
34 52  
... ... @@ -53,13 +71,31 @@
53 71 label: '报修记录'
54 72 }
55 73 ],
56   - typeShow:false
  74 + typeShow:false,
  75 + joinShow:false,
  76 + form:{
  77 + estimate:'',
  78 + id:''
  79 + },
  80 + indexMsg :0
57 81 }
58 82 },
59 83 mounted(){
60 84 this.getALL()
61 85 },
  86 + computed: {
  87 + remainingCharacters() {
  88 + const maxLength = 150;
  89 + return maxLength - this.form.estimate.length;
  90 + }
  91 + },
62 92 methods: {
  93 + baoShow(val,ids){
  94 + this.joinShow = true
  95 + this.form.estimate = ''
  96 + this.form.id = ids
  97 + this.indexMsg = val
  98 + },
63 99 getALL(){
64 100 this.pageindex.createUser =uni.getStorageSync('user').phone
65 101 this.$http.sendRequest('/cereComplaintsSuggestions/queryByPage', 'POST',this.pageindex,1).then(res => {
... ... @@ -79,15 +115,44 @@
79 115  
80 116 this.pageindex.start = e[0].labels
81 117 if(e[0].value == 0){
82   - this.$http.sendRequest('/cereReportIssuesRepairs/queryByPage', 'POST',this.pageindex,1).then(res => {
83   - this.recordList = res.data.data.content
  118 +
  119 + this.$http.sendRequest('/cereComplaintsSuggestions/queryByPage', 'POST',this.pageindex,1).then(res => {
  120 + this.toushu = res.data.data.content
  121 + this.recordList =[]
84 122 })
85 123 }else{
86   - this.$http.sendRequest('/cereComplaintsSuggestions/queryByPage', 'POST',this.pageindex,1).then(res => {
87   - this.toushu = res.data.data.content
  124 + this.$http.sendRequest('/cereReportIssuesRepairs/queryByPage', 'POST',this.pageindex,1).then(res => {
  125 + this.recordList = res.data.data.content
  126 + this.toushu = []
88 127 })
89 128 }
90 129 },
  130 + submit(){
  131 + if (!this.form.estimate) {
  132 + uni.showToast({
  133 + icon: 'none',
  134 + title: '请输入评价信息'
  135 + });
  136 + return;
  137 + }
  138 + if(this.indexMsg == 1){
  139 + this.$http.sendRequest('/cereComplaintsSuggestions/edit', 'POST',this.form,1).then(res => {
  140 + uni.showToast({
  141 + icon: 'success',
  142 + title: '评价成功'
  143 + });
  144 + })
  145 + this.joinShow = false
  146 + }else{
  147 + this.$http.sendRequest('/cereReportIssuesRepairs/edit', 'POST',this.form,1).then(res => {
  148 + uni.showToast({
  149 + icon: 'success',
  150 + title: '评价成功'
  151 + });
  152 + })
  153 + this.joinShow = false
  154 + }
  155 + }
91 156 }
92 157 }
93 158 </script>
... ...
wenjuan-h5/config/api.js
  View file @f8ac8ba
1 1  
2 2 // const DOMAIN_PREFIXPING = 'https://jy.scjysm.asia:18086/admin-server'
3 3 // const DOMAIN_PREFIX = 'https://jy.scjysm.asia:18086/api'
4   -let DOMAIN_PREFIXPING = 'http://172.16.61.125:9003'
5   -let DOMAIN_PREFIX = 'http://172.16.61.125:9007'
  4 +// let DOMAIN_PREFIXPING = 'http://172.16.61.125:9003'
  5 +// let DOMAIN_PREFIX = 'http://172.16.61.125:9007'
6 6  
7 7  
8 8 // const DOMAIN_PREFIXPING = 'https://jy.scjysm.asia:18086/meserver/admin-server'
... ... @@ -14,14 +14,16 @@ let DOMAIN_PREFIX = &#39;http://172.16.61.125:9007&#39;
14 14 // const DOMAIN_PREFIXPING = `${host}/cdwlMall/admin-server`
15 15 // const DOMAIN_PREFIX =`${host}/cdwlMall/meserver/api`
16 16  
17   -// const DOMAIN_PREFIXPING = `http://192.168.2.152:9003`
18   -// const DOMAIN_PREFIX = 'http://192.168.2.152:9007'
  17 +let DOMAIN_PREFIXPING = `http://10.0.0.41:9003`
  18 +let DOMAIN_PREFIX = 'http://10.0.0.41:9007'
19 19  
20 20 let host = window.location.host;
21 21 let hostall = window.location.href;
22 22 if(host === 'localhost:8080' || host === 'localhost:8081' || host === 'localhost:9528'|| host === '192.168.31.45:9528'|| host === 'localhost:9529' ) {
  23 +
23 24 DOMAIN_PREFIXPING = 'http://10.0.0.41:9003'
24 25 DOMAIN_PREFIX = 'http://10.0.0.41:9007'
  26 +
25 27 } else {
26 28 let c1 = hostall.split('cdwlMall')[0];
27 29 DOMAIN_PREFIXPING = `${c1}/cdwlMall/admin-server`
... ...
wenjuan-h5/pages_category_page1/question/question.vue
  View file @f8ac8ba
... ... @@ -274,7 +274,7 @@
274 274 if (res.data.id) {
275 275 this.wenjuan = res.data
276 276 this.wenjuan.question = JSON.parse(res.data.question)
277   - console.error(this.wenjuan.question)
  277 +
278 278 //检查this.wenjuan.question这个list的每个里面是否有maxChoose参数，没有的话就加一个
279 279 // this.wenjuan.question.forEach(item => {
280 280 // console.log(item)
... ... @@ -677,7 +677,7 @@
677 677 // questionnaireScore: null,
678 678  
679 679 // }
680   - // console.log(obj.question)
  680 +
681 681 obj.question = JSON.stringify(obj.question)
682 682 let tijiaoObj = {
683 683 questionnaireId: this.wenjuanIds,
... ... @@ -693,11 +693,13 @@
693 693 question: obj.question
694 694 }
695 695  
  696 +
696 697 // console.log(result)
697 698 // console.log(JSON.stringify(result))
698   - console.log(tijiaoObj)
  699 + // console.log(tijiaoObj)
699 700 // console.log(JSON.stringify(tijiaoObj))
700 701 // return
  702 +
701 703 NET.request(API.wenjuanUp, tijiaoObj, 'post').then(res => {
702 704 // this.show =true
703 705  
... ... @@ -752,7 +754,7 @@
752 754 // this.$forceUpdate();
753 755 },
754 756 chooseAnswerOne(options, chooseItem, idx) {
755   - console.error(options, chooseItem, idx)
  757 +
756 758 options.forEach(item => {
757 759 item.disabled = false
758 760 })
... ... @@ -760,11 +762,13 @@
760 762 for (let key in this.wenjuan.question) {
761 763 this.wenjuan.question[key].options.map(res => {
762 764 if (res.answer == chooseItem.answer) {
763   - console.error('；；',chooseItem.answer)
  765 +
764 766 this.wenjuan.question[key].choose = chooseItem.answer
  767 +
765 768 }
766 769 })
767 770 }
  771 +
768 772 // console.error({
769 773 // ...this.myChoose
770 774 // })
... ... @@ -776,14 +780,14 @@
776 780 // ...chooseItem
777 781 // }
778 782 chooseItem.disabled = true
  783 +
779 784 },
780 785 chooseAnswer(val,idx,item,index) {
781   - console.log(val,idx,item,index)
782   - console.error(this.wenjuan.question[Number(index)].options[idx])
  786 +
783 787 if (item.maxChoose && item.maxChoose > 0) {
784 788 // 获取当前题目的已选中选项数量
785 789 const selectedCount = item.options.filter(option => option.disabled).length;
786   - console.error(selectedCount)
  790 +
787 791 // 如果已选中到达 maxChoose，并且当前项未被选中，则不允许选择
788 792 if (selectedCount > item.maxChoose ) {
789 793 uni.showToast({
... ... @@ -798,7 +802,7 @@
798 802 }
799 803 },
800 804 chooseAnswerMore(chooseItem, idx, item) {
801   - console.log(chooseItem, idx, item)
  805 +
802 806 // item.maxChoose =2
803 807 if (item.maxChoose && item.maxChoose > 0) {
804 808 // 获取当前题目的已选中选项数量
... ...
wenjuan-pc/dist.zip deleted
View file @25ccb2a
No preview for this file type
wenjuan-pc/src/components/dajuanTongji/index.vue
  View file @f8ac8ba
... ... @@ -160,9 +160,9 @@ export default {
160 160 }
161 161 },
162 162 mounted () {
163   - this.loadQuestionByIndex(this.index)
164   - this.tubiao()
165   - console.log(JSON.parse(this.obj))
  163 + // this.loadQuestionByIndex(this.index)
  164 + // this.tubiao()
  165 +
166 166 // this.processData()
167 167 },
168 168 onload () {
... ... @@ -183,7 +183,7 @@ export default {
183 183 methods: {
184 184 init (data) {
185 185 this.tableData = data;
186   - // console.log('initdata',data);
  186 +
187 187 this.loadQuestionByIndex(this.index)
188 188 this.tubiao()
189 189 },
... ... @@ -195,8 +195,13 @@ export default {
195 195 } = this.tableData;
196 196  
197 197 var list = []; // 用于存储结果
  198 + var table =null
  199 + if(typeof cereQuestionnaireTable.question == 'string'){
  200 + table = JSON.parse(cereQuestionnaireTable.question); // 解析问卷中的问题数据
  201 + }else{
  202 + table = cereQuestionnaireTable.question
  203 + }
198 204  
199   - var table = JSON.parse(cereQuestionnaireTable.question); // 解析问卷中的问题数据
200 205  
201 206 // 遍历 groupKeys 中的每个条目
202 207 // for (let i = 0; i < groupKeys.length; i++) {
... ... @@ -322,6 +327,7 @@ export default {
322 327  
323 328 this.tiList = [];
324 329 this.tiList = optionlist
  330 + this.tiList = optionlist.filter(item => typeof item.title === 'string' && item.title.trim() !== '');
325 331 },
326 332 // 初始化选项统计，确保每个选项都有统计数据
327 333 initOptionStats (optionSettings) {
... ... @@ -342,6 +348,7 @@ export default {
342 348 },
343 349  
344 350 tubiao () {
  351 +
345 352 const res = this.tiList.map(function (item) {
346 353 return {
347 354 name: item.title,
... ...
wenjuan-pc/src/main.js
  View file @f8ac8ba
... ... @@ -29,8 +29,9 @@ Vue.prototype.$echarts = echarts
29 29 // Vue.prototype.$API = '/cdwlMall/meserver/api'
30 30 // Vue.prototype.$API = 'https://h5.028wlkj.com/cdwlMall/meserver/api'
31 31 // Vue.prototype.$hostUrl = 'https://h5.028wlkj.com/cdwlMall/'
32   -// Vue.prototype.$API = 'http://192.168.2.225:9007'
33   -Vue.prototype.$API = process.env.VUE_APP_DOMAIN_PREFIX_2
  32 +// Vue.prototype.$API = 'http://172.16.61.123/cdwlMall/meserver/api'
  33 +Vue.prototype.$API = `${window.location.protocol}//${window.location.host}/cdwlMall/meserver/api`
  34 +// Vue.prototype.$API = process.env.VUE_APP_DOMAIN_PREFIX_2
34 35 Vue.prototype.$hostUrl = `${window.location.protocol}//${window.location.host}/cdwlMall`
35 36  
36 37  
... ...
wenjuan-pc/src/utils/request.js
  View file @f8ac8ba
... ... @@ -21,7 +21,8 @@ let hostall = window.location.href;
21 21 if(host === 'localhost:8080' || host === 'localhost:8081' || host === 'localhost:9528'|| host === '192.168.31.45:9528'|| host === 'localhost:9529' ) {
22 22  
23 23 // baseURL = process.env.VUE_APP_DOMAIN_PREFIX_1;
24   - baseURL = 'http://172.16.61.125:9003';
  24 + // baseURL = 'http://10.0.0.41:9003';
  25 + baseURL = 'http://172.16.61.123:9003';
25 26 // baseURL = 'http://172.16.61.125:9003';
26 27 // baseURL = 'http://192.168.2.36:9003';
27 28 // baseURL = process.env.VUE_APP_DOMAIN_PREFIX_1;
... ...
wenjuan-pc/src/views/investigation/index.vue
  View file @f8ac8ba
... ... @@ -244,7 +244,7 @@
244 244 </el-checkbox-group>
245 245  
246 246 <div v-if="item.type == '文本'" style="display: flex;flex-direction: column;">
247   - {{ item.choose }}
  247 + {{ item.choose}}
248 248  
249 249 </div>
250 250 </div>
... ... @@ -2120,6 +2120,22 @@ export default {
2120 2120 if (typeof this.daxiangData.question === 'string') {
2121 2121 this.daxiangData.question = JSON.parse(this.daxiangData.question)
2122 2122 }
  2123 +
  2124 +
  2125 + for(let key in this.daxiangData.question){
  2126 +
  2127 +if(this.daxiangData.question[key].type == '单选') {
  2128 +
  2129 + if( Array.isArray(this.daxiangData.question[key].choose) ) {
  2130 + this.daxiangData.question[key].choose = this.daxiangData.question[key].choose.join(',')
  2131 +
  2132 + }
  2133 + }
  2134 + if(this.daxiangData.question[key].type == '文本') {
  2135 + this.daxiangData.question[key].choose = this.daxiangData.question[key].choose[0]
  2136 + }
  2137 + }
  2138 +
2123 2139 // this.daxiangData.question = this.xuanxiang(question)
2124 2140  
2125 2141 // for (const key in this.daxiangData.question) {
... ...