feat:conflict

src/services/defaults.ts

@@ -1692,6 +1692,7 @@ export const formComponents = [
           height: 0,
           disableAnchor: true,
           // disableSize: true,
+          colHeaders:true,
           colWidth: 90,
           rowHeight: 32,
           bordered: false,
@@ -1702,10 +1703,11 @@ export const formComponents = [
           // hasHeader: false,
           textColor: '#FFFFFF',
           columns:[
-            {},
-            {},
-            {},
+            {text:'设备 ID'},
+            {text:'设备名称'},
+            {text:'数据协议'},
             { 
+              text:'级别',
               fnJs:`if(data==='一级告警'){
                   return {
                     text:data,
@@ -1924,10 +1926,11 @@ export const formComponents = [
           // stripe: true,
           swiper:true,
           // stripeColor: '#407FFF1F', //'#15181c',
-          hasHeader:true,
+          colHeaders:true,
           textColor: '#FFFFFF',
-          maxNum:5,
-          columns:[{},{},{},{
+          maxNum:5, 
+          columns:[{text:"序号"},{text:"时间"},{text:"事件内容"},{
+            text:"处理状态",
             fnJs:`
             if(data==='处理中'){
               return {
@@ -2036,21 +2039,21 @@ export const formComponents = [
                 "col": 2,
                 "width": 112
             },
-            {
-                "col": 3,
-                "pens": [
-                    {
-                        "disableAnchor": true,
-                        "fontSize": 0.6,
-                        "height": 20,
-                        "lineWidth": 0,
-                        "name": "rectangle",
-                        "textColor": "#05CFF9FF",
-                        "width": 56
-                    }
-                ],
-                "width": 70
-            },
+            // {
+            //     "col": 3,
+            //     "pens": [
+            //         {
+            //             "disableAnchor": true,
+            //             "fontSize": 0.6,
+            //             "height": 20,
+            //             "lineWidth": 0,
+            //             "name": "rectangle",
+            //             "textColor": "#05CFF9FF",
+            //             "width": 56
+            //         }
+            //     ],
+            //     "width": 70
+            // },
             {
                 "col": 0,
                 "pens": [
@@ -2157,7 +2160,7 @@ export const formComponents = [
           stripeColor: "#407FFF1F",
           ellipsis: true,
           whiteSpace: "break-all",
-          maxNum:11,
+          maxNum:10,
           colHeaders:true,
           pagination: {
             current: 1,
@@ -2171,9 +2174,15 @@ export const formComponents = [
             ],
             size: "small",
             total: 88
-          },
-          columns:[{},{},{},
-            {
+          }, 
+          columns:[{
+              text:'场景',
+            },{
+              text:'图纸id'
+            },{
+              text:'名称'
+            },{
+              text:'操作',
               fnJs:` 
               let link = 'https://view.le5le.com/2d?id='+data;
               return  {
@@ -2198,7 +2207,7 @@ export const formComponents = [
               "actions": [
                 {
                   "action": 15,
-                  "callback": " let _data = [['场景','图纸id','名称','操作']]; \r\n      let data1 = JSON.parse(data);\r\n      pen.pagination.total = data1.total;\r\n      pen.calculative.paginationPen.total = data1.total;\r\n      data1.list.forEach((item)=>{\r\n        let _item = [item.case?item.case:'无',item.id,item.name,item.id];\r\n        _data.push(_item);\r\n      });\r\n      context.meta2d.setValue({id:pen.id,data:_data},{doEvent:false,history:false});",
+                  "callback": " let _data = []; \r\n      let data1 = JSON.parse(data);\r\n      pen.pagination.total = data1.total;\r\n      pen.calculative.paginationPen.total = data1.total;\r\n      data1.list.forEach((item)=>{\r\n        let _item = [item.case?item.case:'无',item.id,item.name,item.id];\r\n        _data.push(_item);\r\n      });\r\n      context.meta2d.setValue({id:pen.id,data:_data},{doEvent:false,history:false});",
                   "input": "",
                   "network": {
                     "httpTimeInterval": 1000,
@@ -2231,12 +2240,7 @@ export const formComponents = [
             }
           ],
           data: [
-            [
-              "场景",
-              "图纸id",
-              "名称",
-              "操作"
-            ],
+          
             [
               "智慧物联",
               "01840e23-efb8-70d4-804b-9402de84d2d7",

src/views/components/Graphics.vue

@@ -1294,16 +1294,14 @@ const dragStart = async (event: DragEvent | MouseEvent|TouchEvent, item: any) =>
           const _data = new Array(100).fill(0)
           .map((_, row) => new Array(10).fill(0)
           .map((_, column) => `${row}, ${column}`));
-          _data.splice(0, 0, new Array(10).fill(0).map((_, i) =>String.fromCharCode(65+i)));
+          // _data.splice(0, 0, new Array(10).fill(0).map((_, i) =>String.fromCharCode(65+i)));
           _data.forEach((item,index)=>{
-            if(index==0){
-              item.splice(0, 0, '');
-            }else{
-              item.splice(0, 0, index+'');
-            }
+              item.splice(0, 0, index+1+'');
           })
+          const columns = new Array(10).fill(0).map((_, i) =>{return {text:String.fromCharCode(65+i)}});
+          columns.splice(0, 0, {text:''});
           data.data = _data;
-          // console.log("data",data);
+          data.columns = columns;
         }
       }
     }