From 497e575d8cb37acf2877f5a7f1746d15e2d01fb4 Mon Sep 17 00:00:00 2001
From: liuqimichale <123456lq>
Date: Thu, 4 Apr 2019 10:07:14 +0800
Subject: [PATCH] 诱导屏故障

---
 src/assets/images/screenName.png | Bin 0 -> 509 bytes
 src/components/geomagnetism.vue  |  19 ++++++++++++++++---
 src/components/screen.vue        |  64 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++--
 src/utils/api.js                 |   3 +++
 src/utils/request.js             | 104 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 5 files changed, 185 insertions(+), 5 deletions(-)
 create mode 100644 src/assets/images/screenName.png
 create mode 100644 src/utils/api.js
 create mode 100644 src/utils/request.js

diff --git a/src/assets/images/screenName.png b/src/assets/images/screenName.png
new file mode 100644
index 0000000..4c1e11b
Binary files /dev/null and b/src/assets/images/screenName.png differ
diff --git a/src/components/geomagnetism.vue b/src/components/geomagnetism.vue
index 0a5d72a..4fd7783 100644
--- a/src/components/geomagnetism.vue
+++ b/src/components/geomagnetism.vue
@@ -36,6 +36,7 @@
 </template>
 
 <script>
+import { diciAddress } from '../utils/api'
 export default {
   name: 'geomagnetism',
   data() {
@@ -43,6 +44,18 @@ export default {
   },
   created() {
     document.title = '地磁故障'
+    diciAddress({
+      modifyTimeBegin: new Date('2019-04-01 00:00:00'),
+      modifyTimeEnd: new Date('2019-04-04 00:00:00'),
+      orgId: 10003,
+      sysCode:'1001',
+    })
+    .then((res) => {
+      console.log(res)
+    })
+    .catch((res) => {
+      console.log(res)
+    })
   }
 }
 </script>
@@ -57,7 +70,7 @@ export default {
 
   .parkName {
     font-size: 1.8rem;
-    font-weight: 600;
+    font-weight: 700;
     padding-left: 2.5rem;
     background: url("../assets/images/parkName.png") no-repeat 0 center;
     background-size: 1.8rem 1.8rem;
@@ -68,8 +81,8 @@ export default {
     padding: 0 15px;
     margin-top: 12px;
     >li{
-      height: 4.5rem;
-      line-height: 4.5rem;
+      height: 3.8rem;
+      line-height: 3.8rem;
       position: relative;
       &:first-child:after{
        @include border-1px(#D9D9D9, bottom)
diff --git a/src/components/screen.vue b/src/components/screen.vue
index c2fa05b..1c1a697 100644
--- a/src/components/screen.vue
+++ b/src/components/screen.vue
@@ -1,7 +1,38 @@
 <template>
-    <div>2</div>
-</template>
+  <div class="">
+    <ul class="dici-wrap">
+      <li>
+        <p class="parkName">赤峰诱导屏名称</p>
+        <ul class="diciList">
+          <li>
+            编号 ：B8888B8888
+          </li>
+          <li>
+            异常类型 ：设备故障
+          </li>
+          <li>
+            故障时间 ：2019-01-91 15:31:00
+          </li>
+        </ul>
 
+      </li>
+      <li>
+        <p class="parkName">赤峰诱导屏名称</p>
+        <ul class="diciList">
+          <li>
+            编号 ：B8888B8888
+          </li>
+          <li>
+            异常类型 ：设备故障
+          </li>
+          <li>
+            故障时间 ：2019-01-91 15:31:00
+          </li>
+        </ul>
+      </li>
+    </ul>
+  </div>
+</template>
 <script>
 export default {
   name: 'screen',
@@ -12,5 +43,34 @@ export default {
 </script>
 
 <style scoped lang="scss">
+  .dici-wrap > li {
+    background-color: $whiteBg;
+    margin-bottom: 12px;
+    padding: 15px 15px 0 15px;
+  }
 
+  .parkName {
+    font-size: 1.8rem;
+    font-weight: 700;
+    padding-left: 2.5rem;
+    background: url("../assets/images/screenName.png") no-repeat 0 center;
+    background-size: 1.8rem 1.8rem;
+  }
+
+  .diciList {
+    border-radius: 4px;
+    margin-top: 12px;
+    > li {
+      height: 3.8rem;
+      line-height: 3.8rem;
+      position: relative;
+      &:after {
+        @include border-1px(#D9D9D9, bottom);
+        opacity: .5;
+      }
+      &:last-child:after {
+        height: 0;
+      }
+    }
+  }
 </style>
diff --git a/src/utils/api.js b/src/utils/api.js
new file mode 100644
index 0000000..6e87085
--- /dev/null
+++ b/src/utils/api.js
@@ -0,0 +1,3 @@
+import { post } from './request'
+
+export const diciAddress = params => post('',params)
diff --git a/src/utils/request.js b/src/utils/request.js
new file mode 100644
index 0000000..c2ddc40
--- /dev/null
+++ b/src/utils/request.js
@@ -0,0 +1,104 @@
+//引入axios
+import axios from 'axios'
+//import qs from 'qs'
+let cancel
+const CancelToken = axios.CancelToken;
+//请求拦截器  // 在发送请求之前做些什么
+axios.interceptors.request.use(config => {
+  //发起请求时，取消掉当前正在进行的相同请求
+  // config.headers['x-auth-token'] = '18de1300-c3f2-4365-9f51-62f77614f8c5'
+  // //config.headers['x-auth-token'] = '6840160c-7c45-42c4-8736-805f13487565' //测试地址
+  // config.data = {
+  //   ...config.data,
+  //   // sysCode: '1001'
+  // }
+  // config.data = qs.stringify(config.data);
+  return config
+}, error => {
+  return Promise.reject(error)
+})
+
+
+//响应拦截器即异常处理,对响应数据做点什么
+axios.interceptors.response.use(response => {
+  return response
+}, err => {
+  err.messages='';
+  if (err && err.response) {
+    switch (err.response.status) {
+      case 400:
+        err.messages = '错误请求'
+        break;
+      case 401:
+        err.messages = '未授权，请重新登录'
+        break;
+      case 403:
+        err.messages = '拒绝访问'
+        break;
+      case 404:
+        err.messages = '请求错误,未找到该资源'
+        break;
+      case 405:
+        err.messages = '请求方法未允许'
+        break;
+      case 408:
+        err.messages = '请求超时'
+        break;
+      case 500:
+        err.messages = '服务器端出错'
+        break;
+      case 501:
+        err.messages = '网络未实现'
+        break;
+      case 502:
+        err.messages = '网络错误'
+        break;
+      case 503:
+        err.messages = '服务不可用'
+        break;
+      case 504:
+        err.messages = '网络超时'
+        break;
+      case 505:
+        err.messages = 'http版本不支持该请求'
+        break;
+      default:
+        err.messages = `连接错误${err.response.status}`
+    }
+  } else {
+    err.messages = "连接到服务器失败";
+  }
+  //message.err(err.message)
+  //return Promise.reject(err.response)
+  return Promise.resolve(err)
+})
+//基础url前缀
+//axios.defaults.baseURL = '/api'
+
+// axios.defaults.baseURL = 'http://39.98.54.240:8093/';
+axios.defaults.baseURL = 'http://test.renniting.cn/bcp/wxcpMsgCenter/queryGeoFaultList';//测试地址
+//设置默认请求头
+// axios.defaults.withCredentials=true;//让ajax携带cookie
+
+// axios.defaults.headers.post['Content-Type'] = 'application/x-www-form-urlencoded;charset=UTF-8';
+axios.defaults.timeout = 10000
+
+
+function post(url, params) {
+  return new Promise((resolve,reject) => {
+    axios({
+      method: 'post',
+      url,
+      data: params,
+      cancelToken: new CancelToken(c => {
+        cancel = c
+      })
+    }).then(res => {
+      resolve(res)
+    })
+  })
+}
+
+
+export {post}
+
--
libgit2 0.21.4