调整

src/pages/components/cardWarp.vue

@@ -2,6 +2,8 @@
 .card-warp
     .card-header(:style="{height,'line-height':height}" :class=" showBackground ? 'bg' : '' ")
         span.card-title {{ title }}
+            div(style='margin-left:20px;')
+                slot(name="left" )
         slot(name="right")
     .card-content
         slot(name="content")

src/pages/sys/road/index.vue

 <template lang="pug">
   el-container(style="padding:0px;height:77.6vh;")
-    el-header( style="height:42px;line-height:42px;background: #f4f4f4;z-index:1001;border: 1px solid rgba(195, 195, 195, 1);" )
-      span.title-bold.title-left-color 站点维护
-    el-main.box_main
-      el-card()
+
+    card-warp(title="站点维护", height="45px")
+      div(slot='content')
+        div
           el-form(:model='dataForm', :rules='dataRule', ref='dataForm',  label-width='100px')
               el-row(:gutter='20')
                   el-col(:span='12')
@@ -53,7 +53,7 @@ import Vue from 'vue'
 
 export default {
   computed: {
-    ...mapState('d2admin/user', ['info']),
+    ...mapState('d2admin/user', ['info'])
   },
   data() {
     let validateNumber = (rule, value, callback) => {
@@ -78,11 +78,11 @@ export default {
       logo: 'this.src="' + require('../../../assets/images/videoImg.png') + '"',
       typeList: [
         { id: '1', name: '正线站点' },
-        { id: '2', name: '换乘站点' },
+        { id: '2', name: '换乘站点' }
       ],
       masterList: [
         { id: 1, name: '主站' },
-        { id: 2, name: '从站' },
+        { id: 2, name: '从站' }
       ],
       dataForm: {},
       dataRule: {
@@ -93,15 +93,15 @@ export default {
         orderNum: [
           { required: true, message: '排序值不能为空' },
           { type: 'number', message: '排序值必须为数字' },
-          { validator: validateNumber, trigger: ['blur', 'change'] },
+          { validator: validateNumber, trigger: ['blur', 'change'] }
         ],
         shortName: [
           {
             min: 1,
             max: 20,
             message: '长度在 1 到 20 个字符',
-            trigger: 'blur',
-          },
+            trigger: 'blur'
+          }
         ],
         code: [
           { required: true, message: '车站编码不能为空', trigger: 'blur' },
@@ -109,21 +109,21 @@ export default {
             min: 1,
             max: 30,
             message: '长度在 1 到 30 个字符',
-            trigger: 'blur',
-          },
+            trigger: 'blur'
+          }
         ],
         type: [
-          { required: true, message: '车站类型不能为空', trigger: 'blur' },
+          { required: true, message: '车站类型不能为空', trigger: 'blur' }
         ],
         remark: [
           {
             min: 1,
             max: 300,
             message: '长度在 1 到 300 个字符',
-            trigger: 'blur',
-          },
-        ],
-      },
+            trigger: 'blur'
+          }
+        ]
+      }
     }
   },
   created() {
@@ -135,7 +135,7 @@ export default {
       this.$http({
         url: this.$http.adornUrl(`/liStation/getId/${id}`),
         method: 'get',
-        params: this.$http.adornParams(),
+        params: this.$http.adornParams()
       }).then((data) => {
         if (data && data.code === 0) {
           this.dataForm = data.bean
@@ -149,11 +149,11 @@ export default {
     initData() {
       this.typeList = [
         { id: '1', name: '正线站点' },
-        { id: '2', name: '换乘站点' },
+        { id: '2', name: '换乘站点' }
       ]
       this.masterList = [
         { id: 1, name: '主站' },
-        { id: 2, name: '从站' },
+        { id: 2, name: '从站' }
       ]
     },
     // 表单提交
@@ -189,13 +189,13 @@ export default {
             ),
             method: 'post',
             // headers: { 'Content-Type': 'application/x-www-form-urlencoded' },
-            data: this.dataForm,
+            data: this.dataForm
           }).then((data) => {
             if (data && data.code === 0) {
               this.$message({
                 message: '操作成功',
                 type: 'success',
-                duration: 1500,
+                duration: 1500
               })
             } else {
               this.$message.error(data.msg)
@@ -237,7 +237,7 @@ export default {
         this.$http({
           url: this.$http.adornUrl(`/liStationMap/uploadFile`),
           method: 'post',
-          data: fd,
+          data: fd
         }).then((data) => {
           if (data && data.code === 0) {
             this.currentRow = data.bean
@@ -281,13 +281,13 @@ export default {
         confirmButtonText: '确定',
         cancelButtonText: '取消',
         type: 'warning',
-        closeOnClickModal: true,
+        closeOnClickModal: true
       })
         .then(() => {
           this.$http({
             url: this.$http.adornUrl('/liStationMap/delete'),
             method: 'post',
-            data: this.$http.adornData(ids, false),
+            data: this.$http.adornData(ids, false)
           }).then((data) => {
             if (data && data.code === 0) {
               this.$message({
@@ -296,7 +296,7 @@ export default {
                 duration: 1500,
                 onClose: () => {
                   this.fileList.splice(index, 1)
-                },
+                }
               })
             } else {
               this.$message.error(data.msg)
@@ -334,8 +334,8 @@ export default {
         this.$message.error('上传图片大小不能超过10MB!')
       }
       return isJPG && isLt2M
-    },
-  },
+    }
+  }
 }
 </script>
 <style lang="scss" scoped>

src/pages/sys/role/index.vue

@@ -13,12 +13,14 @@
             el-button(v-if="isAuth('sys:role:update')" plain type='primary' size='mini'  @click="addOrUpdateHandle(item)") 编辑
             el-button(v-if="isAuth('sys:role:delete')" plain type='primary' size='mini' style="margin-left:10px;" @click="delRole(item.roleId)") 删除
     el-container(style="height:77vh")
-      el-header(style='height:42px;line-height:42px;background: #f4f4f4;z-index:1001;border:1px solid rgba(196, 196, 196, 1);')
-        template()
-          span.title-bold.title-left-color  {{roleName ? roleName : '权限详情'}} 
+      //- el-header(style='height:42px;line-height:42px;background: #f4f4f4;z-index:1001;border:1px solid rgba(196, 196, 196, 1);')
+      //-   template()
+      //-     span.title-bold.title-left-color  {{roleName ? roleName : '权限详情'}} 
+      card-warp(:title="roleName ? roleName: '权限详情'", height="45px")
+        div(slot="left")
           el-checkbox(v-model="checked" @change="checkAll(videoData)") 全选
-      el-main().box_main
-        el-card.tableCard( style='overflow:auto;box-sizing:border-box;' v-loading.fullscreen.lock="rightLoading")
+        div(slot='content')
+          div.tableCard( style='overflow:auto;box-sizing:border-box;' v-loading.fullscreen.lock="rightLoading")
             div(v-loading="rightLoading1" class='div_tree')
               //- el-tree(ref="tree"   @check-change="handleNodeClick" :render-content="renderContent"  @node-expand="handleNodeExpand" :default-expanded-keys="expandedKeys" :props="defaultProps" :data="videoData" show-checkbox node-key="menu_id")
               //- 树结构