diff --git a/src/views/components_web/head/head.vue b/src/views/components_web/head/head.vue
index 84a7c4d8..9006652e 100644
--- a/src/views/components_web/head/head.vue
+++ b/src/views/components_web/head/head.vue
@@ -306,7 +306,7 @@
-
版本V2.1.0.0
+
版本V2.1.0.1
探索者平台介绍
探索者协同是一款方便、快捷、功能多样的办公软件,堪称设计人员的最佳拍档
diff --git a/src/views/main_web/workspace.vue b/src/views/main_web/workspace.vue
index bab61fa3..15e7ec1d 100644
--- a/src/views/main_web/workspace.vue
+++ b/src/views/main_web/workspace.vue
@@ -437,15 +437,16 @@
@click="setFileStatus(file, 0, '已开启文件协同',2)"
>
-
-

+
@@ -813,13 +814,12 @@
{{ file.archName }}
-
工作中
-

+
打开
打开方式
在文件夹中浏览
下载至本地
@@ -946,13 +946,12 @@
-
工作中
-

+
打开
打开方式
下载至本地
@@ -1086,13 +1085,12 @@
-
打开
打开方式
下载至本地
@@ -1356,20 +1354,20 @@
>在线查看
打开
打开方式
在文件夹中浏览
下载至本地
@@ -1389,16 +1387,16 @@
>在线查看
打开
打开方式
下载至本地
@@ -2160,8 +2158,7 @@ export default {
dialogNewSuperMapVisible: false,
newSuperMap: { showName: "", description: "" },
mapAddress: "北京天安门",
- isClient: false, // 是否是客户端
- // isClient: true, // 是否是客户端
+ isClient: process.env.IS_CLIENT, // 是否是客户端
/**新建文件分组 start*/
dialogNewFolderGroup: false, //新建文件分组组弹窗
//文件分组数据
@@ -3364,10 +3361,6 @@ export default {
this.appInstanceTitle = "应用查看-" + file.archName;
} else if (file.extension == "svfzip") {
window.open(file.showUrl, file.archName);
- // this.showApp = true;
- // this.instanceType = 2;
- // this.forgeShowUrl = file.showUrl;
- // this.appInstanceTitle = "应用查看-" + file.archName;
} else if (file.extension == "supermap") {
this.instanceType = 3;
this.showApp = true;
@@ -3581,9 +3574,6 @@ export default {
return;
}
if (this.isClient) {
- if (file.status == 1 || file.status == 0) {
- // do nothing
- } else {
if (file.extension == "map") {
this.instanceType = 1;
this.showApp = true;
@@ -3613,8 +3603,7 @@ export default {
var archid = file.archID;
var filename = file.archName + "." + file.extension;
var folderID = file.folderID;
- var folderName = this.listUserFolders[this.nowFolderIndex]
- .folderName;
+ var folderName = this.listUserFolders[this.nowFolderIndex].folderName;
var projID = file.projID;
var type = "open";
back.openFile(
@@ -3626,7 +3615,6 @@ export default {
folderName
);
}
- }
} else {
this.openOffice(file);
}
@@ -3640,17 +3628,6 @@ export default {
return;
}
if (this.isClient) {
- if (file.status == 1 || file.status == 0) {
- this.$confirm("对方正在工作中,请稍后查看", "", {
- confirmButtonText: "确定",
- showClose: false,
- showCancelButton: false,
- type: "warning",
- center: true
- })
- .then(() => {})
- .catch(error => {});
- } else {
if (file.extension == "map") {
this.instanceType = 1;
this.showApp = true;
@@ -3658,10 +3635,6 @@ export default {
this.appInstanceTitle = "应用查看-" + file.archName;
} else if (file.extension == "svfzip") {
window.open(file.showUrl, file.archName);
- // this.showApp = true;
- // this.instanceType = 2;
- // this.forgeShowUrl = file.showUrl;
- // this.appInstanceTitle = "应用查看-" + file.archName;
} else if (file.extension == "supermap") {
this.instanceType = 3;
this.showApp = true;
@@ -3694,7 +3667,6 @@ export default {
folderName
);
}
- }
}
this.$axios({
method: "delete",
diff --git a/static/css/main.css b/static/css/main.css
index 5709e0f4..3cfa7eda 100644
--- a/static/css/main.css
+++ b/static/css/main.css
@@ -8705,7 +8705,7 @@ h5.dulilabel{
.downloadIcon{
position: absolute;
width: 100%;
- height: 100%;
+ height: 120px;
left: 0;
top: 0;
}