sunny пре 1 недеља
родитељ
комит
7e6a19489f

+ 10 - 10
ruoyi-ui/src/layout/components/Sidebar/Item.vue

@@ -17,7 +17,7 @@ export default {
     const { icon, title } = context.props;
     const vnodes = [];
 
-    if (icon) {
+    if (icon!=="#") {
       vnodes.push(<svg-icon icon-class={icon} />);
     }
 
@@ -42,47 +42,47 @@ export default {
         vnodes.push(
           <span slot="title">
             {title}
-            {icon === "#" && title === "评估考察" && inspectNum ? (
+            {title === "评估考察" && inspectNum ? (
               <span class="hint">{inspectNum}</span>
             ) : (
               ""
             )}
-            {icon === "#" && title === "项目立项" && projectLXNum ? (
+            {title === "项目立项" && projectLXNum ? (
               <span class="hint">{projectLXNum}</span>
             ) : (
               ""
             )}
-            {icon === "#" && title === "尽职背调" && dueNum ? (
+            {title === "尽职背调" && dueNum ? (
               <span class="hint">{dueNum}</span>
             ) : (
               ""
             )}
-            {icon === "#" && title === "项目投决" && projectTJNum ? (
+            {title === "项目投决" && projectTJNum ? (
               <span class="hint">{projectTJNum}</span>
             ) : (
               ""
             )}
-            {icon === "select" && title === "项目机会" && investOppNum ? (
+            {title === "项目机会" && investOppNum ? (
               <span class="hint">{investOppNum}</span>
             ) : (
               ""
             )}
-            {icon === "select" && title === "项目立项" && approvalNum ? (
+            {title === "项目立项" && approvalNum ? (
               <span class="hint">{approvalNum}</span>
             ) : (
               ""
             )}
-            {icon === "select" && title === "项目背调" && investigateNum ? (
+            {title === "项目背调" && investigateNum ? (
               <span class="hint">{investigateNum}</span>
             ) : (
               ""
             )}
-            {icon === "select" && title === "项目投决" && decisionNum ? (
+            {title === "项目投决" && decisionNum ? (
               <span class="hint">{decisionNum}</span>
             ) : (
               ""
             )}
-            {icon === "select" && title === "项目终止" && terminationNum ? (
+            {title === "项目终止" && terminationNum ? (
               <span class="hint">{terminationNum}</span>
             ) : (
               ""

+ 1 - 1
ruoyi-ui/src/layout/index.vue

@@ -5,7 +5,7 @@
     <div :class="{hasTagsView:needTagsView,sidebarHide:sidebar.hide}" class="main-container">
       <div :class="{'fixed-header':fixedHeader}">
         <navbar/>
-        <tags-view v-if="needTagsView"/>
+        <!-- <tags-view v-if="needTagsView"/> -->
       </div>
       <app-main/>
       <right-panel>

+ 15 - 5
ruoyi-ui/src/views/project/investOpp/myTask.vue

@@ -3,7 +3,7 @@
   <div>
     <el-card shadow="hover">
       <!-- 查询表单区域 -->
-      <el-form :model="queryParams" ref="queryForm" inline>
+      <el-form :model="queryParams" ref="queryForm" inline label-position="top">
         <el-form-item label="项目名称" prop="projectName">
           <el-input
             v-model.trim="queryParams.projectName"
@@ -63,10 +63,14 @@
           />
         </el-form-item>
         <!-- 可继续扩展其他查询表单项目,比如项目编号、负责人等 -->
-        <el-form-item>
-          <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
-          <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
-          <el-button type="warning" plain icon="el-icon-download" size="mini" @click="exportQuery">导出</el-button>
+        <el-form-item label="搜索">
+          <el-button style="width: 217px;" type="primary" icon="el-icon-search" @click="handleQuery">搜索</el-button>
+        </el-form-item>
+         <el-form-item label="重置">
+          <el-button style="width: 217px;" icon="el-icon-refresh" @click="resetQuery">重置</el-button>
+        </el-form-item>
+         <el-form-item label="导出">
+          <el-button style="width: 217px;" type="warning" plain icon="el-icon-download" @click="exportQuery">导出</el-button>
         </el-form-item>
       </el-form>
       <!-- Tab 切换区域 -->
@@ -950,6 +954,12 @@ export default {
 };
 </script>
 <style lang="scss" scoped>
+ ::v-deep .el-form-item{
+  margin-right: 35px;
+ }
+ ::v-deep .el-form--label-top .el-form-item__label{
+    padding: 0;
+ }
 .tableWrapper {
   font-size: 12px;
   color: #000;