Browse Source

接口调试

zhulizhen 5 years ago
parent
commit
d7267daca9

+ 4 - 0
src/api/doBusiness/business.js

@@ -0,0 +1,4 @@
+import httputils from '@/api/httputils'
+export function queryHours({postParams}) {
+    return httputils.postJson(`/duoduo-service/transfer/chiller/business/hours/query`, postParams)
+}

+ 49 - 49
src/api/httputils.js

@@ -1,5 +1,5 @@
 import axios from 'axios'
-//import store from '@/store'
+import store from '@/store'
 import { MessageBox } from 'element-ui'
 
 var CancelToken = axios.CancelToken
@@ -17,55 +17,55 @@ const axiosservice = axios.create({
     })
 })
 
-// axiosservice.interceptors.request.use(
-//     config => {
-//         config.withCredentials = true // 允许携带token ,这个是解决跨域产生的相关问题
-//         let token = store.getters['ssoToken']
-//         if (token) {
-//             config.headers = {
-//                 'sso-token': token
-//             }
-//         }
-//         return config
-//     },
-//     error => {
-//         return Promise.reject(error)
-//     }
-// )
+axiosservice.interceptors.request.use(
+    config => {
+        config.withCredentials = true // 允许携带token ,这个是解决跨域产生的相关问题
+        let token = store.getters['token']
+        if (token) {
+            config.headers = {
+                'sso-token': token
+            }
+        }
+        return config
+    },
+    error => {
+        return Promise.reject(error)
+    }
+)
 
-// axiosservice.interceptors.response.use(
-//     function(res) {
-//         //在这里对返回的数据进行处理
-//         //console.log('axios interceptors res = ', res.status, res)
-//         let resp = res.data
-//         if (resp.result === 'unauthc') {
-//             store.commit('logined', false)
-//             MessageBox.confirm('未登陆或登陆信息已失效, 是否重新登陆?', '提示', {
-//                 confirmButtonText: '确定',
-//                 cancelButtonText: '取消',
-//                 type: 'error'
-//             })
-//                 .then(resp => {
-//                     //console.log('--------------------------- confirm', resp)
-//                     //router.push('/login')
-//                     window.location.reload()
-//                 })
-//                 .catch(error => {
-//                     //console.log('--------------------------- cancel', error)
-//                     console.log('')
-//                 })
-//         } else if (resp.result == 'unauthorization') {
-//             MessageBox.alert('无权操作', { title: '警告', type: 'error' })
-//         }
-//         //console.log('axios interceptors resp2 = ', resp.success, resp.errorCode, resp.errorMessage, res)
-//         return res
-//     },
-//     function(err) {
-//         //Do something with response error
-//         console.log('axios interceptors err = ', err)
-//         return Promise.reject(err)
-//     }
-// )
+axiosservice.interceptors.response.use(
+    function(res) {
+        //在这里对返回的数据进行处理
+        //console.log('axios interceptors res = ', res.status, res)
+        let resp = res.data
+        if (resp.result === 'unauthc') {
+            store.commit('logined', false)
+            MessageBox.confirm('未登陆或登陆信息已失效, 是否重新登陆?', '提示', {
+                confirmButtonText: '确定',
+                cancelButtonText: '取消',
+                type: 'error'
+            })
+                .then(resp => {
+                    //console.log('--------------------------- confirm', resp)
+                    //router.push('/login')
+                    window.location.reload()
+                })
+                .catch(error => {
+                    //console.log('--------------------------- cancel', error)
+                    console.log('')
+                })
+        } else if (resp.result == 'unauthorization') {
+            MessageBox.alert('无权操作', { title: '警告', type: 'error' })
+        }
+        //console.log('axios interceptors resp2 = ', resp.success, resp.errorCode, resp.errorMessage, res)
+        return res
+    },
+    function(err) {
+        //Do something with response error
+        console.log('axios interceptors err = ', err)
+        return Promise.reject(err)
+    }
+)
 
 /* 下载方法 */
 function downFile(blob, fileName) {

+ 22 - 4
src/views/doBusiness/index.vue

@@ -3,7 +3,7 @@
   <div class="business">
     <Head :headText="headText"></Head>
     <div class="count-top-right">
-      <date-temp @pickerVal="pickerVal"></date-temp>
+      <date-temp :types="1"  @pickerVal="pickerVal"></date-temp>
     </div>
     <el-calendar class="doBusinessContainer" :first-day-of-week="7">
       <template slot="dateCell" slot-scope="{date, data}">
@@ -27,12 +27,13 @@
 <script>
 import Head from "../main/index";
 import DateTemp from "../evaluate/dateTemp";
-
+import {queryHours} from '@/api/doBusiness/business.js'
 export default {
   data() {
     return {
       headText: "营业时间调整",
-      value1: [new Date(), new Date()]
+      value1: [new Date(), new Date()],
+      date:""
     };
   },
   components: {
@@ -42,7 +43,24 @@ export default {
   methods: {
     pickerVal(val) {
       console.log(val);
-    }
+      this.date = val
+    },
+    getHours(){
+      let params = {
+        postParams:{
+          criteria:{
+            projectId:'Pj1101010001',
+            date:'20190218'
+          }
+        }
+      }
+      queryHours(params).then(res=>{
+        console.log(res)
+      })
+    },
+  },
+  mounted(){
+    this.getHours()
   }
 };
 </script>

+ 6 - 1
src/views/evaluate/dateTemp.vue

@@ -2,7 +2,8 @@
   <div class="date-temp">
     <span class="arrow-left" @click="pickerChangeLeft"></span>
     <span class="arrow-line arrow-line1" @click="pickerChangeLeft"></span>
-    <el-date-picker v-model="pickerVal" type="date" format="yyyy.MM.dd" value-format="yyyy.MM.dd"></el-date-picker>
+    <el-date-picker v-if="types==1" v-model="pickerVal" type="month" format="yyyy.MM" value-format="yyyy.MM"></el-date-picker>
+    <el-date-picker v-if="types==0" v-model="pickerVal" type="date" format="yyyy.MM.dd" value-format="yyyy.MM.dd"></el-date-picker>
     <span class="arrow-line" @click="pickerChangeRight"></span>
     <span class="arrow-right" @click="pickerChangeRight"></span>
   </div>
@@ -16,6 +17,7 @@ export default {
       pickerVal: new Date()
     };
   },
+  props:['types'],
   methods: {
     formatter(date) {
       return moment.unix(date / 1000).format("YYYYMMDD");
@@ -50,6 +52,9 @@ export default {
       }
       this.$emit("pickerVal", this.pickerVal);
     }
+  },
+  mounted(){
+    console.log(this.types)
   }
 };
 </script>

+ 1 - 1
src/views/evaluate/evTwoLevelMenu.vue

@@ -15,7 +15,7 @@
             <li :class="{current: num==3}" @click="change(3)">执行率</li>
           </div>
           <div class="count-top-right">
-            <date-temp @pickerVal="pickerVal"></date-temp>
+            <date-temp :types="0"  @pickerVal="pickerVal"></date-temp>
           </div>
         </ul>
         <div class="count-bottom">