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

src/views/main_web/workspace.vue

@@ -621,7 +621,7 @@
                       class="yiyunwenjian_name"
                       :title="foldergroup.folderGroupName"
                     >{{ foldergroup.folderGroupName}}</strong>
-                    <strong class="visontext">{{foldergroup.childCount}}个项目</strong>
+                    <strong class="visontext">{{foldergroup.childrenTotalCount}}个项目</strong>
                   </div>
                 </draggable>
                 <!-- zxm修改托拽 end -->
@@ -2132,7 +2132,7 @@ export default {
       dialogNewSuperMapVisible: false,
       newSuperMap: { showName: "", description: "" },
       mapAddress: "北京天安门",
-      isClient: true, // 是否是客户端
+      isClient: false, // 是否是客户端
 
       /**新建文件分组 start*/
       dialogNewFolderGroup: false, //新建文件分组组弹窗
@@ -5999,7 +5999,7 @@ export default {
       var thisApp = this;
       var sourceData = evt.draggedContext.element;
       var targetData = evt.relatedContext.element;
-      if (targetData.folderGroupID == "myFile" || targetData.folderGroupID == "myComFile") {
+      if (!targetData && (targetData.folderGroupID == "myFile" || targetData.folderGroupID == "myComFile")){
         targetData.folderID = this.nowFolder.folderID;
       }
       var draggableData = {};