'fix:修改首页图片，修改用户详情'

sqy
1 parent 3a2b867c
Showing 5 changed files with 54 additions and 88 deletions
src/utils/rules.ts
src/views/dashboard/workbench/components/GrowCard.vue
src/views/stationnotification/notificationmanager/config.d.ts
src/views/system/account/AccountDetail.vue
src/views/system/account/index.vue
--- a/src/utils/rules.ts
View file @ec6dd08
+++ b/src/utils/rules.ts
View file @ec6dd08
@@ -69,6 +69,7 @@ export const NotificationTitleMaxLength: Rule[] = [
       if (String(value).length > 50) {
         return Promise.reject('标题长度不超过200字');
       }
+      return Promise.resolve();
     },
     validateTrigger: 'blur',
   },
@@ -86,18 +87,6 @@ export const NotificationContentMaxLength: Rule[] = [
     validateTrigger: 'blur',
   },
 ];
-export const NotificationTypeMaxLength: Rule[] = [
-  {
-    required: true,
-    validator: (_, value: string) => {
-      if (!value) {
-        return Promise.reject('请选择类型');
-      }
-      return Promise.resolve();
-    },
-    validateTrigger: 'blur',
-  },
-];
 export const DeviceNameMaxLength: Rule[] = [
   {
--- a/src/views/dashboard/workbench/components/GrowCard.vue
View file @ec6dd08
+++ b/src/views/dashboard/workbench/components/GrowCard.vue
View file @ec6dd08
@@ -35,13 +35,18 @@
     </Card>
     <Card size="small" class="md:w-1/3 w-full !md:mt-0 !mt-4 !md:mr-4">
       <div class="flex" style="height: 100px">
-        <div class="mr-4"
-          ><img
-            :src="
-              !isAdmin(role) ? '/src/assets/images/alarm-count.png' : '/src/assets/images/zh.png'
-            "
+        <div class="mr-4">
+          <img
+            v-if="!isAdmin(role)"
+            src="/src/assets/images/alarm-count.png"
             style="width: 5rem; height: 5rem"
-        /></div>
+          />
+          <img
+            v-if="isAdmin(role)"
+            src="/src/assets/images/zh.png"
+            style="width: 5rem; height: 5rem"
+          />
+        </div>
         <div class="flex-auto">
           <div class="flex justify-between" style="align-items: center">
             <div style="font-size: 1.625rem; color: #333">{{
@@ -60,9 +65,15 @@
       <div class="flex" style="height: 100px">
         <div class="mr-4"
           ><img
-            :src="!isAdmin(role) ? '/src/assets/images/msg-count.png' : '/src/assets/images/kf.png'"
+            v-if="!isAdmin(role)"
+            src="/src/assets/images/msg-count.png"
             style="width: 5rem; height: 5rem"
-        /></div>
+          /><img
+            v-if="isAdmin(role)"
+            src="/src/assets/images/kf.png"
+            style="width: 5rem; height: 5rem"
+          />
+        </div>
         <div class="flex-auto">
           <div class="flex justify-between" style="align-items: center">
             <div style="font-size: 1.625rem; color: #333">{{
--- a/src/views/stationnotification/notificationmanager/config.d.ts
View file @ec6dd08
+++ b/src/views/stationnotification/notificationmanager/config.d.ts
View file @ec6dd08
@@ -5,7 +5,7 @@ import { Tinymce } from '/@/components/Tinymce/index';
 import { getOrganizationList } from '/@/api/system/system';
 import { copyTransFun } from '/@/utils/fnUtils';
 import { Tag } from 'ant-design-vue';
-import { NotificationTitleMaxLength, NotificationTypeMaxLength } from '/@/utils/rules';
+import { NotificationTitleMaxLength } from '/@/utils/rules';
 export enum IsOrgEnum {
   IS_ORG_ENUM = '1',
@@ -87,7 +87,6 @@ export const formSchema: FormSchema[] = [
         },
       ],
     },
-    rules: NotificationTypeMaxLength,
   },
   {
     field: 'title',
--- a/src/views/system/account/AccountDetail.vue
View file @ec6dd08
+++ b/src/views/system/account/AccountDetail.vue
View file @ec6dd08
 <template>
   <div>
-    <BasicModal
-      width="650px"
-      v-bind="$attrs"
-      @register="registerModal"
-      :title="getTitle"
-      @ok="handleSubmit"
-    >
-      <PageWrapper :title="`用户资料`" contentBackground @back="goBack">
-        <Description size="middle" @register="register" />
-      </PageWrapper>
-    </BasicModal>
+    <PageWrapper :title="`用户资料`" contentBackground @back="goBack">
+      <Description size="middle" @register="register" />
+    </PageWrapper>
   </div>
 </template>
 <script>
-  import { defineComponent, ref } from 'vue';
-  // import { useRoute } from 'vue-router';
+  import { defineComponent } from 'vue';
+  import { useRoute } from 'vue-router';
   import { PageWrapper } from '/@/components/Page';
   import { useGo } from '/@/hooks/web/usePage';
   import { Description } from '../../../components/Description';
-  import { useTabs } from '/@/hooks/web/useTabs';
   import { getAccountInfo } from '../../../api/system/system';
   import { accountSchema } from './account.detail.data';
   import { useDescription } from '../../../components/Description';
-  import { BasicModal, useModalInner } from '/@/components/Modal';
-
+  import { useTabs } from '/@/hooks/web/useTabs';
   const accountData = {};
   export default defineComponent({
     name: 'AccountDetail',
-    components: { PageWrapper, Description, BasicModal },
+    components: { PageWrapper, Description },
     setup() {
-      // const route = useRoute();
+      const route = useRoute();
       const go = useGo();
-      const { setTitle } = useTabs();
-      const getId = ref('');
-      const getTitle = ref('');
+      const { setTitle, close } = useTabs();
       const [register, methods] = useDescription({
         title: '账号基础信息',
         data: accountData,
-        bordered: false,
         schema: accountSchema,
         column: 3,
       });
-
-      const [registerModal] = useModalInner(async (data) => {
-        getId.value = await data.record.id;
-        getAccountInfo(getId.value).then((result) => {
-          Reflect.set(accountData, 'realName', result.realName);
-          Reflect.set(accountData, 'phoneNumber', result.phoneNumber);
-          Reflect.set(accountData, 'email', result.email);
-          Reflect.set(accountData, 'username', result.username);
-          Reflect.set(
-            accountData,
-            'enabled',
-            result.enabled ? '正常' : !result.enabled ? '禁用' : '已过期'
-          );
-          Reflect.set(accountData, 'accountExpireTime', result.accountExpireTime);
-          Reflect.set(accountData, 'createTime', result.createTime);
-          Reflect.set(accountData, 'updateTime', result.updateTime);
-          Reflect.set(accountData, 'deptId', result.deptId);
-          // 设置Tab的标题（不会影响页面标题）
-          setTitle('详情：用户' + result.realName);
-          getTitle.value = '详情：用户' + result.realName;
-          methods.setDescProps(accountData);
-        });
+      getAccountInfo(route.params?.id).then((result) => {
+        Reflect.set(accountData, 'realName', result.realName);
+        Reflect.set(accountData, 'phoneNumber', result.phoneNumber);
+        Reflect.set(accountData, 'email', result.email);
+        Reflect.set(accountData, 'username', result.username);
+        Reflect.set(
+          accountData,
+          'enabled',
+          result.enabled ? '正常' : !result.enabled ? '禁用' : '已过期'
+        );
+        Reflect.set(accountData, 'accountExpireTime', result.accountExpireTime);
+        Reflect.set(accountData, 'createTime', result.createTime);
+        Reflect.set(accountData, 'updateTime', result.updateTime);
+        Reflect.set(accountData, 'deptId', result.deptId);
+        // 设置Tab的标题（不会影响页面标题）
+        setTitle('详情：用户' + result.realName);
+        methods.setDescProps(accountData);
       });
       // 页面左侧点击返回链接时的操作
       function goBack() {
         // 本例的效果时点击返回始终跳转到账号列表页，实际应用时可返回上一页
+        close();
         go('/system/account');
       }
-      return { goBack, accountSchema, accountData, register, registerModal, getTitle };
+      return { goBack, accountSchema, accountData, register };
     },
   });
 </script>
-
-<style></style>
--- a/src/views/system/account/index.vue
View file @ec6dd08
+++ b/src/views/system/account/index.vue
View file @ec6dd08
@@ -62,7 +62,6 @@
         </template>
       </BasicTable>
       <AccountModal @register="registerModal" @success="handleSuccess" />
-      <AccountDetail @register="registerDetailModal" @success="handleSuccess" />
     </PageWrapper>
   </div>
 </template>
@@ -75,26 +74,17 @@
   import { Tag } from 'ant-design-vue';
   import { useModal } from '/@/components/Modal';
   import AccountModal from './AccountModal.vue';
-  import AccountDetail from './AccountDetail.vue';
+
   import { columns, searchFormSchema } from './account.data';
-  // import { useGo } from '/@/hooks/web/usePage';
+  import { useGo } from '/@/hooks/web/usePage';
   import { useMessage } from '/@/hooks/web/useMessage';
   export default defineComponent({
     name: 'AccountManagement',
-    components: {
-      BasicTable,
-      PageWrapper,
-      OrganizationIdTree,
-      AccountModal,
-      TableAction,
-      Tag,
-      AccountDetail,
-    },
+    components: { BasicTable, PageWrapper, OrganizationIdTree, AccountModal, TableAction, Tag },
     setup() {
-      // const go = useGo();
+      const go = useGo();
       const [registerModal, { openModal }] = useModal();
-      const [registerDetailModal, { openModal: openDetailModal }] = useModal();
       const { createMessage } = useMessage();
       let searchInfo = reactive<Recordable>({});
       const { organizationIdTreeRef, resetFn } = useResetOrganizationTree(searchInfo);
@@ -157,14 +147,10 @@
       }
       function handleView(record: Recordable) {
-        openDetailModal(true, {
-          record,
-        });
-        // go('/system/account_detail/' + record.id);
+        go('/system/account_detail/' + record.id);
       }
       return {
-        registerDetailModal,
         registerTable,
         registerModal,
         handleCreate,