SpaceOfCheng
/
admin
Seguir 3
Destacar 0
Cuchillo 0
Código Incidencias 0 Peticiones pull 0 Lanzamientos 2 Activity
Explorar el Código

xcx

许成详 hace 6 años
padre
bda5ca8bf0
commit
94ef062cc9
Se han modificado 4 ficheros con 8 adiciones y 13 borrados
Unificar vista Mostrar estadísticas de diff
  1. 1
    1
      dist/index.html
  2. 5
    10
      src/pages/system/caseManager/signinManager/index.vue
  3. 1
    1
      src/pages/system/cmsManager/majorProjects/index.vue
  4. 1
    1
      src/util/api.js

+ 1
- 1
dist/index.html Ver fichero

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 Ver fichero

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

+ 1
- 1
src/pages/system/cmsManager/majorProjects/index.vue Ver fichero

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

+ 1
- 1
src/util/api.js Ver fichero

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