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

+ 1 - 1
ruoyi-ui/src/assets/styles/variables.scss

@@ -36,7 +36,7 @@ $base-sub-menu-background:#000c17;
 $base-sub-menu-hover:#001528;
 $base-sub-menu-hover:#001528;
 */
 */
 
 
-$base-sidebar-width: 200px;
+$base-sidebar-width: 250px;
 
 
 // the :export directive is the magic sauce for webpack
 // the :export directive is the magic sauce for webpack
 // https://www.bluematador.com/blog/how-to-share-variables-between-js-and-sass
 // https://www.bluematador.com/blog/how-to-share-variables-between-js-and-sass

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

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

+ 2 - 1
ruoyi-ui/src/layout/components/Sidebar/Logo.vue

@@ -67,7 +67,8 @@ export default {
   height: 50px;
   height: 50px;
   line-height: 50px;
   line-height: 50px;
   background: #2b2f3a;
   background: #2b2f3a;
-  text-align: center;
+  margin-left: 10px;
+  // text-align: center;
   overflow: hidden;
   overflow: hidden;
 
 
   & .sidebar-logo-link {
   & .sidebar-logo-link {

+ 4 - 1
ruoyi-ui/src/views/project/investOpp/myTask.vue

@@ -74,7 +74,7 @@
         </el-form-item>
         </el-form-item>
       </el-form>
       </el-form>
       <!-- Tab 切换区域 -->
       <!-- Tab 切换区域 -->
-      <el-tabs v-model="activeTab" type="card" @tab-click="handleTabClick">
+      <el-tabs v-model="activeTab" type="border-card" @tab-click="handleTabClick">
         <el-tab-pane label="待办任务" name="list1">
         <el-tab-pane label="待办任务" name="list1">
           <!-- 列表一内容 -->
           <!-- 列表一内容 -->
           <el-table
           <el-table
@@ -960,6 +960,9 @@ export default {
  ::v-deep .el-form--label-top .el-form-item__label{
  ::v-deep .el-form--label-top .el-form-item__label{
     padding: 0;
     padding: 0;
  }
  }
+::v-deep .el-tabs--border-card{
+  box-shadow:none;
+}
 .tableWrapper {
 .tableWrapper {
   font-size: 12px;
   font-size: 12px;
   color: #000;
   color: #000;