소스 검색

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

yuantianjiao 6 년 전
부모
커밋
22e3a557f5

+ 2
- 2
config/index.js 파일 보기

12
     proxyTable: {
12
     proxyTable: {
13
       '/api': {
13
       '/api': {
14
         // target: 'https://dp.huiju360.com.cn/hj_operations',
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
         // target: 'http://127.0.0.1:8080', 
16
         // target: 'http://127.0.0.1:8080', 
17
-        // target: 'http://192.168.0.11:8080', //ys
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
         // target: 'http://dev.ycjcjy.com/', //frp
19
         // target: 'http://dev.ycjcjy.com/', //frp
20
         changeOrigin: true, // 如果接口跨域,需要进行这个参数配置
20
         changeOrigin: true, // 如果接口跨域,需要进行这个参数配置

+ 0
- 1
src/pages/system/cardAndCouponManager/cardManager/edit.vue 파일 보기

22
           <div class="flex-item">
22
           <div class="flex-item">
23
             <div>
23
             <div>
24
               <el-upload
24
               <el-upload
25
-                :disabled="isEdit"
26
                 class="avatar-uploader"
25
                 class="avatar-uploader"
27
                 action='string'
26
                 action='string'
28
                 :http-request="toolClass.upload"
27
                 :http-request="toolClass.upload"

+ 0
- 1
src/pages/system/cardAndCouponManager/couponManager/edit.vue 파일 보기

23
           <div class="flex-item">
23
           <div class="flex-item">
24
             <div>
24
             <div>
25
               <el-upload
25
               <el-upload
26
-                :disabled="isEdit"
27
                 class="avatar-uploader"
26
                 class="avatar-uploader"
28
                 action='string'
27
                 action='string'
29
                 :http-request="toolClass.upload"
28
                 :http-request="toolClass.upload"

+ 1
- 1
src/pages/system/caseManager/signinManager/index.vue 파일 보기

180
       return this.toolClass.dateFormat(date, 'yyyy-MM-dd hh:mm:ss')
180
       return this.toolClass.dateFormat(date, 'yyyy-MM-dd hh:mm:ss')
181
     },
181
     },
182
     excelSignin () { // 导出Excel
182
     excelSignin () { // 导出Excel
183
-      window.open(`${this.toolClass.ReplaceOrg(this.$api.caseManager.getExcelSignin.url)}?token=${localStorage.getItem('JWT')}&selectType=${this.$data.valueTime}&caseid=${this.$data.valueCase}`, '_blank')
183
+      window.open(`${this.toolClass.ReplaceOrg(this.$api.caseManager.getExcelSignin.url)}?token=${localStorage.getItem('JWT')}&selectType=${this.valueTime}&caseid=${this.postData.caseid}`, '_blank')
184
     }
184
     }
185
   },
185
   },
186
   computed: {
186
   computed: {