ytj

package-lock.json

@@ -15248,6 +15248,14 @@
         "uppercamelcase": "1.1.0"
       }
     },
+    "vue-clipboard2": {
+      "version": "0.2.1",
+      "resolved": "https://registry.npmjs.org/vue-clipboard2/-/vue-clipboard2-0.2.1.tgz",
+      "integrity": "sha512-n6ie/0g0bKohmLlC/5ja1esq2Q0jQ5hWmhNSZcvCsWfDeDnVARjl6cBB9p72XV1nlVfuqsZcfV8HTjjZAIlLBA==",
+      "requires": {
+        "clipboard": "2.0.1"
+      }
+    },
     "vue-cookie": {
       "version": "1.1.4",
       "resolved": "https://registry.npmjs.org/vue-cookie/-/vue-cookie-1.1.4.tgz",

package.json

@@ -24,6 +24,7 @@
     "js-md5": "^0.7.3",
     "vue": "^2.5.2",
     "vue-amap": "^0.5.8",
+    "vue-clipboard2": "^0.2.1",
     "vue-cookie": "^1.1.4",
     "vue-fullcalendar": "^1.0.9",
     "vue-morris": "0.0.13",

src/pages/system/cardAndCouponManager/bodyBuildingCardManager/index.vue

@@ -82,7 +82,13 @@
               size="mini"
               type="danger"
               @click="sendCard(scope.$index, scope.row)">赠送客户</el-button>
-            <a v-if="scope.row.SendType === 'channel'" class="copyBtn" :data-clipboard-text="'www.baidu.com'" :ref="'copy' + scope.$index" @click="toCopy(scope.$index, scope.row)">点击复制链接</a>
+            <el-button
+              size="mini"
+              type="success"
+              v-clipboard:copy="this.clientUrl + '/receiveChannelShared/' + scope.row.GymCardId + '/' + scope.row.GymTypeId + '/receive'"
+              v-clipboard:success="onCopy"
+              v-clipboard:error="onError"
+              >点击复制链接</el-button>
           </template>
         </el-table-column>
       </el-table>
@@ -201,7 +207,6 @@
           v-model="currentCopyUrl"
           clearable>
         </el-input>
-        <!-- <a :data-clipboard-text="currentCopyUrl" ref="copy" @click="toCopy">复制链接</a> -->
       </div>
       <span slot="footer" class="dialog-footer">
         <el-button type="primary" @click="copyDialogVisible = false">确 定</el-button>
@@ -211,7 +216,6 @@
 </template>
 
 <script>
-import Clipboard from 'clipboard'
 import { mapState, createNamespacedHelpers } from 'vuex'
 const { mapState: mapGymCardState, mapActions: mapGymCardActions } = createNamespacedHelpers('gymcard')
 const { mapState: mapCustomerState, mapActions: mapCustomerActions } = createNamespacedHelpers('customer')
@@ -220,6 +224,7 @@ export default {
   name: '',
   data () {
     return {
+      clipboardArr: [],
       currentCopyUrl: '',
       copyDialogVisible: false,
       selectCustomer: [],
@@ -253,6 +258,7 @@ export default {
       gymCardList: x => x.gymCardList,
     }),
     ...mapState({
+      clientUrl: x => x.app.clientUrl,
       cases: x => x.app.cases.list,
       defaultCaseId: x => x.app.cases.default
     }),
@@ -293,7 +299,6 @@ export default {
     },
     toSendCard () { // 赠送卡
       if (this.selectCustomer.length) {
-        console.log(this.selectCustomer)
         this.selectCustomer = this.selectCustomer.map(x => x.CustomerId).join(',')
         this.giveCard({
           id: this.currentCardId,
@@ -338,7 +343,6 @@ export default {
         caseid: this.CaseId || this.defaultCaseId
       }).then((res) => {
         this.total = res.pagenum
-        // console.log(JSON.stringify(res))
       })
     },
     handleCurrentChange (val) { // 跳转到分页
@@ -347,21 +351,21 @@ export default {
     handleEdit (index, row) { // 编辑
       this.$router.push({ name: 'editBodyBuildingCard', query: { id: row.GymCardId } })
     },
-    toCopy (index, row) { // 复制
-      console.log(1)
-      var clipboard = new Clipboard(this.$refs['copy' + index])
-      clipboard.on('success', e => {
-        console.log('复制成功')
-        clipboard.destroy()
+    addCard () {
+      this.$router.push({ name: 'editBodyBuildingCard', query: {} })
+    },
+    onCopy () {
+      this.$message({
+        type: 'success',
+        message: '复制成功！'
       })
-      clipboard.on('error', e => {
-        console.log('该浏览器不支持自动复制')
-        clipboard.destroy()
+    },
+    onError () {
+      this.$message({
+        type: 'error',
+        message: '复制失败！'
       })
     },
-    addCard () {
-      this.$router.push({ name: 'editBodyBuildingCard', query: {} })
-    }
   }
 }
 </script>
@@ -382,7 +386,7 @@ export default {
     }
   }
 }
-.copyBtn{
+.copyBtn {
   line-height: 29px;
   border-radius: 3px;
   color: #fff;

src/pages/system/cardAndCouponManager/cardManager/index.vue

@@ -87,7 +87,14 @@
               size="mini"
               type="danger"
               @click="sendCard(scope.$index, scope.row)">赠送客户</el-button>
-            <a v-if="scope.row.SendType === 'channel'" class="copyBtn" :data-clipboard-text="'www.baidu.com'" :ref="'copy' + scope.$index" @click="toCopy(scope.$index, scope.row)">点击复制链接</a>
+            <el-button
+              size="mini"
+              type="success"
+              v-if="scope.row.SendType === 'channel'"
+              v-clipboard:copy="clientUrl + '/receiveChannelShared/' + scope.row.CardId + '/card/receive'"
+              v-clipboard:success="onCopy"
+              v-clipboard:error="onError"
+              >点击复制链接</el-button>
           </template>
         </el-table-column>
       </el-table>
@@ -258,6 +265,7 @@ export default {
       cardList: x => x.cardList,
     }),
     ...mapState({
+      clientUrl: x => x.app.clientUrl,
       cases: x => x.app.cases.list,
       defaultCaseId: x => x.app.cases.default
     }),
@@ -380,7 +388,19 @@ export default {
     },
     addCard () {
       this.$router.push({ name: 'editCard', query: {} })
-    }
+    },
+    onCopy () {
+      this.$message({
+        type: 'success',
+        message: '复制成功！'
+      })
+    },
+    onError () {
+      this.$message({
+        type: 'error',
+        message: '复制失败！'
+      })
+    },
   }
 }
 </script>

src/pages/system/cardAndCouponManager/couponManager/index.vue

@@ -89,10 +89,13 @@
               type="danger"
               @click="sendCoupon(scope.$index, scope.row)">赠送客户</el-button>
             <el-button
-              v-if="scope.row.SendType === 'channel'"
               size="mini"
               type="success"
-              @click="handleDelete(scope.$index, scope.row)">点击复制链接</el-button>
+              v-if="scope.row.SendType === 'channel'"
+              v-clipboard:copy="clientUrl + '/receiveChannelShared/' + scope.row.CouponId + '/coupon/receive'"
+              v-clipboard:success="onCopy"
+              v-clipboard:error="onError"
+              >点击复制链接</el-button>
           </template>
         </el-table-column>
       </el-table>
@@ -246,6 +249,7 @@ export default {
       customers: x => x.customers,
     }),
     ...mapState({
+      clientUrl: x => x.app.clientUrl,
       cases: x => x.app.cases.list,
       defaultCaseId: x => x.app.cases.default
     }),
@@ -360,7 +364,19 @@ export default {
         this.centerDialogVisible = false
         this.getList()
       })
-    }
+    },
+    onCopy () {
+      this.$message({
+        type: 'success',
+        message: '复制成功！'
+      })
+    },
+    onError () {
+      this.$message({
+        type: 'error',
+        message: '复制失败！'
+      })
+    },
   }
 }
 </script>

src/pages/system/dashboard/index.vue

@@ -1,7 +1,7 @@
 <template>
   <div class="subPage">
     <div class="selectCase">
-      <el-select v-model="CaseId" placeholder="请选择">
+      <el-select v-model="postData.caseid" placeholder="请选择">
         <el-option
           v-for="item in cases"
           :key="item.CaseId"
@@ -39,7 +39,7 @@
 </template>
 
 <script>
-import { mapState } from 'vuex'
+import { mapState, createNamespacedHelpers } from 'vuex'
 import dashboardList from '../../../components/dashboardList/index'
 import histogram from '../../../components/histogram/index'
 import pieDiagram from '../../../components/pieDiagram/index'
@@ -47,6 +47,7 @@ import brokenLineGraph from '../../../components/brokenLineGraph/index'
 import ringChart from '../../../components/ringChart/index'
 import dashboard from '../../../components/dashboard/index'
 import brokenLineGraphGroup from '../../../components/brokenLineGraphGroup/index'
+const { mapActions: mapStaActions } = createNamespacedHelpers('sta')
 
 export default {
   name: '',
@@ -102,13 +103,17 @@ export default {
   },
   mounted () {
     this.$nextTick(function () {
-      this.drawHistogram()
+      this.getDashboardData({
+        caseid: this.postData.caseid
+      }).then((res) => {
+        console.log(JSON.stringify(res))
+      })
     })
   },
   methods: {
-    drawHistogram () { // 绘制柱状图
-      // this.histogramInit.source(this.histogramParams)
-    },
+    ...mapStaActions([
+      'getDashboardData',
+    ]),
   }
 }
 </script>

src/pages/system/dataStatistics/cardCouponList/index.vue

@@ -171,7 +171,7 @@ export default {
       })
     },
     exportExcel () {
-      window.location.href = `${this.toolClass.ReplaceOrg(this.$api.statistics.cardCouponListExcel.url)}?token=${localStorage.getItem('JWT')}`
+      window.open(`${this.toolClass.ReplaceOrg(this.$api.statistics.cardCouponListExcel.url)}?token=${localStorage.getItem('JWT')}`, '_blank')
     },
   }
 }

src/store/index.js

@@ -2,7 +2,10 @@ import Vue from 'vue'
 import Vuex from 'vuex'
 import Ajax from '../util/ajax'
 import api from '../util/api'
+import VueClipboard from 'vue-clipboard2'
+
 Vue.use(Vuex)
+Vue.use(VueClipboard)
 
 const store = new Vuex.Store({
   state: {

src/store/sta/sta.js

@@ -156,5 +156,17 @@ export default {
         }).catch(reject)
       })
     },
+    getDashboardData ({ commit }, payload) {
+      return new Promise((resolve, reject) => {
+        ajax(api.statistics.dashboardData.url, {
+          method: api.statistics.dashboardData.method,
+          queryData: {
+            ...payload,
+          }
+        }).then(res => {
+          resolve(res)
+        }).catch(reject)
+      })
+    },
   }
 }

src/util/api.js

@@ -748,6 +748,10 @@ const $api = {
       url: `${baseUrl}${common}/statistics/cardcouponverify/excel`
     },
   },
+  dashboardData: {
+    method: 'get',
+    url: `${baseUrl}${common}/dashboard`
+  },
   health: {
     healthList: {
       method: 'get',