首页更新

package.json

@@ -13,6 +13,7 @@
     "@quasar/extras": "^1.0.0",
     "@riophae/vue-treeselect": "^0.4.0",
     "ali-oss": "^6.12.0",
+    "apexcharts": "^3.32.0",
     "axios": "^0.18.1",
     "benz-amr-recorder": "^1.1.3",
     "browser-md5-file": "^1.0.0",
@@ -34,6 +35,7 @@
     "relation-graph": "^1.0.8",
     "v-viewer": "^1.5.1",
     "vue-amap": "^0.5.10",
+    "vue-apexcharts": "^1.6.2",
     "vue-draggable-resizable": "^1.7.2",
     "vue-easytable": "^1.7.2",
     "vue-i18n": "^8.0.0",

src/App.vue

@@ -21,6 +21,18 @@ export default {
 
 <style>
 @import url("//at.alicdn.com/t/font_2077629_70it4rlfqmf.css");
+@font-face{
+    font-family: 'din';
+    src: url('./assets/font/DIN-Bold.otf') format('opentype');
+    font-weight: normal;
+    font-style: normal;
+}
+.border-radius{
+  border-radius: 5px;
+}
+.din{
+    font-family: din !important;
+}
 .q-scrollarea__thumb {
   z-index: 999999 !important;
 }

src/assets/css/font.css

@@ -5,4 +5,4 @@
 @font-face {
     font-family: 'pingfang';
     src: url('../font/PingFang2.ttf');
-}
\ No newline at end of file
+}

src/css/quasar.variables.sass

@@ -23,4 +23,10 @@ $negative  : #f5576c
 $info      : #31CCEC
 $warning   : #F2C037
 $infobg    : #eeeeee
-$infotwo   : #1296db
\ No newline at end of file
+$infotwo   : #1296db
+$applegrey : #AFB0B5 !default
+
+.text-applegrey
+    color: $applegrey !important
+.bg-applegrey
+    background: $applegrey !important
\ No newline at end of file

src/pages/Work.vue

@@ -7,6 +7,7 @@
           <el-tab-pane :label="item.label" :name="item.value" :key="item.value" v-for="(item, index) in options"></el-tab-pane>
         </el-tabs>
       </div> -->
+      <q-btn flat @click="changeMenu(5)" :color="chosenMenu==5?'primary':'blue-grey-14'" :class="[chosenMenu==5?'text-weight-bold':'']" label="工作台"></q-btn>
       <q-btn @click="changeMenu(1)"  flat :color="chosenMenu==1?'primary':'blue-grey-14'" :class="[chosenMenu==1?'text-weight-bold':'']" label="OKR 工作区">
         <q-menu v-if="chosenMenu==1">
           <q-list>
@@ -32,12 +33,15 @@
           </q-list>
         </q-menu>
       </q-btn>
-      <!-- <q-btn @click="changeMenu(2)"  v-if="AccountType==2 || ispower==true" flat :color="chosenMenu==2?'primary':'blue-grey-14'" :class="[chosenMenu==2?'text-weight-bold':'']" label="备课管理"> -->
-      </q-btn>
+      <!-- <q-btn @click="changeMenu(2)"  v-if="AccountType==2 || ispower==true" flat :color="chosenMenu==2?'primary':'blue-grey-14'" :class="[chosenMenu==2?'text-weight-bold':'']" label="备课管理"> 
+      </q-btn>-->
       <q-btn flat @click="changeMenu(3)" :color="chosenMenu==3?'primary':'blue-grey-14'" :class="[chosenMenu==3?'text-weight-bold':'']" label="我的排班计划"></q-btn>
       <q-btn flat @click="changeMenu(4)" v-if="AccountType==2" :color="chosenMenu==4?'primary':'blue-grey-14'" :class="[chosenMenu==4?'text-weight-bold':'']" label="我的上课计划"></q-btn>
 
     </div>
+    <div class="bg-white col" v-if="chosenMenu==5">
+      <work></work>
+    </div>
     <div v-if="chosenMenu==1" class="flex col" style="flex: 1">
       <okr v-if="okrMenu==1"></okr>
       <align-view v-if="okrMenu==2"></align-view>
@@ -73,6 +77,7 @@
   import noticeForm from '../components/course/notice-form'
   import mySchedule from './scheduling/mySchedule'
   import myClassmate from './scheduling/myClassmate';
+  import work from '../components/work/index'
 
   export default {
     components:{
@@ -81,7 +86,8 @@
       alignView,
       noticeForm,
       mySchedule,
-      myClassmate
+      myClassmate,
+      work
     },
     name: 'PageIndex',
     data(){
@@ -93,7 +99,7 @@
         model: 'one',
         AccountType:1,
         ispower:false,//是否显示备课管理
-        chosenMenu:1,
+        chosenMenu:5,
         okrMenu:1,
 
         //通知请求参数