SpaceOfCheng
/
admin
Watch 3
Star 0
Fork 0
Code Issues 0 Pull Requests 0 Releases 2 Activity
Browse Source

Merge branch 'dev' of http://git.ycjcjy.com/SpaceOfCheng/admin into dev

wangfei 6 years ago
parent
dfe73f9136 6b21841c09
commit
672fdd96f5
9 changed files with 47 additions and 34 deletions
Split View Show Diff Stats
  1. 1
    0
      dist/index.html
  2. 7
    3
      src/components/dashboard/index.vue
  3. 4
    3
      src/pages/system/caseManager/keyManager/add.vue
  4. 2
    3
      src/pages/system/caseManager/signinManager/index.vue
  5. 1
    1
      src/pages/system/dashboard/index.vue
  6. 3
    3
      src/pages/system/marketingActivities/addActivities/index.vue
  7. 5
    3
      src/pages/system/newOrder/newOrderList/index.vue
  8. 23
    17
      src/pages/system/systemSet/userManager/index.vue
  9. 1
    1
      src/pages/system/verificationManager/drawVerification/verificationList/index.vue

+ 1
- 0
dist/index.html View File 

@@ -0,0 +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.698e70c6ecefb981618e5496eff15cef.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.aa7aa848206f6617d036.js></script></body></html>

+ 7
- 3
src/components/dashboard/index.vue View File 

@@ -24,9 +24,13 @@ export default {
24 24 
     })
25 25 
   },
26 26 
   methods: {
27 
+    returnValue (val) {
28 
+      return String(val).substring(0, 2).split('').join('.') - 0
29 
+    },
27 30 
     init () {
28 31 
       var _that = this
29 32 
       var Shape = G2.Shape
33 
+      var aValue = _that.returnValue(_that.data.value)
30 34 
       // 自定义Shape 部分
31 35 
       Shape.registerShape('point', 'pointer', {
32 36 
         drawShape: function drawShape (cfg, group) {

@@ -65,7 +69,7 @@ export default {
65 69 
         height: 400,
66 70 
         padding: [0, 0, 30, 0]
67 71 
       })
68 
-      chart.source(_that.data.value)
72 
+      chart.source([{ value: aValue }])
69 73
70 74 
       chart.coord('polar', {
71 75 
         startAngle: -9 / 8 * Math.PI,

@@ -122,7 +126,7 @@ export default {
122 126 
       chart.guide().arc({
123 127 
         zIndex: 1,
124 128 
         start: [0, 0.945],
125 
-        end: [_that.data.value[0].value, 0.945],
129 
+        end: [aValue, 0.945],
126 130 
         style: {
127 131 
           stroke: '#1890FF',
128 132 
           lineWidth: 18

@@ -131,7 +135,7 @@ export default {
131 135 
       // 绘制指标数字
132 136 
       chart.guide().html({
133 137 
         position: ['50%', '100%'],
134 
-        html: '<div style="width: 300px;text-align: center;">' + '<p style="font-size: 20px; color: #545454;margin: 0;">' + _that.data.title + '</p>' + '<p style="font-size: 36px;color: #545454;margin: 0;">' + _that.data.list[0].value * 10 + '%</p>' + '</div>'
138 
+        html: '<div style="width: 300px;text-align: center;">' + '<p style="font-size: 20px; color: #545454;margin: 0;">' + _that.data.title + '</p>' + '<p style="font-size: 36px;color: #545454;margin: 0;">' + aValue * 10 + '%</p>' + '</div>'
135 139 
       })
136 140
137 141 
       chart.render()

+ 4
- 3
src/pages/system/caseManager/keyManager/add.vue View File 

@@ -25,7 +25,8 @@
25 25 
                 placeholder="请输入数字"
26 26 
                 v-model="postData.beginnum"
27 27 
                 clearable
28 
-                onkeyup="value=value.replace(/[^\d]/g,'')">
28 
+                onkeyup="value=value.replace(/[^\d]/g,'')"
29 
+                @blur="postData.beginnum=postData.beginnum.replace(/[^\d]/g,'')">
29 30 
               </el-input>
30 31 
             </div>
31 32 
           </div>

@@ -38,7 +39,8 @@
38 39 
                 placeholder="请输入数字"
39 40 
                 v-model="postData.endnum"
40 41 
                 clearable
41 
-                onkeyup="value=value.replace(/[^\d]/g,'')">
42 
+                onkeyup="value=value.replace(/[^\d]/g,'')"
43 
+                @blur="postData.beginnum=postData.beginnum.replace(/[^\d]/g,'')">
42 44 
               </el-input>
43 45 
             </div>
44 46 
           </div>

@@ -101,7 +103,6 @@ export default {
101 103 
       this.postData.AreaIcon = res.result.url
102 104 
     },
103 105 
     submit () { // 提交数据
104 
-      console.log('柜子编号:' + this.postData.beginnum + ' ' + this.postData.endnum)
105 106 
       if (this.postData.beginnum === '') {
106 107 
         this.$message({
107 108 
           type: 'error',

+ 2
- 3
src/pages/system/caseManager/signinManager/index.vue View File 

@@ -32,7 +32,7 @@
32 32 
         </ul>
33 33 
         <el-button
34 34 
           size="mini"
35 
-          type="primary" @click="getList">搜索</el-button>
35 
+          type="primary" @click="postData.page = 1;total = 1;getList()">搜索</el-button>
36 36 
         <el-button
37 37 
         size="mini"
38 38 
         type="success" @click="excelSignin">导出excel</el-button>
 
@@ -83,7 +83,7 @@
83 83 
           @size-change="handleSizeChange"
84 84 
           @current-change="handleCurrentChange"
85 85 
           :current-page.sync="postData.page"
86 
-          :page-size="100"
86 
+          :page-size="10"
87 87 
           layout="prev, pager, next, jumper"
88 88 
           :total="total">
89 89 
         </el-pagination>
 
@@ -162,7 +162,6 @@ export default {
162 162 
       }).then(res => {
163 163 
         this.tempoptionsCase = res.list
164 164 
         this.postData.page = res.page
165 
-        this.total = res.pagenum
166 165 
         // 调用一次,计算属性
167 166 
         this.optionsCase = this.CaseCompted
168 167 
         this.getList()

+ 1
- 1
src/pages/system/dashboard/index.vue View File 

@@ -27,7 +27,7 @@
27 27 
         <div v-if="subItem.type === 'ringChart' && typeof(subItem.value) === 'object' && (subItem.value || []).length">
28 28 
           <ringChart :data="subItem" :index="index + '-' + subIndex"></ringChart>
29 29 
         </div>
30 
-        <div v-if="subItem.type === 'dashboard' && typeof(subItem.value) === 'object' && (subItem.value || []).length">
30 
+        <div v-if="subItem.type === 'dashboard'">
31 31 
           <dashboard :data="subItem" :index="index + '-' + subIndex"></dashboard>
32 32 
         </div>
33 33 
         <div v-if="subItem.type === 'brokenLineGraphGroup' && typeof(subItem.value) === 'object' && (subItem.value || []).length">

+ 3
- 3
src/pages/system/marketingActivities/addActivities/index.vue View File 

@@ -55,14 +55,14 @@
55 55 
             </div>
56 56 
           </div>
57 57 
         </li>
58 
-        <li class="flex-h" v-if="activeType === 'giveCoupon'">
58 
+        <!-- <li class="flex-h" v-if="activeType === 'giveCoupon'">
59 59 
           <span>赠券数量：<em>*</em></span>
60 60 
           <div class="flex-item">
61 61 
             <div style="width:50%">
62 62 
               <el-input v-model="giftNum" placeholder="请输入内容"></el-input>
63 63 
             </div>
64 64 
           </div>
65 
-        </li>
65 
+        </li> -->
66 66 
         <li class="flex-h">
67 67 
           <span>活动描述：</span>
68 68 
           <div class="flex-item">
 
@@ -115,7 +115,7 @@ export default {
115 115 
       activityName: '', // 活动名称
116 116 
       activityType: this.regValue, // 活动类型
117 117 
       resourceDesc: '', // 存储JSON (赠券类型,赠送数量,活动描述)
118 
-      giftNum: '', // 赠送数量
118 
+      giftNum: '1', // 赠送数量
119 119 
       desc: '', // 活动描述
120 120 
       giftList: [] // 赠券卡券数据体
121 121 
     }

+ 5
- 3
src/pages/system/newOrder/newOrderList/index.vue View File 

@@ -50,7 +50,7 @@
50 50 
           <div style="padding:0px 10px 5px;border-bottom:2px solid #cccccc;">
51 51 
             <div style="display:inline-block;">
52 52 
               <img class="topIcon" style="display:block;width:60%;margin:0 0 20px 0px;" src="http://jingcheng-resourceplat.oss-cn-shanghai.aliyuncs.com/upload/111101940020.png" alt="">
53 
-              <span style="display:block;font-size:20px;font-weight:700;text-align: center;"> <img width='25px' height="25px" :src='item.AreaIconWhite' alt=""> {{item.AreaName + item.TableNo}}</span>
53 
+              <span style="display:block;font-size:20px;font-weight:700;text-align: center;"> <img width='30px' :src='item.AreaIconWhite' alt=""> {{item.AreaName + item.TableNo}}</span>
54 54 
             </div>
55 55 
           </div>
56 56 
           <div style="padding:10px 10px 5px;border-bottom:1px solid #cccccc;" v-for='(item1,index1) in item.Goods' :key='index1'>

@@ -141,16 +141,18 @@ export default {
141 141 
     console.log(this.websockets)
142 142 
     Object.keys(this.websockets).forEach((key) => {
143 143 
       console.log(key, this.websockets[key])
144 
-      this.websockets[key].onclose()
144 
+      this.websockets[key].close()
145 145 
     })
146 
+    this.websockets = {}
146 147 
     next()
147 148 
   },
148 149 
   methods: {
149 150 
     init () {
150 151 
       Object.keys(this.websockets).forEach((key) => {
151 152 
         console.log(key, this.websockets[key])
152 
-        this.websockets[key].onclose()
153 
+        this.websockets[key].close()
153 154 
       })
155 
+      this.websockets = {}
154 156 
       // console.log('init')
155 157 
       var param = []
156 158 
       if (!this.CaseId) {

+ 23
- 17
src/pages/system/systemSet/userManager/index.vue View File 

@@ -90,27 +90,28 @@
90 90 
         </el-table-column>
91 91 
         <el-table-column
92 92 
           prop="CreateDate"
93 
-          label="创建时间"
94 
-          width="">
93 
+          label="创建时间">
95 94 
         </el-table-column>
96 
-        <el-table-column label="操作" fixed='right' width="350">
95 
+        <el-table-column label="操作" fixed='right' width="200">
97 96 
           <template slot-scope="scope">
98 
-            <el-button
97 
+            <div style="width: 100%" class="btnBox">
98 
+              <el-button
99 
+                size="mini"
100 
+                type="warning"
101 
+                @click="handleEdit(scope.$index, scope.row)">编辑</el-button>
102 
+              <el-button
103 
+                size="mini"
104 
+                type="danger"
105 
+                @click="handleDelete(scope.$index, scope.row)">删除</el-button>
106 
+              <el-button
99 107 
               size="mini"
100 
-              type="warning"
101 
-              @click="handleEdit(scope.$index, scope.row)">编辑</el-button>
102 
-            <el-button
108 
+              type="success"
109 
+              @click="handleBind(scope.$index, scope.row)">绑定角色</el-button>
110 
+              <el-button
103 111 
               size="mini"
104 
-              type="danger"
105 
-              @click="handleDelete(scope.$index, scope.row)">删除</el-button>
106 
-            <el-button
107 
-            size="mini"
108 
-            type="success"
109 
-            @click="handleBind(scope.$index, scope.row)">绑定角色</el-button>
110 
-            <el-button
111 
-            size="mini"
112 
-            type="primary"
113 
-            @click="resetPasswd(scope.$index, scope.row)">重置密码</el-button>
112 
+              type="primary"
113 
+              @click="resetPasswd(scope.$index, scope.row)">重置密码</el-button>
114 
+              </div>
114 115 
           </template>
115 116 
         </el-table-column>
116 117 
       </el-table>

@@ -385,4 +386,9 @@ export default {
385 386
386 387 
 <!-- Add "scoped" attribute to limit CSS to this component only -->
387 388 
 <style lang="scss" scoped>
389 
+.btnBox{
390 
+  >*{
391 
+    margin-bottom: 10px;
392 
+  }
393 
+}
388 394 
 </style>

+ 1
- 1
src/pages/system/verificationManager/drawVerification/verificationList/index.vue View File 

@@ -111,7 +111,7 @@ export default {
111 111 
         type: 'warning'
112 112 
       }).then(() => {
113 113 
         this.drawVerify({
114 
-          id: this.$route.query.code
114 
+          id: item.Id
115 115 
         }).then((res) => {
116 116 
           this.$message({
117 117 
             type: 'success',