Browse Source

2023-8-10

codeMan 2 years ago
parent
commit
4d078d3082
63 changed files with 42 additions and 62 deletions
  1. 1 1
      dist/assets/PlusCircleOutlined-c2a6c9b0.js
  2. 0 0
      dist/assets/base-7a378ac7.js
  3. 1 1
      dist/assets/customBtn-3ff8b053.js
  4. 0 0
      dist/assets/dataBlock-260faf19.js
  5. 0 0
      dist/assets/index-01ff8c07.js
  6. 0 0
      dist/assets/index-0b5e114c.js
  7. 0 0
      dist/assets/index-0cbfc560.js
  8. 0 0
      dist/assets/index-10634b15.js
  9. 0 0
      dist/assets/index-116427fe.js
  10. 0 0
      dist/assets/index-14178547.js
  11. 0 0
      dist/assets/index-190f299b.js
  12. 0 0
      dist/assets/index-1b879020.js
  13. 1 1
      dist/assets/index-1d6e7cf3.js
  14. 0 0
      dist/assets/index-1e68ff35.js
  15. 0 0
      dist/assets/index-29715f69.js
  16. 0 0
      dist/assets/index-2aa27089.js
  17. 0 0
      dist/assets/index-2e9c96b0.js
  18. 0 0
      dist/assets/index-2f78feb5.js
  19. 0 0
      dist/assets/index-35a35eae.js
  20. 0 0
      dist/assets/index-3882b444.js
  21. 0 0
      dist/assets/index-3bfaebc3.js
  22. 1 1
      dist/assets/index-3e63b630.js
  23. 0 0
      dist/assets/index-450131ac.js
  24. 0 0
      dist/assets/index-4f0aa24b.js
  25. 0 0
      dist/assets/index-54cc0b67.js
  26. 1 1
      dist/assets/index-680acb0c.js
  27. 1 1
      dist/assets/index-6deb600a.js
  28. 1 1
      dist/assets/index-710b55fd.js
  29. 0 0
      dist/assets/index-71382e67.js
  30. 0 0
      dist/assets/index-75c21b51.js
  31. 0 0
      dist/assets/index-7ead8680.js
  32. 0 0
      dist/assets/index-8a38c200.js
  33. 0 0
      dist/assets/index-8afa55ab.js
  34. 0 0
      dist/assets/index-8be4d790.js
  35. 0 0
      dist/assets/index-98716a4c.js
  36. 0 0
      dist/assets/index-a5cee8eb.js
  37. 0 0
      dist/assets/index-bae2f5e7.js
  38. 0 0
      dist/assets/index-c4e1616d.js
  39. 0 0
      dist/assets/index-c4f95e9a.js
  40. 0 0
      dist/assets/index-cd8906c7.js
  41. 0 0
      dist/assets/index-cf798470.js
  42. 0 0
      dist/assets/index-d7a3af70.js
  43. 0 0
      dist/assets/index-dac17021.js
  44. 0 0
      dist/assets/index-e5883e5f.js
  45. 0 0
      dist/assets/index-e983dd37.js
  46. 0 0
      dist/assets/index-eff7c498.js
  47. 0 0
      dist/assets/index-f383976f.js
  48. 0 0
      dist/assets/index-fa9392f5.js
  49. 0 0
      dist/assets/index-fe5fd4f7.js
  50. 1 1
      dist/assets/index.vue_vue_type_style_index_0_scoped_f6f545f0_lang-b75f3235.js
  51. 0 0
      dist/assets/index2-7e1a5609.js
  52. 1 1
      dist/assets/login-2ab24fbf.js
  53. 0 0
      dist/assets/map-b824657b.js
  54. 1 1
      dist/index.html
  55. BIN
      src/assets/deviced/控制器.png
  56. BIN
      src/assets/deviced/活塞型.png
  57. 0 2
      src/system/IOT/controlPanel/model/dianci/modules/timeControl.vue
  58. 1 1
      src/system/IOT/controlPanel/modules/myInput.vue
  59. 27 10
      src/system/IOT/equipmentMag/detail/modules/attributeTab/modules/Add.vue
  60. 1 12
      src/system/IOT/equipmentMag/detail/modules/attributeTab/modules/Edit.vue
  61. 1 14
      src/system/IOT/productManage/detail/modules/attributeTab/modules/Add.vue
  62. 1 12
      src/system/IOT/productManage/detail/modules/attributeTab/modules/Edit.vue
  63. 1 1
      src/template/defaultInfo/index.vue

+ 1 - 1
dist/assets/PlusCircleOutlined-615e3cb1.js → dist/assets/PlusCircleOutlined-c2a6c9b0.js

@@ -1 +1 @@
-import{b as a}from"./index-dd78fae8.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-e5883e5f.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};

File diff suppressed because it is too large
+ 0 - 0
dist/assets/base-7a378ac7.js


+ 1 - 1
dist/assets/customBtn-ad1aff5a.js → dist/assets/customBtn-3ff8b053.js

@@ -1 +1 @@
-import"./index-dd78fae8.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-e5883e5f.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};

File diff suppressed because it is too large
+ 0 - 0
dist/assets/dataBlock-260faf19.js


File diff suppressed because it is too large
+ 0 - 0
dist/assets/index-01ff8c07.js


File diff suppressed because it is too large
+ 0 - 0
dist/assets/index-0b5e114c.js


File diff suppressed because it is too large
+ 0 - 0
dist/assets/index-0cbfc560.js


File diff suppressed because it is too large
+ 0 - 0
dist/assets/index-10634b15.js


File diff suppressed because it is too large
+ 0 - 0
dist/assets/index-116427fe.js


File diff suppressed because it is too large
+ 0 - 0
dist/assets/index-14178547.js


File diff suppressed because it is too large
+ 0 - 0
dist/assets/index-190f299b.js


File diff suppressed because it is too large
+ 0 - 0
dist/assets/index-1b879020.js


+ 1 - 1
dist/assets/index-b638e8e1.js → dist/assets/index-1d6e7cf3.js

@@ -1 +1 @@
-import{U as s,V as e,a3 as t,X as n,W as c,F as i,a2 as _,a4 as d,a1 as m,a7 as u}from"./vue-b109b72f.js";const g={__name:"index",props:["data"],setup(o){const l=o;return(x,y)=>{const r=s("a-descriptions-item"),p=s("a-descriptions");return e(),t(p,{column:4,labelStyle:{color:"#666",width:"150px"},contentStyle:{marginRight:"20px",marginBottom:"5px"},size:"small",bordered:""},{default:n(()=>[(e(!0),c(i,null,_(l.data,a=>(e(),t(r,{span:a.span?a.span:1,key:a.index,label:a.label},{default:n(()=>[d("span",{style:m(a.style?a.style():"")},u(a.value||"--"),5)]),_:2},1032,["span","label"]))),128))]),_:1})}}};export{g as _};
+import{U as s,V as e,a3 as t,X as n,W as c,F as i,a2 as _,a4 as d,a1 as m,a7 as u}from"./vue-b109b72f.js";const g={__name:"index",props:["data"],setup(o){const l=o;return(x,y)=>{const r=s("a-descriptions-item"),p=s("a-descriptions");return e(),t(p,{column:3,labelStyle:{color:"#666",width:"120px"},contentStyle:{marginRight:"20px",marginBottom:"5px"},size:"small",bordered:""},{default:n(()=>[(e(!0),c(i,null,_(l.data,a=>(e(),t(r,{span:a.span?a.span:1,key:a.index,label:a.label},{default:n(()=>[d("span",{style:m(a.style?a.style():"")},u(a.value||"--"),5)]),_:2},1032,["span","label"]))),128))]),_:1})}}};export{g as _};

File diff suppressed because it is too large
+ 0 - 0
dist/assets/index-1e68ff35.js


File diff suppressed because it is too large
+ 0 - 0
dist/assets/index-29715f69.js


File diff suppressed because it is too large
+ 0 - 0
dist/assets/index-2aa27089.js


File diff suppressed because it is too large
+ 0 - 0
dist/assets/index-2e9c96b0.js


File diff suppressed because it is too large
+ 0 - 0
dist/assets/index-2f78feb5.js


File diff suppressed because it is too large
+ 0 - 0
dist/assets/index-35a35eae.js


File diff suppressed because it is too large
+ 0 - 0
dist/assets/index-3882b444.js


File diff suppressed because it is too large
+ 0 - 0
dist/assets/index-3bfaebc3.js


+ 1 - 1
dist/assets/index-9fab3ecd.js → dist/assets/index-3e63b630.js

@@ -1 +1 @@
-import{n as g}from"./index-b9c97432.js";import{m as k}from"./index-dd78fae8.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-29715f69.js";import{m as k}from"./index-e5883e5f.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 _};

File diff suppressed because it is too large
+ 0 - 0
dist/assets/index-450131ac.js


File diff suppressed because it is too large
+ 0 - 0
dist/assets/index-4f0aa24b.js


File diff suppressed because it is too large
+ 0 - 0
dist/assets/index-54cc0b67.js


+ 1 - 1
dist/assets/index-29fead63.js → dist/assets/index-680acb0c.js

@@ -1 +1 @@
-import{l as d}from"./index-fe82acd0.js";import{a as u,A as f}from"./index-dd78fae8.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-615d6776.js";import"./base-93c20765.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-2f78feb5.js";import{a as u,A as f}from"./index-e5883e5f.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-b75f3235.js";import"./base-7a378ac7.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};

+ 1 - 1
dist/assets/index-9391cbcd.js → dist/assets/index-6deb600a.js

@@ -1 +1 @@
-import{M as r,A as c,e as l}from"./index-dd78fae8.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-e5883e5f.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 _};

+ 1 - 1
dist/assets/index-8f08eb6f.js → dist/assets/index-710b55fd.js

@@ -1 +1 @@
-import{l as n}from"./index-fe82acd0.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-615d6776.js";import"./index-dd78fae8.js";import"./_plugin-vue_export-helper-c27b6911.js";import"./base-93c20765.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-2f78feb5.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-b75f3235.js";import"./index-e5883e5f.js";import"./_plugin-vue_export-helper-c27b6911.js";import"./base-7a378ac7.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};

File diff suppressed because it is too large
+ 0 - 0
dist/assets/index-71382e67.js


File diff suppressed because it is too large
+ 0 - 0
dist/assets/index-75c21b51.js


File diff suppressed because it is too large
+ 0 - 0
dist/assets/index-7ead8680.js


File diff suppressed because it is too large
+ 0 - 0
dist/assets/index-8a38c200.js


File diff suppressed because it is too large
+ 0 - 0
dist/assets/index-8afa55ab.js


File diff suppressed because it is too large
+ 0 - 0
dist/assets/index-8be4d790.js


File diff suppressed because it is too large
+ 0 - 0
dist/assets/index-98716a4c.js


File diff suppressed because it is too large
+ 0 - 0
dist/assets/index-a5cee8eb.js


File diff suppressed because it is too large
+ 0 - 0
dist/assets/index-bae2f5e7.js


File diff suppressed because it is too large
+ 0 - 0
dist/assets/index-c4e1616d.js


File diff suppressed because it is too large
+ 0 - 0
dist/assets/index-c4f95e9a.js


File diff suppressed because it is too large
+ 0 - 0
dist/assets/index-cd8906c7.js


File diff suppressed because it is too large
+ 0 - 0
dist/assets/index-cf798470.js


File diff suppressed because it is too large
+ 0 - 0
dist/assets/index-d7a3af70.js


File diff suppressed because it is too large
+ 0 - 0
dist/assets/index-dac17021.js


File diff suppressed because it is too large
+ 0 - 0
dist/assets/index-e5883e5f.js


File diff suppressed because it is too large
+ 0 - 0
dist/assets/index-e983dd37.js


File diff suppressed because it is too large
+ 0 - 0
dist/assets/index-eff7c498.js


File diff suppressed because it is too large
+ 0 - 0
dist/assets/index-f383976f.js


File diff suppressed because it is too large
+ 0 - 0
dist/assets/index-fa9392f5.js


File diff suppressed because it is too large
+ 0 - 0
dist/assets/index-fe5fd4f7.js


+ 1 - 1
dist/assets/index.vue_vue_type_style_index_0_scoped_f6f545f0_lang-615d6776.js → dist/assets/index.vue_vue_type_style_index_0_scoped_f6f545f0_lang-b75f3235.js

@@ -1 +1 @@
-import{a as i,s as r,k as m,e as u,A as p}from"./index-dd78fae8.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-e5883e5f.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};

File diff suppressed because it is too large
+ 0 - 0
dist/assets/index2-7e1a5609.js


+ 1 - 1
dist/assets/login-2f1b2fc7.js → dist/assets/login-2ab24fbf.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-dd78fae8.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-e5883e5f.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

File diff suppressed because it is too large
+ 0 - 0
dist/assets/map-b824657b.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-dd78fae8.js"></script>
+    <script type="module" crossorigin src="./assets/index-e5883e5f.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">

BIN
src/assets/deviced/控制器.png


BIN
src/assets/deviced/活塞型.png


+ 0 - 2
src/system/IOT/controlPanel/model/dianci/modules/timeControl.vue

@@ -43,7 +43,6 @@
                 :form="cmdForm"
                 :ref="`Input${i}`"
                 :isCheck="true"
-                :label="false"
                 inputBorder="1px solid #ccc"
               >
             </MyInput>
@@ -57,7 +56,6 @@
                 :form="cmdForm"
                 :isCheck="true"
                 :ref="`Input${i}`"
-                :label="false"
                 inputBorder="1px solid #ccc"
               >
             </MyInput>

+ 1 - 1
src/system/IOT/controlPanel/modules/myInput.vue

@@ -154,7 +154,7 @@ let checkNumScale = (rule,value) => {
 /* 验证时间 */
 let checkTime = (rule,value) => {
   let temp = value.split(props.timeSplit)
-  if (temp.length == 2 && (+temp[0] <= 24 && +temp[0] > 0) && (+temp[1] <=60 && +temp[1] > 0)) {
+  if (temp.length == 2 && (+temp[0] < 24 && +temp[0] >= 0) && (+temp[1] <60 && +temp[1] >= 0)) {
     return Promise.resolve()
   } else {
     return Promise.reject(`时间格式 00${props.timeSplit}00 `)

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

@@ -171,6 +171,31 @@ let check = async (rule,value) => {
   return Promise.resolve()
 }
 
+// let checkValue = async (rule,value) => {
+//   value.forEach(item => {
+//     if (form.value.datatype == 'boolean') {
+//       if (typeof item.value == 'number') {
+//         item.value.toString()
+//       }
+//       if (!item.label || !item.value) {
+//         throw '请输入值或者描述'
+//       } else {
+//         return Promise.resolve()
+//       }
+//     } else {
+//       if (typeof item.value == 'number') {
+//         item.value = item.value.toString()
+//       }
+//       if (!item.label && !item.value) {
+//         return Promise.resolve()
+//       } else if ((item.label && !item.value) || (!item.label && item.value)) {
+//         throw '请输入值或者描述'
+//       }
+//     }
+    
+//   })
+// }
+
 let checkValue = async (rule,value) => {
   value.forEach(item => {
     if (form.value.datatype == 'boolean') {
@@ -182,20 +207,12 @@ let checkValue = async (rule,value) => {
       } else {
         return Promise.resolve()
       }
-    } else {
-      if (typeof item.value == 'number') {
-        item.value = item.value.toString()
-      }
-      if (!item.label && !item.value) {
-        return Promise.resolve()
-      } else if ((item.label && !item.value) || (!item.label && item.value)) {
-        throw '请输入值或者描述'
-      }
     }
-    
   })
 }
 
+
+
 let checkNumber = async (rule,value) => {
   if (isNaN(+value)) {
     return Promise.reject('请输入数字类型')

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

@@ -171,28 +171,17 @@ let check = async (rule,value) => {
 }
 
 let checkValue = async (rule,value) => {
-  console.log(value);
   value.forEach(item => {
     if (form.value.datatype == 'boolean') {
       if (typeof item.value == 'number') {
-        item.value = item.value.toString()
+        item.value.toString()
       }
       if (!item.label || !item.value) {
         throw '请输入值或者描述'
       } else {
         return Promise.resolve()
       }
-    } else {
-      if (typeof item.value == 'number') {
-        item.value = item.value.toString()
-      }
-      if (!item.label && !item.value) {
-        return Promise.resolve()
-      } else if ((item.label && !item.value) || (!item.label && item.value)) {
-        throw '请输入值或者描述'
-      }
     }
-    
   })
 }
 

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

@@ -170,27 +170,14 @@ let checkValue = async (rule,value) => {
   value.forEach(item => {
     if (form.value.datatype == 'boolean') {
       if (typeof item.value == 'number') {
-        item.value = item.value.toString()
-      }
-      if (typeof item.value == 'number') {
-        item.value = item.value.toString()
+        item.value.toString()
       }
       if (!item.label || !item.value) {
         throw '请输入值或者描述'
       } else {
         return Promise.resolve()
       }
-    } else {
-      if (typeof item.value == 'number') {
-        item.value = item.value.toString()
-      }
-      if (!item.label && !item.value) {
-        return Promise.resolve()
-      } else if ((item.label && !item.value) || (!item.label && item.value)) {
-        throw '请输入值或者描述'
-      }
     }
-    
   })
 }
 

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

@@ -171,27 +171,16 @@ let check = async (rule,value) => {
 
 let checkValue = async (rule,value) => {
   value.forEach(item => {
-    console.log(!item.label || !item.value);
     if (form.value.datatype == 'boolean') {
       if (typeof item.value == 'number') {
-        item.value = item.value.toString()
+        item.value.toString()
       }
       if (!item.label || !item.value) {
         throw '请输入值或者描述'
       } else {
         return Promise.resolve()
       }
-    } else {
-      if (typeof item.value == 'number') {
-        item.value = item.value.toString()
-      }
-      if (!item.label && !item.value) {
-        return Promise.resolve()
-      } else if ((item.label && !item.value) || (!item.label && item.value)) {
-        throw '请输入值或者描述'
-      }
     }
-    
   })
 }
 

+ 1 - 1
src/template/defaultInfo/index.vue

@@ -1,5 +1,5 @@
 <template>
-  <a-descriptions :column="4" :labelStyle="{color:'#666',width:'150px'}" :contentStyle="{marginRight:'20px',marginBottom:'5px'}"  size="small" bordered>
+  <a-descriptions :column="3" :labelStyle="{color:'#666',width:'120px'}" :contentStyle="{marginRight:'20px',marginBottom:'5px'}"  size="small" bordered>
     <a-descriptions-item :span="item.span ? item.span : 1"  v-for="item in props.data" :key="item.index" :label="item.label"><span :style="item.style?item.style():''">{{item.value || '--'}}</span></a-descriptions-item>
   </a-descriptions>
 </template>

Some files were not shown because too many files changed in this diff