许成详 6 年前
父节点
当前提交
cbcdfac29e

+ 2
- 2
config/index.js 查看文件

12
     proxyTable: {
12
     proxyTable: {
13
       '/api': {
13
       '/api': {
14
         // target: 'https://dp.huiju360.com.cn/hj_operations',
14
         // target: 'https://dp.huiju360.com.cn/hj_operations',
15
-        target: 'http://192.168.0.62:8080', //wf
16
-        // target: 'http://192.168.0.11', //ys
15
+        // target: 'http://192.168.0.62:8080', //wf
16
+        target: 'http://192.168.0.11', //ys
17
         // target: 'http://192.168.0.11', //ys
17
         // target: 'http://192.168.0.11', //ys
18
         // target: 'http://dev.ycjcjy.com/', //frp
18
         // target: 'http://dev.ycjcjy.com/', //frp
19
         changeOrigin: true, // 如果接口跨域,需要进行这个参数配置
19
         changeOrigin: true, // 如果接口跨域,需要进行这个参数配置

+ 2
- 1
src/pages/system/cardAndCouponManager/bodyBuildingCardManager/index.vue 查看文件

85
             <el-button
85
             <el-button
86
               size="mini"
86
               size="mini"
87
               type="success"
87
               type="success"
88
-              v-clipboard:copy="'www.baidu.com' + scope.$index"
88
+              v-clipboard:copy="this.clientUrl + '/receiveChannelShared/' + scope.row.GymCardId + '/' + scope.row.GymTypeId + '/receive'"
89
               v-clipboard:success="onCopy"
89
               v-clipboard:success="onCopy"
90
               v-clipboard:error="onError"
90
               v-clipboard:error="onError"
91
               >点击复制链接</el-button>
91
               >点击复制链接</el-button>
258
       gymCardList: x => x.gymCardList,
258
       gymCardList: x => x.gymCardList,
259
     }),
259
     }),
260
     ...mapState({
260
     ...mapState({
261
+      clientUrl: x => x.app.clientUrl,
261
       cases: x => x.app.cases.list,
262
       cases: x => x.app.cases.list,
262
       defaultCaseId: x => x.app.cases.default
263
       defaultCaseId: x => x.app.cases.default
263
     }),
264
     }),

+ 2
- 1
src/pages/system/cardAndCouponManager/cardManager/index.vue 查看文件

91
               size="mini"
91
               size="mini"
92
               type="success"
92
               type="success"
93
               v-if="scope.row.SendType === 'channel'"
93
               v-if="scope.row.SendType === 'channel'"
94
-              v-clipboard:copy="'www.baidu.com' + scope.$index"
94
+              v-clipboard:copy="clientUrl + '/receiveChannelShared/' + scope.row.CardId + '/card/receive'"
95
               v-clipboard:success="onCopy"
95
               v-clipboard:success="onCopy"
96
               v-clipboard:error="onError"
96
               v-clipboard:error="onError"
97
               >点击复制链接</el-button>
97
               >点击复制链接</el-button>
265
       cardList: x => x.cardList,
265
       cardList: x => x.cardList,
266
     }),
266
     }),
267
     ...mapState({
267
     ...mapState({
268
+      clientUrl: x => x.app.clientUrl,
268
       cases: x => x.app.cases.list,
269
       cases: x => x.app.cases.list,
269
       defaultCaseId: x => x.app.cases.default
270
       defaultCaseId: x => x.app.cases.default
270
     }),
271
     }),

+ 2
- 1
src/pages/system/cardAndCouponManager/couponManager/index.vue 查看文件

92
               size="mini"
92
               size="mini"
93
               type="success"
93
               type="success"
94
               v-if="scope.row.SendType === 'channel'"
94
               v-if="scope.row.SendType === 'channel'"
95
-              v-clipboard:copy="'www.baidu.com' + scope.$index"
95
+              v-clipboard:copy="clientUrl + '/receiveChannelShared/' + scope.row.CouponId + '/coupon/receive'"
96
               v-clipboard:success="onCopy"
96
               v-clipboard:success="onCopy"
97
               v-clipboard:error="onError"
97
               v-clipboard:error="onError"
98
               >点击复制链接</el-button>
98
               >点击复制链接</el-button>
249
       customers: x => x.customers,
249
       customers: x => x.customers,
250
     }),
250
     }),
251
     ...mapState({
251
     ...mapState({
252
+      clientUrl: x => x.app.clientUrl,
252
       cases: x => x.app.cases.list,
253
       cases: x => x.app.cases.list,
253
       defaultCaseId: x => x.app.cases.default
254
       defaultCaseId: x => x.app.cases.default
254
     }),
255
     }),

+ 11
- 6
src/pages/system/dashboard/index.vue 查看文件

1
 <template>
1
 <template>
2
   <div class="subPage">
2
   <div class="subPage">
3
     <div class="selectCase">
3
     <div class="selectCase">
4
-      <el-select v-model="CaseId" placeholder="请选择">
4
+      <el-select v-model="postData.caseid" placeholder="请选择">
5
         <el-option
5
         <el-option
6
           v-for="item in cases"
6
           v-for="item in cases"
7
           :key="item.CaseId"
7
           :key="item.CaseId"
39
 </template>
39
 </template>
40
 
40
 
41
 <script>
41
 <script>
42
-import { mapState } from 'vuex'
42
+import { mapState, createNamespacedHelpers } from 'vuex'
43
 import dashboardList from '../../../components/dashboardList/index'
43
 import dashboardList from '../../../components/dashboardList/index'
44
 import histogram from '../../../components/histogram/index'
44
 import histogram from '../../../components/histogram/index'
45
 import pieDiagram from '../../../components/pieDiagram/index'
45
 import pieDiagram from '../../../components/pieDiagram/index'
47
 import ringChart from '../../../components/ringChart/index'
47
 import ringChart from '../../../components/ringChart/index'
48
 import dashboard from '../../../components/dashboard/index'
48
 import dashboard from '../../../components/dashboard/index'
49
 import brokenLineGraphGroup from '../../../components/brokenLineGraphGroup/index'
49
 import brokenLineGraphGroup from '../../../components/brokenLineGraphGroup/index'
50
+const { mapActions: mapStaActions } = createNamespacedHelpers('sta')
50
 
51
 
51
 export default {
52
 export default {
52
   name: '',
53
   name: '',
102
   },
103
   },
103
   mounted () {
104
   mounted () {
104
     this.$nextTick(function () {
105
     this.$nextTick(function () {
105
-      this.drawHistogram()
106
+      this.getDashboardData({
107
+        caseid: this.postData.caseid
108
+      }).then((res) => {
109
+        console.log(JSON.stringify(res))
110
+      })
106
     })
111
     })
107
   },
112
   },
108
   methods: {
113
   methods: {
109
-    drawHistogram () { // 绘制柱状图
110
-      // this.histogramInit.source(this.histogramParams)
111
-    },
114
+    ...mapStaActions([
115
+      'getDashboardData',
116
+    ]),
112
   }
117
   }
113
 }
118
 }
114
 </script>
119
 </script>

+ 1
- 1
src/pages/system/dataStatistics/cardCouponList/index.vue 查看文件

171
       })
171
       })
172
     },
172
     },
173
     exportExcel () {
173
     exportExcel () {
174
-      window.location.href = `${this.toolClass.ReplaceOrg(this.$api.statistics.cardCouponListExcel.url)}?token=${localStorage.getItem('JWT')}`
174
+      window.open(`${this.toolClass.ReplaceOrg(this.$api.statistics.cardCouponListExcel.url)}?token=${localStorage.getItem('JWT')}`, '_blank')
175
     },
175
     },
176
   }
176
   }
177
 }
177
 }

+ 12
- 0
src/store/sta/sta.js 查看文件

156
         }).catch(reject)
156
         }).catch(reject)
157
       })
157
       })
158
     },
158
     },
159
+    getDashboardData ({ commit }, payload) {
160
+      return new Promise((resolve, reject) => {
161
+        ajax(api.statistics.dashboardData.url, {
162
+          method: api.statistics.dashboardData.method,
163
+          queryData: {
164
+            ...payload,
165
+          }
166
+        }).then(res => {
167
+          resolve(res)
168
+        }).catch(reject)
169
+      })
170
+    },
159
   }
171
   }
160
 }
172
 }

+ 4
- 0
src/util/api.js 查看文件

747
       method: 'get',
747
       method: 'get',
748
       url: `${baseUrl}${common}/statistics/cardcouponverify/excel`
748
       url: `${baseUrl}${common}/statistics/cardcouponverify/excel`
749
     },
749
     },
750
+    dashboardData: {
751
+      method: 'get',
752
+      url: `${baseUrl}${common}/dashboard`
753
+    },
750
   }
754
   }
751
 }
755
 }
752
 export default $api
756
 export default $api