Browse Source

Merge branch 'test' of http://192.168.2.236:10080/zhouna/platformFront into test

reaper 4 years ago
parent
commit
a91bde6870

+ 12 - 3
src/components/common/HomePage.vue

@@ -28,7 +28,8 @@
         </p>
       </div>
     </el-aside>
-    <img src="../../images/icon-collect.png" class="collect" @click="collect" />
+    <img src="../../images/icon-collect-right.png" v-show="!onshow" class="collect" @click="collect" />
+    <img src="../../images/icon-collect-left.png" v-show="onshow" class="collect-left" @click="collect" />
     <el-container>
       <el-header class="clearfix">
         <div class="title fl">
@@ -234,13 +235,21 @@ export default {
 <style lang="less">
 @import '../../less/common.less';
 .collect {
-  width: 106px;
-  height: 60px;
+  width: 36px;
+  height: 32px;
   position: fixed;
   left: 0;
   top: 70%;
   z-index: 20;
 }
+.collect-left{
+  width: 36px;
+  height: 32px;
+  position: fixed;
+  left:calc(20% - 36px); 
+  top: 65%;
+  z-index: 20;
+}
 .user .el-menu-item.is-active {
   color: @userBase;
 }

File diff suppressed because it is too large
+ 596 - 395
src/components/knowledgeExtra/AddDiagBase.vue


BIN
src/images/icon-collect-left.png


BIN
src/images/icon-collect-right.png


BIN
src/images/icon-collect.png