up

src/api/request/httpApi.js

@@ -9,7 +9,7 @@ export const httpApi = async (obj, message= true) => {
             resolve(getResData(response,false));
         }).catch((response) => {
             if (message) {
-                window.$message?.error(response?.data?.msg || '未知错误！');
+                window.$message?.error(getMsgVal(response));
             }
             resolve(getResData(response,true));
         })
@@ -27,6 +27,13 @@ const getResData = (response, error = false) => {
         msg: response?.data?.msg,
         status: response?.status,
         disposition: headers['content-disposition'],
+        message: getMsgVal(response),
         error: error
     }
 }
+
+//获取msg消息内容
+const getMsgVal = (response) => {
+    const {msg, error_description} = getObjValue(response.data)
+    return msg || error_description || '未知错误';
+}

src/global/components/hc-context-menu/index.vue

@@ -98,6 +98,7 @@ const hideContextMenu = () => {
 }
 
 const onClickOutside = () => {
+    console.log(111)
     hideContextMenu()
 }
 

src/layout/modules/HelpInfoBar.vue

@@ -22,8 +22,8 @@
             </div>
             <div class="list-item" @click="toOrderService">
                 <span class="text">工单服务\需求反馈</span>
-                <img class="icon" :src="getAssetsHomeFile('short.png')" alt="" @click.stop="screenShortClick"/>
-                <img class="icon1" :src="getAssetsHomeFile('short1.png')" alt="" @click.stop="screenShortClick"/>
+                <img class="icon" :src="getAssetsHomeFile('screen.png')" alt="" @click.stop="screenShortClick"/>
+                <img class="icon1" :src="getAssetsHomeFile('screen1.png')" alt="" @click.stop="screenShortClick"/>
             </div>
         </div>
     </el-popover>

src/views/data-fill/components/WbsTree.vue

@@ -263,11 +263,13 @@ defineExpose({
         font-weight: bold;
     }
     .menu-icon {
-        position: relative;
-        font-size: 20px;
-        opacity: 0;
+        position: absolute;
         pointer-events: none;
         transition: opacity 0.2s;
+        opacity: 0;
+        right: 0;
+        background: #fff;
+        border-radius: 2px;
         .cu-tree-node-popover-menu-icon {
             display: flex;
             align-items: center;
@@ -288,3 +290,8 @@ defineExpose({
     }
 }
 </style>
+<style lang="scss">
+.hc-tree-node .el-tree-node__label {
+    flex: 1;
+}
+</style>

src/views/other-file/image-data.vue

@@ -27,10 +27,8 @@
                         </el-table-column>
                         <el-table-column label="操作" align="center" width="130">
                             <template #default="scope">
-                                <HcTooltip keys="tasks_flow_edit">
-                                    <el-button type="primary" size="small" text @click="viewClick(scope.row)">查看</el-button>
-                                </HcTooltip>
-                                <HcTooltip keys="tasks_flow_edit">
+                                <el-button type="primary" size="small" text @click="viewClick(scope.row)">查看</el-button>
+                                <HcTooltip keys="image-data-upload">
                                     <el-button type="primary" size="small" text @click="uploadClick(scope.row)">上传</el-button>
                                 </HcTooltip>
                             </template>