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

src/views/main_web/workspace.vue

@@ -2059,7 +2059,7 @@ export default {
       dialogNewSuperMapVisible: false,
       newSuperMap: { showName: "", description: "" },
       mapAddress: "北京天安门",
-      isClient: true, // 是否是客户端
+      isClient: false, // 是否是客户端
 
       /**新建文件分组 start*/
       dialogNewFolderGroup: false, //新建文件分组组弹窗
@@ -3685,7 +3685,7 @@ export default {
     clientUpload() {
       if (this.isClient) {
         this.isShowNewFiledialog = false;
-        back.uploadFile(this.listUserFolders[this.nowFolderIndex].folderID);
+        back.uploadFile(this.listUserFolders[this.nowFolderIndex].folderID,sessionStorage.userId);
       }
     },
     /**
@@ -4233,6 +4233,18 @@ export default {
      * 设置历史文件界面
      */
     showFileMilestone: function(file) {
+      if(file.status == 1 && file.modifyUserID != sessionStorage.userId)
+      {
+        this.$notify({
+              title: "温馨提示",
+              message: "其他人编辑中，不能设置历史文件",
+              type: "warning",
+              offset: 100,
+              duration: 5000
+            });
+        return;        
+      }
+
       this.dialogFileHistory = true;
       this.loadFileMilestones(file);
       this.currentArchID = file.archID;
@@ -4275,6 +4287,17 @@ export default {
       if (this.isCreating) {
         return;
       }
+      if(file.status == 1 && file.modifyUserID != sessionStorage.userId)
+      {
+        this.$notify({
+              title: "温馨提示",
+              message: "其他人编辑中，不能设置历史文件",
+              type: "warning",
+              offset: 100,
+              duration: 5000
+            });
+        return;        
+      }
       this.isCreating = true;
       var thisApp = this;
       this.$axios({
@@ -5193,7 +5216,7 @@ export default {
             var file=response.data.data;
             if(this.isClient)
             {
-              thisApp.clientDownLoad(file,1);
+              this.clientDownLoad(file,1);
             }
           } else {
             this.$notify({

static/css/main.css

@@ -7506,7 +7506,7 @@ li.secondMenu ul li:hover {
 	border-radius: 16px 16px 0 0;
 	box-shadow: 0 -3px 11px 1px rgba(0,0,0,0.06);
 	overflow-y: auto;
-	position: absolute;
+	position: fixed;
 	bottom: 0;
 	width: 100%;
 	box-sizing: border-box;