Browse Source

Merge branch 'test' of http://39.106.184.70:3000/ctop/adsp-vue into test

zhuxinbo 5 years ago
parent
commit
be41531216
2 changed files with 841 additions and 891 deletions
  1. 19 15
      src/views/modules/headerLibrary/index.vue
  2. 822 876
      src/views/modules/material/excellentMaterial.vue

+ 19 - 15
src/views/modules/headerLibrary/index.vue

@@ -1,15 +1,16 @@
 <style lang="scss" scoped>
-.search-box p {
-  display: inline-block;
-  border: 1px solid #f2f2f2;
-  border-radius: 5px;
-  margin-right: 10px;
-  padding: 5px 10px;
-  cursor: pointer;
-}
-#office-iframe {
-  height: 800px;
-}
+  .search-box p {
+    display: inline-block;
+    border: 1px solid #f2f2f2;
+    border-radius: 5px;
+    margin-right: 10px;
+    padding: 5px 10px;
+    cursor: pointer;
+  }
+
+  #office-iframe {
+    height: 800px;
+  }
 </style>
 <template>
   <a-row :gutter="10">
@@ -64,10 +65,13 @@
 </template>
 
 <script>
-import { getAction, postAction } from '@/api/manage'
-import moment from 'moment'
-import $ from 'jquery'
-import qs from 'qs'
+  import {
+    getAction,
+    postAction
+  } from '@/api/manage'
+  import moment from 'moment'
+  import $ from 'jquery'
+  import qs from 'qs'
 
 export default {
   name: 'online-training-list',

File diff suppressed because it is too large
+ 822 - 876
src/views/modules/material/excellentMaterial.vue