Merge branch 'master' of http://192.168.5.34:10101/r/YiYunJianZhuBeta

config/prod.env.js

@@ -6,9 +6,9 @@ module.exports = {
 
   // OFFICE_WEB:'"https://office.tszcloud.com"',
   // API_HOST: '"https://bapi.tszcloud.com/api/"',
-  IS_CLIENT: false,
-
-  // OFFICE_WEB: '"https://office.tszcloud.com"'
+  IS_CLIENT: true,
+  OFFICE_WEB: '"http://192.168.5.25"',
   API_HOST:'"http://192.168.5.32:9003/api/"',
+  // API_HOST:'"http://10.240.5.189:9003/api/"',  // 王静内网
 
 }

src/views/main_web/recycle.vue

@@ -85,7 +85,7 @@
                   <strong class="yiyunwenjian_name" >
                     {{foldergroup.folderGroupName}}
                   </strong>
-                  <strong class="yiyunwenjian_name">{{foldergroup.childCount}}个项目</strong>
+                  <!-- <strong class="yiyunwenjian_name">{{foldergroup.childCount}}个项目</strong> -->
                 </div>
                 <!--删除的文件分组 end-->
             </div>

src/views/main_web/workspace.vue

@@ -2277,6 +2277,8 @@ export default {
     this.listFolders();
     this.updateProjUser();
     window.addEventListener("resize", this.listenBottomHeight, true);
+    //添加鼠标移入齿轮事件
+    window.addEventListener("mouseenter", this.setIconMouseEnter, true);
   },
   computed: {
     /**
@@ -2319,6 +2321,17 @@ export default {
         this.showadow = false
       }
     },
+    /**
+     * 鼠标移上齿轮设置事件
+     */
+    setIconMouseEnter:function(){
+      //工作文件下 指定显示某些菜单项
+      if (this.currentPageType == 1) {
+        this.isShowMenuFile = true;
+      } else {
+        this.isShowMenuFile = false;
+      }
+    },
     /**
      * 刷新页面
      */
@@ -2863,6 +2876,7 @@ export default {
      */
     setFileStatusSure(){
       var thisApp=this;
+      // null 判断
       if(thisApp.setFile.alias == "")
       {
         this.$notify({
@@ -6100,6 +6114,9 @@ export default {
             });
           }
           thisApp.refreshPages();
+          thisApp.$router.push({
+            name: "workspace"
+          });
         })
         .catch(error => {
           console.log(error);
@@ -6155,6 +6172,7 @@ export default {
   destroyed: function() {
     window.removeEventListener("scroll", this.onscroll);
     window.removeEventListener("resize", this.listenBottomHeight);
+    window.removeEventListener("mouseenter", this.setIconMouseEnter);
     clearInterval(this.timer);
   },
   components: {