Merge branch 'main' of http://123.132.248.154:10000/HC_YFZX/CaiYuanYiTiHua

src/layouts/default/header/components/notify/index.vue

@@ -94,8 +94,8 @@
     // });
     console.log(data);
     let arr: any = [];
-    if (data.items && data.items.length > 0) {
-      data.items.forEach((item: any) => {
+    if (data && data.length > 0) {
+      data.forEach((item: any) => {
         arr.push({
           id: item.msgId,
           title: item.content,

src/views/demo/statistical/illegaltreatment/illegaltreatment.data.ts

@@ -97,24 +97,29 @@ export const columns: BasicColumn[] = [
         },
       ],
     },
+    fixed: 'right',
   },
   {
     title: '立案号',
     dataIndex: 'registrnumber',
     editRow: true,
     editComponent: 'Input',
+    fixed: 'right',
   },
   {
     title: '违法联系人',
     dataIndex: 'illegalcontact',
     editRow: true,
     editComponent: 'Input',
+    fixed: 'right',
   },
   {
     title: '违法人身份证号',
     dataIndex: 'illegalshenfenzhenghao',
     editRow: true,
     editComponent: 'Input',
+    fixed: 'right',
+    width: 160,
   },
 ];