解决冲突

src/views/backOfficeSystem/IntelligentControl/myControl/index.vue

@@ -32,15 +32,10 @@
             <el-link type="danger" size="small" @click="handleRow('delete', row)">删除</el-link>
           </template>
         </MyTable>
-        <Pages
-          @changeNo="changeNo"
-          @changeSize="changeSize"
-          :tableHeight="pageData.tableHeight"
-          :pageConfiger="{
-            ...pageData.pageConfiger,
-            total: pageData.total
-          }"
-        ></Pages>
+        <Pages @changeNo="changeNo" @changeSize="changeSize" :tableHeight="pageData.tableHeight" :pageConfiger="{
+          ...pageData.pageConfiger,
+          total: pageData.total
+        }"></Pages>
       </div>
     </div>
   </div>
@@ -191,10 +186,12 @@ const tabHeightFn = () => {
 .el-loading-mask {
   background: rgba(0, 0, 0, 0.5) !important;
 }
+
 .content {
   background-color: #fff;
   border-radius: 4px;
   padding-top: 10px;
+
   .btns {
     padding: 0 10px;
   }