Merge branch 'master' of http://139.196.39.194:9021/chenc/cd-work-flow-web

package.json

@@ -16,6 +16,7 @@
     "@fullcalendar/timegrid": "^5.9.0",
     "@fullcalendar/vue": "^5.9.0",
     "@jeecg/antd-online-214": "^2.1.41",
+    "@jiaminghi/data-view": "^2.10.0",
     "@tinymce/tinymce-vue": "^2.1.0",
     "ant-design-vue": "^1.4.11",
     "apexcharts": "^3.6.5",
@@ -60,6 +61,7 @@
     "html-webpack-plugin": "^4.0.0-beta.11",
     "less": "^3.9.0",
     "less-loader": "^4.1.0",
+    "sass": "^1.54.8",
     "vue-template-compiler": "^2.6.10"
   },
   "eslintConfig": {

src/components/tools/Logo.vue

@@ -14,7 +14,7 @@
       <!-- <img src="~@/assets/logo-cd-left1.png" alt="logo">
       <h1 >OA办公系统</h1>  -->
       <img :src="this.logoUrl" alt="logo">
-      <h1 >{{ dashboard }}</h1> 
+      <!-- <h1 >{{ dashboard }}</h1> -->
     </router-link>
   </div>
 </template>

src/views/account/center/page/App.vue

@@ -10,7 +10,7 @@
             <a-avatar class="card-avatar" slot="avatar" :src="item.avatar" size="small"/>
             <div class="meta-cardInfo" slot="description">
               <div>
-                <p>活跃用户</p>
+                <p>活跃用户测试</p>
                 <p>
                   <span>{{ item.activeUser }}<span>万</span></span>
                 </p>