SpaceOfCheng
/
admin
關註 3
收藏 0
複製 0
程式碼 問題管理 0 合併請求 0 版本發佈 2 Activity
瀏覽代碼

xcx

许成详 6 年之前
父節點
0f43463cb9
當前提交
74c90e096b
共有 5 個文件被更改，包括 9 次插入 和 7 次删除
分割檢視 顯示文件統計
  1. 2
    2
      config/index.js
  2. 1
    1
      dist/index.html
  3. 3
    2
      src/components/brokenLineGraphGroup/index.vue
  4. 2
    2
      src/pages/system/dashboard/index.vue
  5. 1
    0
      src/pages/system/dataStatistics/courseVerifyList/index.vue

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

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

+ 1
- 1
dist/index.html 查看文件 

@@ -1 +1 @@
1 
-<!DOCTYPE html><html><head><meta charset=utf-8><meta name=viewport content="width=device-width,initial-scale=1"><link rel=stylesheet href=//at.alicdn.com/t/font_775069_dwqa9wy3lkh.css><link rel="shortcut icon" href=favorite.ico><title>城的空间后台管理系统</title><link href=./static/css/app.57f5c4bc9fb8d329b5b3831192d694b9.css rel=stylesheet></head><body><div id=app></div><script type=text/javascript src=./static/js/manifest.3ad1d5771e9b13dbdad2.js></script><script type=text/javascript src=./static/js/vendor.992319e39e0ff64940a3.js></script><script type=text/javascript src=./static/js/app.211071f49a39defb575e.js></script></body></html>
1 
+<!DOCTYPE html><html><head><meta charset=utf-8><meta name=viewport content="width=device-width,initial-scale=1"><link rel=stylesheet href=//at.alicdn.com/t/font_775069_dwqa9wy3lkh.css><link rel="shortcut icon" href=favorite.ico><title>城的空间后台管理系统</title><link href=./static/css/app.45fcf44070ed5b9869d852c7f53f571f.css rel=stylesheet></head><body><div id=app></div><script type=text/javascript src=./static/js/manifest.3ad1d5771e9b13dbdad2.js></script><script type=text/javascript src=./static/js/vendor.992319e39e0ff64940a3.js></script><script type=text/javascript src=./static/js/app.e7fa53f1b3c04949bbe6.js></script></body></html>

+ 3
- 2
src/components/brokenLineGraphGroup/index.vue 查看文件 

@@ -32,6 +32,7 @@ export default {
32 32 
         width: _that.$refs.box.clientWidth,
33 33 
         height: 400,
34 34 
       })
35 
+      var keys = Object.keys(_that.data.value[0])
35 36 
       chart.source(_that.data.value, {
36 37 
         month: {
37 38 
           range: [0, 1]

@@ -49,8 +50,8 @@ export default {
49 50 
           }
50 51 
         }
51 52 
       })
52 
-      chart.line().position('month*temperature').color('city')
53 
-      chart.point().position('month*temperature').color('city').size(4).shape('circle').style({
53 
+      chart.line().position(`${keys[0]}*${keys[1]}`).color(keys[2])
54 
+      chart.point().position(`${keys[0]}*${keys[1]}`).color(keys[2]).size(4).shape('circle').style({
54 55 
         stroke: '#fff',
55 56 
         lineWidth: 1
56 57 
       })

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

@@ -169,7 +169,7 @@ export default {
169 169 
     getData (id) {
170 170 
       this.pageData = []
171 171 
       this.getDashboardData({
172 
-        caseid: id
172 
+        caseids: id
173 173 
       }).then((res) => {
174 174 
         res = res || []
175 175 
         for (var n = 0; n < res.length; n++) {

@@ -185,7 +185,7 @@ export default {
185 185 
     getBottomData (id, type) {
186 186 
       this.bottomData = []
187 187 
       this.getDashboardBottomData({
188 
-        caseid: id,
188 
+        caseids: id,
189 189 
         statype: type
190 190 
       }).then((res) => {
191 191 
         res = res || []

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

@@ -199,6 +199,7 @@ export default {
199 199 
     },
200 200 
     exportExcel () {
201 201 
       var url = '&tel=' + this.postData.tel + '&status=' + this.postData.status + '&name=' + this.postData.name
202 
+      console.log(`${this.toolClass.ReplaceOrg(this.$api.statistics.courseVerifyListExcel.url)}?token=${localStorage.getItem('JWT')}&caseid=${this.CaseId === 'all' ? '' : this.CaseId}${url}`)
202 203 
       window.location.href = `${this.toolClass.ReplaceOrg(this.$api.statistics.courseVerifyListExcel.url)}?token=${localStorage.getItem('JWT')}&caseid=${this.CaseId === 'all' ? '' : this.CaseId}${url}`
203 204 
     },
204 205 
   }