codeMan %!s(int64=2) %!d(string=hai) anos
pai
achega
c591a8a1a5
Modificáronse 59 ficheiros con 61 adicións e 53 borrados
  1. 1 1
      dist/assets/PlusCircleOutlined-63c2ef7e.js
  2. 0 0
      dist/assets/base-e6cf7c6a.js
  3. 1 1
      dist/assets/customBtn-d153d5d7.js
  4. 0 0
      dist/assets/dataBlock-9c1471a0.js
  5. 1 1
      dist/assets/index-0fb7ee87.js
  6. 0 0
      dist/assets/index-174c4512.js
  7. 0 0
      dist/assets/index-1c5bbc52.js
  8. 1 1
      dist/assets/index-2923a0ac.js
  9. 0 0
      dist/assets/index-2a9849d7.js
  10. 0 0
      dist/assets/index-38419bad.js
  11. 0 0
      dist/assets/index-445838ea.js
  12. 0 0
      dist/assets/index-49518271.js
  13. 0 0
      dist/assets/index-4ede458a.js
  14. 0 0
      dist/assets/index-4f148303.js
  15. 0 0
      dist/assets/index-5bda4634.js
  16. 0 0
      dist/assets/index-5c4fedaa.js
  17. 0 0
      dist/assets/index-61d6830a.js
  18. 0 0
      dist/assets/index-63fc224c.js
  19. 0 0
      dist/assets/index-6eb61e0c.js
  20. 0 0
      dist/assets/index-72e5d4a9.js
  21. 0 0
      dist/assets/index-7d8cda8f.js
  22. 0 0
      dist/assets/index-832b9380.js
  23. 0 0
      dist/assets/index-896152b6.js
  24. 0 0
      dist/assets/index-89783a8e.js
  25. 0 0
      dist/assets/index-8f7ed7c4.js
  26. 0 0
      dist/assets/index-9baed5bb.js
  27. 1 1
      dist/assets/index-a2c46d08.js
  28. 1 1
      dist/assets/index-a6b780fb.js
  29. 0 0
      dist/assets/index-a7477512.js
  30. 0 0
      dist/assets/index-aff2acbb.js
  31. 0 0
      dist/assets/index-b01f8302.js
  32. 0 0
      dist/assets/index-b9de2b3e.js
  33. 0 0
      dist/assets/index-b9f6e2bf.js
  34. 0 0
      dist/assets/index-bc9e63c2.js
  35. 0 0
      dist/assets/index-c5517ec0.js
  36. 0 0
      dist/assets/index-d0c789fd.js
  37. 0 0
      dist/assets/index-d6285843.js
  38. 0 0
      dist/assets/index-e01c67fb.js
  39. 0 0
      dist/assets/index-e053bd16.js
  40. 0 0
      dist/assets/index-e358199a.js
  41. 0 0
      dist/assets/index-e45c4dfe.js
  42. 0 0
      dist/assets/index-ea86a4a7.js
  43. 0 0
      dist/assets/index-ee3234f8.js
  44. 0 0
      dist/assets/index-f3a2264f.js
  45. 0 0
      dist/assets/index-fcdcb0ee.js
  46. 0 0
      dist/assets/index-ff662dc3.js
  47. 1 1
      dist/assets/index.vue_vue_type_style_index_0_scoped_f6f545f0_lang-090ef8da.js
  48. 0 0
      dist/assets/index2-b42f7b61.js
  49. 1 1
      dist/assets/login-0828af37.js
  50. 0 0
      dist/assets/map-d77b08b0.js
  51. 1 1
      dist/index.html
  52. 8 2
      src/system/IOT/IoTdashboard/index.vue
  53. 1 1
      src/system/IOT/equipmentMag/detail/modules/attributeTab/modules/Add.vue
  54. 1 1
      src/system/IOT/equipmentMag/detail/modules/attributeTab/modules/Edit.vue
  55. 1 1
      src/system/IOT/gatewayManage/index.vue
  56. 14 18
      src/system/IOT/gatewayManage/modules/Add.vue
  57. 14 19
      src/system/IOT/gatewayManage/modules/Edit.vue
  58. 12 1
      src/system/IOT/iotcard/modules/add.vue
  59. 1 1
      src/system/IOT/productManage/detail/modules/attributeTab/modules/Edit.vue

+ 1 - 1
dist/assets/PlusCircleOutlined-71546928.js → dist/assets/PlusCircleOutlined-63c2ef7e.js

@@ -1 +1 @@
-import{b as a}from"./index-0347ddbf.js";import{j as u}from"./vue-b109b72f.js";var s={icon:{tag:"svg",attrs:{viewBox:"64 64 896 896",focusable:"false"},children:[{tag:"path",attrs:{d:"M696 480H544V328c0-4.4-3.6-8-8-8h-48c-4.4 0-8 3.6-8 8v152H328c-4.4 0-8 3.6-8 8v48c0 4.4 3.6 8 8 8h152v152c0 4.4 3.6 8 8 8h48c4.4 0 8-3.6 8-8V544h152c4.4 0 8-3.6 8-8v-48c0-4.4-3.6-8-8-8z"}},{tag:"path",attrs:{d:"M512 64C264.6 64 64 264.6 64 512s200.6 448 448 448 448-200.6 448-448S759.4 64 512 64zm0 820c-205.4 0-372-166.6-372-372s166.6-372 372-372 372 166.6 372 372-166.6 372-372 372z"}}]},name:"plus-circle",theme:"outlined"};const o=s;function i(r){for(var t=1;t<arguments.length;t++){var e=arguments[t]!=null?Object(arguments[t]):{},n=Object.keys(e);typeof Object.getOwnPropertySymbols=="function"&&(n=n.concat(Object.getOwnPropertySymbols(e).filter(function(c){return Object.getOwnPropertyDescriptor(e,c).enumerable}))),n.forEach(function(c){f(r,c,e[c])})}return r}function f(r,t,e){return t in r?Object.defineProperty(r,t,{value:e,enumerable:!0,configurable:!0,writable:!0}):r[t]=e,r}var l=function(t,e){var n=i({},t,e.attrs);return u(a,i({},n,{icon:o}),null)};l.displayName="PlusCircleOutlined";l.inheritAttrs=!1;const m=l;export{m as P};
+import{b as a}from"./index-5bda4634.js";import{j as u}from"./vue-b109b72f.js";var s={icon:{tag:"svg",attrs:{viewBox:"64 64 896 896",focusable:"false"},children:[{tag:"path",attrs:{d:"M696 480H544V328c0-4.4-3.6-8-8-8h-48c-4.4 0-8 3.6-8 8v152H328c-4.4 0-8 3.6-8 8v48c0 4.4 3.6 8 8 8h152v152c0 4.4 3.6 8 8 8h48c4.4 0 8-3.6 8-8V544h152c4.4 0 8-3.6 8-8v-48c0-4.4-3.6-8-8-8z"}},{tag:"path",attrs:{d:"M512 64C264.6 64 64 264.6 64 512s200.6 448 448 448 448-200.6 448-448S759.4 64 512 64zm0 820c-205.4 0-372-166.6-372-372s166.6-372 372-372 372 166.6 372 372-166.6 372-372 372z"}}]},name:"plus-circle",theme:"outlined"};const o=s;function i(r){for(var t=1;t<arguments.length;t++){var e=arguments[t]!=null?Object(arguments[t]):{},n=Object.keys(e);typeof Object.getOwnPropertySymbols=="function"&&(n=n.concat(Object.getOwnPropertySymbols(e).filter(function(c){return Object.getOwnPropertyDescriptor(e,c).enumerable}))),n.forEach(function(c){f(r,c,e[c])})}return r}function f(r,t,e){return t in r?Object.defineProperty(r,t,{value:e,enumerable:!0,configurable:!0,writable:!0}):r[t]=e,r}var l=function(t,e){var n=i({},t,e.attrs);return u(a,i({},n,{icon:o}),null)};l.displayName="PlusCircleOutlined";l.inheritAttrs=!1;const m=l;export{m as P};

A diferenza do arquivo foi suprimida porque é demasiado grande
+ 0 - 0
dist/assets/base-e6cf7c6a.js


+ 1 - 1
dist/assets/customBtn-89365069.js → dist/assets/customBtn-d153d5d7.js

@@ -1 +1 @@
-import"./index-0347ddbf.js";import{_ as B}from"./_plugin-vue_export-helper-c27b6911.js";import{a as _,c as C,V as t,W as a,a4 as d,F as b,a2 as f,$ as s,a1 as k,a0 as g,u as c,a7 as x,R as h}from"./vue-b109b72f.js";const S={class:"btn-box"},F=["onClick"],N={key:0,class:"icon1"},O={key:0,class:"content"},$={__name:"customBtn",props:{btnOptions:Array,btn:!1,tab:{type:Boolean,default:()=>!1},select:{type:Boolean,default:()=>!1},activeNormal:{type:Boolean,default:()=>!0},selectDisabled:{type:Boolean,default:()=>!1},btnColor:{type:String,default:()=>"rgb(22,255,246,.30)"},textColor:{type:String,default:()=>"#16FFF6"},icon1:{type:Boolean,default:()=>!1}},emits:["clickBtn","selectChange"],setup(e,{expose:v,emit:m}){const r=e;let n=_(r.activeNormal?r.btnOptions[0].label:""),y=C(o=>i=>(console.log(n.value),i.value==n.value)),p=o=>{n.value=o.label,m("clickBtn",o)};return v({active:n}),(o,i)=>(t(),a("div",null,[d("div",{class:"btn-wrapper",style:k([{"--btnColor":e.btnColor},{"--textColor":e.textColor}])},[d("div",S,[(t(!0),a(b,null,f(e.btnOptions,l=>(t(),a("div",{class:g(["btn-item",c(n)==l.label?"active":"",{active:e.btn}]),onClick:u=>c(p)(l)},x(l.label),11,F))),256))]),e.icon1?(t(),a("div",N)):s("",!0)],4),e.tab?(t(),a("div",O,[(t(!0),a(b,null,f(e.btnOptions,(l,u)=>(t(),a("div",null,[c(y)(l)?h(o.$slots,`slot${u}`,{key:0,data:l},void 0,!0):s("",!0)]))),256))])):s("",!0)]))}},w=B($,[["__scopeId","data-v-277be93f"]]);export{w as c};
+import"./index-5bda4634.js";import{_ as B}from"./_plugin-vue_export-helper-c27b6911.js";import{a as _,c as C,V as t,W as a,a4 as d,F as b,a2 as f,$ as s,a1 as k,a0 as g,u as c,a7 as x,R as h}from"./vue-b109b72f.js";const S={class:"btn-box"},F=["onClick"],N={key:0,class:"icon1"},O={key:0,class:"content"},$={__name:"customBtn",props:{btnOptions:Array,btn:!1,tab:{type:Boolean,default:()=>!1},select:{type:Boolean,default:()=>!1},activeNormal:{type:Boolean,default:()=>!0},selectDisabled:{type:Boolean,default:()=>!1},btnColor:{type:String,default:()=>"rgb(22,255,246,.30)"},textColor:{type:String,default:()=>"#16FFF6"},icon1:{type:Boolean,default:()=>!1}},emits:["clickBtn","selectChange"],setup(e,{expose:v,emit:m}){const r=e;let n=_(r.activeNormal?r.btnOptions[0].label:""),y=C(o=>i=>(console.log(n.value),i.value==n.value)),p=o=>{n.value=o.label,m("clickBtn",o)};return v({active:n}),(o,i)=>(t(),a("div",null,[d("div",{class:"btn-wrapper",style:k([{"--btnColor":e.btnColor},{"--textColor":e.textColor}])},[d("div",S,[(t(!0),a(b,null,f(e.btnOptions,l=>(t(),a("div",{class:g(["btn-item",c(n)==l.label?"active":"",{active:e.btn}]),onClick:u=>c(p)(l)},x(l.label),11,F))),256))]),e.icon1?(t(),a("div",N)):s("",!0)],4),e.tab?(t(),a("div",O,[(t(!0),a(b,null,f(e.btnOptions,(l,u)=>(t(),a("div",null,[c(y)(l)?h(o.$slots,`slot${u}`,{key:0,data:l},void 0,!0):s("",!0)]))),256))])):s("",!0)]))}},w=B($,[["__scopeId","data-v-277be93f"]]);export{w as c};

A diferenza do arquivo foi suprimida porque é demasiado grande
+ 0 - 0
dist/assets/dataBlock-9c1471a0.js


+ 1 - 1
dist/assets/index-bf985e43.js → dist/assets/index-0fb7ee87.js

@@ -1 +1 @@
-import{M as r,A as c,e as l}from"./index-0347ddbf.js";import{U as m,V as d,a3 as u,X as p,G as y,a7 as g,u as S}from"./vue-b109b72f.js";const f={__name:"index",props:{type:String,btnName:String,message:String,idName:String,keyName:String,id:[String,Number],paramData:{type:Array,default(){return[]}},size:String,disabled:Boolean},emits:["onSuccess"],setup(e,{emit:i}){const a=e;let o=()=>{r.confirm({title:a.message||"确定操作当前数据吗?",async onOk(){let t={content:{}};t.id=a.idName,t.content[a.keyName]=a.id,a.paramData.forEach(n=>{t.content[n.key]=n.value});let s=await c.requested(t);l.message(s,"操作成功",()=>{i("onSuccess")})},onCancel(){}})};return(t,s)=>{const n=m("a-button");return d(),u(n,{type:e.type?e.type:"primary",onClick:S(o),size:e.size||"small",disabled:e.disabled},{default:p(()=>[y(g(e.btnName),1)]),_:1},8,["type","onClick","size","disabled"])}}};export{f as _};
+import{M as r,A as c,e as l}from"./index-5bda4634.js";import{U as m,V as d,a3 as u,X as p,G as y,a7 as g,u as S}from"./vue-b109b72f.js";const f={__name:"index",props:{type:String,btnName:String,message:String,idName:String,keyName:String,id:[String,Number],paramData:{type:Array,default(){return[]}},size:String,disabled:Boolean},emits:["onSuccess"],setup(e,{emit:i}){const a=e;let o=()=>{r.confirm({title:a.message||"确定操作当前数据吗?",async onOk(){let t={content:{}};t.id=a.idName,t.content[a.keyName]=a.id,a.paramData.forEach(n=>{t.content[n.key]=n.value});let s=await c.requested(t);l.message(s,"操作成功",()=>{i("onSuccess")})},onCancel(){}})};return(t,s)=>{const n=m("a-button");return d(),u(n,{type:e.type?e.type:"primary",onClick:S(o),size:e.size||"small",disabled:e.disabled},{default:p(()=>[y(g(e.btnName),1)]),_:1},8,["type","onClick","size","disabled"])}}};export{f as _};

A diferenza do arquivo foi suprimida porque é demasiado grande
+ 0 - 0
dist/assets/index-174c4512.js


A diferenza do arquivo foi suprimida porque é demasiado grande
+ 0 - 0
dist/assets/index-1c5bbc52.js


+ 1 - 1
dist/assets/index-e9986431.js → dist/assets/index-2923a0ac.js

@@ -1 +1 @@
-import{l as n}from"./index-af5011fb.js";import{a as e,o as p,V as s,W as i,j as c,X as l,u as a}from"./vue-b109b72f.js";import"./vue-router-e4a270fb.js";import"./index.vue_vue_type_style_index_0_scoped_f6f545f0_lang-ffd4da3c.js";import"./index-0347ddbf.js";import"./_plugin-vue_export-helper-c27b6911.js";import"./base-c69569f7.js";const x={__name:"index",setup(m){const t=e();let r=e([{label:"范围",key:"isnext",type:"select",dataSource:[{remarks:"今年",value:"0"},{remarks:"明年",value:"1"}]},{label:"时间范围",key:"dateRange",type:"datepickerRange",objKeys:["begindate","enddate"]}]),o=e({content:{pageNumber:1,pageSize:20,where:{condition:""}},id:20221215165504});return p(()=>{}),(u,d)=>(s(),i("div",null,[c(n,{ref_key:"list",ref:t,keyRouteName:"accountno",param:a(o),tableName:"vacationTable",searchType:a(r)},{operation:l(()=>[]),_:1},8,["param","searchType"])]))}};export{x as default};
+import{l as n}from"./index-8f7ed7c4.js";import{a as e,o as p,V as s,W as i,j as c,X as l,u as a}from"./vue-b109b72f.js";import"./vue-router-e4a270fb.js";import"./index.vue_vue_type_style_index_0_scoped_f6f545f0_lang-090ef8da.js";import"./index-5bda4634.js";import"./_plugin-vue_export-helper-c27b6911.js";import"./base-e6cf7c6a.js";const x={__name:"index",setup(m){const t=e();let r=e([{label:"范围",key:"isnext",type:"select",dataSource:[{remarks:"今年",value:"0"},{remarks:"明年",value:"1"}]},{label:"时间范围",key:"dateRange",type:"datepickerRange",objKeys:["begindate","enddate"]}]),o=e({content:{pageNumber:1,pageSize:20,where:{condition:""}},id:20221215165504});return p(()=>{}),(u,d)=>(s(),i("div",null,[c(n,{ref_key:"list",ref:t,keyRouteName:"accountno",param:a(o),tableName:"vacationTable",searchType:a(r)},{operation:l(()=>[]),_:1},8,["param","searchType"])]))}};export{x as default};

A diferenza do arquivo foi suprimida porque é demasiado grande
+ 0 - 0
dist/assets/index-2a9849d7.js


A diferenza do arquivo foi suprimida porque é demasiado grande
+ 0 - 0
dist/assets/index-38419bad.js


A diferenza do arquivo foi suprimida porque é demasiado grande
+ 0 - 0
dist/assets/index-445838ea.js


A diferenza do arquivo foi suprimida porque é demasiado grande
+ 0 - 0
dist/assets/index-49518271.js


A diferenza do arquivo foi suprimida porque é demasiado grande
+ 0 - 0
dist/assets/index-4ede458a.js


A diferenza do arquivo foi suprimida porque é demasiado grande
+ 0 - 0
dist/assets/index-4f148303.js


A diferenza do arquivo foi suprimida porque é demasiado grande
+ 0 - 0
dist/assets/index-5bda4634.js


A diferenza do arquivo foi suprimida porque é demasiado grande
+ 0 - 0
dist/assets/index-5c4fedaa.js


A diferenza do arquivo foi suprimida porque é demasiado grande
+ 0 - 0
dist/assets/index-61d6830a.js


A diferenza do arquivo foi suprimida porque é demasiado grande
+ 0 - 0
dist/assets/index-63fc224c.js


A diferenza do arquivo foi suprimida porque é demasiado grande
+ 0 - 0
dist/assets/index-6eb61e0c.js


A diferenza do arquivo foi suprimida porque é demasiado grande
+ 0 - 0
dist/assets/index-72e5d4a9.js


A diferenza do arquivo foi suprimida porque é demasiado grande
+ 0 - 0
dist/assets/index-7d8cda8f.js


A diferenza do arquivo foi suprimida porque é demasiado grande
+ 0 - 0
dist/assets/index-832b9380.js


A diferenza do arquivo foi suprimida porque é demasiado grande
+ 0 - 0
dist/assets/index-896152b6.js


A diferenza do arquivo foi suprimida porque é demasiado grande
+ 0 - 0
dist/assets/index-89783a8e.js


A diferenza do arquivo foi suprimida porque é demasiado grande
+ 0 - 0
dist/assets/index-8f7ed7c4.js


A diferenza do arquivo foi suprimida porque é demasiado grande
+ 0 - 0
dist/assets/index-9baed5bb.js


+ 1 - 1
dist/assets/index-7fe1f50a.js → dist/assets/index-a2c46d08.js

@@ -1 +1 @@
-import{n as g}from"./index-597813ad.js";import{m as k}from"./index-0347ddbf.js";import{a as d,w as y,U as D,V as l,W as o,j as u,X as f,ab as _,R as r,F as b,G as R,a7 as S,u as m,H as C}from"./vue-b109b72f.js";const T={key:0},V={key:1},$={__name:"index",props:{title:String,wdith:String,custom:{type:Object,default:()=>!1}},emits:["selectRowData","close"],setup(i,{expose:p,emit:c}){let s=d(),e=d(!1),v=()=>{if(!s.value.tableRecord.length)return k.warning("请选择数据");e.value=!1,c("selectRowData",s.value.tableRecord)};y(()=>e.value,(t,n)=>{t||s.value.reloadSelect()});let h=()=>{c("close")};return p({modeVisible:e,refreshTable:()=>{s.value.listData()},list:s}),(t,n)=>{const w=D("a-modal");return l(),o(b,null,[u(w,{visible:m(e),"onUpdate:visible":n[0]||(n[0]=a=>C(e)?e.value=a:e=a),class:"custom-class",title:i.title||"标题",placement:"right",width:i.wdith||"1200px",closable:!1,onClose:m(h),onOk:m(v)},{default:f(()=>[u(g,_(t.$attrs,{ref_key:"list",ref:s,size:"small",onListData:t.listData}),{tb_cell:f(({data:a})=>[i.custom?(l(),o("div",T,[r(t.$slots,"custom",{data:a})])):(l(),o("div",V,[a.column.dataIndex==="operation"?r(t.$slots,"handleBtn",{key:0}):(l(),o(b,{key:1},[R(S(a.record[a.column.dataIndex]),1)],64))]))]),_:3},16,["onListData"])]),_:3},8,["visible","title","width","onClose","onOk"]),r(t.$slots,"slot1")],64)}}};export{$ as _};
+import{n as g}from"./index-832b9380.js";import{m as k}from"./index-5bda4634.js";import{a as d,w as y,U as D,V as l,W as o,j as u,X as f,ab as _,R as r,F as b,G as R,a7 as S,u as m,H as C}from"./vue-b109b72f.js";const T={key:0},V={key:1},$={__name:"index",props:{title:String,wdith:String,custom:{type:Object,default:()=>!1}},emits:["selectRowData","close"],setup(i,{expose:p,emit:c}){let s=d(),e=d(!1),v=()=>{if(!s.value.tableRecord.length)return k.warning("请选择数据");e.value=!1,c("selectRowData",s.value.tableRecord)};y(()=>e.value,(t,n)=>{t||s.value.reloadSelect()});let h=()=>{c("close")};return p({modeVisible:e,refreshTable:()=>{s.value.listData()},list:s}),(t,n)=>{const w=D("a-modal");return l(),o(b,null,[u(w,{visible:m(e),"onUpdate:visible":n[0]||(n[0]=a=>C(e)?e.value=a:e=a),class:"custom-class",title:i.title||"标题",placement:"right",width:i.wdith||"1200px",closable:!1,onClose:m(h),onOk:m(v)},{default:f(()=>[u(g,_(t.$attrs,{ref_key:"list",ref:s,size:"small",onListData:t.listData}),{tb_cell:f(({data:a})=>[i.custom?(l(),o("div",T,[r(t.$slots,"custom",{data:a})])):(l(),o("div",V,[a.column.dataIndex==="operation"?r(t.$slots,"handleBtn",{key:0}):(l(),o(b,{key:1},[R(S(a.record[a.column.dataIndex]),1)],64))]))]),_:3},16,["onListData"])]),_:3},8,["visible","title","width","onClose","onOk"]),r(t.$slots,"slot1")],64)}}};export{$ as _};

+ 1 - 1
dist/assets/index-caed88c9.js → dist/assets/index-a6b780fb.js

@@ -1 +1 @@
-import{l as d}from"./index-af5011fb.js";import{a as u,A as f}from"./index-0347ddbf.js";import{u as x}from"./vue-router-e4a270fb.js";import{_ as y}from"./_plugin-vue_export-helper-c27b6911.js";import{a as s,U as h,V as r,W as b,j as k,X as n,G as g,a3 as w,a4 as A,a7 as B,$ as v,u as i}from"./vue-b109b72f.js";import"./index.vue_vue_type_style_index_0_scoped_f6f545f0_lang-ffd4da3c.js";import"./base-c69569f7.js";const N={class:"y-container"},S=["onClick"],C={__name:"index",setup(V){x();let c=s([]);s([]);let l=u(),p=s({content:{pageNumber:1,pageSize:20,systemappid:l.app.systemappid},id:20221213094401});const _=()=>{let t=window.location.href,e=t.indexOf("/"),o=0;for(;e!=-1;)if(o++,e=t.indexOf("/",e+1),o++==3)return t.slice(0,e)},m=async t=>{console.log("http://60.204.153.188/");let e=await f.requested({id:20221213094501,content:{sys_reportid:t.sys_reportid,dataid:0}});window.open(_()+e.data)};return(t,e)=>{const o=h("a-button");return r(),b("div",N,[k(d,{columns:i(c),param:i(p),tableName:"reportcenterTable"},{operation:n(()=>[g(" 报表中心 ")]),tb_cell:n(({data:a})=>[a.column.dataIndex=="name"?(r(),w(o,{key:0,type:"link"},{default:n(()=>[A("span",{class:"btn-link",onClick:I=>m(a.record)},B(a.record.name),9,S)]),_:2},1024)):v("",!0)]),_:1},8,["columns","param"])])}}},j=y(C,[["__scopeId","data-v-b9e552e1"]]);export{j as default};
+import{l as d}from"./index-8f7ed7c4.js";import{a as u,A as f}from"./index-5bda4634.js";import{u as x}from"./vue-router-e4a270fb.js";import{_ as y}from"./_plugin-vue_export-helper-c27b6911.js";import{a as s,U as h,V as r,W as b,j as k,X as n,G as g,a3 as w,a4 as A,a7 as B,$ as v,u as i}from"./vue-b109b72f.js";import"./index.vue_vue_type_style_index_0_scoped_f6f545f0_lang-090ef8da.js";import"./base-e6cf7c6a.js";const N={class:"y-container"},S=["onClick"],C={__name:"index",setup(V){x();let c=s([]);s([]);let l=u(),p=s({content:{pageNumber:1,pageSize:20,systemappid:l.app.systemappid},id:20221213094401});const _=()=>{let t=window.location.href,e=t.indexOf("/"),o=0;for(;e!=-1;)if(o++,e=t.indexOf("/",e+1),o++==3)return t.slice(0,e)},m=async t=>{console.log("http://60.204.153.188/");let e=await f.requested({id:20221213094501,content:{sys_reportid:t.sys_reportid,dataid:0}});window.open(_()+e.data)};return(t,e)=>{const o=h("a-button");return r(),b("div",N,[k(d,{columns:i(c),param:i(p),tableName:"reportcenterTable"},{operation:n(()=>[g(" 报表中心 ")]),tb_cell:n(({data:a})=>[a.column.dataIndex=="name"?(r(),w(o,{key:0,type:"link"},{default:n(()=>[A("span",{class:"btn-link",onClick:I=>m(a.record)},B(a.record.name),9,S)]),_:2},1024)):v("",!0)]),_:1},8,["columns","param"])])}}},j=y(C,[["__scopeId","data-v-b9e552e1"]]);export{j as default};

A diferenza do arquivo foi suprimida porque é demasiado grande
+ 0 - 0
dist/assets/index-a7477512.js


A diferenza do arquivo foi suprimida porque é demasiado grande
+ 0 - 0
dist/assets/index-aff2acbb.js


A diferenza do arquivo foi suprimida porque é demasiado grande
+ 0 - 0
dist/assets/index-b01f8302.js


A diferenza do arquivo foi suprimida porque é demasiado grande
+ 0 - 0
dist/assets/index-b9de2b3e.js


A diferenza do arquivo foi suprimida porque é demasiado grande
+ 0 - 0
dist/assets/index-b9f6e2bf.js


A diferenza do arquivo foi suprimida porque é demasiado grande
+ 0 - 0
dist/assets/index-bc9e63c2.js


A diferenza do arquivo foi suprimida porque é demasiado grande
+ 0 - 0
dist/assets/index-c5517ec0.js


A diferenza do arquivo foi suprimida porque é demasiado grande
+ 0 - 0
dist/assets/index-d0c789fd.js


A diferenza do arquivo foi suprimida porque é demasiado grande
+ 0 - 0
dist/assets/index-d6285843.js


A diferenza do arquivo foi suprimida porque é demasiado grande
+ 0 - 0
dist/assets/index-e01c67fb.js


A diferenza do arquivo foi suprimida porque é demasiado grande
+ 0 - 0
dist/assets/index-e053bd16.js


A diferenza do arquivo foi suprimida porque é demasiado grande
+ 0 - 0
dist/assets/index-e358199a.js


A diferenza do arquivo foi suprimida porque é demasiado grande
+ 0 - 0
dist/assets/index-e45c4dfe.js


A diferenza do arquivo foi suprimida porque é demasiado grande
+ 0 - 0
dist/assets/index-ea86a4a7.js


A diferenza do arquivo foi suprimida porque é demasiado grande
+ 0 - 0
dist/assets/index-ee3234f8.js


A diferenza do arquivo foi suprimida porque é demasiado grande
+ 0 - 0
dist/assets/index-f3a2264f.js


A diferenza do arquivo foi suprimida porque é demasiado grande
+ 0 - 0
dist/assets/index-fcdcb0ee.js


A diferenza do arquivo foi suprimida porque é demasiado grande
+ 0 - 0
dist/assets/index-ff662dc3.js


+ 1 - 1
dist/assets/index.vue_vue_type_style_index_0_scoped_f6f545f0_lang-ffd4da3c.js → dist/assets/index.vue_vue_type_style_index_0_scoped_f6f545f0_lang-090ef8da.js

@@ -1 +1 @@
-import{a as i,s as r,k as m,e as u,A as p}from"./index-0347ddbf.js";const h=i();let{tableConfigs:c,app:d}=r(h);const v=m("columnStore",{state:()=>({colIndex:[],checkedColumns:[],columnsIndex:[],selectedColumns:0,cacheData:{},time:null}),persist:{enabled:!0,strategies:[{storage:localStorage,paths:[]}]},getters:{},actions:{userSetting(e){this.selectedColumns=new Date,c.value[`${d.value.systemappid}${e}`]={},c.value[`${d.value.systemappid}${e}`].columnsIndex=this.columnsIndex,c.value[`${d.value.systemappid}${e}`].checkedColumns=this.checkedColumns,this.saveConfig(c.value)},getUserSetting(e){console.log(d.value);let l=[],a=new Map,o=u.TBLayout(e),n=c.value[`${d.value.systemappid}${e}`];return n&&o.length==n.columnsIndex.length?(u.TBLayout(e).map(s=>({value:s.dataIndex,label:s.title})).forEach(s=>{a.set(s.value,s.label)}),this.checkedColumns=n.checkedColumns,n.columnsIndex=this.columnsIndex=n.columnsIndex.length==0?u.TBLayout(e).map(s=>s.dataIndex):n.columnsIndex,n.columnsIndex.forEach(s=>{l.push({value:s,label:a.get(s)})}),l):(this.checkedColumns=this.columnsIndex=u.TBLayout(e).map(t=>t.dataIndex),l=u.TBLayout(e).map(t=>({value:t.dataIndex,label:t.title})),l)},loadTableConfig(e){let l=u.TBLayout(e),a=c.value[`${d.value.systemappid}${e}`],o=[],n=new Map;try{return a&&l.length==a.columnsIndex.length?(l.forEach(t=>{n.set(t.dataIndex,t)}),a.columnsIndex.forEach(t=>{o.push(n.get(t))}),o=o.filter(t=>{if(a.checkedColumns.some(s=>s===t.dataIndex))return t}),o):l}catch{}},async saveConfig(e){await p.requested({classname:"sysmanage.develop.users.users",method:"updateClientConfig",content:{config:JSON.stringify(e)}})}}});export{v as u};
+import{a as i,s as r,k as m,e as u,A as p}from"./index-5bda4634.js";const h=i();let{tableConfigs:c,app:d}=r(h);const v=m("columnStore",{state:()=>({colIndex:[],checkedColumns:[],columnsIndex:[],selectedColumns:0,cacheData:{},time:null}),persist:{enabled:!0,strategies:[{storage:localStorage,paths:[]}]},getters:{},actions:{userSetting(e){this.selectedColumns=new Date,c.value[`${d.value.systemappid}${e}`]={},c.value[`${d.value.systemappid}${e}`].columnsIndex=this.columnsIndex,c.value[`${d.value.systemappid}${e}`].checkedColumns=this.checkedColumns,this.saveConfig(c.value)},getUserSetting(e){console.log(d.value);let l=[],a=new Map,o=u.TBLayout(e),n=c.value[`${d.value.systemappid}${e}`];return n&&o.length==n.columnsIndex.length?(u.TBLayout(e).map(s=>({value:s.dataIndex,label:s.title})).forEach(s=>{a.set(s.value,s.label)}),this.checkedColumns=n.checkedColumns,n.columnsIndex=this.columnsIndex=n.columnsIndex.length==0?u.TBLayout(e).map(s=>s.dataIndex):n.columnsIndex,n.columnsIndex.forEach(s=>{l.push({value:s,label:a.get(s)})}),l):(this.checkedColumns=this.columnsIndex=u.TBLayout(e).map(t=>t.dataIndex),l=u.TBLayout(e).map(t=>({value:t.dataIndex,label:t.title})),l)},loadTableConfig(e){let l=u.TBLayout(e),a=c.value[`${d.value.systemappid}${e}`],o=[],n=new Map;try{return a&&l.length==a.columnsIndex.length?(l.forEach(t=>{n.set(t.dataIndex,t)}),a.columnsIndex.forEach(t=>{o.push(n.get(t))}),o=o.filter(t=>{if(a.checkedColumns.some(s=>s===t.dataIndex))return t}),o):l}catch{}},async saveConfig(e){await p.requested({classname:"sysmanage.develop.users.users",method:"updateClientConfig",content:{config:JSON.stringify(e)}})}}});export{v as u};

A diferenza do arquivo foi suprimida porque é demasiado grande
+ 0 - 0
dist/assets/index2-b42f7b61.js


+ 1 - 1
dist/assets/login-db98d54f.js → dist/assets/login-0828af37.js

@@ -1,4 +1,4 @@
-import{u as useRouter}from"./vue-router-e4a270fb.js";import{c as commonjsGlobal,u as useRouteTabsStore,a as useAuthStore,s as storeToRefs,A as Api,m as message}from"./index-0347ddbf.js";import{_ as _imports_0}from"./LOGO-5fe40572.js";import{_ as _export_sfc}from"./_plugin-vue_export-helper-c27b6911.js";import{d as defineComponent,U as resolveComponent,V as openBlock,W as createElementBlock,a4 as createBaseVNode,j as createVNode,X as withCtx,a1 as normalizeStyle,G as createTextVNode,a as ref,r as reactive,a5 as pushScopeId,a6 as popScopeId}from"./vue-b109b72f.js";var md5Exports={},md5$1={get exports(){return md5Exports},set exports(e){md5Exports=e}};/**
+import{u as useRouter}from"./vue-router-e4a270fb.js";import{c as commonjsGlobal,u as useRouteTabsStore,a as useAuthStore,s as storeToRefs,A as Api,m as message}from"./index-5bda4634.js";import{_ as _imports_0}from"./LOGO-5fe40572.js";import{_ as _export_sfc}from"./_plugin-vue_export-helper-c27b6911.js";import{d as defineComponent,U as resolveComponent,V as openBlock,W as createElementBlock,a4 as createBaseVNode,j as createVNode,X as withCtx,a1 as normalizeStyle,G as createTextVNode,a as ref,r as reactive,a5 as pushScopeId,a6 as popScopeId}from"./vue-b109b72f.js";var md5Exports={},md5$1={get exports(){return md5Exports},set exports(e){md5Exports=e}};/**
  * [js-md5]{@link https://github.com/emn178/js-md5}
  *
  * @namespace md5

A diferenza do arquivo foi suprimida porque é demasiado grande
+ 0 - 0
dist/assets/map-d77b08b0.js


+ 1 - 1
dist/index.html

@@ -5,7 +5,7 @@
     <link rel="icon" type="image/svg+xml" href="./vite.svg" />
     <meta name="viewport" content="width=device-width, initial-scale=1.0" />
     <title>班尼戈水务管理</title>
-    <script type="module" crossorigin src="./assets/index-0347ddbf.js"></script>
+    <script type="module" crossorigin src="./assets/index-5bda4634.js"></script>
     <link rel="modulepreload" crossorigin href="./assets/vue-b109b72f.js">
     <link rel="modulepreload" crossorigin href="./assets/vue-router-e4a270fb.js">
     <link rel="stylesheet" href="./assets/index-8790befc.css">

+ 8 - 2
src/system/IOT/IoTdashboard/index.vue

@@ -162,8 +162,8 @@ let param2 = ref({
 
 let list = ref([])
 let latlng = ref({
-  lat:0,
-  lng:0
+  lat:39,
+  lng:117
 })
 let zoom = ref(3)
 let model = ref(true)
@@ -283,6 +283,12 @@ let autoRange = (map, points_arr) => {
 let listData = async () => {
   let res = await Api.requested(param.value)
   list.value = res.data.filter(item => item.latitude != '')
+  if (!list.value.length) {
+    latlng.value = {
+      lat:39,
+      lng:117
+    }
+  }
   console.log(list.value);
 }
 

+ 1 - 1
src/system/IOT/equipmentMag/detail/modules/attributeTab/modules/Add.vue

@@ -44,7 +44,7 @@
         </a-form-item>
       </a-col>
       <a-col :span="12" v-if="form.datatype == 'int' || form.datatype == 'float' || form.datatype == 'long' || form.datatype == 'double'">
-        <a-form-item  label="单位" name="unit" :rules="[{ required: true, message: '请选择单位' }]">
+        <a-form-item  label="单位" name="unit">
           <a-select
             v-model:value="form.unit"
             placeholder="请选择单位"

+ 1 - 1
src/system/IOT/equipmentMag/detail/modules/attributeTab/modules/Edit.vue

@@ -44,7 +44,7 @@
         </a-form-item>
       </a-col>
       <a-col :span="12" v-if="form.datatype == 'int' || form.datatype == 'float' || form.datatype == 'long' || form.datatype == 'double'">
-        <a-form-item  label="单位" name="unit" :rules="[{ required: true, message: '请选择单位' }]">
+        <a-form-item  label="单位" name="unit">
           <a-select
             v-model:value="form.unit"
             placeholder="请选择单位"

+ 1 - 1
src/system/IOT/gatewayManage/index.vue

@@ -2,7 +2,7 @@
   <listTemp ref="list" :param="param" tableName="gatewayAssetsTable" :searchType="searchType" :detailPage="{name:'valveAssetsDetail',idname:'eam_assetid'}" @emitRes="listData">
     <template #operation>
       <Add @onSuccess="$refs.list.tableData()" :disabled="!utils.hasPermission('insert')"></Add>
-      <gatewayProduct :disabled="!utils.hasPermission('product')"></gatewayProduct>
+      <!-- <gatewayProduct :disabled="!utils.hasPermission('product')"></gatewayProduct> -->
     </template>
     <template #tb_cell="{data}">
       <template v-if="data.column.dataIndex === 'attinfos'">

+ 14 - 18
src/system/IOT/gatewayManage/modules/Add.vue

@@ -12,9 +12,9 @@
     <a-form ref="formRef" :model="form" size="small" layout="vertical" mode="multiple" :validateTrigger="['onChange']">
       <a-row :gutter="16">
         <a-col :span="24">
-          <a-form-item  label="网关产品" name="itemname">
-            <a-input v-model:value="form.itemname" placeholder="请选择网关产品" @click="productInputClick"></a-input>
-            <SelectModel 
+          <a-form-item  label="产品名称" name="itemname" :rules="[{ required: true, message: '请输入序列号' }]">
+            <a-input v-model:value="form.itemname" placeholder="请选择产品名称"></a-input>
+            <!-- <SelectModel 
               ref="product" 
               @selectRowData="selectProduct" 
               rowKey="itemid" 
@@ -31,7 +31,7 @@
                 {{ data.record[data.column.dataIndex] }}
               </div>
             </template>
-            </SelectModel>
+            </SelectModel> -->
           </a-form-item>
         </a-col>
         <a-col :span="12">
@@ -39,11 +39,11 @@
             <a-input v-model:value="form.serialnumber" placeholder="请输入序列号"></a-input>
           </a-form-item>
         </a-col>
-        <a-col :span="12">
+        <!-- <a-col :span="12">
           <a-form-item  label="产品编码" name="itemno" :rules="[{ required: true, message: '请输入产品编码' }]">
             <a-input v-model:value="form.itemno" placeholder="请输入产品编码"></a-input>
           </a-form-item>
-        </a-col>
+        </a-col> -->
         <!-- <a-col :span="12">
           <a-form-item  label="产品名称" name="itemname" :rules="[{ required: true, message: '请输入产品名称' }]">
             <a-input v-model:value="form.itemname" placeholder="请输入产品名称"></a-input>
@@ -91,7 +91,7 @@
             <a-textarea v-model:value="form.remarks" placeholder="请输入备注说明"></a-textarea>
           </a-form-item>
         </a-col>
-        <a-col :span="24" v-for="(item,index) in form.dataextend">
+        <!-- <a-col :span="24" v-for="(item,index) in form.dataextend">
         <a-form-item  label="自定义属性" name="dataextend">
           <div style="display: flex;">
             <a-input v-model:value="item.fieldname" placeholder="请输入描述" style="margin-right: 10px;"></a-input>
@@ -101,7 +101,7 @@
             <CloseCircleOutlined v-if="form.dataextend.length > 1" :style="{fontSize:'25px'}" style="cursor: pointer;" @click="form.dataextend.splice(form.dataextend.indexOf(item),1)"/>
           </div>
         </a-form-item>
-        </a-col>
+        </a-col> -->
         <a-col :span="24">
           <!-- :rules="[{required:true,message:'请选择图片',validateTrigger:'onChange'}]" -->
           <a-form-item  label="图片" name="attinfos">
@@ -152,11 +152,7 @@ let form = ref({
   "marketprice": '',
   "remarks": "",
   "dataextend": [
-    {
-      "fieldname": "",
-      "fieldvalue": "",
-      "sequence": 1
-    }
+
   ],
   "attinfos":''
 })
@@ -193,11 +189,11 @@ let onSubmit = async () => {
   form.value.attinfos = upload.value.fileList.length ? '1' : '' 
   let isCheck = await formRef.value.validateFields()
   if (!isCheck) return
-  form.value.dataextend.forEach((item,index) => {
-    if (item.fieldname == '' && item.fieldname == '') {
-      form.value.dataextend.splice(index,1)
-    }
-  })
+  // form.value.dataextend.forEach((item,index) => {
+  //   if (item.fieldname == '' && item.fieldname == '') {
+  //     form.value.dataextend.splice(index,1)
+  //   }
+  // })
   let res = await Api.requested({
     id:20230802135302,
     content: form.value

+ 14 - 19
src/system/IOT/gatewayManage/modules/Edit.vue

@@ -12,9 +12,9 @@
   <a-form ref="formRef" :model="form" size="small" layout="vertical" mode="multiple" :validateTrigger="['onChange']">
       <a-row :gutter="16">
         <a-col :span="24">
-          <a-form-item  label="网关产品" name="itemname">
-            <a-input v-model:value="form.itemname" :disabled="true" placeholder="请选择网关产品" @click="productInputClick"></a-input>
-            <SelectModel 
+          <a-form-item  label="产品名称" name="itemname" :rules="[{ required: true, message: '请输入序列号' }]">
+            <a-input v-model:value="form.itemname" placeholder="请选择产品名称"></a-input>
+            <!-- <SelectModel 
               ref="product" 
               @selectRowData="selectProduct" 
               rowKey="itemid" 
@@ -31,7 +31,7 @@
                 {{ data.record[data.column.dataIndex] }}
               </div>
             </template>
-            </SelectModel>
+            </SelectModel> -->
           </a-form-item>
         </a-col>
         <a-col :span="12">
@@ -39,11 +39,11 @@
             <a-input v-model:value="form.serialnumber" placeholder="请输入序列号"></a-input>
           </a-form-item>
         </a-col>
-        <a-col :span="12">
+        <!-- <a-col :span="12">
           <a-form-item  label="产品编码" name="itemno" :rules="[{ required: true, message: '请输入产品编码' }]">
             <a-input v-model:value="form.itemno" placeholder="请输入产品编码"></a-input>
           </a-form-item>
-        </a-col>
+        </a-col> -->
         <!-- <a-col :span="12">
           <a-form-item  label="产品名称" name="itemname" :rules="[{ required: true, message: '请输入产品名称' }]">
             <a-input v-model:value="form.itemname" placeholder="请输入产品名称"></a-input>
@@ -91,7 +91,7 @@
             <a-textarea v-model:value="form.remarks" placeholder="请输入备注说明"></a-textarea>
           </a-form-item>
         </a-col>
-        <a-col :span="24" v-for="(item,index) in form.dataextend">
+        <!-- <a-col :span="24" v-for="(item,index) in form.dataextend">
         <a-form-item  label="自定义属性" name="dataextend">
           <div style="display: flex;">
             <a-input v-model:value="item.fieldname" placeholder="请输入描述" style="margin-right: 10px;"></a-input>
@@ -101,11 +101,11 @@
             <CloseCircleOutlined v-if="form.dataextend.length > 1" :style="{fontSize:'25px'}" style="cursor: pointer;" @click="form.dataextend.splice(form.dataextend.indexOf(item),1)"/>
           </div>
         </a-form-item>
-        </a-col>
+        </a-col> -->
         <a-col :span="24">
           <!-- :rules="[{required:true,message:'请选择图片',validateTrigger:'onChange'}]" -->
           <a-form-item  label="图片" name="attinfos">
-            <Upload2 accept="image/png, image/jpeg" @deleteSuccess="emit('onSuccess')" @uploadSuccess="emit('onSuccess')" :bindData="bindData" ref="upload" v-model:value="form.attinfos"></Upload2>
+            <Upload2 accept="image/png, image/jpeg" :bindData="bindData" ref="upload" v-model:value="form.attinfos"></Upload2>
           </a-form-item>
         </a-col>
       </a-row>
@@ -149,11 +149,6 @@ let form = ref({
   "marketprice": '',
   "remarks": "",
   "dataextend": [
-    {
-      "fieldname": "",
-      "fieldvalue": "",
-      "sequence": 1
-    }
   ],
   "attinfos":''
 })
@@ -211,11 +206,11 @@ let onSubmit = async () => {
   form.value.attinfos = upload.value.fileList.length ? '1' : '' 
   let isCheck = await formRef.value.validateFields()
   if (!isCheck) return
-  form.value.dataextend.forEach((item,index) => {
-    if (item.fieldname == '' && item.fieldname == '') {
-      form.value.dataextend.splice(index,1)
-    }
-  })
+  // form.value.dataextend.forEach((item,index) => {
+  //   if (item.fieldname == '' && item.fieldname == '') {
+  //     form.value.dataextend.splice(index,1)
+  //   }
+  // })
   loading.value = true
   let res = await Api.requested({
     id:20230802135302,

+ 12 - 1
src/system/IOT/iotcard/modules/add.vue

@@ -12,7 +12,7 @@
     >
       <a-form ref="formRef" :model="form" :rules="rules"  size="small" layout="vertical">
         <a-col :span="24">
-          <a-form-item label="ICCID" name="iccid" :rules="[{ required: true, message: '请输入ICCID' }]">
+          <a-form-item label="ICCID" name="iccid" :rules="[{ required: true, message: '请输入ICCID' },{validator:checkType}]">
             <a-input v-model:value="form.iccid"  placeholder="请输入ICCID" />
           </a-form-item>
         </a-col>
@@ -63,6 +63,17 @@
     },
 
   ])
+
+  const checkType = (rule,value) => {
+    let reg = /^[A-Za-z0-9]+$/
+    console.log(reg.test(value));
+    if (reg.test(value)) {
+      return Promise.resolve()
+    } else {
+      return Promise.reject('字母、数字组成');
+    }
+  }
+
   const visible = ref(false)
   const submit = async ()=>{
     try {

+ 1 - 1
src/system/IOT/productManage/detail/modules/attributeTab/modules/Edit.vue

@@ -44,7 +44,7 @@
         </a-form-item>
       </a-col>
       <a-col :span="12" v-if="form.datatype == 'int' || form.datatype == 'float' || form.datatype == 'long' || form.datatype == 'double'">
-        <a-form-item  label="单位" name="unit" :rules="[{ required: true, message: '请选择单位' }]">
+        <a-form-item  label="单位" name="unit">
           <a-select
             v-model:value="form.unit"
             placeholder="请选择单位"

Algúns arquivos non se mostraron porque demasiados arquivos cambiaron neste cambio