许成详 6 år sedan
förälder
incheckning
94ef062cc9

+ 1
- 1
dist/index.html Visa fil

@@ -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.ffd9e72ae9ac0d2fc543943dcd2bc516.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.0661f4f50705af504e94.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.b40d091e5fa84606c309c255ff5f8186.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.1816291ad658e996cc75.js></script></body></html>

+ 5
- 10
src/pages/system/caseManager/signinManager/index.vue Visa fil

@@ -5,11 +5,11 @@
5 5
         <div class="flex-item flex-h"></div>
6 6
         <ul>
7 7
           <li>
8
-            <el-select v-model="CaseId" placeholder="请选择案场" @change="handelSignin">
8
+            <el-select v-model="postData.caseid" placeholder="请选择案场">
9 9
               <el-option
10
-                key="all"
10
+                key=""
11 11
                 label="所有案场"
12
-                value="all">
12
+                value="">
13 13
               </el-option>
14 14
               <el-option
15 15
                 v-for="item in optionsCase"
@@ -126,7 +126,7 @@ export default {
126 126
         valueTime: '3',
127 127
         label: '今年'
128 128
       }],
129
-      valueTime: '0',
129
+      valueTime: '-1',
130 130
       // 案场数据
131 131
       // {valueCase: '1',label: '案场1'}
132 132
       optionsCase: [], // 调用computed计算属性
@@ -165,11 +165,9 @@ export default {
165 165
         this.total = res.pagenum
166 166
         // 调用一次,计算属性
167 167
         this.optionsCase = this.CaseCompted
168
+        this.getList()
168 169
       })
169 170
     },
170
-    handelSignin () { // 查询签到记录
171
-      // this.getList()
172
-    },
173 171
     reset () { // 重置按钮
174 172
       this.$data.valueTime = '0'
175 173
       this.$data.total = ''
@@ -201,14 +199,11 @@ export default {
201 199
     CaseCompted: {
202 200
       get () { // get方法
203 201
         let data = []
204
-        console.log('数据大小')
205
-        console.log(this.$data.tempoptionsCase)
206 202
         var cases = this.$data.tempoptionsCase
207 203
         for (let i = 0; i < cases.length; i++) {
208 204
           let obj = []
209 205
           obj.valueCase = cases[i].CaseId
210 206
           obj.label = cases[i].CaseName
211
-          console.log('编号:' + obj.valueCase + '名称:' + obj.label)
212 207
           data.push(obj)
213 208
         }
214 209
         return data

+ 1
- 1
src/pages/system/cmsManager/majorProjects/index.vue Visa fil

@@ -8,7 +8,7 @@
8 8
         <ul>
9 9
           <li>
10 10
             <!-- <span>选择案场:</span> -->
11
-            <el-select v-model="tableSearch.caseId" placeholder="请选择">
11
+            <el-select v-model="tableSearch.caseId" placeholder="请选择案场">
12 12
               <el-option
13 13
                 key="all"
14 14
                 label="所有案场"

+ 1
- 1
src/util/api.js Visa fil

@@ -721,7 +721,7 @@ const $api = {
721 721
   marketingActivities: { // 营销活动
722 722
     getMarketingList: { // 查询所有
723 723
       method: 'get',
724
-      url: `${baseUrl}${common}/marketing/list`
724
+      url: `${baseUrl}${common}/marketing`
725 725
     },
726 726
     addMarketing: { // 添加
727 727
       method: 'post',