Просмотр исходного кода

[VersionBeta] V.1.0.0.0

[Adds]
1.NO
master
xzx 4 лет назад
Родитель
Сommit
0021cff0fb
3 измененных файлов: 21 добавлений и 21 удалений
  1. +4
    -4
      config/prod.env.js
  2. +2
    -2
      src/views/components_web/head/head.vue
  3. +15
    -15
      src/views/main_web/workspace.vue

+ 4
- 4
config/prod.env.js Просмотреть файл

@@ -6,10 +6,10 @@ module.exports = {


// OFFICE_WEB:'"https://office.tszcloud.com"', // OFFICE_WEB:'"https://office.tszcloud.com"',
// API_HOST: '"https://bapi.tszcloud.com/api/"', // API_HOST: '"https://bapi.tszcloud.com/api/"',
IS_CLIENT: true,
// OFFICE_WEB: '"http://10.240.10.239:9003"', // 工大Office服务地址
// API_HOST:'"http://10.240.5.189:9003/api/"', // 王静内网
IS_CLIENT: false,
OFFICE_WEB: '"http://10.240.10.239:9003"', // 工大Office服务地址
API_HOST:'"http://10.240.5.189:9003/api/"', // 王静内网


API_HOST:'"http://192.168.5.32:9003/api/"', // xzx内网
// API_HOST:'"http://192.168.5.32:9003/api/"', // xzx内网


} }

+ 2
- 2
src/views/components_web/head/head.vue Просмотреть файл

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


+ 15
- 15
src/views/main_web/workspace.vue Просмотреть файл

@@ -777,7 +777,7 @@
:class=" :class="
file.extension +'-mid'+ file.extension +'-mid'+
(file.status == '2' ? ' opitcy1' : ' opitcy1') (file.status == '2' ? ' opitcy1' : ' opitcy1')
+ (file.extension!='map'&&file.extension!='svfzip'&&file.extension!='supermap'&& isClient && !file.isDownload && (file.status == 0 || file.status == 2)?' toumin':'')
+ (file.extension!='map'&&file.extension!='svfzip'&&file.extension!='supermap'&& isClient && !file.isDownload ?' toumin':'')
" "
v-if=" v-if="
file.extension != 'jpg' && file.extension != 'jpg' &&
@@ -790,7 +790,7 @@
></div> ></div>
<div <div
class="defultImage-mid img_bg-mid" class="defultImage-mid img_bg-mid"
:class="file.status == '2' ? ' opitcy1' : ' opitcy1' + (file.extension!='map'&&file.extension!='svfzip'&&file.extension!='supermap'&& isClient && !file.isDownload && (file.status == 0 || file.status == 2)?' toumin':'')"
:class="file.status == '2' ? ' opitcy1' : ' opitcy1' + (file.extension!='map'&&file.extension!='svfzip'&&file.extension!='supermap'&& isClient && !file.isDownload ?' toumin':'')"
v-if=" v-if="
file.extension == 'jpg' || file.extension == 'jpg' ||
file.extension == 'png' || file.extension == 'png' ||
@@ -919,7 +919,7 @@
:class=" :class="
file.extension +'-mid'+ file.extension +'-mid'+
(file.status == '2' ? ' opitcy1' : ' opitcy1') (file.status == '2' ? ' opitcy1' : ' opitcy1')
+ (file.extension!='map'&&file.extension!='svfzip'&&file.extension!='supermap'&& isClient && !file.isDownload && (file.status == 0 || file.status == 2)?' toumin':'')
+ (file.extension!='map'&&file.extension!='svfzip'&&file.extension!='supermap'&& isClient && !file.isDownload ?' toumin':'')
" "
v-if=" v-if="
file.extension != 'jpg' && file.extension != 'jpg' &&
@@ -932,7 +932,7 @@
></div> ></div>
<div <div
class="defultImage-mid img_bg-mid" class="defultImage-mid img_bg-mid"
:class="file.status == '2' ? ' opitcy1' : ' opitcy1' + (file.extension!='map'&&file.extension!='svfzip'&&file.extension!='supermap'&& isClient && !file.isDownload && (file.status == 0 || file.status == 2)?' toumin':'')"
:class="file.status == '2' ? ' opitcy1' : ' opitcy1' + (file.extension!='map'&&file.extension!='svfzip'&&file.extension!='supermap'&& isClient && !file.isDownload ?' toumin':'')"
v-if=" v-if="
file.extension == 'jpg' || file.extension == 'jpg' ||
file.extension == 'png' || file.extension == 'png' ||
@@ -1056,9 +1056,8 @@
<div <div
class="defultImage-mid" class="defultImage-mid"
:class=" :class="
file.extension + '-mid'+
(file.status == '2' ? ' opitcy1' : ' opitcy1')
+ (file.extension!='map'&&file.extension!='svfzip'&&file.extension!='supermap'&& isClient && !file.isDownload && (file.status == 0 || file.status == 2)?' toumin':'')
file.extension + '-mid'
+ (file.extension!='map'&&file.extension!='svfzip'&&file.extension!='supermap'&& isClient && !file.isDownload ?' toumin':'')
" "
v-if=" v-if="
file.extension != 'jpg' && file.extension != 'jpg' &&
@@ -1071,7 +1070,7 @@
></div> ></div>
<div <div
class="defultImage-mid img_bg-mid" class="defultImage-mid img_bg-mid"
:class="file.status == '2' ? ' opitcy1' : ' opitcy1' + (file.extension!='map'&&file.extension!='svfzip'&&file.extension!='supermap'&& isClient && !file.isDownload && (file.status == 0 || file.status == 2)?' toumin':'')"
:class="(file.extension!='map'&&file.extension!='svfzip'&&file.extension!='supermap'&& isClient && !file.isDownload ?' toumin':'')"
v-if=" v-if="
file.extension == 'jpg' || file.extension == 'jpg' ||
file.extension == 'png' || file.extension == 'png' ||
@@ -1107,8 +1106,7 @@
<div class="eidtTip" v-if="file.status == 3">文件已取消协同</div> <div class="eidtTip" v-if="file.status == 3">文件已取消协同</div>
<strong <strong
:class=" :class="
'yiyunwenjian_name ' +
(file.status == 2 ? ' opitcy1' : ' opitcy1')
'yiyunwenjian_name '
" "
> >
<i <i
@@ -2157,10 +2155,7 @@ export default {
newSuperMap: { showName: "", description: "" }, newSuperMap: { showName: "", description: "" },
mapAddress: "北京天安门", mapAddress: "北京天安门",
isClient: process.env.IS_CLIENT, // 是否是客户端 isClient: process.env.IS_CLIENT, // 是否是客户端
// isClient:true, // 是否是客户端
/**新建文件分组 start*/
dialogNewFolderGroup: false, //新建文件分组组弹窗 dialogNewFolderGroup: false, //新建文件分组组弹窗
//文件分组数据
folderGroupData: { folderGroupData: {
folderGroupID: "", folderGroupID: "",
folderID: "", folderID: "",
@@ -2172,7 +2167,7 @@ export default {
createTime: "", createTime: "",
modifyUserID: "", modifyUserID: "",
modifyTime: "" modifyTime: ""
},
}, //文件分组数据
myListFolderGroups: [], // 我的文件分组数据 myListFolderGroups: [], // 我的文件分组数据
dbClickSelectedFolderGroupData: {}, //双击选中的当前文件夹分组对象 dbClickSelectedFolderGroupData: {}, //双击选中的当前文件夹分组对象
isShowWorkt: true, //是否显示我的文件和工作文件 isShowWorkt: true, //是否显示我的文件和工作文件
@@ -2219,7 +2214,6 @@ export default {
} }
], ],
showadow:false showadow:false
/**新建文件分组 end*/
}; };
}, },
created:function(){ created:function(){
@@ -3601,6 +3595,9 @@ export default {
// 客户端打开文件 // 客户端打开文件
var archid = file.archID; var archid = file.archID;
var filename = file.archName + "." + file.extension; var filename = file.archName + "." + file.extension;
if (file.version > 1) {
filename = file.archName + file.version + "." + file.extension;
}
var folderID = file.folderID; var folderID = file.folderID;
var folderName = this.listUserFolders[this.nowFolderIndex].folderName; var folderName = this.listUserFolders[this.nowFolderIndex].folderName;
var projID = file.projID; var projID = file.projID;
@@ -3652,6 +3649,9 @@ export default {
// 客户端打开文件 // 客户端打开文件
var archid = file.archID; var archid = file.archID;
var filename = file.archName + "." + file.extension; var filename = file.archName + "." + file.extension;
if (file.version > 1) {
filename = file.archName + file.version + "." + file.extension;
}
var folderID = file.folderID; var folderID = file.folderID;
var folderName = this.listUserFolders[this.nowFolderIndex] var folderName = this.listUserFolders[this.nowFolderIndex]
.folderName; .folderName;