src/components/business_space/business/handsontable.vue

@@ -11,7 +11,7 @@
             暂无数据
         </div>
         <!-- <add-business :buildMess="buildMess" :dialog="dialog"></add-business> -->
-        <div class="right-nobg" v-show="main && main.length">
+        <div class="right" v-show="main && main.length">
             <my-pagination :page="page" @change="pageChange"></my-pagination>    
         </div>
     </div>

src/components/business_space/table/addEquip.vue

@@ -82,7 +82,7 @@
     <el-dialog width="40%" title="设备详情" :visible.sync="innerVisible" append-to-body>
       <iframe height="400px" width="100%" :src="iframeSrc"></iframe>
     </el-dialog>
-    <div class="right-nobg">
+    <div class="right" v-if="tableData.length">
         <my-pagination :page="page" @change="pageChange"></my-pagination>
     </div>
     <div class="el-dialog__footer">

src/components/business_space/table/businessTable.vue

@@ -40,7 +40,7 @@
             </el-table-column>
         </el-table>
     </div>
-    <div class="right">
+    <div class="right" v-if="tableData.length">
         <my-pagination :page="page" @change="pageChange"></my-pagination>
     </div>
   </div>

src/components/business_space/table/equipTable.vue

@@ -26,15 +26,15 @@
                         </template>
                     </el-table-column>
                 </el-table>
-        <div class="right-nobg">
-            <my-pagination :page="page" @change="pageChange"></my-pagination>
-        </div>
-        </el-tab-pane>
-    </el-tabs>
-    <el-dialog width="40%" title="设备详情" :visible.sync="innerVisible" append-to-body>
-      <iframe height="400px" width="100%" :src="iframeSrc"></iframe>
-    </el-dialog>
-  </div>
+                <div class="right" v-show="tableData.length">
+                    <my-pagination :page="page" @change="pageChange"></my-pagination>
+                </div>
+            </el-tab-pane>
+        </el-tabs>
+        <el-dialog width="40%" title="设备详情" :visible.sync="innerVisible" append-to-body>
+        <iframe height="400px" width="100%" :src="iframeSrc"></iframe>
+        </el-dialog>
+    </div>
 </template>
 
 <script>

src/components/config_point/step3_point/steps3_main.vue

@@ -104,7 +104,11 @@
                 })
             },
             paramCheck(param) {
-                if (param.EquipmentMark == "空") {
+                console.log(param,'param')
+                if(!!param &&!!param.PhysicalRelated){
+                    this.$message("已完成设置，您可以重新设置")
+                }
+                if (!!param && !!param.EquipmentMark && param.EquipmentMark == "空") {
                     //空查询分组信息
                     getNullofParam({
                         data: {

src/framework/style/layout.scss

@@ -1,13 +1,9 @@
 @import './theme.scss';
-
 $pageHeaderHeight: 50px;
-
 $pageSidebarWidth: 235px;
 $pageSidebarClosedWidth: 64px;
 $pageSidebarItemHeight: 40px;
-
 $pageFooterHeight: 40px;
-
 html,
 body {
     padding: 0 !important;
@@ -16,16 +12,20 @@ body {
     width: 100%;
     height: 100%;
 }
+
 #app {
     width: 100%;
     height: 100%;
 }
+
 #page-main {
     width: 100%;
     height: 100%;
     display: flex;
-    flex-direction: column; /* 垂直 从上到下 */
-    justify-content: flex-start; /* 垂直 左对齐 */
+    flex-direction: column;
+    /* 垂直 从上到下 */
+    justify-content: flex-start;
+    /* 垂直 左对齐 */
     align-items: stretch;
     .page-header {
         order: 0;
@@ -33,16 +33,15 @@ body {
         flex-shrink: 0;
         height: $pageHeaderHeight;
     }
-
     .page-container {
         order: 1;
         flex-grow: 1;
         flex-shrink: 1;
-
         display: flex;
-        flex-direction: row; /* 水平,从左到右 */
-        justify-content: flex-start; /* 水平上对齐 */
-
+        flex-direction: row;
+        /* 水平,从左到右 */
+        justify-content: flex-start;
+        /* 水平上对齐 */
         .page-sidebar-wrapper {
             width: $pageSidebarWidth;
             overflow: auto;
@@ -54,7 +53,6 @@ body {
             flex-shrink: 1;
         }
     }
-
     .page-footer {
         order: 2;
         flex-grow: 0;
@@ -68,21 +66,20 @@ body {
 
 #page-main .page-header {
     display: flex;
-    flex-direction: row; /* 水平, 从左向右 */
-    justify-content: flex-start; /* 垂直 左对齐 */
-
+    flex-direction: row;
+    /* 水平, 从左向右 */
+    justify-content: flex-start;
+    /* 垂直 左对齐 */
     .page-logo {
         flex-grow: 0;
         flex-shrink: 0;
-
         padding-left: 20px;
         padding-right: 20px;
         width: 195px;
-
         display: inline-flex;
         flex-direction: row;
         justify-content: space-between;
-        > a {
+        >a {
             display: inline-block;
             .logo-default {
                 margin: 18px 0 0;
@@ -127,8 +124,7 @@ body {
 
 #page-main .page-container {
     .page-sidebar-wrapper {
-        .el-menu {
-        }
+        .el-menu {}
     }
 }
 
@@ -144,7 +140,9 @@ body {
     }
 }
 
+
 /** sidebar 弹框 */
+
 .el-menu--vertical {
     .el-menu.el-menu--popup.el-menu--popup-right-start {
         .el-menu-item.sidebar-menu-item {
@@ -156,11 +154,9 @@ body {
 
 #page-main .page-container .page-content-wrapper {
     margin: 0px 10px 10px 10px;
-
     display: flex;
     flex-direction: column;
     justify-content: flex-start;
-
     .page-bar {
         flex-grow: 0;
         flex-shrink: 0;
@@ -186,20 +182,18 @@ body {
     flex-direction: column;
     justify-content: flex-start;
     align-items: stretch;
-
     flex-grow: 1;
     flex-shrink: 1;
-
-    > .query-form {
+    >.query-form {
         flex-grow: 0;
         flex-shrink: 0;
     }
-    > .data-table {
+    >.data-table {
         flex-grow: 1;
         flex-shrink: 1;
         overflow-x: auto;
         overflow-y: auto;
-        background: #fff;
+        background: rgb(242, 242, 242);
         margin-top: 10px;
     }
     >.data-table-pagination {
@@ -220,7 +214,7 @@ body {
     }
 }
 
-#page-main #page-container #page-content-wrapper .page-content > .query-form {
+#page-main #page-container #page-content-wrapper .page-content>.query-form {
     padding: 5px 10px 0px 10px;
     margin-bottom: 10px;
     .el-form {
@@ -241,19 +235,16 @@ body {
     }
 }
 
-#page-main #page-container #page-content-wrapper .page-content .data-table {
-}
+#page-main #page-container #page-content-wrapper .page-content .data-table {}
 
 // #page-main #page-container #page-content-wrapper .page-content  .data-table {
 .data-table {
     position: relative;
-
-    > .el-table {
+    >.el-table {
         position: absolute;
         .el-table__header-wrapper {
             .el-table__header {
-                thead tr th {
-                }
+                thead tr th {}
             }
         }
         .el-table__body-wrapper {
@@ -262,10 +253,10 @@ body {
                     padding: 6px 0;
                     .cell {
                         line-height: 20px;
-                    } 
-                    &.btn{
+                    }
+                    &.btn {
                         padding: 2px 0;
-                    }                   
+                    }
                 }
             }
         }
@@ -276,15 +267,12 @@ body {
     form {
         max-width: 800px;
         margin: 50px auto;
-
-        > .el-form-item {
+        >.el-form-item {
             margin-bottom: 18px;
-
-            > .el-form-item__label {
+            >.el-form-item__label {
                 width: 180px;
             }
-
-            > .el-form-item__content {
+            >.el-form-item__content {
                 max-width: 600px;
                 margin-left: 180px;
             }
@@ -298,7 +286,7 @@ body {
             padding-left: 20px;
             padding-right: 20px;
             width: 20px;
-            > a {
+            >a {
                 display: none;
             }
         }
@@ -329,7 +317,6 @@ body {
 //         }
 //     }
 // }
-
 // @media screen and (max-width: 800px) {
 //     #page-main {
 //         .page-header {
@@ -341,14 +328,12 @@ body {
 //             display: flex;
 //             flex-direction: column;
 //             justify-content: flex-start;
-
 //             .page-sidebar-wrapper {
 //                 width: 100%;
 //             }
 //         }
 //     }
 // }
-
 // @media screen and (max-height: 700px) {
 //     #page-main {
 //         .page-footer {
@@ -369,14 +354,11 @@ body {
 #page-main #page-container #page-content-wrapper .box {
     display: flex;
     flex-direction: column;
-
     .el-tabs {
         flex-grow: 1;
         flex-shrink: 1;
-
         display: flex;
         flex-direction: column;
-
         .el-tabs__header {
             flex-grow: 0;
             flex-shrink: 0;
@@ -384,18 +366,14 @@ body {
         .el-tabs__content {
             flex-grow: 1;
             flex-shrink: 1;
-
             display: flex;
             flex-direction: column;
-
             .el-tab-pane {
                 height: 100%;
                 // flex-grow: 1;
                 // flex-shrink: 1;
-
                 display: flex;
                 flex-direction: column;
-
                 // // > div {
                 // //     flex-grow: 1;
                 // //     flex-shrink: 1;
@@ -403,4 +381,4 @@ body {
             }
         }
     }
-}
+}

src/views/point/config_point/steps/index.vue

@@ -78,7 +78,7 @@
                 console.log("test")
             },
             changeStep(index) {
-                console.log()
+                // console.log()
                 let step = this.$refs.step
                 let flag = step.hasOwnProperty('noSaveData') ? step.noSaveData() : false
                 if (flag || this.activeStep == 4 || this.activeStep == 3) {