inl-ui 0.0.12 → 0.0.14

package/dist/index.js

@@ -17,7 +17,7 @@ import { ColorPicker } from 'vue-color-kit';
 import 'vue-color-kit/dist/vue-color-kit.css';
 import 'inl-card/dist/style.css';
 
-var version$1="0.0.62";/*
+var version$1="0.0.63";/*
  * @Abstract: 摘要
  * @Author: wang liang
  * @Date: 2022-03-25 10:44:08
@@ -144,7 +144,7 @@ const columnsOut=[{title:"销货商",dataIndex:"seller"},{title:"具体时间",d
 },setup(){const form=reactive({tableData:[],overhaul:0,function:0,hotStandby:0,coldStandby:0});const getData=async()=>{const{data}=await instance$1$1.post("/getCardData",{card:"electricMonitor"});form.tableData=data.rows;form.overhaul=data.overhaul;form.function=data.function;form.hotStandby=data.hotStandby;form.coldStandby=data.coldStandby;};onMounted(getData);return ()=>createVNode("div",{"class":"electric-monitor statisticsAndList"},[createVNode("div",{"class":"statistics flex"},[createVNode("div",{"class":"ele"},[createVNode("div",{"class":"name"},[createTextVNode("\u68C0\u4FEE")]),createVNode("div",{"class":"number"},[form.overhaul])]),createVNode("div",{"class":"ele"},[createVNode("div",{"class":"name"},[createTextVNode("\u8FD0\u884C")]),createVNode("div",{"class":"number green"},[form.function])]),createVNode("div",{"class":"ele"},[createVNode("div",{"class":"name"},[createTextVNode("\u70ED\u5907\u7528")]),createVNode("div",{"class":"number orange"},[form.hotStandby])]),createVNode("div",{"class":"ele"},[createVNode("div",{"class":"name"},[createTextVNode("\u70ED\u5907\u7528")]),createVNode("div",{"class":"number blue"},[form.coldStandby])])]),withDirectives(createVNode(resolveComponent("a-table"),{"class":"dark-table","pagination":false,"columns":columns$5$1,"scroll":{y:150},"dataSource":form.tableData},null),[[resolveDirective("autoScroll")]])]);}});const mock$m={"rows|10":[{name:"@cword(4)","la|16-30":1,"Uab|20-50":1,"P|100-500":1,"Q|100-500":1}],"overhaul|1-10":1,"function|1-10":1,"hotStandby|1-10":1,"coldStandby|1-10":1};const columns$4$1=[{title:" 设备名称",dataIndex:"name"},{title:"来源",dataIndex:"source"},{title:"内容",dataIndex:"content"},{title:"报告时间",dataIndex:"reportingTime"}];const Item$7=({name,value,total,color})=>createVNode("div",{"class":"item"},[createVNode("div",{"class":"name"},[name]),createVNode("div",{"class":"content"},[createVNode("span",{"class":["value",color]},[value]),createVNode("span",{"class":"total"},[createTextVNode("/")]),createVNode("span",{"class":"total"},[total])])]);/**
  * 故障、报警、隐患
  */const AlarmFaultDanger=defineComponent({name:"alarmFaultDanger",cname:"故障、报警、隐患",developer:"前端开发组",equipment:"PC",directives:{autoScroll},props:{prefix:String,serverName:String,timeout:Number// 接口请求超时时长
-},setup(){const form=reactive({tableData:[],alarmEquipment:{value:0,total:0},reportHiddenDanger:{value:0,total:0},reportFault:{value:0,total:0}});const getData=async()=>{const{data}=await instance$1$1.post("/getCardData",{card:"alarmFaultDanger"});form.tableData=data.rows;form.alarmEquipment=data.alarmEquipment;form.reportHiddenDanger=data.reportHiddenDanger;form.reportFault=data.reportFault;};onMounted(getData);return ()=>createVNode("div",{"class":"alarm-fault-danger"},[createVNode("div",{"class":"statistics-container"},[createVNode(Item$7,{"name":"报警设备","color":"red","value":form.alarmEquipment.value,"total":form.alarmEquipment.total},null),createVNode(Item$7,{"name":"上报隐患","color":"blue","value":form.reportHiddenDanger.value,"total":form.reportHiddenDanger.total},null),createVNode(Item$7,{"name":"上报故障","color":"yellow","value":form.reportFault.value,"total":form.reportFault.total},null)]),withDirectives(createVNode(resolveComponent("a-table"),{"class":"table dark-table3","pagination":false,"columns":columns$4$1,"scroll":{y:200},"dataSource":form.tableData},null),[[resolveDirective("autoScroll")]])]);}});const mock$l={alarmEquipment:{"total|1-50":1,"value|1-50":1},reportHiddenDanger:{"total|1-50":1,"value|1-50":1},reportFault:{"total|1-50":1,"value|1-50":1},"rows|3":[{name:"@cword(4)",source:"@cword(2)",content:"@ctitle",reportingTime:"@date(yyyy-MM-dd HH:mm:ss)"}]};const prefix$2="inl-card";const installCom=(component,name)=>{component.install=app=>{app.component(`${prefix$2}-${name}`,component);};return component;};const screen$1={// 退出全屏
+},setup(){const form=reactive({tableData:[],alarmEquipment:{value:0,total:0},reportHiddenDanger:{value:0,total:0},reportFault:{value:0,total:0}});const getData=async()=>{const{data}=await instance$1$1.post("/getCardData",{card:"alarmFaultDanger"});form.tableData=data.rows;form.alarmEquipment=data.alarmEquipment;form.reportHiddenDanger=data.reportHiddenDanger;form.reportFault=data.reportFault;};onMounted(getData);return ()=>createVNode("div",{"class":"alarm-fault-danger"},[createVNode("div",{"class":"statistics-container"},[createVNode(Item$7,{"name":"报警设备","color":"red","value":form.alarmEquipment.value,"total":form.alarmEquipment.total},null),createVNode(Item$7,{"name":"上报隐患","color":"blue","value":form.reportHiddenDanger.value,"total":form.reportHiddenDanger.total},null),createVNode(Item$7,{"name":"上报故障","color":"yellow","value":form.reportFault.value,"total":form.reportFault.total},null)]),withDirectives(createVNode(resolveComponent("a-table"),{"class":"table dark-table3","pagination":false,"columns":columns$4$1,"scroll":{y:200},"dataSource":form.tableData},null),[[resolveDirective("autoScroll")]])]);}});const mock$l={alarmEquipment:{"total|25-50":1,"value|1-25":1},reportHiddenDanger:{"total|25-50":1,"value|1-25":1},reportFault:{"total|25-50":1,"value|1-25":1},"rows|3":[{name:"@cword(4)",source:"@cword(2)",content:"@ctitle",reportingTime:"@date(yyyy-MM-dd HH:mm:ss)"}]};const prefix$2="inl-card";const installCom=(component,name)=>{component.install=app=>{app.component(`${prefix$2}-${name}`,component);};return component;};const screen$1={// 退出全屏
 exitFullscreen(id){const dom=document.getElementById(id);dom.addEventListener("click",event=>{if(document.fullscreenElement===dom){document.exitFullscreen();}event.preventDefault();});},// 进入全屏
 requestFullscreen(id){const dom=document.getElementById(id);dom.requestFullscreen();}};const formatMoney=(number,decimals=0,decPoint=".",thousandsSep=",")=>{number=(number+"").replace(/[^0-9+-Ee.]/g,"");let n=!isFinite(+number)?0:+number;let prec=!isFinite(+decimals)?0:Math.abs(decimals);let sep=typeof thousandsSep==="undefined"?",":thousandsSep;let dec=typeof decPoint==="undefined"?".":decPoint;let s;let toFixedFix=function(n,prec){let k=Math.pow(10,prec);return ""+Math.ceil(n*k)/k;};s=(prec?toFixedFix(n,prec):""+Math.round(n)).split(".");let re=/(-?\d+)(\d{3})/;while(re.test(s[0])){s[0]=s[0].replace(re,"$1"+sep+"$2");}if((s[1]||"").length<prec){s[1]=s[1]||"";s[1]+=new Array(prec-s[1].length+1).join("0");}return s.join(dec);};const columns$3$1=[{title:"车号",dataIndex:"licenseNumber"},{title:"重量(t)",dataIndex:"weight"},{title:"起止点",dataIndex:"startingAndEndingPoints"},{title:"运输状态",dataIndex:"transportationStatus"}];const status=value=>{switch(value){case 0:return "待发货";case 1:return "运输中";case 2:return "已送达";default:return "--";}};const Item$6=({name,value})=>{return createVNode("div",{"class":"item"},[createVNode("div",{"class":"name"},[name]),createVNode("div",{"class":"value"},[value])]);};/**
  * 物流信息
@@ -326,7 +326,7 @@ const textAlign="center";group.addShape({type:"text",attrs:{x:0,y:0,text:obj.nam
 onBeforeUnmount(()=>chartIns.value?.destroy());return ()=>createVNode("div",{"class":"chart"},[createVNode("div",{"ref":chartRef},null)]);}});const Item$4=props=>{const{name,value,total}=props;return createVNode("div",{"class":"item"},[createVNode("div",{"class":"name"},[name]),createVNode("div",{"class":"content"},[createVNode("div",{"class":"value"},[value]),total!==undefined&&createVNode("div",{"class":"total"},[createTextVNode("/"),total])])]);};/**
  * 检修计划
  */const OverhaulPlan=defineComponent({name:"overhaulPlan",cname:"检修计划",developer:"前端开发组",equipment:"PC",props:{prefix:String,serverName:String,timeout:Number// 接口请求超时时长
-},setup(){const form=reactive({repairTime:"",maintain:{total:0,value:0},overhaul:{total:0,value:0},runDripLeak:{total:0,value:0},rows:[]});const getData=async()=>{const{data}=await instance$1$1.post("/getCardData",{card:"overhaulPlan"});form.repairTime=data.repairTime;form.maintain=data.maintain;form.overhaul=data.overhaul;form.runDripLeak=data.runDripLeak;form.rows=data.rows;};onMounted(getData);return ()=>createVNode("div",{"class":"overhaul-plan"},[createVNode("div",{"class":"statistics-container"},[createVNode(Item$4,{"name":"今日检修时间","value":form.repairTime},null),createVNode(Item$4,{"name":"日常维护(项)","value":form.maintain.value,"total":form.maintain.total},null),createVNode(Item$4,{"name":"大修更换(项)","value":form.overhaul.value,"total":form.overhaul.total},null),createVNode(Item$4,{"name":"跑冒滴漏溅撒(项)","value":form.runDripLeak.value,"total":form.runDripLeak.value},null)]),createVNode(ChartContainer,{"data":form.rows},null)]);}});const mock$7={repairTime:"@time(HH:mm)-@time(HH:mm)",maintain:{"total|10-50":1,"value|10-50":1},overhaul:{"total|10-50":1,"value|10-50":1},runDripLeak:{"total|10-50":1,"value|10-50":1},rows:[{name:"日常维护","value|1-100":1},{name:"大修更换","value|1-100":1},{name:"其他","value|1-100":1}]};// const tempData = [
+},setup(){const form=reactive({repairTime:"",maintain:{total:0,value:0},overhaul:{total:0,value:0},runDripLeak:{total:0,value:0},rows:[]});const getData=async()=>{const{data}=await instance$1$1.post("/getCardData",{card:"overhaulPlan"});form.repairTime=data.repairTime;form.maintain=data.maintain;form.overhaul=data.overhaul;form.runDripLeak=data.runDripLeak;form.rows=data.rows;};onMounted(getData);return ()=>createVNode("div",{"class":"overhaul-plan"},[createVNode("div",{"class":"statistics-container"},[createVNode(Item$4,{"name":"今日检修时间","value":form.repairTime},null),createVNode(Item$4,{"name":"日常维护(项)","value":form.maintain.value,"total":form.maintain.total},null),createVNode(Item$4,{"name":"大修更换(项)","value":form.overhaul.value,"total":form.overhaul.total},null),createVNode(Item$4,{"name":"跑冒滴漏溅撒(项)","value":form.runDripLeak.value,"total":form.runDripLeak.total},null)]),createVNode(ChartContainer,{"data":form.rows},null)]);}});const mock$7={repairTime:"@time(HH:mm)-@time(HH:mm)",maintain:{"total|25-50":1,"value|1-25":1},overhaul:{"total|25-50":1,"value|1-25":1},runDripLeak:{"total|25-50":1,"value|1-25":1},rows:[{name:"日常维护","value|1-100":1},{name:"大修更换","value|1-100":1},{name:"其他","value|1-100":1}]};// const tempData = [
 //   { name: "孙瞳", value: 1500 },
 //   { name: "袁一", value: 1200 },
 //   { name: "青东", value: 1600 },
@@ -1077,7 +1077,7 @@ const stopPlay=()=>{if(play){play.stopPlay(`videoPlayer${time$1}${_prop.index||0
 const init=()=>{play=null;const camera=videoInfo.value;const{channel,streamType}=camera;let url=camera.webrtcTemplateMerged;if(channel&&streamType&&url.indexOf("${channel}")>-1&&url.indexOf("${streamType}")>-1){url=url.replaceAll("${channel}",channel);url=url.replaceAll("${streamType}",streamType);play=new WebRtcMt$3({plays:{videoElm:`videoPlayer${time$1}${_prop.index||0}`,mediaServerAddr:camera.mediaServerPo.url,cameraUserName:camera.user,cameraPwd:camera.pass,cameraIp:camera.ip,cameraRtspPort:camera.rtspPort,cameraChannel:camera.channel,cameraStream:camera.streamType,addRtspProxyUrl:url}});}else {message.error("缺少参数");}};const stopV=id=>{const videoElement=document.getElementById(id);if(videoElement){videoElement.pause();videoElement.removeAttribute("src");// empty source
 videoElement.load();}};const timer=setInterval(()=>{stopPlay();stopV(`videoPlayer${timer}${_prop.index||0}`);init();},3600000);// 播放信息变化初始化视频
 watch(()=>_prop.camera,async e=>{stopPlay();stopV(`videoPlayer${timer}${_prop.index||0}`);if(e&&typeof e==="object"){videoInfo.value=e;init();}else if(e&&typeof e==="string"){const res=await instance$1$1.get("vms/v1/camera/getByUuid",{params:{uuid:e}});if(res.data){videoInfo.value=res.data;init();}}},{immediate:true,deep:true});// 页面销毁时停止播放视频流
-onUnmounted(()=>{stopPlay();stopV(`videoPlayer${timer}${_prop.index||0}`);clearInterval(timer);});return ()=>createVNode("video",{"id":`videoPlayer${time$1}${_prop.index||0}`,"style":"height:100%;width:100%;position: relative;background-color: #000000;","muted":true,"autoplay":true},null);}});const props$6$1={data:{type:Object},index:Number};const video=defineComponent({props:props$6$1,components:{VideoPlayer: VideoPlayer$2},setup(props,ctx){return ()=>createVNode("div",{"class":"video"},[createVNode(VideoPlayer$2,{"camera":props.data?.camera,"index":props.index},null),createVNode("div",{"class":"tool flex"},[createVNode(VideoCameraFilled,{"class":"icon blue"},null),createVNode("div",{"class":"flex1"},[props.data?.name]),createVNode("div",{"class":"full"},[createVNode(FullscreenOutlined,{"class":"yellow"},null)])])]);}});const videos=defineComponent({name:"videos",cname:"视频",developer:"前端开发组",equipment:"PC",setup(){const videoList=ref([]);const getData=async()=>{const{data}=await instance$1$1.post("/getCardData",{card:"videos"});videoList.value=data.rows;};onMounted(getData);return ()=>createVNode("div",{"class":"videos"},[videoList.value.map((ele,index)=>{return createVNode(video,{"data":ele,"index":index},null);})]);}});const mock$1={"rows|9":[{name:"@cword('东西',1)区@cword('装卸')车",camera:"c360022543485562880"}]};const props$5$1={tabId:String,workShopType:String,cardCode:String,prefix:String,serverName:String,timeout:Number,index:Number// 索引值
+onUnmounted(()=>{stopPlay();stopV(`videoPlayer${timer}${_prop.index||0}`);clearInterval(timer);});return ()=>createVNode("video",{"id":`videoPlayer${time$1}${_prop.index||0}`,"style":"height:100%;width:100%;position: relative;background-color: #000000;","muted":true,"autoplay":true},null);}});const props$6$1={data:{type:Object},index:Number};const video=defineComponent({props:props$6$1,components:{VideoPlayer: VideoPlayer$2},setup(props,ctx){return ()=>createVNode("div",{"class":"video"},[createTextVNode("23"),createVNode("div",{"class":"tool flex"},[createVNode(VideoCameraFilled,{"class":"icon blue"},null),createVNode("div",{"class":"flex1"},[props.data?.name]),createVNode("div",{"class":"full"},[createVNode(FullscreenOutlined,{"class":"yellow"},null)])])]);}});const videos=defineComponent({name:"videos",cname:"视频",developer:"前端开发组",equipment:"PC",setup(){const videoList=ref([]);const getData=async()=>{const{data}=await instance$1$1.post("/getCardData",{card:"videos"});videoList.value=data.rows;};onMounted(getData);return ()=>createVNode("div",{"class":"videos"},[videoList.value.map((ele,index)=>{return createVNode(video,{"data":ele,"index":index},null);})]);}});const mock$1={"rows|9":[{name:"@cword('东西',1)区@cword('装卸')车",camera:"c360022543485562880"}]};const props$5$1={tabId:String,workShopType:String,cardCode:String,prefix:String,serverName:String,timeout:Number,index:Number// 索引值
 };var demoCard=defineComponent({name:"demoCard",cname:"默认卡片",developer:"前端开发组",equipment:"PC",props:props$5$1,setup(_props,_ctx){// 自定义接口配置
 setInstance$1$1({prefix:_props.prefix,serverName:_props.serverName,timeout:_props.timeout// 超时时长
 });const http=async()=>{await defaultApi({CURRENT_DATA:[{code:"flow_monitor_air2__FLOW",datasource:"DATAWAREHOURSE"}],HISTORY_DATA:[{code:"flow_monitor_air1__FLOW",startTime:2022,endTime:2023,timeType:"YEAR",shiftId:"0"}]},"TAIL_COAL_FILTER_PRESS");};onMounted(()=>{http();});return ()=>createVNode("div",{"class":"default"},[createTextVNode("111")]);}});const cards=[...defaultCard,...bigScreenCard,...dataList$1,...chart,...cardList$1,videos,demoCard];const props$4$1={layout:{type:String,default:"pc"},row:{type:Number,default:4},col:{type:Number,default:5},cards:{type:Array,default:[{name:"默认卡片",componentName:"default",row:"1/1",col:"3/1",params:{workShopType:"index",cardCode:"",prefix:"/api/",serverName:"card/v1",timeout:30// 超时时间 单位:s
@@ -1093,7 +1093,7 @@ serverName:String,// 接口文件名
 timeout:Number// 接口请求超时时长
 },setup(){const form=reactive({systemYieldData:[],coalRankYieldData:[]});const getData=async()=>{const{data}=await instance$1$1.post("/getCardData",{card:"productionStatistics"});form.systemYieldData=data.systemYieldData;form.coalRankYieldData=data.coalRankYieldData;};onMounted(getData);return ()=>createVNode("div",{"class":"production-statistics"},[createVNode(SystemYield,{"data":form.systemYieldData},null),createVNode(CoalRankYield,{"data":form.coalRankYieldData},null)]);}});const mock={systemYieldData:[{name:"东区1#","value|0-20000":1},{name:"东区1#","percent|0-100":1,type:"产率"},{name:"东区2#","value|0-20000":1},{name:"东区2#","percent|0-100":1,type:"产率"},{name:"西区1#","value|0-20000":1},{name:"西区1#","percent|0-100":1,type:"产率"},{name:"西区2#","value|0-20000":1},{name:"西区2#","percent|0-100":1,type:"产率"},{name:"西区3#","value|0-20000":1},{name:"西区3#","percent|0-100":1,type:"产率"}],coalRankYieldData:[{name:"肥","value|1000-20000":1},{name:"焦","value|1000-20000":1},{name:"1/3焦","value|1000-20000":1},{name:"中","value|1000-20000":1},{name:"煤泥","value|1000-20000":1},{name:"矸石","value|1000-20000":1}]};var mockData={storageInfo:mock$d,remoteSwitchhouse:mock$y,substation:mock$x,electricMonitor:mock$m,rawCoalSendIn2:mock$9,productionPlan2:mock$e,productionStatistics:mock,mechineTimeDayStatistics:mock$8,drySeparationPlant:mock$6,luLingDayStatistics:mock$5,humanResources:mock$4,energyConsumptionInfo:mock$3,logisticsInfo:mock$k,commodityConsume:mock$j,deviceOverview:mock$2,overhaulPlan:mock$7,smartInspection:mock$n,remoteElectricity:mock$u,alarmFaultDanger:mock$l,productionPlan:mock$i,washingRawCoalQuantity:mock$h,washingSystemHandleQuantity:mock$q,systemRunStatus:mock$p,realTimeAshWater:mock$b,consumeAnalysis:mock$a,alarmInfo:mock$w,keyEquipmentTesting:mock$s,opsInfo:mock$r,hiddenTrouble:mock$v,faultJudgment:mock$t,rawCoalSendIn:mock$g,warehouseStorage:mock$f,sendInOutCoalList:mock$o,outTransportStatistics:mock$c,videos:mock$1};const cardList=[];const coms=[];const createComp=()=>{coms.push(installCom(Layout,"layout"));coms.push(installCom(CardBox,"box"));coms.push(installCom(layoutEditor,"layout-editor"));for(let i of cards){const com=installCom(i,i.name);coms.push(com);cardList.push({name:i.name,cname:i.cname,developer:i.developer,equipment:i.equipment,version: version$1});}};createComp();var index$1={install(app){for(let i of coms){app.use(i);}},cards:cardList,mockData:mockData,version: version$1};
 
-var version = "0.0.12";
+var version = "0.0.14";
 
 const config$1 = {
   prefix: "inl"
@@ -39687,23 +39687,11 @@ var NewOrder = defineComponent({
       dataSource: [],
       columns: [{
         dataIndex: "name",
-        title: "设备编号/名称",
-        width: "30%",
-        ellipsis: true,
-        customRender: rowCell => {
-          const {
-            record
-          } = rowCell;
-          const {
-            code,
-            name
-          } = record;
-          return createVNode("div", null, [code, name]);
-        }
+        title: "名称",
+        ellipsis: true
       }, {
         dataIndex: "location",
         title: "设备位置",
-        width: "30%",
         ellipsis: true
       }, {
         dataIndex: "loop",
@@ -39878,7 +39866,7 @@ var NewOrder = defineComponent({
               "class": "titleLine flex-center"
             }, [createVNode("span", {
               "class": "title"
-            }, [device.code, device.name]), createVNode(Button, {
+            }, [device.name]), createVNode(Button, {
               "type": "link",
               "onClick": () => {
                 formState.value.deviceList.splice(index, 1);
@@ -40041,6 +40029,7 @@ var NewOrder = defineComponent({
           "pagination": false,
           "columns": eqModal.columns,
           "scroll": {
+            x: 760,
             y: 440
           },
           "dataSource": eqModal.dataSource,
@@ -40074,7 +40063,8 @@ var NewOrder = defineComponent({
         })]), createVNode("div", {
           "class": "activedBox"
         }, [selectedList.value.map((selected, idx) => {
-          const name = `${selected.code}${selected.name}`;
+          // const name = `${selected.code}${selected.name}`;
+          const name = selected.name;
           const textLength = 10;
           const title = name.length > textLength ? name : "";
           return createVNode(resolveComponent("a-tag"), {
@@ -40519,9 +40509,9 @@ var Info$1 = defineComponent({
         }, {
           default: () => [createVNode("div", {
             "class": "label"
-          }, [createTextVNode("\u8BBE\u5907\u7F16\u53F7/\u540D\u79F0:")]), createVNode("div", {
+          }, [createTextVNode("\u540D\u79F0:")]), createVNode("div", {
             "class": "value"
-          }, [dataObj.value.equipCode, dataObj.value.equipName])]
+          }, [dataObj.value.equipName])]
         }), createVNode(Col, {
           "span": 8
         }, {
@@ -40906,9 +40896,9 @@ var Tables = defineComponent({
         key: "currentState",
         width: 140
       }, {
-        // dataIndex: "equipName",
-        title: "设备编号/名称",
-        key: "numAndName",
+        dataIndex: "equipName",
+        title: "名称",
+        // key: "numAndName",
         width: 200
       }, {
         title: "回路数量",
@@ -41319,10 +41309,15 @@ var Tables = defineComponent({
             "class": ["stateNode", record.taskFlag]
           }, [record.taskStatus]);
         }
-        // 设备编号/名称
-        if (column.key === "numAndName") {
-          return createVNode("span", null, [record.equipCode, record.equipName]);
-        }
+        // // 设备编号/名称
+        // if (column.key === "numAndName") {
+        //   return (
+        //     <span>
+        //       {record.equipCode}
+        //       {record.equipName}
+        //     </span>
+        //   );
+        // }
         // 回路数量
         if (column.key === "loopsNum") {
           return createVNode("span", null, [record.loops.length, createTextVNode("\u4E2A")]);
@@ -41704,8 +41699,9 @@ const com$d = defineComponent({
         key: "currentState",
         width: 120
       }, {
-        title: "设备编号/名称",
-        key: "numAndName",
+        dataIndex: "equipName",
+        title: "名称",
+        // key: "numAndName",
         width: 200
       }, {
         title: "回路数量",
@@ -41840,10 +41836,14 @@ const com$d = defineComponent({
             "class": ["stateNode", record.taskFlag]
           }, [record.taskStatus]);
         }
-        // 设备编号/名称
-        if (column.key === "numAndName") {
-          return createVNode("span", null, [record.equipCode, createTextVNode("-"), record.equipName]);
-        }
+        // // 设备编号/名称
+        // if (column.key === "numAndName") {
+        //   return (
+        //     <span>
+        //       {record.equipCode}-{record.equipName}
+        //     </span>
+        //   );
+        // }
         // 回路数量
         if (column.key === "loopsNum") {
           return createVNode("span", null, [record.loops.length, createTextVNode("\u4E2A")]);