From 6c361681f9ea7e15632c5660d9b233d47d453688 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=BC=A0=E9=91=AB?= <zhangxin@zhehekeji.com>
Date: Tue, 15 Dec 2020 20:09:10 +0800
Subject: [PATCH] =?UTF-8?q?1=E3=80=81api=E9=85=8D=E7=BD=AE=E6=96=87?=
 =?UTF-8?q?=E4=BB=B6=E4=BD=8D=E7=BD=AE=E8=A7=84=E5=88=99=E4=BF=AE=E6=94=B9?=
 =?UTF-8?q?=E8=87=B3src/api/http-api.js,=E8=A7=84=E5=88=99=E9=85=8D?=
 =?UTF-8?q?=E7=BD=AE=E8=AF=A6=E8=A7=81axios.js=E6=96=87=E4=BB=B6=E3=80=82?=
 =?UTF-8?q?=202=E3=80=81=E5=B7=B7=E9=81=93=E7=AE=A1=E7=90=86=E5=88=97?=
 =?UTF-8?q?=E8=A1=A8=E9=A1=B5=E6=9E=84=E5=BB=BA+=E6=8E=A5=E5=8F=A3?=
 =?UTF-8?q?=E8=81=94=E8=B0=83?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/http/http-api.js             |  13 ++++
 src/layouts/PageContent.vue          |   8 ++-
 src/plugins/axios/index.js           |   2 +-
 src/views/history/api/history-api.js |   6 +-
 src/views/history/index.vue          |   3 +-
 src/views/roadwayManage/index.vue    | 102 ++++++++++++++++++++++++++-
 6 files changed, 125 insertions(+), 9 deletions(-)
 create mode 100644 src/api/http/http-api.js

diff --git a/src/api/http/http-api.js b/src/api/http/http-api.js
new file mode 100644
index 0000000..6a0eceb
--- /dev/null
+++ b/src/api/http/http-api.js
@@ -0,0 +1,13 @@
+export default {
+    getStreetList: {
+        method: "POST",
+        url: "/street/page",
+        name: "获取巷道列表"
+    },
+    queryList: {
+        url: '/order/list',
+        name: '查询',
+        method: 'POST'
+    }
+}
+
diff --git a/src/layouts/PageContent.vue b/src/layouts/PageContent.vue
index 8ea938c..68ba208 100644
--- a/src/layouts/PageContent.vue
+++ b/src/layouts/PageContent.vue
@@ -6,7 +6,7 @@
                 <slot name="title">{{ title }}</slot>
             </span>
         </div>
-        <router-view class="sss"></router-view>
+        <router-view class="table"></router-view>
         <!-- footer -->
         <div class="wrap-footer bg-white">
             <slot name="footer"></slot>
@@ -95,5 +95,11 @@ export default {
             text-align: center;
             z-index: 2;
         }
+        .table{
+            background: #ffffff;
+            margin: 8px 20px;
+            height: 900px;
+            padding:20px;
+        }
     }
 </style>
diff --git a/src/plugins/axios/index.js b/src/plugins/axios/index.js
index 25e0dab..c107685 100644
--- a/src/plugins/axios/index.js
+++ b/src/plugins/axios/index.js
@@ -15,7 +15,7 @@ const trans = (apiObj) => {
     return obj;
 };
 
-const apiAll = require.context('@/views', true, /-api\.js$/);
+const apiAll = require.context('@/api', true, /-api\.js$/);
 const moduleApis = {};
 // -转驼峰
 function toCamelCase(str) {
diff --git a/src/views/history/api/history-api.js b/src/views/history/api/history-api.js
index f3817d7..0304802 100644
--- a/src/views/history/api/history-api.js
+++ b/src/views/history/api/history-api.js
@@ -1,7 +1,3 @@
 export default {
-    queryList: {
-        url: '/order/list',
-        name: '查询',
-        method: 'POST'
-    }
+
 }
diff --git a/src/views/history/index.vue b/src/views/history/index.vue
index 17c184a..c7fd80b 100644
--- a/src/views/history/index.vue
+++ b/src/views/history/index.vue
@@ -108,10 +108,11 @@ export default {
     },
     methods: {
         handleSearch() {
+            console.log(this.$api)
             this.query();
         },
         query() {
-            this.$api.historyApi
+            this.$api.httpApi
                 .queryList({
                     data: {
                         orderNum: this.search
diff --git a/src/views/roadwayManage/index.vue b/src/views/roadwayManage/index.vue
index 324d265..8ceebc8 100644
--- a/src/views/roadwayManage/index.vue
+++ b/src/views/roadwayManage/index.vue
@@ -1,3 +1,103 @@
 <template>
-    <div>巷道管理页面</div>
+    <a-table
+        :columns="columns"
+        :row-key="record => record.id"
+        :data-source="data"
+        :pagination="pagination"
+        @change="handleGetStreetList"
+    >
+         <span slot="leftType" slot-scope="text">
+              {{ text === 0 ? '单伸' : '双伸' }}
+         </span>
+        <span slot="rightType" slot-scope="text">
+              {{ text === 0 ? '单伸' : '双伸' }}
+         </span>
+        <span slot="actions" slot-scope="text">
+              <template>
+                  <span v-if="text.camera1Name">{{text.camera1Name}}</span>
+                  <span v-if="text.camera2Name">{{text.camera2Name}}</span>
+                  <span v-if="text.camera1Name && text.camera2Name">{{text.camera1Name}}/{{text.camera2Name}}</span>
+              </template>
+         </span>
+        <span slot="action" slot-scope="text, record">
+            <a @click="editModal(1,record)" v-action="'dosage_edit'">
+              编辑
+            </a>
+            <a-divider type="vertical" v-action="'dosage_edit'"/>
+            <a-popconfirm
+                title="是否删除?"
+                @confirm="() => delDosage(record)"
+                v-action="'dosage_delete'"
+            >
+              <a>删除</a>
+            </a-popconfirm>
+          </span>
+    </a-table>
 </template>
+<script>
+// import reqwest from 'reqwest';
+const columns = [
+    {
+        title: '巷道名称',
+        dataIndex: 'name',
+    },
+    {
+        title: 'PLC-ID',
+        dataIndex: 'plcId',
+    },
+    {
+        title: '左货架类型',
+        dataIndex: 'leftType',
+        scopedSlots: { customRender: 'leftType' }
+    },
+    {
+        title: '右货架类型',
+        dataIndex: 'rightType',
+        scopedSlots: { customRender: 'rightType' }
+    },
+    {
+        title: '对应球机',
+        scopedSlots: { customRender: 'actions' },
+    },
+    {
+        title: '修改时间',
+        dataIndex: 'updateTime',
+    },
+    {
+        title: '操作',
+        dataIndex: 'action',
+        scopedSlots: { customRender: 'action' }
+    },
+];
+export default {
+    data() {
+        return {
+            pageNum:1,
+            pageSize:10,
+            data: [],
+            pagination: {},
+            loading: false,
+            columns,
+        };
+    },
+    mounted() {
+        this.handleGetStreetList()
+    },
+    methods: {
+        handleGetStreetList(){
+            this.$api.httpApi
+                .getStreetList({
+                    data: {
+                        pageNum:this.pageNum,
+                        pageSize:this.pageSize,
+                    }
+                })
+                .then(res => {
+                    // res.data[1].mediaPath =
+                    //     "http://gitlab.zhehekeji.com/security_check/security_front/raw/1.0.0/src/assets/video/video2.mp4";
+                    this.data = res.data.list;
+                });
+        }
+    },
+};
+</script>