yiyun-fe
/
yiyunjianzhu-vue
4
0
フォーク 0
コード プルリクエスト 0 リリース 0 アクティビティ
ソースを参照

[VersionBeta] V.2.1.0.1 

[Adds]
1.允许打开协作文件
new-cli
xzx 4年前
親
fede79e339
コミット
0463dac07c
3個のファイルの変更、28行の追加、56行の削除
分割表示
差分オプション
統計情報を表示 Patchファイルをダウンロード Diffファイルをダウンロード
  1. +2
    -2
      src/views/components_web/head/head.vue
  2. +25
    -53
      src/views/main_web/workspace.vue
  3. +1
    -1
      static/css/main.css

+ 2
- 2
src/views/components_web/head/head.vue ファイルの表示

@@ -306,7 +306,7 @@
<li @click="toAboutYiYun">
<span class="fl">关于探索者</span>
<i class="el-collapse-item__arrow el-icon-arrow-right right-list_btn"></i>
<span class="right-list_beizhu">版本V2.1.0.0</span>
<span class="right-list_beizhu">版本V2.1.0.1</span>
</li>
</ul>
</div>
@@ -401,7 +401,7 @@
<div class="pxline"></div>
<div>
<div class="user_Img"><img src="" alt=""></div>
<div class="userNamelabel">版本V2.1.0.0</div>
<div class="userNamelabel">版本V2.1.0.1</div>
<div>
<span class="introlisttitle">探索者平台介绍</span>
<p class="downtext_beizhu mt-10">探索者协同是一款方便、快捷、功能多样的办公软件，堪称设计人员的最佳拍档</p>


+ 25
- 53
src/views/main_web/workspace.vue ファイルの表示

@@ -437,15 +437,16 @@
@click="setFileStatus(file, 0, '已开启文件协同',2)"
></i>
</div>
<!-- 下载状态 v-if="file.extension!='map'&&file.extension!='svfzip'&&file.extension!='supermap'&& isClient && !file.isDownload && (file.status == 0 || file.status == 2)"-->
<div
@contextmenu.prevent.stop="rightShowMenu($event, file, 1)"
class="downloadIcon"
@click="clientDownLoad(file,1)"
v-if="file.extension!='map'&&file.extension!='svfzip'&&file.extension!='supermap'&& isClient && !file.isDownload && (file.status == 0 || file.status == 2)"
>
<img src="/static/img/download.svg" alt class="imgjuzhong"/>
<img src="/static/img/download.svg" alt class="imgjuzhong" />
</div>
<div
@contextmenu.prevent.stop="rightShowMenu($event, file, 1)"
class="downloadIcon"
v-if="isClient && file.isDownload && file.downloadStatus == 1"
>
@@ -813,13 +814,12 @@
<i v-if="file.updateStatus == 0" class="yiyun_file_newlabel mr-10"></i>
{{ file.archName }}
</strong>
<div class="eidtTip" v-if="file.status == 0 || file.status == 1">工作中</div>
<div
class="downloadIcon"
v-if="file.extension!='map'&&file.extension!='svfzip'&&file.extension!='supermap'&& isClient && !file.isDownload"
@click="clientDownLoad(file,2)"
>
<img src="/static/img/download.svg" alt />
<img src="/static/img/download.svg" alt class="imgjuzhong"/>
</div>
<div
class="downloadIcon"
@@ -858,27 +858,27 @@
</el-dropdown-item>
<el-dropdown-item
@click.native="fileClickColl(file)"
v-if="file.status == 2 && isClient && file.downloadStatus == 2"
v-if=" isClient && file.downloadStatus == 2"
>
<span>打开</span>
</el-dropdown-item>
<el-dropdown-item
@click.native="fileClickSelectColl(file)"
v-if="file.status == 2 && isClient && file.downloadStatus == 2"
v-if=" isClient && file.downloadStatus == 2"
>
<span>打开方式</span>
</el-dropdown-item>
<el-dropdown-item
divided
@click.native="openNativeFolder(file)"
v-if="file.status == 2 && isClient"
v-if="isClient"
>
<span>在文件夹中浏览</span>
</el-dropdown-item>
<el-dropdown-item
divided
@click.native="downLoadMyFile(file)"
v-if="file.status ==2 && file.extension !='map' && file.extension!='supermap'"
v-if=" file.extension !='map' && file.extension!='supermap'"
>
<span>下载至本地</span>
</el-dropdown-item>
@@ -946,13 +946,12 @@
<img v-lazy="imgSrc + file.alias" alt class="file_Img" />
</div>
</div>
<div class="eidtTip" v-if="file.status == 0 || file.status == 1">工作中</div>
<div
class="downloadIcon"
v-if="file.extension!='map'&&file.extension!='svfzip'&&file.extension!='supermap'&&isClient && !file.isDownload"
@click="clientDownLoad(file,2)"
>
<img src="/static/img/download.svg" alt />
<img src="/static/img/download.svg" alt class="imgjuzhong" />
</div>
<div
class="downloadIcon"
@@ -1009,20 +1008,20 @@
</el-dropdown-item>
<el-dropdown-item
@click.native="fileClickColl(file)"
v-if="isClient && file.status == 2 && file.downloadStatus == 2"
v-if="isClient && file.downloadStatus == 2"
>
<span>打开</span>
</el-dropdown-item>
<el-dropdown-item
@click.native="fileClickSelectColl(file)"
v-if="isClient && file.status == 2 && file.downloadStatus == 2"
v-if="isClient && file.downloadStatus == 2"
>
<span>打开方式</span>
</el-dropdown-item>
<el-dropdown-item
divided
@click.native="downLoadMyFile(file)"
v-if="file.status == 2 && file.extension !='map' && file.extension!='supermap'"
v-if=" file.extension !='map' && file.extension!='supermap'"
>
<span>下载至本地</span>
</el-dropdown-item>
@@ -1086,13 +1085,12 @@
<img v-lazy="imgSrc + file.alias" alt class="file_Img" />
</div>
</div>
<div class="eidtTip" v-if="file.status == 0 || file.status == 1">工作中</div>
<div
class="downloadIcon"
v-if="file.extension!='map'&&file.extension!='svfzip'&&file.extension!='supermap'&&isClient && !file.isDownload"
@click="clientDownLoad(file,2)"
>
<img src="/static/img/download.svg" alt />
<img src="/static/img/download.svg" alt class="imgjuzhong"/>
</div>
<div
class="downloadIcon"
@@ -1150,20 +1148,20 @@
</el-dropdown-item>
<el-dropdown-item
@click.native="fileClickColl(file)"
v-if="isClient && file.status == 2 && file.downloadStatus == 2"
v-if="isClient && file.downloadStatus == 2"
>
<span>打开</span>
</el-dropdown-item>
<el-dropdown-item
@click.native="fileClickSelectColl(file)"
v-if="isClient && file.status == 2 && file.downloadStatus == 2"
v-if="isClient && file.downloadStatus == 2"
>
<span>打开方式</span>
</el-dropdown-item>
<el-dropdown-item
divided
@click.native="downLoadMyFile(file)"
v-if="file.status == 2 && file.extension !='map' && file.extension!='supermap'"
v-if="file.extension !='map' && file.extension!='supermap'"
>
<span>下载至本地</span>
</el-dropdown-item>
@@ -1356,20 +1354,20 @@
>在线查看</li>
<li
@click="fileClickColl(BtnRightFile)"
v-if="isClient && BtnRightFile.status == 2 && BtnRightFile.downloadStatus == 2"
v-if="isClient && BtnRightFile.downloadStatus == 2"
>打开</li>
<li
@click="fileClickSelectColl(BtnRightFile)"
v-if="isClient && BtnRightFile.status == 2 && BtnRightFile.downloadStatus == 2"
v-if="isClient && BtnRightFile.downloadStatus == 2"
>打开方式</li>
<div class="line" v-if="BtnRightFile.status == 2"></div>
<li
@click="openNativeFolder(BtnRightFile)"
v-if="isClient && BtnRightFile.status == 2"
v-if="isClient"
>在文件夹中浏览</li>
<li
@click="downLoadMyFile(BtnRightFile)"
v-if="BtnRightFile.status == 2 && BtnRightFile.extension !='map' && BtnRightFile.extension!='supermap'"
v-if=" BtnRightFile.extension !='map' && BtnRightFile.extension!='supermap'"
>下载至本地</li>
</ul>
<!-- 公共文件 -->
@@ -1389,16 +1387,16 @@
>在线查看</li>
<li
@click="fileClickColl(BtnRightFile)"
v-if="isClient && BtnRightFile.status == 2 && BtnRightFile.downloadStatus == 2"
v-if="isClient && BtnRightFile.downloadStatus == 2"
>打开</li>
<li
@click="fileClickSelectColl(BtnRightFile)"
v-if="isClient && BtnRightFile.status == 2 && BtnRightFile.downloadStatus == 2"
v-if="isClient && BtnRightFile.downloadStatus == 2"
>打开方式</li>
<div class="line" v-if="BtnRightFile.status == 2"></div>
<li
@click="downLoadMyFile(BtnRightFile)"
v-if="BtnRightFile.status == 2 && BtnRightFile.extension !='map' && BtnRightFile.extension!='supermap'"
v-if=" BtnRightFile.extension !='map' && BtnRightFile.extension!='supermap'"
>下载至本地</li>
</ul>
<!--新建文件分组-->
@@ -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",


+ 1
- 1
static/css/main.css ファイルの表示

@@ -8705,7 +8705,7 @@ h5.dulilabel{
.downloadIcon{
position: absolute;
width: 100%;
height: 100%;
height: 120px;
left: 0;
top: 0;
}


書き込み プレビュー
読み込み中…
キャンセル
保存