Merge remote-tracking branch 'origin/master'

src/layout/components/Sidebar/Logo.vue

@@ -14,7 +14,7 @@
 </template>
 
 <script>
-import logoImg from '@/assets/logo/logo.png'
+import logoImg from '@/assets/logo/lanjv.png'
 import variables from '@/assets/styles/variables.scss'
 
 export default {
@@ -35,7 +35,7 @@ export default {
   },
   data() {
     return {
-      title: '榄菊生产管理系统',
+      title: '管理系统',
       logo: logoImg
     }
   }
@@ -66,7 +66,7 @@ export default {
     width: 100%;
 
     & .sidebar-logo {
-      width: 32px;
+      width: 85px;
       height: 32px;
       vertical-align: middle;
       margin-right: 12px;

src/views/index.vue

@@ -10,7 +10,7 @@
     </el-row>
     <el-row :gutter="20">
       <el-col :sm="24" :lg="12" style="padding-left: 20px">
-        <h2>Open Platform</h2>
+        <h2>榄菊生产管理系统</h2>
         <p>
           <b>当前版本:</b> <span>v{{ version }}</span>
         </p>
@@ -19,33 +19,17 @@
       <el-col :sm="24" :lg="12" style="padding-left: 50px">
         <el-row>
           <el-col :span="12">
-            <h2>技术选型</h2>
+            <h2>管理模块</h2>
           </el-col>
         </el-row>
         <el-row>
           <el-col :span="6">
-            <h4>后端技术</h4>
-            <ul>
-              <li>SpringBoot</li>
-              <li>SpringCloud</li>
-              <li>Nacos</li>
-              <li>Sentinel</li>
-              <li>Seata</li>
-              <li>Minio</li>
-              <li>...</li>
-            </ul>
-          </el-col>
-          <el-col :span="6">
-            <h4>前端技术</h4>
-            <ul>
-              <li>Vue</li>
-              <li>Vuex</li>
-              <li>Element-ui</li>
-              <li>Axios</li>
-              <li>Echarts</li>
-              <li>Quill</li>
-              <li>...</li>
-            </ul>
+            <h3>1.计划管理</h3>
+            <h3>2.工艺管理</h3>
+            <h3>3.MES管理</h3>
+            <h3>4.WMS管理</h3>
+            <h3>5.基础数据管理</h3>
+            <h3>6.系统服务管理</h3>
           </el-col>
         </el-row>
       </el-col>