huangtao 4 gadi atpakaļ
vecāks
revīzija
5826644e81

+ 6 - 5
src/components/layout/components/AppMain.vue

@@ -3,7 +3,8 @@
     :class="{ 'app-main': true, 'app-main-hasBreadcrumb': isHaveBreadcrumb }"
   >
     <transition name="fade-transform" mode="out-in">
-      <keep-alive :include="cachedViews">
+      <!-- :include="cachedViews" -->
+      <keep-alive>
         <router-view v-if="active" :key="key" />
       </keep-alive>
     </transition>
@@ -27,10 +28,10 @@ export default {
     },
   },
   computed: {
-    cachedViews() {
-      return '';
-      // return this.$store.state.tagsView.cachedViews;
-    },
+    // cachedViews() {
+    //   return '';
+    //   // return this.$store.state.tagsView.cachedViews;
+    // },
     key() {
       return this.$route.fullPath;
     },

+ 1 - 1
src/components/layout/components/Sider.vue

@@ -167,7 +167,7 @@ export default {
   }
   .ant-menu-ul {
     height: calc(100vh - @navTopHight);
-    overflow-y: auto;
+    overflow-y: hidden;
   }
 }
 </style>

+ 21 - 18
src/styles/frame/index.less

@@ -6,23 +6,26 @@ ul  li {
   list-style-type:none;
 }
 
-// /*定义滚动条高宽及背景 高宽分别对应横竖滚动条的尺寸*/
-// ::-webkit-scrollbar {
-//   width: 0;
-//   height: 0;
-//   background-color: #f5f5f5;
-// }
+/*定义滚动条轨道 内阴影+圆角*/
+::-webkit-scrollbar-track {
+  border-radius: 3px;
+  // background-color: rgba(0, 0, 0, 0.1);
+}
 
-// /*定义滚动条轨道 内阴影+圆角*/
-// ::-webkit-scrollbar-track {
-//   -webkit-box-shadow: inset 0 0 1px rgba(0, 0, 0, 0);
-//   border-radius: 0.4rem;
-//   background-color: #f5f5f5;
-// }
+/* 修改的滚动条样式 */
+::-webkit-scrollbar {
+  width: 4px;
+  height: 4px;
+  background-color: #fff;
+}
 
-// /*定义滑块 内阴影+圆角*/
-// ::-webkit-scrollbar-thumb {
-//   border-radius: 0.4rem;
-//   -webkit-box-shadow: inset 0 0 0.25rem rgba(0, 0, 0, 0.3);
-//   background-color: #555;
-// }
+/*定义滚动条滑块 内阴影+圆角*/
+::-webkit-scrollbar-thumb {
+  border-radius: 3px;
+  -webkit-box-shadow: inset 0 0 6px #cccccc;
+  background-color: #cccccc;
+  &:hover{
+    background-color: #777777;
+    // -webkit-box-shadow: 0 0 6px 6px #777777;
+  }
+}

+ 3 - 3
src/views/examQuestionManagement/examQuestionList.vue

@@ -219,21 +219,21 @@ export default {
           id: 2,
           questionCode: 'TradeCode 1',
           questionDescription: '这是一段描述,关于这个应用的描述文字内容',
-          questionType: 'TianKong',
+          questionType: 'DanXuan',
           engineeringWork: 'QiaoSuiGong',
         },
         {
           id: 3,
           questionCode: 'TradeCode 2',
           questionDescription: '这是一段描述,关于这个应用的描述文字内容',
-          questionType: 'TianKong',
+          questionType: 'DuoXuan',
           engineeringWork: 'QiaoSuiGong',
         },
         {
           id: 4,
           questionCode: 'TradeCode 3',
           questionDescription: '这是一段描述,关于这个应用的描述文字内容',
-          questionType: 'TianKong',
+          questionType: 'PanDuan',
           engineeringWork: 'QiaoSuiGong',
         },
         {

+ 1 - 0
src/views/examQuestionManagement/examQusetionCreateSingle.vue

@@ -53,6 +53,7 @@
           <a-date-picker
             @change="onDateChange"
             v-decorator="[
+              'studyDate',
               {
                 rules: [{ required: true, message: 'Please selete date!' }],
               },

+ 2 - 2
src/views/login/index.vue

@@ -61,7 +61,7 @@
 </template>
 
 <script>
-import { PROGRAM_Title } from '@/common/Constant';
+import { PROGRAM_Title, AUTH_TOKEN_FRONT } from '@/common/Constant';
 export default {
   name: 'login',
   props: {},
@@ -91,7 +91,7 @@ export default {
           console.log(values);
           let params = {
             ...values,
-            token: '1111',
+            token: AUTH_TOKEN_FRONT,
           };
           this.httpLoginFun(params);
         }