From 27743f1faf12390842fda788f1771ff3e328ad40 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=BC=A0=E9=91=AB?= <zhangxin@zhehekeji.com>
Date: Thu, 17 Dec 2020 20:50:12 +0800
Subject: [PATCH] =?UTF-8?q?=E5=B7=B7=E9=81=93=E7=AE=A1=E7=90=86=E5=88=A0?=
 =?UTF-8?q?=E9=99=A4=E6=8E=A5=E5=8F=A3=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          |  7 +++++-
 src/layouts/PageContent.vue       |  2 +-
 src/main.js                       |  2 ++
 src/views/index.vue               |  3 +++
 src/views/roadwayManage/index.vue | 38 ++++++++++++++++++++++++++++---
 src/views/roadwayManage/model.vue | 37 +++++++++++++++++++++---------
 6 files changed, 73 insertions(+), 16 deletions(-)

diff --git a/src/api/http/http-api.js b/src/api/http/http-api.js
index 9ea9ac1..523b42a 100644
--- a/src/api/http/http-api.js
+++ b/src/api/http/http-api.js
@@ -1,4 +1,4 @@
-export default {
+export default  {
     getStreetList: {
         method: "POST",
         url: "/street/page",
@@ -14,6 +14,11 @@ export default {
         url: "/street",
         name: "编辑巷道"
     },
+    // deleteStreet: {
+    //     method: "DELETE",
+    //     url: "/street",
+    //     name: "删除巷道"
+    // },
     queryList: {
         url: '/order/list',
         name: '查询',
diff --git a/src/layouts/PageContent.vue b/src/layouts/PageContent.vue
index 68ba208..6e847dc 100644
--- a/src/layouts/PageContent.vue
+++ b/src/layouts/PageContent.vue
@@ -98,7 +98,7 @@ export default {
         .table{
             background: #ffffff;
             margin: 8px 20px;
-            height: 900px;
+            height: calc(100vh - 190px);
             padding:20px;
         }
     }
diff --git a/src/main.js b/src/main.js
index 32fb703..a309b73 100644
--- a/src/main.js
+++ b/src/main.js
@@ -10,6 +10,8 @@ import api from './plugins/axios/index'
 Vue.config.productionTip = false
 Vue.prototype.$utils = utils
 Vue.prototype.$api = api
+// import axios from 'axios'
+// Vue.prototype.$axios = axios
 new Vue({
     router,
     store,
diff --git a/src/views/index.vue b/src/views/index.vue
index 6abd291..0e51e03 100644
--- a/src/views/index.vue
+++ b/src/views/index.vue
@@ -111,5 +111,8 @@ export default {
     .collapsedClose{
         margin-left: 80px;
     }
+    .ant-table td {
+        white-space: nowrap;
+    }
 }
 </style>
diff --git a/src/views/roadwayManage/index.vue b/src/views/roadwayManage/index.vue
index 0992859..777c3bd 100644
--- a/src/views/roadwayManage/index.vue
+++ b/src/views/roadwayManage/index.vue
@@ -48,7 +48,7 @@
 
 
 <script>
-import Model from "./model.vue";
+import Model from "./model.vue"
 const columns = [
     {
         title: '巷道名称',
@@ -88,7 +88,14 @@ export default {
             pageNum:1,
             pageSize:10,
             data: [],
-            pagination: {},
+            pagination:{
+                total:0,
+                defaultPageSize:10, // 默认每页显示数量
+                showTotal: total => `共 ${total} 条数据`, // 显示总数
+                showSizeChanger:true, // 显示可改变每页数量
+                pageSizeOptions: ['10', '20', '30'],
+                onShowSizeChange:(current, pageSize)=>this.pageSize = pageSize // 改变每页数量时更新显示
+            },
             loading: false,
             columns,
             visible:false,
@@ -100,14 +107,27 @@ export default {
         this.handleGetStreetList()
     },
     methods: {
-        handleGetStreetList(){
+        handleGetStreetList(pagination) {
+            console.log(pagination)
+            if(pagination){
+                this.pagination.current = pagination.current;
+                this.pagination.pageSize = pagination.pageSize;
+                this.pageNum = pagination.current;
+                this.pageSize = pagination.pageSize;
+            }
+            this.request();
+        },
+        request(){
             this.$api.httpApi.getStreetList({
                 data: {
                     pageNum:this.pageNum,
                     pageSize:this.pageSize,
                 }
             }).then(res => {
+                const pagination = { ...this.pagination };
+                pagination.total = res.data.total;
                 this.data = res.data.list;
+                this.pagination = pagination;
             });
         },
         showModel(type,data){
@@ -128,6 +148,18 @@ export default {
             this.visible = visible
             this.modelData=data
         },
+        delDosage(data){
+            console.log(data.id)
+            var id=data.id
+            this.$axios.delete('/street/'+id, {
+                data: {}
+            }).then(res => {
+                if(res.code==200){
+                    this.$message.success('删除巷道成功');
+                    this.handleGetStreetList()
+                }
+            })
+        }
     },
     components:{
         Model
diff --git a/src/views/roadwayManage/model.vue b/src/views/roadwayManage/model.vue
index 881bc9b..10c62bb 100644
--- a/src/views/roadwayManage/model.vue
+++ b/src/views/roadwayManage/model.vue
@@ -146,10 +146,10 @@
                         placeholder="选择球机"
                     >
                         <a-select-option value="0">
-                            单伸
+                            球机1
                         </a-select-option>
                         <a-select-option value="1">
-                            双伸
+                            球机2
                         </a-select-option>
                     </a-select>
                 </a-form-item>
@@ -161,10 +161,10 @@
                         placeholder="选择球机"
                     >
                         <a-select-option value="0">
-                            单伸
+                            球机3
                         </a-select-option>
                         <a-select-option value="1">
-                            双伸
+                            球机4
                         </a-select-option>
                     </a-select>
                 </a-form-item>
@@ -198,6 +198,7 @@ export default {
                 this.mdata=newVal
                 this.leftType=newVal.leftType
                 this.rightType=newVal.rightType
+                this.id = newVal.id
                 // console.log('触发了watch，重新赋值')
                 this.$nextTick(()=>{   //this.$nextTick解决不能在表单渲染之前赋值的报错问题
                     this.form.setFieldsValue({  //setFieldsValue 表示对form表单重新设置值
@@ -234,6 +235,7 @@ export default {
             form: this.$form.createForm(this, { name: 'dynamic_rule' }),
             leftType:'',
             rightType:'',
+            id:'',
             mdata:[]
         };
     },
@@ -250,9 +252,7 @@ export default {
                         console.log(this.title)
                         if(this.title=='新增巷道'){
                             this.$api.httpApi.addStreet({
-                                data: {
-                                    values
-                                }
+                                data:values
                             }).then(res => {
                                 if(res.code==200){
                                     this.$emit('sure',false)
@@ -260,10 +260,25 @@ export default {
                                 }
                             });
                         }else if(this.title=='编辑巷道'){
-                            this.$api.httpApi.addStreet({
-                                data: {
-                                    values
-                                }
+                            values.id = this.id
+                            switch (values.leftType) {
+                            case '单伸':
+                                values.leftType='0'
+                                break;
+                            case '双伸':
+                                values.leftType='1'
+                                break;
+                            }
+                            switch (values.rightType) {
+                            case '单伸':
+                                values.rightType='0'
+                                break;
+                            case '双伸':
+                                values.rightType='1'
+                                break;
+                            }
+                            this.$api.httpApi.editStreet({
+                                data:values
                             }).then(res => {
                                 if(res.code==200){
                                     this.$emit('sure',false)