fea(车道基础数据、登录页): 联调、开发完成

src/interface/apis.js

 /* eslint-disable */
  export default {
 	"basic-info-controller": {
+		"area-get": {
+			"url": "/api/basicinfo/area",
+			"method": "get"
+		},
 		"equipCreate-post": {
 			"url": "/api/basicinfo/equipCreate",
 			"method": "post"
@@ -17,6 +21,10 @@
 			"url": "/api/basicinfo/equipUpdate",
 			"method": "put"
 		},
+		"areaId-get": {
+			"url": "/api/basicinfo/lane/{areaId}",
+			"method": "get"
+		},
 		"stationCreate-post": {
 			"url": "/api/basicinfo/stationCreate",
 			"method": "post"
@@ -104,6 +112,10 @@
 		"runtimePage-post": {
 			"url": "/api/equipment/runtimePage",
 			"method": "post"
+		},
+		"test-get": {
+			"url": "/api/equipment/test",
+			"method": "get"
 		}
 	},
 	"show-field-controller": {

src/router/modules/basic.js

@@ -8,12 +8,12 @@ export default {
     meta: {title: 'Basic', icon: 'codingConfig'},
     alwaysShow: true,
     children: [
-        {
-            path: 'workshopBasic',
-            component: () => import('@/views/Basic/WorkshopBasic/list'),
-            name: 'WorkshopBasic',
-            meta: {title: 'WorkshopBasic', icon: 'document', noCache: false}
-        },
+        // {
+        //     path: 'workshopBasic',
+        //     component: () => import('@/views/Basic/WorkshopBasic/list'),
+        //     name: 'WorkshopBasic',
+        //     meta: {title: 'WorkshopBasic', icon: 'document', noCache: false}
+        // },
         {
             path: 'deviceBasic',
             component: () => import('@/views/Basic/DeviceBasic/list'),

src/styles/page-reset.scss

@@ -20,20 +20,20 @@
             }
         }
     }
-    .el-button {
-        width: 100%;
-        border-radius: 0px;
-        height: 60px;
-        line-height: 60px;
-        font-size: 24px;
-    }
-    .el-button--medium {
-        padding: 0;
-    }
-    .el-button--primary {
-        background-color: #00a1d8;
-        border: 1px solid #00a1d8;
-    }
+    //.el-button {
+    //    width: 100%;
+    //    border-radius: 0px;
+    //    height: 60px;
+    //    line-height: 60px;
+    //    font-size: 24px;
+    //}
+    //.el-button--medium {
+    //    padding: 0;
+    //}
+    //.el-button--primary {
+    //    background-color: #00a1d8;
+    //    border: 1px solid #00a1d8;
+    //}
 }
 .missingListMaterial-list-page {
     .el-input {

src/views/Basic/DeviceBasic/list.vue

@@ -26,7 +26,7 @@
                 </el-button>
             </div>
         </div>
-        <div class="general-list-main-pack pl-15 pr-15">
+        <div class="general-list-main-pack pl-15 pr-15 pb-15">
             <div>
                 <Table
                     :tableConfig="tableConfig"
@@ -219,7 +219,7 @@
 <style lang="scss" scoped>
     .page-pack {
         position: relative;
-        height: 100%;
+        min-height: 100%;
         width: 100%;
         border: 1px solid #d2d3d5;
         background-color: #fff;

src/views/Basic/LaneBasic/list.vue

@@ -26,12 +26,20 @@
                 </el-button>
             </div>
         </div>
-        <div class="general-list-main-pack pl-15 pr-15">
+        <div class="general-list-main-pack pl-15 pr-15 pb-15">
             <div>
                 <Table
                     :tableConfig="tableConfig"
                     @onPageSizeChange="onPageSizeChange"
                     @onCurrentPageChange="onCurrentPageChange">
+                    <template slot="workshopCode">
+                        <el-table-column
+                            label="车间">
+                            <template slot-scope="scope">
+                                <span>{{ scope.row.workshopCode !== null ? scope.row.workshopCode : '涂装车间' }}</span>
+                            </template>
+                        </el-table-column>
+                    </template>
                     <template slot="keyStation">
                         <el-table-column
                             label="是否为关键工位"
@@ -56,12 +64,14 @@
                             label="操作">
                             <template slot-scope="scope">
                                 <el-button
-                                    type="text">
+                                    type="text"
+                                    @click="doEditClick(scope.row)">
                                     编辑
                                 </el-button>
                                 <el-button
                                     type="text"
-                                    style="color: rgb(244, 116, 118)">
+                                    style="color: rgb(244, 116, 118)"
+                                    @click="doDeleteClick(scope.row)">
                                     删除
                                 </el-button>
                             </template>
@@ -73,8 +83,15 @@
 
         <!--新增车道基础信息对话框-->
         <AddLaneDialog
-            ref="AddLaneDialog">
+            ref="AddLaneDialog"
+            @doConfirmClick="doAddLaneDialogConfirmClick">
         </AddLaneDialog>
+
+        <!--编辑车道基础信息对话框-->
+        <EditLaneDialog
+            ref="EditLaneDialog"
+            :editLaneBasicValue="editLaneBasicValue">
+        </EditLaneDialog>
     </div>
 </template>
 
@@ -82,16 +99,20 @@
     import Table from '@/components/Table/index.vue'
     import Search from '@/components/Search'
     import AddLaneDialog from './components/AddLaneDialog'
+    import EditLaneDialog from './components/EditLaneDialog'
 
     export default {
         name: 'LaneBasic',
         components: {
             Search,
             Table,
-            AddLaneDialog
+            AddLaneDialog,
+            EditLaneDialog
         },
         data () {
             return {
+                // 编辑车道基础数据
+                editLaneBasicValue: {},
                 // 精准搜索关键字列表
                 searchList: {},
                 // 表格配置项
@@ -99,7 +120,7 @@
                     height: 0,
                     data: [],
                     fieldList: [
-                        { label: '车间', value: 'workshopCode' },
+                        { label: '车间', value: 'workshopCode', slot: 'workshopCode' },
                         { label: '区域', value: 'areaName' },
                         { label: '车道编号', value: 'laneCode' },
                         { label: '工位编号', value: 'code' },
@@ -176,6 +197,33 @@
             // 点击新增按钮
             doAddClick () {
                 this.$refs.AddLaneDialog.dialogToggle = true
+            },
+            // 点击新增车道对话框确认按钮
+            doAddLaneDialogConfirmClick () {
+                // 获取表格数据
+                this.getTableList()
+            },
+            // 点击编辑按钮
+            doEditClick (laneValue) {
+                this.editLaneBasicValue = _.cloneDeep(laneValue)
+                this.$refs.EditLaneDialog.dialogToggle = true
+            },
+            // 点击删除按钮
+            doDeleteClick (laneValue) {
+                console.log(laneValue)
+                this.$confirm(`确定要删除车道编号为 ${laneValue.laneCode} 的车道基础数据吗？`, '提示', {
+                    confirmButtonText: '确定',
+                    cancelButtonText: '取消',
+                    type: 'warning',
+                    center: true
+                }).then(() => {
+                    let queryParams = { stationId: laneValue.id, hash: 'stationId' }
+                    this.$fetch('basic-info-controller/stationId-delete', queryParams).then(response => {
+                        this.$message.success('删除成功！')
+                        // 获取表格数据
+                        this.getTableList()
+                    })
+                }).catch(() => {})
             }
         },
         mounted () {
@@ -191,7 +239,7 @@
 <style lang="scss" scoped>
     .page-pack {
         position: relative;
-        height: 100%;
+        min-height: 100%;
         width: 100%;
         border: 1px solid #d2d3d5;
         background-color: #fff;

src/views/Basic/WorkshopBasic/list.vue

@@ -25,7 +25,7 @@
                 </el-button>
             </div>
         </div>
-        <div class="general-list-main-pack pl-15 pr-15">
+        <div class="general-list-main-pack pl-15 pr-15 pb-15">
             <div>
                 <Table
                     :tableConfig="tableConfig">
@@ -80,7 +80,7 @@
 <style lang="scss" scoped>
     .page-pack {
         position: relative;
-        height: 100%;
+        min-height: 100%;
         width: 100%;
         border: 1px solid #d2d3d5;
         background-color: #fff;

src/views/DeviceRunning/DeviceFaultRecord/list.vue

@@ -18,7 +18,7 @@
                 @reset="doResetClick">
             </Search>
         </div>
-        <div class="general-list-main-pack pl-15 pr-15">
+        <div class="general-list-main-pack pl-15 pr-15 pb-15">
             <div>
                 <Table
                     :tableConfig="tableConfig"
@@ -158,7 +158,7 @@
 <style lang="scss" scoped>
     .page-pack {
         position: relative;
-        height: 100%;
+        min-height: 100%;
         width: 100%;
         border: 1px solid #d2d3d5;
         background-color: #fff;

src/views/DeviceRunning/DeviceRunningTime/list.vue

@@ -18,7 +18,7 @@
                 @reset="doResetClick">
             </Search>
         </div>
-        <div class="general-list-main-pack pl-15 pr-15">
+        <div class="general-list-main-pack pl-15 pr-15 pb-15">
             <div>
                 <Table
                     :tableConfig="tableConfig"
@@ -138,7 +138,7 @@
 <style lang="scss" scoped>
     .page-pack {
         position: relative;
-        height: 100%;
+        min-height: 100%;
         width: 100%;
         border: 1px solid #d2d3d5;
         background-color: #fff;

src/views/Workshop/Chassis/list.vue

@@ -36,7 +36,7 @@
                     </span>
                 </div>
             </div>
-            <div class="tool-pack clear-float pl-15 pr-15">
+            <div class="tool-pack clear-float pl-15 pr-15 pb-15">
                 <Search
                     v-if="searchComponentRenderToggle"
                     :searchCode="currentSearchCode"
@@ -52,7 +52,7 @@
                     </el-button>
                 </div>
             </div>
-            <div class="general-list-main-pack pl-15 pr-15">
+            <div class="general-list-main-pack pl-15 pr-15 pb-15">
                 <div>
                     <PreviewTable
                         :tableConfig="tableConfig"
@@ -254,7 +254,7 @@
         mounted () {
             setTimeout(() => {
                 this.treeHeight = { 'height': `${document.body.offsetHeight - 180}px` }
-                this.tableConfig.height = document.querySelector('.page-pack').offsetHeight - 205
+                this.tableConfig.height = document.querySelector('.page-pack').offsetHeight - 210
                 this.$refs.sortTree.setCurrentKey(this.sortTreeData[0].id)
                 this.currentSort = _.cloneDeep(this.sortTreeData[0])
                 this.currentSearchCode = _.cloneDeep(this.sortTreeData[0].code)
@@ -271,7 +271,7 @@
 
 <style lang="scss" scoped>
     .page-pack {
-        height: 100%;
+        min-height: 100%;
         width: 100%;
         overflow: hidden;
         position: relative;
@@ -297,7 +297,6 @@
             height: 100%;
             border: 1px solid #d2d3d5;
             background-color: #fff;
-            overflow-y: auto;
 
             .title-pack {
                 height: 38px;

src/views/Workshop/Final/list.vue

@@ -52,7 +52,7 @@
                     </el-button>
                 </div>
             </div>
-            <div class="general-list-main-pack pl-15 pr-15">
+            <div class="general-list-main-pack pl-15 pr-15 pb-15">
                 <div>
                     <PreviewTable
                         :tableConfig="tableConfig"
@@ -264,7 +264,7 @@
         mounted () {
             setTimeout(() => {
                 this.treeHeight = { 'height': `${document.body.offsetHeight - 180}px` }
-                this.tableConfig.height = document.querySelector('.page-pack').offsetHeight - 205
+                this.tableConfig.height = document.querySelector('.page-pack').offsetHeight - 210
                 this.$refs.sortTree.setCurrentKey(this.sortTreeData[0].id)
                 this.currentSort = _.cloneDeep(this.sortTreeData[0])
                 this.currentSearchCode = _.cloneDeep(this.sortTreeData[0].code)
@@ -281,7 +281,7 @@
 
 <style lang="scss" scoped>
     .page-pack {
-        height: 100%;
+        min-height: 100%;
         width: 100%;
         overflow: hidden;
         position: relative;

src/views/Workshop/Painting/list.vue

@@ -52,7 +52,7 @@
                     </el-button>
                 </div>
             </div>
-            <div class="general-list-main-pack pl-15 pr-15">
+            <div class="general-list-main-pack pl-15 pr-15 pb-15">
                 <div>
                     <PreviewTable
                         :tableConfig="tableConfig"
@@ -259,7 +259,7 @@
         mounted () {
             setTimeout(() => {
                 this.treeHeight = { 'height': `${document.body.offsetHeight - 180}px` }
-                this.tableConfig.height = document.querySelector('.page-pack').offsetHeight - 205
+                this.tableConfig.height = document.querySelector('.page-pack').offsetHeight - 210
                 this.$refs.sortTree.setCurrentKey(this.sortTreeData[0].id)
                 this.currentSort = _.cloneDeep(this.sortTreeData[0])
                 this.currentSearchCode = _.cloneDeep(this.sortTreeData[0].code)
@@ -276,7 +276,7 @@
 
 <style lang="scss" scoped>
     .page-pack {
-        height: 100%;
+        min-height: 100%;
         width: 100%;
         overflow: hidden;
         position: relative;

src/views/Workshop/Parts/list.vue

@@ -57,7 +57,7 @@
                     </el-button>
                 </div>
             </div>
-            <div class="general-list-main-pack pl-15 pr-15">
+            <div class="general-list-main-pack pl-15 pr-15 pb-15">
                 <div>
                     <PreviewTable
                         :tableConfig="tableConfig"
@@ -278,7 +278,7 @@
         mounted () {
             setTimeout(() => {
                 this.treeHeight = { 'height': `${document.body.offsetHeight - 180}px` }
-                this.tableConfig.height = document.querySelector('.page-pack').offsetHeight - 205
+                this.tableConfig.height = document.querySelector('.page-pack').offsetHeight - 210
                 this.$refs.sortTree.setCurrentKey(this.sortTreeData[0].id)
                 this.currentSort = _.cloneDeep(this.sortTreeData[0])
                 this.currentSearchCode = _.cloneDeep(this.sortTreeData[0].code)
@@ -295,7 +295,7 @@
 
 <style lang="scss" scoped>
     .page-pack {
-        height: 100%;
+        min-height: 100%;
         width: 100%;
         overflow: hidden;
         position: relative;
@@ -321,7 +321,6 @@
             height: 100%;
             border: 1px solid #d2d3d5;
             background-color: #fff;
-            overflow-y: auto;
 
             .title-pack {
                 height: 38px;

src/views/Workshop/Trial/list.vue

@@ -52,7 +52,7 @@
                     </el-button>
                 </div>
             </div>
-            <div class="general-list-main-pack pl-15 pr-15">
+            <div class="general-list-main-pack pl-15 pr-15 pb-15">
                 <div>
                     <PreviewTable
                         :tableConfig="tableConfig"
@@ -244,7 +244,7 @@
         mounted () {
             setTimeout(() => {
                 this.treeHeight = { 'height': `${document.body.offsetHeight - 180}px` }
-                this.tableConfig.height = document.querySelector('.page-pack').offsetHeight - 205
+                this.tableConfig.height = document.querySelector('.page-pack').offsetHeight - 210
                 this.$refs.sortTree.setCurrentKey(this.sortTreeData[0].id)
                 this.currentSort = _.cloneDeep(this.sortTreeData[0])
                 this.currentSearchCode = _.cloneDeep(this.sortTreeData[0].code)
@@ -261,7 +261,7 @@
 
 <style lang="scss" scoped>
     .page-pack {
-        height: 100%;
+        min-height: 100%;
         width: 100%;
         overflow: hidden;
         position: relative;

src/views/Workshop/Welding/list.vue

@@ -52,7 +52,7 @@
                     </el-button>
                 </div>
             </div>
-            <div class="general-list-main-pack pl-15 pr-15">
+            <div class="general-list-main-pack pl-15 pr-15 pb-15">
                 <div>
                     <PreviewTable
                         :tableConfig="tableConfig"
@@ -244,7 +244,7 @@
         mounted () {
             setTimeout(() => {
                 this.treeHeight = { 'height': `${document.body.offsetHeight - 180}px` }
-                this.tableConfig.height = document.querySelector('.page-pack').offsetHeight - 205
+                this.tableConfig.height = document.querySelector('.page-pack').offsetHeight - 210
                 this.$refs.sortTree.setCurrentKey(this.sortTreeData[0].id)
                 this.currentSort = _.cloneDeep(this.sortTreeData[0])
                 this.currentSearchCode = _.cloneDeep(this.sortTreeData[0].code)
@@ -261,7 +261,7 @@
 
 <style lang="scss" scoped>
     .page-pack {
-        height: 100%;
+        min-height: 100%;
         width: 100%;
         overflow: hidden;
         position: relative;