Merge branch 'main' of http://123.60.103.97:3000/xuziqiang/SaaS-lib

hx-ai-intelligent/src/icon/trigger.svg

@@ -0,0 +1,6 @@
+<svg width="20" height="9" viewBox="0 0 20 9" fill="none" xmlns="http://www.w3.org/2000/svg">
+<g id="Group 6356610" opacity="0.65">
+<path id="Vector" d="M6.89084 5.13637L9.85448 8.1L8.95448 9L4.45446 4.49997L8.95448 -8.86233e-07L9.85448 0.899993L6.89091 3.86357L19.0918 3.86351L19.0918 5.13631L6.89084 5.13637Z" fill="white" fill-opacity="0.3"/>
+<path id="Vector_2" d="M1.27246 0.0904379L1.27246 9L-0.000335336 9L-0.000334557 0.0904378L1.27246 0.0904379Z" fill="white" fill-opacity="0.65"/>
+</g>
+</svg>

hx-ai-intelligent/src/view/organizationManage/usermanage/index.vue

@@ -43,29 +43,29 @@
     <div class="right">
       <ns-view-list-table v-bind="tableConfig" :model="data" ref="mainRef" class="table" />
     </div>
-  </div>
-  <a-drawer
-    :width="1200"
-    :visible="visible"
-    :body-style="{ paddingBottom: '80px' }"
-    :footer-style="{ textAlign: 'right' }"
-    @close="onClose">
-    <ns-form :schemas="formSchema" :model="formData" class="form" />
-    <span class="admin">用户权限</span>
-    <ns-view-list-table v-bind="tableConfig2" :model="data" ref="mainRef" rowKey="uuid" />
-    <a-button style="margin-right: 8px" @click="onClose">取消</a-button>
-    <a-button type="primary" @click="onEdit">确定</a-button>
-  </a-drawer>
+    <a-drawer
+      :width="1200"
+      :visible="visible"
+      :body-style="{ paddingBottom: '80px' }"
+      :footer-style="{ textAlign: 'right' }"
+      @close="onClose">
+      <ns-form :schemas="formSchema" :model="formData" class="form" />
+      <span class="admin">用户权限</span>
+      <ns-view-list-table v-bind="tableConfig2" :model="data" ref="mainRef" rowKey="uuid" />
+      <a-button style="margin-right: 8px" @click="onClose">取消</a-button>
+      <a-button type="primary" @click="onEdit">确定</a-button>
+    </a-drawer>
 
-  <a-modal
-    title="用户信息"
-    :width="600"
-    :visible="addformvisible"
-    cancelText="取消"
-    @ok="handleOk"
-    @cancel="handleClose">
-    <ns-form :schemas="formSchema2" :model="formData2" />
-  </a-modal>
+    <a-modal
+      title="用户信息"
+      :width="600"
+      :visible="addformvisible"
+      cancelText="取消"
+      @ok="handleOk"
+      @cancel="handleClose">
+      <ns-form :schemas="formSchema2" :model="formData2" />
+    </a-modal>
+  </div>
 </template>
 <script lang="ts">
   import { Modal } from 'ant-design-vue';
@@ -223,7 +223,6 @@
           {
             title: '序号',
             dataIndex: 'address',
-            width: 80,
             customRender: (text: any) => {
               return text.index + 1;
             },
@@ -651,10 +650,14 @@
   .left {
     width: 400px;
     /* height: 95vh; */
-    height: 92.7vh;
+    // height: 92.7vh;
     border-right: 5px solid rgb(229, 235, 240);
     min-width: fit-content;
   }
+  .right {
+    flex: 1;
+    overflow: auto;
+  }
   .top {
     height: 46vh;
     border-bottom: 5px solid rgb(229, 235, 240);

lib/saas/view/system/layout/header.vue

@@ -311,9 +311,7 @@
           authorizationStore.clearAuthorization();
         }
       };
-      const updatePassWord = () => {
-        router.push('/synthetical/user/updatePassWord');
-      };
+
       const currentThemeColor = ref(null);
       function changeTheme(color: string) {
         replaceStyleVariables({ colorVariables: [...getThemeColors(color)] });
@@ -377,7 +375,6 @@
         changeTheme,
         userName,
         dropOut,
-        updatePassWord,
         getOPMenu,
         configStore,
       };