|
@@ -1,15 +1,50 @@
|
|
|
#切换git库的目录地址
|
|
#切换git库的目录地址
|
|
|
-
|
|
|
|
|
|
|
+-- ------------------------
|
|
|
git remote remove origin
|
|
git remote remove origin
|
|
|
git remote add origin http://code.dashoo.cn/dashoo/labsop_base.git
|
|
git remote add origin http://code.dashoo.cn/dashoo/labsop_base.git
|
|
|
git push --set-upstream origin master
|
|
git push --set-upstream origin master
|
|
|
-
|
|
|
|
|
|
|
+-- ------------------------
|
|
|
|
|
|
|
|
#fork 出来的子项目，如何更新
|
|
#fork 出来的子项目，如何更新
|
|
|
-
|
|
|
|
|
|
|
+-- ------------------------
|
|
|
git fetch upstream
|
|
git fetch upstream
|
|
|
git merge upstream/master
|
|
git merge upstream/master
|
|
|
-## git rebase remotes/upstream/master
|
|
|
|
|
|
|
+---- git rebase remotes/upstream/master
|
|
|
|
|
+-- ------------------------
|
|
|
|
|
|
|
|
|
|
|
|
|
#系统不同布局、样式的调整，修改说明:
|
|
#系统不同布局、样式的调整，修改说明:
|
|
|
|
|
+-- -----------------------
|
|
|
|
|
+Variables.scss
|
|
|
|
|
+$main: #2b3b49;
|
|
|
|
|
+$main-darker: #24313c;
|
|
|
|
|
+// $main: #001529;
|
|
|
|
|
+// $main-darker: #002140;
|
|
|
|
|
+
|
|
|
|
|
+$sidebar-width: 10rem;
|
|
|
|
|
+$sidebar-min-width: 2.25rem;
|
|
|
|
|
+// $sidebar-width: 12.5rem; //大港
|
|
|
|
|
+// $sidebar-min-width: 3.5rem;
|
|
|
|
|
+
|
|
|
|
|
+Header.scss
|
|
|
|
|
+padding: 0.5rem;
|
|
|
|
|
+// padding: 0 0;
|
|
|
|
|
+background-color:#2b3b49;
|
|
|
|
|
+// background-color:white;
|
|
|
|
|
+
|
|
|
|
|
+
|
|
|
|
|
+Headbar.vue
|
|
|
|
|
+//大港油田标题
|
|
|
|
|
+<imgsrc="../assets/img/标题2.png"style="height:35px;padding-top:5px;"/>
|
|
|
|
|
+
|
|
|
|
|
+Login.vue
|
|
|
|
|
+首页标题
|
|
|
|
|
+<imgsrc="../assets/img/title_dagang2.png"style="height:50px; margin-top: 20px;margin-left: 100px;">
|
|
|
|
|
+
|
|
|
|
|
+Sidebar.vue
|
|
|
|
|
+
|
|
|
|
|
+.menudiv {
|
|
|
|
|
+position:absolute;background:#2B3B49;font-size: 13px;z-index: 999;color:#F0F0F0
|
|
|
|
|
+}
|
|
|
|
|
+
|
|
|
|
|
+-- -----------------------
|
yuedefeng