Merge branch 'V20231129-中建一局二公司' of http://192.168.60.201/root/dsk-operate-sys...

Merge branch 'V20231129-中建一局二公司' of http://192.168.60.201/root/dsk-operate-sys into V20231129-中建一局二公司

dsk-operate-ui/src/assets/styles/supplierlist.scss

@@ -248,3 +248,6 @@
 .el-range-editor--medium{
   text-align: left;
 }
+.el-date-editor .el-range-input{
+  text-align: left;
+}

dsk-operate-ui/src/layout/components/Sidebar/SidebarItem.vue

 <template>
   <div v-if="!item.hidden">
     <!-- 展开 -->
-    <template v-if="!isCollapse">
+    <!--&lt;!&ndash;<template v-if="!isCollapse">&ndash;&gt;  菜单白色样式需要此处与else的内容配合-->
+    <template>
       <template v-if="hasOneShowingChild(item.children,item) && (!onlyOneChild.children || onlyOneChild.noShowingChildren) && !item.alwaysShow">
         <app-link v-if="onlyOneChild.meta" :to="resolvePath(onlyOneChild.path,onlyOneChild.query)">
           <el-menu-item :index="resolvePath(onlyOneChild.path)" :class="{'submenu-title-noDropdown':!isNest}">
@@ -18,39 +19,39 @@
       </el-submenu>
     </template>
     <!-- 收起 -->
-    <template v-else>
-      <div v-if="hasOneShowingChild(item.children,item) && (!onlyOneChild.children || onlyOneChild.noShowingChildren) && !item.alwaysShow"
-        class="side-retract">
-        <el-popover placement="right-start" popper-class="side-popover side-one-popover" :visible-arrow="true" trigger="hover"
-          :disabled="onlyOneChild.meta||item.meta?false:true">
-          <div class="side-container">
-            <div class="side-title">
-              <!--<app-link v-if="onlyOneChild.meta || item.meta" :to="resolvePath(onlyOneChild.path || item.path)">-->
-              <app-link :to="resolvePath(onlyOneChild.path || item.path,onlyOneChild.query)">
-                {{ onlyOneChild.meta.title || item.meta.title }}
-              </app-link>
+    <!--<template v-else>-->
+      <!--<div v-if="hasOneShowingChild(item.children,item) && (!onlyOneChild.children || onlyOneChild.noShowingChildren) && !item.alwaysShow"-->
+        <!--class="side-retract">-->
+        <!--<el-popover placement="right-start" popper-class="side-popover side-one-popover" :visible-arrow="true" trigger="hover"-->
+          <!--:disabled="onlyOneChild.meta||item.meta?false:true">-->
+          <!--<div class="side-container">-->
+            <!--<div class="side-title">-->
+              <!--&lt;!&ndash;<app-link v-if="onlyOneChild.meta || item.meta" :to="resolvePath(onlyOneChild.path || item.path)">&ndash;&gt;-->
+              <!--<app-link :to="resolvePath(onlyOneChild.path || item.path,onlyOneChild.query)">-->
+                <!--{{ onlyOneChild.meta.title || item.meta.title }}-->
+              <!--</app-link>-->
 
-            </div>
-          </div>
-          <item v-if="onlyOneChild.meta" slot="reference" :icon="sideIcon(item, onlyOneChild)" />
-        </el-popover>
-      </div>
-      <div v-else class="side-retract">
-        <el-popover placement="right-start" popper-class="side-popover" :visible-arrow="true" trigger="hover" :disabled="item.meta?false:true">
-          <div class="side-container">
-            <div class="side-title">{{ item.meta.title }}</div>
-            <ul class="side-list">
-              <li v-for="child in item.children" :key="child.path">
-                <app-link v-if="child.meta" :to="resolvePath(child.path,child.query)">
-                  {{ child.meta.title }}
-                </app-link>
-              </li>
-            </ul>
-          </div>
-          <item v-if="item.meta" slot="reference" :icon="sideIcon(item)" />
-        </el-popover>
-      </div>
-    </template>
+            <!--</div>-->
+          <!--</div>-->
+          <!--<item v-if="onlyOneChild.meta" slot="reference" :icon="sideIcon(item, onlyOneChild)" />-->
+        <!--</el-popover>-->
+      <!--</div>-->
+      <!--<div v-else class="side-retract">-->
+        <!--<el-popover placement="right-start" popper-class="side-popover" :visible-arrow="true" trigger="hover" :disabled="item.meta?false:true">-->
+          <!--<div class="side-container">-->
+            <!--<div class="side-title">{{ item.meta.title }}</div>-->
+            <!--<ul class="side-list">-->
+              <!--<li v-for="child in item.children" :key="child.path">-->
+                <!--<app-link v-if="child.meta" :to="resolvePath(child.path,child.query)">-->
+                  <!--{{ child.meta.title }}-->
+                <!--</app-link>-->
+              <!--</li>-->
+            <!--</ul>-->
+          <!--</div>-->
+          <!--<item v-if="item.meta" slot="reference" :icon="sideIcon(item)" />-->
+        <!--</el-popover>-->
+      <!--</div>-->
+    <!--</template>-->
   </div>
 </template>