Jelajahi Sumber

25.PC端兼容小pad√

Changpeng Duan 5 tahun lalu
induk
melakukan
df742e5656

+ 71 - 13
pc/src/assets/css/panel.css

@@ -308,7 +308,7 @@
     margin-right: 0;
 }
 
-.el-transfer-panel__item.el-checkbox .el-checkbox__label span{
+.el-transfer-panel__item.el-checkbox .el-checkbox__label span {
     /*width: 50%;*/
     text-align: left;
 }
@@ -357,42 +357,100 @@ input::-webkit-inner-spin-button {
 input[type="number"] {
     -moz-appearance: textfield;
 }
+
 /*ipad only*/
-@media only screen and (max-width: 1366px) {
+@media (min-width: 1025px) and (max-width: 1366px) {
     .panel .panel_control em {
         font-size: 12px;
         width: 60px;
     }
+
     .panel /deep/ .el-input__inner {
         /*width: 130px;*/
     }
+
     .panel /deep/ .el-date-editor--daterange {
         width: 100%;
     }
+
     .panel /deep/ .el-date-editor .el-range-separator {
         width: 20px;
         padding: 0;
     }
+
     .panel /deep/ .el-input__inner {
-        padding-right:3px;
+        padding-right: 3px;
     }
+
     .panel .el-date-editor .el-range-input {
         width: 44%;
     }
+
     .panel /deep/ .el-col-4 {
-        padding-left: 1px!important;
-        padding-right: 1px!important;
+        padding-left: 1px !important;
+        padding-right: 1px !important;
     }
 }
-  .el-checkbox-group  .el-checkbox:last-of-type {
+
+.el-checkbox-group .el-checkbox:last-of-type {
     margin-right: 30px;
 }
-  table .el-radio {
-      width: 20px;
-      overflow: hidden;
-      display: block;
-      margin: 0 auto;
-      float: none;
 
-  }
+table .el-radio {
+    width: 20px;
+    overflow: hidden;
+    display: block;
+    margin: 0 auto;
+    float: none;
+
+}
+
+@media (min-width: 960px) and (max-width: 1024px) {
+    .el-main > .context {
+        padding-bottom: 60px!important;
+    }
+    .panel .panel_control em {
+        font-size: 12px;
+        width: 60px;
+    }
+
+    .panel /deep/ .el-input__inner {
+        /*width: 130px;*/
+    }
+
+    .panel /deep/ .el-date-editor--daterange {
+        width: 100%;
+    }
+
+    .panel /deep/ .el-date-editor .el-range-separator {
+        width: 20px;
+        padding: 0;
+    }
+
+    .panel /deep/ .el-input__inner {
+        padding-right: 3px;
+    }
+
+    .panel .el-date-editor .el-range-input {
+        width: 44%;
+    }
+
+    .panel /deep/ .el-col-4 {
+        padding-left: 1px !important;
+        padding-right: 1px !important;
+    }
+    .el-checkbox-group .el-checkbox:last-of-type {
+        margin-right: 30px;
+    }
+
+    table .el-radio {
+        width: 20px;
+        overflow: hidden;
+        display: block;
+        margin: 0 auto;
+        float: none;
+
+    }
+
+}
 

+ 44 - 1
pc/src/components/Navside.vue

@@ -292,7 +292,7 @@
     }
 
     /*ipad only*/
-    @media only screen and (max-width: 1366px) {
+    @media(min-width:1025px) and (max-width: 1366px){
         .userContainer {
             width: 80%;
         }
@@ -337,4 +337,47 @@
             height: 40px;
         }
     }
+    @media(min-width:960px) and (max-width: 1024px){
+        .el-container.is-vertical {
+            left: 60px;
+        }
+        .el-menu-item span {
+            text-align: left;
+            float: left;
+            margin-left: 5px;
+            line-height: 20px;
+            font-size: 12px;
+        }
+        .el-menu-item i {
+            left: 20px;
+            padding: 0;
+            margin: 0;
+            float: left;
+            line-height: 20px;
+        }
+        .userContainer em {
+            width: 100%;
+            overflow: hidden;
+            display: block;
+            margin: 0 auto;
+            font-size: 12px;
+        }
+        .el-menu-item {
+            padding: 0 !important;
+            margin: 0;
+        }
+
+        /deep/ .el-tooltip {
+            padding: 0 !important;
+        }
+
+        .userContainer span {
+            font-size: 12px;
+        }
+
+        .el-menu-item, .el-submenu__title {
+            height: 40px;
+        }
+    }
+
 </style>

+ 258 - 175
pc/src/views/Index.vue

@@ -1,185 +1,268 @@
 <template>
-  <div class="IndexContainer">
-    <el-container>
-      <el-aside :class="[{'shortElaside':isCollapse},{'lognElaside':!isCollapse}]">
-        <Navside :isCollapse="isCollapse"></Navside>
-      </el-aside>
-      <el-container>
-        <el-header>
-          <Headside @lefthide="left_hide"></Headside>
-        </el-header>
-        <el-main>
-          <keep-alive>
-            <router-view></router-view>
-          </keep-alive>
-        </el-main>
-        <el-footer v-if="true"><p class="footer">济南佰意兴网络科技有限公司提供技术支持</p></el-footer>
-      </el-container>
-    </el-container>
-  </div>
+    <div class="IndexContainer">
+        <el-container>
+            <el-aside :class="[{'shortElaside':isCollapse},{'lognElaside':!isCollapse}]">
+                <Navside :isCollapse="isCollapse"></Navside>
+            </el-aside>
+            <el-container>
+                <el-header>
+                    <Headside @lefthide="left_hide"></Headside>
+                </el-header>
+                <el-main>
+                    <keep-alive>
+                        <router-view></router-view>
+                    </keep-alive>
+                </el-main>
+                <el-footer v-if="true"><p class="footer">济南佰意兴网络科技有限公司提供技术支持</p></el-footer>
+            </el-container>
+        </el-container>
+    </div>
 </template>
 
 <script>
-// @ is an alias to /src
-import Headside from '@/components/Headside.vue'
-import Navside from '@/components/Navside.vue'
-import Navs from '../api/Navs';
-
-export default {
-  name: 'Home',
-  data() {
-    return {
-      isCollapse: document.body.clientWidth < 1366,
-      aSideState: false,
-      thisClick: 0,
-      tabwildState: 1,
-      navs: Navs,
-      handleTabsList: [{
-        title: '系统首页',
-        name: '1',
-        clmurl: '/',
-      }],
-      editableTabsValue: '1'
-    }
-  },
-  mounted() {
-    // checkScreen
-    if (document.body.clientWidth < 1024) {
-      this.$message.warning('请横屏使用本系统');
+    // @ is an alias to /src
+    import Headside from '@/components/Headside.vue'
+    import Navside from '@/components/Navside.vue'
+    import Navs from '../api/Navs';
+
+    export default {
+        name: 'Home',
+        data() {
+            return {
+                isCollapse: document.body.clientWidth < 1366,
+                aSideState: false,
+                thisClick: 0,
+                tabwildState: 1,
+                navs: Navs,
+                handleTabsList: [{
+                    title: '系统首页',
+                    name: '1',
+                    clmurl: '/',
+                }],
+                editableTabsValue: '1'
+            }
+        },
+        mounted() {
+            // checkScreen
+            console.log(this.isCollapse);
+            if (document.body.clientWidth < 1366) {
+                this.$message.warning('请横屏使用本系统');
+            }
+        },
+        methods: {
+            left_hide() {
+                this.aSideState = !this.aSideState;
+                this.isCollapse = !this.isCollapse;
+            },
+        },
+        components: {
+            Headside,
+            Navside
+        }
     }
-  },
-  methods: {
-    left_hide() {
-      this.aSideState = !this.aSideState;
-      this.isCollapse = !this.isCollapse;
-    },
-  },
-  components: {
-    Headside,
-    Navside
-  }
-}
 </script>
 
 <!-- Add "scoped" attribute to limit CSS to this component only -->
 <style>
-.el-header {
-  padding: 0 !important;
-  height: 72px !important;
-}
-
-.shortElaside {
-  width: 140px !important;
-  overflow: hidden;
-  height: 100%;
-  float: left;
-}
-
-.lognElaside {
-  width: 256px !important;
-  overflow: hidden;
-  height: 100%;
-  float: left;
-}
-
-/deep/ .nav {
-  width: 60px;
-}
-
-.IndexContainer {
-  position: absolute;
-  top: 0;
-  bottom: 0;
-  left: 0;
-  right: 0;
-  background: #F0F2F5;
-}
-
-.IndexContainer > .el-container {
-  width: 100%;
-  height: 100%;
-  overflow: hidden;
-  display: block;
-  margin: 0 auto;
-}
-
-.footer {
-  position: absolute;
-  bottom: 0px;
-  width: 100%;
-  padding: 10px;
-  overflow: hidden;
-  display: block;
-  margin: 0 auto;
-  text-align: center;
-  text-indent: -30%;
-  font-size: 12px;
-  color: #BDBDBD;
-  background: #F0F2F5;
-  z-index: 222;
-}
-
-.el-main {
-  width: 100%;
-  height: 100%;
-  /*min-height: 800px;*/
-  overflow: hidden;
-  display: block;
-  margin: 0 auto;
-  overflow-y: hidden;
-  padding: 10px 20px;
-}
-
-/*ipad only*/
-@media only screen and (max-width: 1366px) {
-  .lognElaside {
-    width: 70px!important;
-  }
-  .logoContainer img {
-    display: none!important;
-  }
-  .el-main {
-    padding: 3px!important;
-    overflow-y: scroll;
-  }
-  .el-main > .context {
-    /*height: 640px;*/
-    /*overflow-y: scroll;*/
-    padding: 6px!important;
-  }
-  .table {
-    /*width: 950px;*/
-    /*overflow-x: scroll;*/
-  }
-  .el-dialog {
-    max-width: 960px;
-  }
-  .el-dialog__body {
-    padding: 3px;
-  }
-  .el-transfer__buttons {
-    width: 60px;
-    padding: 3px;
-  }
-  .el-transfer .el-button + .el-button {
-    float: right;
-  }
-  .el-container.is-vertical {
-    position: absolute;
-    left: 140px;
-    top: 0;
-    right: 0;
-    bottom: 0;
-    height: 100%;
-  }
-  .context {
-    border-radius: 12px;
-    height: 823px!important;
-    overflow-y: scroll;
-  }
-  .el-dialog {
-    padding: 5px;
-    padding-bottom: 15px;
-  }
-}
+    .el-header {
+        padding: 0 !important;
+        height: 72px !important;
+    }
+
+
+    .lognElaside {
+        width: 256px !important;
+        overflow: hidden;
+        height: 100%;
+        float: left;
+    }
+
+    /deep/ .nav {
+        width: 60px;
+    }
+
+    .IndexContainer {
+        position: absolute;
+        top: 0;
+        bottom: 0;
+        left: 0;
+        right: 0;
+        background: #F0F2F5;
+    }
+
+    .IndexContainer > .el-container {
+        width: 100%;
+        height: 100%;
+        overflow: hidden;
+        display: block;
+        margin: 0 auto;
+    }
+
+    .footer {
+        position: absolute;
+        bottom: 0px;
+        width: 100%;
+        padding: 10px;
+        overflow: hidden;
+        display: block;
+        margin: 0 auto;
+        text-align: center;
+        text-indent: -30%;
+        font-size: 12px;
+        color: #BDBDBD;
+        background: #F0F2F5;
+        z-index: 222;
+    }
+
+    .el-main {
+        width: 100%;
+        height: 100%;
+        /*min-height: 800px;*/
+        overflow: hidden;
+        display: block;
+        margin: 0 auto;
+        overflow-y: hidden;
+        padding: 10px 20px;
+    }
+
+    /*ipad only*/
+    @media (min-width: 1025px) and (max-width: 1366px) {
+        .shortElaside {
+            width: 140px !important;
+            /*width: 60px !important;*/
+            overflow: hidden;
+            height: 100%;
+            float: left;
+        }
+
+        .lognElaside {
+            width: 70px !important;
+        }
+
+        .logoContainer img {
+            display: none !important;
+        }
+
+        .el-main {
+            position: absolute;
+            top: 70px;
+            bottom: 20px;
+            padding: 3px;
+            padding-bottom: 60px;
+            overflow-y: scroll;
+        }
+
+        .el-main > .context {
+            /*height: 640px;*/
+            /*overflow-y: scroll;*/
+            padding: 6px !important;
+        }
+
+        .table {
+            /*width: 950px;*/
+            /*overflow-x: scroll;*/
+        }
+
+        .el-dialog {
+            max-width: 960px;
+        }
+
+        .el-dialog__body {
+            padding: 3px;
+        }
+
+        .el-transfer__buttons {
+            width: 60px;
+            padding: 3px;
+        }
+
+        .el-transfer .el-button + .el-button {
+            float: right;
+        }
+
+        .el-container.is-vertical {
+            position: absolute;
+            left: 140px;
+            top: 0;
+            right: 0;
+            bottom: 0;
+            height: 100%;
+        }
+
+        .context {
+            border-radius: 12px;
+            height: 823px !important;
+            overflow-y: scroll;
+        }
+
+        .el-dialog {
+            padding: 5px;
+            padding-bottom: 15px;
+        }
+    }
+
+    @media (min-width: 960px) and (max-width: 1024px) {
+        .shortElaside {
+            /*width: 140px !important;*/
+            width: 60px !important;
+            overflow: hidden;
+            height: 100%;
+            float: left;
+        }
+
+        .el-container.is-vertical {
+            left: 60px;
+        }
+
+        .el-transfer__buttons {
+            width: 20px;
+            padding: 3px;
+        }
+        .el-transfer .el-button + .el-button {
+            float: right;
+        }
+
+        .context {
+            border-radius: 12px;
+            height: 823px !important;
+            overflow-y: scroll;
+        }
+
+        .el-dialog {
+            padding: 5px;
+            padding-bottom: 15px;
+        }
+
+        .lognElaside {
+            width: 70px !important;
+        }
+
+        .logoContainer img {
+            display: none !important;
+        }
+
+        .el-main {
+            position: absolute;
+            top: 70px;
+            bottom: 20px;
+            padding: 3px;
+            padding-bottom: 60px;
+            overflow-y: scroll;
+        }
+
+        .el-main > .context {
+            /*height: 640px;*/
+            /*overflow-y: scroll;*/
+            padding: 6px !important;
+        }
+
+        .table {
+            /*width: 950px;*/
+            /*overflow-x: scroll;*/
+        }
+
+        .el-dialog {
+            max-width: 960px;
+        }
+    }
 </style>

+ 1 - 1
pc/src/views/Main.vue

@@ -1040,7 +1040,7 @@
     /*ipad only*/
     @media only screen and (max-width: 1366px) {
         .container {
-            height: 600px;
+            /*height: 600px;*/
             padding-top: 6px;
         }
 

+ 5 - 5
pc/src/views/courseEdit.vue

@@ -54,7 +54,7 @@
                 <el-table-column
                         prop="head"
                         label="头像"
-                        width="90"
+                        width="75"
                         align="center"
                         sortable
                 >
@@ -90,7 +90,7 @@
                 <el-table-column
                         prop="ClassName"
                         label="课程"
-                        width="140"
+                        width="110"
                         sortable
                 >
                     <template slot-scope="scope">
@@ -107,8 +107,8 @@
                 </el-table-column>
                 <el-table-column
                         prop="RemainTotalhour"
-                        label="剩余全部课时"
-                        width="140"
+                        label="剩余课时"
+                        width="110"
                         sortable
                 >
                 </el-table-column>
@@ -162,7 +162,7 @@
                 <el-table-column
                         prop="Status"
                         label="状态"
-                        width="140"
+                        width="110"
                         sortable
                 >
                     <template slot-scope="scope">

+ 4 - 4
pc/src/views/courses.vue

@@ -10,6 +10,7 @@
             <div class="panel-body">
                 <div class="panel_control">
                     <el-row :gutter="20">
+                        <el-col :span="6">
                         <el-date-picker
                                 v-model="panel.timeScope"
                                 type="daterange"
@@ -17,6 +18,7 @@
                                 start-placeholder="开始日期"
                                 end-placeholder="结束日期">
                         </el-date-picker>
+                        </el-col>
                         <el-col :span="4">
                             <el-button size="" type="primary" @click="query" :disabled="serachBtnStatus" plain>查询
                             </el-button>
@@ -48,7 +50,6 @@
                         prop="BeginTime"
                         label="上课时间"
                         :formatter="filterFmtDate"
-                        width="180"
                 >
                 </el-table-column>
                 <el-table-column
@@ -70,8 +71,8 @@
                 </el-table-column>
                 <el-table-column
                         prop="OrderNum"
-                        label="实际预约人数"
-                        width="130"
+                        label="实际预约"
+                        width="110"
                         sortable
                 >
                 </el-table-column>
@@ -85,7 +86,6 @@
                 <el-table-column
                         prop="ClassType"
                         label="课程类型"
-                        width="110"
                         sortable
                 >
                     <template slot-scope="scope">

+ 1 - 1
tv/README.md

@@ -97,6 +97,7 @@ https://segmentfault.com/a/1190000021281307
 7. 测试在线升级√
 24.管理端预约查询,没有按照时间范围搜索√  
 28.空课不允许管理端提交√ 
+25.PC端兼容小pad√ 
 
 1. 月、周卡路里总计火焰字体
 2. 私有心率带角标
@@ -111,7 +112,6 @@ https://segmentfault.com/a/1190000021281307
 25.PC端兼容小pad
 26.PK红色的圈太粗糙
 27.pk4人的时候充分利用布局
-
 29首页界面和内页都给课程增加关课按钮