From f8813ce546eb4e82d940e8f0d9d865930b96e9f9 Mon Sep 17 00:00:00 2001 From: kim131 <1035828775@qq.com> Date: Fri, 18 Dec 2020 22:51:14 +0800 Subject: [PATCH] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E4=BB=8E=E6=A0=B7=E6=9D=BF?= =?UTF-8?q?=E6=96=87=E4=BB=B6=E4=B8=AD=E5=88=9B=E5=BB=BA=E6=96=87=E4=BB=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- public/static/css/main.css | 18 +- src/services/template.js | 2 +- .../projDetail/components/personnel-list.vue | 22 +- src/views/main_web/index/index.vue | 2 +- src/views/main_web/proj-item.vue | 2 +- .../workspace/components/add-file-button.vue | 108 +++++++++ .../workspace/components/file-item.vue | 5 +- src/views/main_web/workspace/helper.js | 18 +- .../main_web/workspace/workspace.new.vue | 222 +++++++++++++++++- src/views/platform_center/index.vue | 2 +- 10 files changed, 385 insertions(+), 16 deletions(-) diff --git a/public/static/css/main.css b/public/static/css/main.css index fc28328a..26be4a85 100644 --- a/public/static/css/main.css +++ b/public/static/css/main.css @@ -8510,9 +8510,9 @@ h5.dulilabel{ .bg_druk{ background-color: #adadad; } -.listTemplateList li:hover,.slected{ +/* .listTemplateList li:hover,.selected{ background-color: rgba(204, 205, 215, 1); -} +} */ .listTemplateList li{ height: 48px; border-radius: 8px; @@ -9011,4 +9011,18 @@ h5.dulilabel{ clear: both; height: 0; visibility: hidden; + } + +/* 新建样本文件弹框显示的图片 */ + .defultImage-small { + margin: 0 auto; + width: 70px; + height: 70px; + background: url(/static/img/defult-mid.png) center/100%; +} +.video-small { + height: 70px; + width: 70px; + background: url(/static/img/FileType/video.svg) center/100%; + margin: 0 auto; } \ No newline at end of file diff --git a/src/services/template.js b/src/services/template.js index 1bdbd80e..6d8fbdc8 100644 --- a/src/services/template.js +++ b/src/services/template.js @@ -83,7 +83,7 @@ export async function fileExchange(unit) { /* 模板文件 */ /** - * 查询当前节点的文件目录 + * 查询模板节点下的所有样本文件 * @param {string} nodeId */ export async function queryAllTemplateNodeModelFile(nodeId) { diff --git a/src/views/components_web/projDetail/components/personnel-list.vue b/src/views/components_web/projDetail/components/personnel-list.vue index b3e3ce82..ec2a2638 100644 --- a/src/views/components_web/projDetail/components/personnel-list.vue +++ b/src/views/components_web/projDetail/components/personnel-list.vue @@ -19,16 +19,20 @@ -
+ user.selected + )" + >
新建项目
diff --git a/src/views/main_web/proj-item.vue b/src/views/main_web/proj-item.vue index 44d54977..5aacb543 100644 --- a/src/views/main_web/proj-item.vue +++ b/src/views/main_web/proj-item.vue @@ -111,7 +111,7 @@ export default { methods:{ // 点击了项目管理按钮 lookProjDetailClick(projItem) { - this.$emit('lookProjDetailClick', projItem); + // this.$emit('lookProjDetailClick', projItem); }, //项目管理 manageProj(){ diff --git a/src/views/main_web/workspace/components/add-file-button.vue b/src/views/main_web/workspace/components/add-file-button.vue index 1fda267b..5a2329cb 100644 --- a/src/views/main_web/workspace/components/add-file-button.vue +++ b/src/views/main_web/workspace/components/add-file-button.vue @@ -35,7 +35,47 @@ 点击上传本地文件夹
+
+
+
从样板文件中创建
+
+
+
    +
  • + {{ + item.extension + }} + {{ item.fileName }} +
  • +
+
+
+ + @@ -43,13 +83,24 @@ @@ -78,4 +134,56 @@ export default { .uploadBtn ~ .uploadBtn { margin-top: 10px; } +.temp-file-container { + height:calc(100vh - 434px); + overflow: scroll; + + background-color: #f1f1f1; + padding: 20px 10px 12px; + text-align: left; + .temp-file { + background-color: #fff; + &:hover { + background-color: #d5d5d6; + } + } +} + + /* 样板文件超出滚动条 */ + .temp-file-container::-webkit-scrollbar { + width: 8px; + height: 8px; + padding: 0 4px 0 0; + border-radius: 4px; + } + + /*滑块样式*/ + .temp-file-container::-webkit-scrollbar-thumb { + -webkit-border-radius: 4px; + border-radius: 4px; + height: 300px; + background-color: #adadad; + } + + /*当前窗口失去焦点时的滑块样式*/ + .temp-file-container::-webkit-scrollbar-thumb:window-inactive { + background-color: #adadad; + } + +.title-head { + padding: 19px 24px; + + .title-text { + color: rgba(50, 50, 60, 100); + font-size: 20px; + text-align: left; + font-family: PingFangSC-Medium; + } +} +.new-template-file-dialog { + .title-text { + font-size: 18px; + } +} + \ No newline at end of file diff --git a/src/views/main_web/workspace/components/file-item.vue b/src/views/main_web/workspace/components/file-item.vue index 77ed509c..267c46e1 100644 --- a/src/views/main_web/workspace/components/file-item.vue +++ b/src/views/main_web/workspace/components/file-item.vue @@ -486,9 +486,12 @@ export default { - + \ No newline at end of file diff --git a/src/views/platform_center/index.vue b/src/views/platform_center/index.vue index 625bec90..51805c63 100644 --- a/src/views/platform_center/index.vue +++ b/src/views/platform_center/index.vue @@ -99,7 +99,7 @@ export default { : isCompanyConsole ? "/company" : "/index", - }); + }).catch(err => console.log(err)) }, // onBackBtnClick() { // console.log("???");