diff --git a/src/views/main_web/workspace/components/file-item.vue b/src/views/main_web/workspace/components/file-item.vue
new file mode 100644
index 00000000..fccd40e4
--- /dev/null
+++ b/src/views/main_web/workspace/components/file-item.vue
@@ -0,0 +1,85 @@
+
+
+
+
+
+
+
+
+
+
+
+
![]()
+
+
+
+
+
+ 工作中
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/src/views/main_web/workspace/workspace.vue b/src/views/main_web/workspace/workspace.vue
index bdaa0d45..ff2fbef0 100644
--- a/src/views/main_web/workspace/workspace.vue
+++ b/src/views/main_web/workspace/workspace.vue
@@ -838,7 +838,7 @@
file.createUserId != userId
"
class="yiyunwenjian_infodesc"
- >{{ file.cnName }}创建{{ file.createUserName }}创建
@@ -1401,7 +1401,7 @@
{{ file.folderName }}
-
+ {{ file.createUserName }}创建
@@ -2591,6 +2591,7 @@ import system from '@/services/system';
import * as services from './service';
import { firstCharToLowerCase, firstCharToUpperCase, notify } from '@/utils/tool';
+
const $ = window.jQuery;
const Velocity = window.Velocity;
Vue.use(vuetify);
@@ -3280,6 +3281,8 @@ export default {
// UserId: this.userId,
// FileStatus: file.status
// }
+ // file.loadingProgress = 0;
+
const [resFlag] = await Promise.all([
services.changeFileWorkStatus(file.id, workStatus),
// services.fileCoordinationChange(params)
@@ -3289,7 +3292,7 @@ export default {
file.workStatus = workStatus;
this.$forceUpdate();
// todo 获取文件最新的hash并更新文件
- // if(workStatus === 1) {
+ // if(workStatus === 1 && file.workStatus === 2) {
// }
},
@@ -3305,25 +3308,12 @@ export default {
FileStatus: state
}
try {
-
const res = await services.fileCoordinationChange(params);
let thisApp = this;
if(res.Code === 0) {
- thisApp.$notify({
- title: "恭喜您",
- message: res,
- type: "success",
- offset: 100,
- duration: 2500,
- });
+ notify.success(res.Msg);
} else {
- thisApp.$notify({
- title: "温馨提醒",
- message: res.Msg,
- type: "info",
- offset: 100,
- duration: 2500,
- });
+ notify.info(res.Msg);
return;
}
} catch(err) {
@@ -4471,7 +4461,6 @@ export default {
var folderName = this.listUserFolders[this.nowFolderIndex].folderName;
var projID = file.projID;
var type = "open";
- debugger;
system.openFile(
archid,
filename,