feat(组件): 修改bug

src/layouts/default/header/components/user-dropdown/index.vue

@@ -4,7 +4,7 @@
       <img :class="`${prefixCls}__header`" :src="getUserInfo.avatar" />
       <span :class="`${prefixCls}__info hidden md:block`">
         <span :class="`${prefixCls}__name  `" class="truncate">
-          {{ getUserInfo.realName }}
+          {{ getUserInfo.realName }} {{getUserInfo.userName}}
         </span>
       </span>
     </span>
@@ -78,8 +78,8 @@
       const userStore = useUserStore();
       const { createConfirm } = useMessage();
       const getUserInfo = computed(() => {
-        const { nickName = '', avatar, desc } = userStore.getUserInfo || {};
-        return { realName:nickName, avatar: avatar || headerImg, desc };
+        const { nickName = '', avatar, desc,userName } = userStore.getUserInfo || {};
+        return { realName:nickName, avatar: avatar || headerImg, desc,userName };
       });
 
       const [register, { openModal }] = useModal();

src/views/account/product/AddModal.vue

@@ -5,6 +5,7 @@
     title="新增相机"
     @visible-change="handleVisibleChange"
     @cancel="resetFields"
+    :confirmLoading="loading"
     @ok="handleSubmit"
   >
     <div class="pt-2px pr-3px">
@@ -37,6 +38,7 @@
         file:null
       })
       const { createMessage } = useMessage();
+      const loading = ref(false)
       const schemas: FormSchema[] = [
         {
           field: 'type',
@@ -227,6 +229,7 @@
         });
       }
       const handleSubmit = async () => {
+        loading.value = true
         try {
           const params = await validate();
           const apiData = {
@@ -243,8 +246,10 @@
           resetFields();
           createMessage.success(t('common.optSuccess'));
           emit('update');
+          loading.value = false
         } catch (error) {
           console.log('not passing', error);
+          loading.value = false
         }
       };
       function handleVisibleChange(v) {
@@ -262,6 +267,7 @@
         handleSubmit,
         addListFunc,
         resetFields,
+        loading,
         t,
       };
     },

src/views/dashboard/analysis/components/lineEcharts.vue

@@ -45,7 +45,7 @@ const props = defineProps({
     }
   }
 });
-const value = ref('0');
+const value = ref('2');
 const options = ref<SelectProps['options']>([
     {
       value: '0',

src/views/dashboard/analysis/components/lineEcharts2.vue

@@ -32,7 +32,7 @@
   loading: Boolean,
     ...basicProps,
   });
-  const value = ref('0');
+  const value = ref('2');
   const options = ref<SelectProps['options']>([
     {
       value: '0',
@@ -100,7 +100,7 @@
       },
       yAxis: {
         type: 'value',
-        max: maxSize.value,
+        // max: maxSize.value,
         splitNumber: 4,
       },
       series: [

src/views/dashboard/analysis/components/orderEchart.vue

@@ -29,7 +29,7 @@
   loading: Boolean,
     ...basicProps,
   });
-  const value = ref('0');
+  const value = ref('2');
   const options = ref<SelectProps['options']>([
     {
       value: '0',

src/views/dashboard/analysis/index.vue

@@ -67,9 +67,9 @@ const scenetData = reactive({
 const SearchData = reactive({
     startTime:'',
     endTime:'',
-    orderType:0,
-    sceneType:0,
-    userType:0,
+    orderType:2,
+    sceneType:2,
+    userType:2,
   })
 onMounted(() => {
   getData();

src/views/invoice/InvoiceModal.vue

@@ -6,6 +6,7 @@
     :okText="okText"
     @visible-change="handleVisibleChange"
     @cancel="resetFields"
+    :confirmLoading="loading"
     @ok="handleSubmit"
   >
     <div class="pt-2px pr-3px">
@@ -40,6 +41,7 @@
         type:2,//2-普通发票，3-专用发票
       })
       const okText = ref('发送')
+      const loading = ref(false)
       const { createMessage } = useMessage();
       const schemas: FormSchema[] = [
           {
@@ -80,7 +82,7 @@
             required: true,
             rules: [{ required: true, message: t('common.uploadMessge') }],
             itemProps: {
-              validateTrigger: 'onBlur',
+              validateTrigger: 'blur',
             },
             componentProps: {
               api: uploadApi,
@@ -150,6 +152,7 @@
         ])
       }
       const handleSubmit = async () => {
+        loading.value = true
         try {
           const params = await validate();
           const apiData = {
@@ -170,7 +173,9 @@
           resetFields();
           createMessage.success(t('common.optSuccess'));
           emit('update');
+          loading.value = false
         } catch (error) {
+          loading.value = false
           console.log('not passing', error);
         }
       };
@@ -186,6 +191,7 @@
         addListFunc,
         resetFields,
         okText,
+        loading,
         t,
       };
     },

src/views/operate/caseList.vue

@@ -106,11 +106,17 @@ export default defineComponent({
       // },
       {
         title: '类型',
-        dataIndex: 'newType',
+        dataIndex: 'typeId',
         ellipsis: true,
         width: 80,
         customRender: ({ record }) => {
-          return record.newType == 1 ? '链接' : '图文';
+          let obj = {
+            'smartCity':'智慧城市',
+            'museum':'博物馆',
+            'government':'刑侦消防',
+            'property':'房产营销',
+          }
+          return obj[record.typeId] || '智慧城市';
         },
       },
       {

src/views/operate/components/case/addModal.vue

@@ -9,7 +9,7 @@
     @ok="handleSubmit"
   >
     <div class="pt-2px pr-3px">
-      <BasicForm @register="registerForm" :model="model">
+      <BasicForm @register="registerForm" >
         <template #text="{ model, field }">
           {{ model[field] }}
         </template>
@@ -254,7 +254,7 @@ export default defineComponent({
     });
     async function onDataReceive(data) {
       modelRef.value = data;
-      resetFields();
+      // resetFields();
       // if (data.newType) {
       //   NewTypeChange(data.newType);
       // }

src/views/operate/components/new/addModal.vue

@@ -9,7 +9,7 @@
     @ok="handleSubmit"
   >
     <div class="pt-2px pr-3px">
-      <BasicForm @register="registerForm" :model="model" >
+      <BasicForm @register="registerForm" >
         <template #text="{ model, field }">
           {{ model[field]  }}
         </template>
@@ -143,7 +143,6 @@
               required: true,
               // @ts-ignore
               validator: async (rule, value) => {
-                console.log('validator',value)
                 if (!value) {
                   return Promise.reject('请输入新闻内容');
                 }
@@ -184,9 +183,7 @@
       async function onDataReceive(data) {
         modelRef.value = data
         resetFields();
-        if(data.newType){
-          NewTypeChange(data.newType)
-        }
+        NewTypeChange(data.newType)
         if(data.id){
           title.value = '编辑新闻'
           const detail = await NewsDetail({id:data.id})
@@ -201,10 +198,11 @@
           setFieldsValue({
             content:'',
             ...data,
+            newType:2,
           });
         }
       }
-      function NewTypeChange(val){
+      function NewTypeChange(val = 2){
         console.log('NewTypeChange',val)
         updateSchema([
           { field: 'content', ifShow:val == 2,},

src/views/system/role/role.data.ts

@@ -158,18 +158,18 @@ export const formSchema: FormSchema[] = [
   //     ],
   //   },
   // },
-  {
-    field: 'status',
-    label: t('routes.system.isPlatformRole'),
-    component: 'RadioButtonGroup',
-    defaultValue: 1,
-    componentProps: {
-      options: [
-        { label: '启用', value: 1 },
-        { label: '禁用', value: 0 },
-      ],
-    },
-  },
+  // {
+  //   field: 'status',
+  //   label: t('routes.system.isPlatformRole'),
+  //   component: 'RadioButtonGroup',
+  //   defaultValue: 1,
+  //   componentProps: {
+  //     options: [
+  //       { label: '启用', value: 1 },
+  //       { label: '禁用', value: 0 },
+  //     ],
+  //   },
+  // },
   {
     label: t('routes.system.description'),
     field: 'description',