From 44a9f50d1b213cce4f8cd4d9f3a47b987a82a82c Mon Sep 17 00:00:00 2001
From: kim131 <1035828775@qq.com>
Date: Mon, 4 Jan 2021 14:32:36 +0800
Subject: [PATCH] =?UTF-8?q?bug=E4=BF=AE=E6=94=B9=20=E6=90=9C=E7=B4=A2?=
 =?UTF-8?q?=E6=A1=8635=E4=B8=AA=E5=AD=97=E9=95=BF=E5=BA=A6=E9=99=90?=
 =?UTF-8?q?=E5=88=B6=20=E6=90=9C=E7=B4=A2=E4=B8=8D=E5=88=B0=E6=96=87?=
 =?UTF-8?q?=E4=BB=B6=E6=98=BE=E7=A4=BA=E6=8F=90=E7=A4=BA=E4=BF=A1=E6=81=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 public/static/css/main.css                    | 10 +++++-----
 src/components/search-bar/search-bar.vue      |  7 +++++--
 .../projDetail/components/personnel-list.vue  |  2 +-
 .../components_web/projDetail/projDetail.vue  |  2 +-
 src/views/main_web/index/index.vue            | 11 ++++++++++-
 .../main_web/workspace/workspace.new.vue      | 19 ++++++++++++++++++-
 src/views/manage_system/customer/index.vue    |  4 ++++
 src/views/manage_system/customer/services.js  |  2 ++
 src/views/manage_system/template/index.vue    |  1 +
 9 files changed, 47 insertions(+), 11 deletions(-)

diff --git a/public/static/css/main.css b/public/static/css/main.css
index 9f868d63..a35b74b7 100644
--- a/public/static/css/main.css
+++ b/public/static/css/main.css
@@ -8000,8 +8000,8 @@ li.secondMenu ul li:hover {
 	color: #fff;
 	border-radius: 10px; */
 	position: absolute;
-	left: 5px;
-	top: 5px;
+	left: 3px;
+	top: 4px;
 }
 .yijianIcon{
 	font-size: 24px;
@@ -9062,15 +9062,15 @@ h5.dulilabel{
 		}
 		/* 绿色协同图标 */
 		.green-icon {
-			background: url('/static/img/FileStatus/已协同协同.svg');
+			background: url('/static/img/FileStatus/已协同协同.svg') center/100%;
 		}
 			/* 灰色图标 未启用协同*/
 		.gray-icon {
-			background: url('/static/img/FileStatus/未启用协同.svg');
+			background: url('/static/img/FileStatus/未启用协同.svg') center/100%;
 		}
 		/* 蓝色图标 待更新协同 */
 		.blue-icon {
-			background: url('/static/img/FileStatus/待更新协同.svg');
+			background: url('/static/img/FileStatus/待更新协同.svg') center/100%;
 		}
 
 		/* 新版项目概况 工作指派微调样式 */
diff --git a/src/components/search-bar/search-bar.vue b/src/components/search-bar/search-bar.vue
index f2ec0eaa..cd3cf269 100644
--- a/src/components/search-bar/search-bar.vue
+++ b/src/components/search-bar/search-bar.vue
@@ -2,7 +2,7 @@
   <div class="search-bar">
     <i class="search-icon" @click.stop="goToSearch"></i>
     <input type="text" v-model="searchContent" @keyup.stop="enterSearchContent"
-    class="search-input" :placeholder="placeholder"/>
+    class="search-input" :placeholder="placeholder" maxlength="35"/>
     <i class="close-icon" @click.stop="hideSearchBar"></i>
   </div>
 </template>
@@ -22,6 +22,9 @@
     },
     watch: {
       searchContent(val) {
+        if(val.length == 35) {
+          this.$emit('maxTextLengthArrived');
+        }
         this.changeSearchContent();
       }
     },
@@ -57,7 +60,7 @@
       border-radius: 8px;
       background-color: rgba(233, 233, 235, 1);
       border: 0.5px solid rgba(174, 174, 174, 1);
-      padding: 0 0 0 32px;
+      padding: 0 32px;
     }
     .search-icon, .close-icon {
       position: absolute;
diff --git a/src/views/components_web/projDetail/components/personnel-list.vue b/src/views/components_web/projDetail/components/personnel-list.vue
index 342fb1b8..163486ea 100644
--- a/src/views/components_web/projDetail/components/personnel-list.vue
+++ b/src/views/components_web/projDetail/components/personnel-list.vue
@@ -114,7 +114,7 @@
         left: 10px;
         width: 22px;
         height:22px;
-        background: url('/static/img/搜索.svg');
+        background: url('/static/img/搜索.svg') center/100%;
         margin: 4px 0;
      }
      .search-input {
diff --git a/src/views/components_web/projDetail/projDetail.vue b/src/views/components_web/projDetail/projDetail.vue
index 3cef10b8..d6074c01 100644
--- a/src/views/components_web/projDetail/projDetail.vue
+++ b/src/views/components_web/projDetail/projDetail.vue
@@ -293,7 +293,7 @@ import NestTemp from '../project/nestTemp.vue';
         activeDeptName: '',//默认打开右侧的某一个部门
         isShowManagerTips: false,//是否显示工作负责人的提示
         isEnterEditPropValue: false,//是否进入编辑模板自定义字段
-        isDistworkDone: false,//是否有惊醒过工作指派
+        isDistworkDone: false,//是否有进行过工作指派
         isDistworkSuccess: false,//每一次工作指派是否成功
       }
     },
diff --git a/src/views/main_web/index/index.vue b/src/views/main_web/index/index.vue
index 702b61fb..99bd8a32 100644
--- a/src/views/main_web/index/index.vue
+++ b/src/views/main_web/index/index.vue
@@ -27,7 +27,8 @@
         placeholder="搜索项目名称"
         @changeSearchContent="changeSearchContent"
         @hideSearchBar="hideSearchBar"
-        @goToSearch="searchForProj"/>
+        @goToSearch="searchForProj"
+        @maxTextLengthArrived="maxTextLengthArrived"/>
         <div class="search-entry" @click.stop="isShowSearchBar = true" v-if="!isShowSearchBar"></div>
       </template>
       <!-- <template #right>
@@ -288,6 +289,14 @@ export default {
     }
   },
   methods: {
+    // 搜索框字数超出35个字
+    maxTextLengthArrived() {
+      this.$notify({
+        message: '请输入35个字之内的搜索内容',
+        type: ["warning"],
+      })
+    },
+    // 点击叉号按钮隐藏搜索栏
     hideSearchBar() {
       this.isShowSearchBar = false;
       this.searchContent = '';
diff --git a/src/views/main_web/workspace/workspace.new.vue b/src/views/main_web/workspace/workspace.new.vue
index 6681ad68..1ecae6ac 100644
--- a/src/views/main_web/workspace/workspace.new.vue
+++ b/src/views/main_web/workspace/workspace.new.vue
@@ -27,7 +27,8 @@
             placeholder="请输入要搜索的文件名"
             @changeSearchContent="changeSearchContent"
             @hideSearchBar="hideSearchBar"
-            @goToSearch="searchForFile"/>
+            @goToSearch="searchForFile"
+            @maxTextLengthArrived="maxTextLengthArrived"/>
           <div class="search-entry" @click.stop="isShowSearchBar = true" v-if="!isShowSearchBar"></div>
       </template>
     </app-header>
@@ -60,6 +61,7 @@
               @dragstart.native="onfileDragStart(file, $event)"
               draggable
             />
+            <div class="no-file-tips" v-if="searchWorkFileList && searchWorkFileList.length == 0">搜索不到与“{{searchContent}}”相关的文件</div>
           </div>
           <div class="list-group" v-else-if="currentBtnIndex == 1">
             <FileItem
@@ -81,6 +83,7 @@
               @dragstart.native="onfileDragStart(file, $event)"
               draggable
             />
+            <div class="no-file-tips" v-if="searchCoopFileList && searchCoopFileList.length == 0">搜索不到与“{{searchContent}}”相关的文件</div>
           </div>
         </div>
     </div>
@@ -628,6 +631,8 @@ export default {
       searchContent: '',//搜索的文件名称
       searchWorkFileList: [],//搜索得到的工作文件列表
       searchCoopFileList: [],//搜索得到的协作文件列表
+
+      isAllFileLoaded: false,//当前工作节点下的文件状态是否都加载完毕
     };
   },
   mounted: function () {
@@ -690,6 +695,13 @@ export default {
     }
   },
   methods: {
+    // 搜索框字数超出35个字
+    maxTextLengthArrived() {
+      this.$notify({
+        message: '请输入35个字之内的搜索内容',
+        type: ["warning"],
+      })
+    },
     /**
     * 搜索文件
     */
@@ -1952,4 +1964,9 @@ export default {
   .out-wrap::-webkit-scrollbar-thumb:window-inactive {
     background-color: #adadad;
   }
+  .no-file-tips {
+    font-size: 22px;
+    text-align: center;
+    margin: 100px auto;
+  }
 </style>
\ No newline at end of file
diff --git a/src/views/manage_system/customer/index.vue b/src/views/manage_system/customer/index.vue
index a4b70d76..6a62acc2 100644
--- a/src/views/manage_system/customer/index.vue
+++ b/src/views/manage_system/customer/index.vue
@@ -1199,6 +1199,10 @@ export default {
         const res = await services.updateCompany(this.currentCompany);
         const flag = res.Code === 0;
         if (!flag) {
+          this.$notify({
+            message: res.Msg,
+            type: ["warning"],
+          })
           return;
         }
         thisApp.$notify({
diff --git a/src/views/manage_system/customer/services.js b/src/views/manage_system/customer/services.js
index df01ff0c..31abc910 100644
--- a/src/views/manage_system/customer/services.js
+++ b/src/views/manage_system/customer/services.js
@@ -147,6 +147,8 @@ export async function updateCompany(data) {
     Remark: data.remark,
     Telphone: data.telphone,
     Id: data.companyID,
+    IpfsApi: data.ipfsApi,
+    IpfsBootstrap: data.ipfsBootstrap, 
   }
 
   const resData = await fetchApi('company/updateCompanyById', { company: fixedData, user: userData });
diff --git a/src/views/manage_system/template/index.vue b/src/views/manage_system/template/index.vue
index 02333953..d681bb16 100644
--- a/src/views/manage_system/template/index.vue
+++ b/src/views/manage_system/template/index.vue
@@ -3059,6 +3059,7 @@ export default {
           confirmButtonText: "确定",
           cancelButtonText: "返回",
           type: "warning",
+          showClose: false,
         }
       ).then(() => {
         this.isShowModelpanel = false;