codeMan hace 1 año
padre
commit
769813e5c0
Se han modificado 71 ficheros con 74 adiciones y 22 borrados
  1. 0 1
      dist/assets/Edit-02fe0cb1.css
  2. 1 0
      dist/assets/Edit-8769aedf.css
  3. 1 1
      dist/assets/PlusCircleOutlined-90e647de.js
  4. 0 0
      dist/assets/base-3ae9c83b.js
  5. 1 1
      dist/assets/customBtn-1da51e69.js
  6. 0 0
      dist/assets/dataBlock-eecf7469.js
  7. 0 0
      dist/assets/index-00b61474.js
  8. 0 0
      dist/assets/index-058a85be.css
  9. 0 0
      dist/assets/index-0e2defa2.js
  10. 0 0
      dist/assets/index-0f489885.js
  11. 0 0
      dist/assets/index-11baa58c.js
  12. 0 0
      dist/assets/index-16368ce8.js
  13. 0 0
      dist/assets/index-1cb7caad.js
  14. 0 1
      dist/assets/index-1eb89852.css
  15. 0 0
      dist/assets/index-2a750655.js
  16. 1 0
      dist/assets/index-2ae735d7.css
  17. 0 0
      dist/assets/index-2d6bdb53.js
  18. 0 1
      dist/assets/index-36784799.js
  19. 0 0
      dist/assets/index-37ec4ca0.js
  20. 0 0
      dist/assets/index-39998d38.js
  21. 0 0
      dist/assets/index-41f3b828.js
  22. 0 0
      dist/assets/index-47047f88.js
  23. 0 0
      dist/assets/index-47a14acc.js
  24. 0 0
      dist/assets/index-51054c6d.js
  25. 0 0
      dist/assets/index-52546936.js
  26. 0 0
      dist/assets/index-69fb055e.js
  27. 0 0
      dist/assets/index-6bc6d473.js
  28. 0 0
      dist/assets/index-6f50c540.js
  29. 0 0
      dist/assets/index-703d7d6e.js
  30. 0 0
      dist/assets/index-70aed998.js
  31. 1 1
      dist/assets/index-739a7d5c.js
  32. 0 0
      dist/assets/index-73cb1a89.js
  33. 0 0
      dist/assets/index-749680c2.js
  34. 0 0
      dist/assets/index-74de86aa.js
  35. 0 0
      dist/assets/index-7674762e.js
  36. 0 0
      dist/assets/index-7cd877e6.js
  37. 1 1
      dist/assets/index-7f8e473f.js
  38. 0 0
      dist/assets/index-84fe00a8.js
  39. 1 0
      dist/assets/index-859374dd.js
  40. 1 1
      dist/assets/index-8947851c.js
  41. 0 0
      dist/assets/index-89c0fe28.js
  42. 0 0
      dist/assets/index-8e3198ef.js
  43. 0 0
      dist/assets/index-98fb2770.js
  44. 0 0
      dist/assets/index-9b974c94.js
  45. 0 0
      dist/assets/index-9d9680c5.js
  46. 0 0
      dist/assets/index-a718cfc8.js
  47. 0 0
      dist/assets/index-a7a3e850.js
  48. 0 0
      dist/assets/index-b6e69698.js
  49. 1 1
      dist/assets/index-b76c48d0.js
  50. 0 0
      dist/assets/index-bf0b18bf.js
  51. 0 0
      dist/assets/index-c12b206f.js
  52. 0 0
      dist/assets/index-c4abedaa.js
  53. 0 0
      dist/assets/index-c58f7f75.js
  54. 0 0
      dist/assets/index-caa01878.css
  55. 0 0
      dist/assets/index-d1bdfe67.js
  56. 0 0
      dist/assets/index-e15321ab.js
  57. 0 0
      dist/assets/index-e7c9a701.js
  58. 0 0
      dist/assets/index-e82f0918.js
  59. 0 0
      dist/assets/index-f88dc312.js
  60. 0 0
      dist/assets/index-fc1a9389.js
  61. 0 0
      dist/assets/index-fc87f2b0.js
  62. 0 0
      dist/assets/index-fe37936d.js
  63. 1 1
      dist/assets/index.vue_vue_type_style_index_0_scoped_f6f545f0_lang-f3323519.js
  64. 0 0
      dist/assets/index2-69434491.js
  65. 1 1
      dist/assets/login-8cf2ecf8.js
  66. 0 0
      dist/assets/map-027f9d5c.js
  67. 1 1
      dist/index.html
  68. 13 3
      src/system/IOT/gatewayManage/modules/Add.vue
  69. 12 3
      src/system/IOT/gatewayManage/modules/Edit.vue
  70. 19 3
      src/system/IOT/warningSet/modules/Add.vue
  71. 18 1
      src/system/IOT/warningSet/modules/Edit.vue

+ 0 - 1
dist/assets/Edit-02fe0cb1.css

@@ -1 +0,0 @@
-[data-v-0a507641] .ant-divider-with-text{margin-top:0!important}.warning-set[data-v-0a507641]{display:flex;width:100%}.warning-set .warning-set__left[data-v-0a507641]{width:100%}.warning-set .warning-set__left .ant-btn[data-v-0a507641]{margin-bottom:10px}[data-v-0a507641] .warning-set .ant-form-item{margin-bottom:0!important}[data-v-0a507641] .ant-tabs-nav-add{display:none}

+ 1 - 0
dist/assets/Edit-8769aedf.css

@@ -0,0 +1 @@
+[data-v-6d75b766] .ant-divider-with-text{margin-top:0!important}.warning-set[data-v-6d75b766]{display:flex;width:100%}.warning-set .warning-set__left[data-v-6d75b766]{width:100%}.warning-set .warning-set__left .ant-btn[data-v-6d75b766]{margin-bottom:10px}[data-v-6d75b766] .warning-set .ant-form-item{margin-bottom:0!important}[data-v-6d75b766] .ant-tabs-nav-add{display:none}

+ 1 - 1
dist/assets/PlusCircleOutlined-746adef3.js → dist/assets/PlusCircleOutlined-90e647de.js

@@ -1 +1 @@
-import{b as a}from"./index-68d225f8.js";import{j as u}from"./vue-676ffbd1.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-e15321ab.js";import{j as u}from"./vue-676ffbd1.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};

La diferencia del archivo ha sido suprimido porque es demasiado grande
+ 0 - 0
dist/assets/base-3ae9c83b.js


+ 1 - 1
dist/assets/customBtn-f39fe3c2.js → dist/assets/customBtn-1da51e69.js

@@ -1 +1 @@
-import"./index-68d225f8.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 c,a1 as k,a0 as g,u as r,a7 as x,R as h}from"./vue-676ffbd1.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:m,emit:v}){const i=e;let o=_(i.activeNormal?i.btnOptions[0].label:""),y=C(n=>s=>(console.log(s.value),s.label==o.value)),p=n=>{o.value=n.label,v("clickBtn",n)};return m({active:o}),(n,s)=>(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",r(o)==l.label?"active":"",{active:e.btn}]),onClick:u=>r(p)(l)},x(l.label),11,F))),256))]),e.icon1?(t(),a("div",N)):c("",!0)],4),e.tab?(t(),a("div",O,[(t(!0),a(b,null,f(e.btnOptions,(l,u)=>(t(),a("div",null,[r(y)(l)?h(n.$slots,`slot${u}`,{key:0,data:l},void 0,!0):c("",!0)]))),256))])):c("",!0)]))}},w=B($,[["__scopeId","data-v-5a886c5a"]]);export{w as c};
+import"./index-e15321ab.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 c,a1 as k,a0 as g,u as r,a7 as x,R as h}from"./vue-676ffbd1.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:m,emit:v}){const i=e;let o=_(i.activeNormal?i.btnOptions[0].label:""),y=C(n=>s=>(console.log(s.value),s.label==o.value)),p=n=>{o.value=n.label,v("clickBtn",n)};return m({active:o}),(n,s)=>(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",r(o)==l.label?"active":"",{active:e.btn}]),onClick:u=>r(p)(l)},x(l.label),11,F))),256))]),e.icon1?(t(),a("div",N)):c("",!0)],4),e.tab?(t(),a("div",O,[(t(!0),a(b,null,f(e.btnOptions,(l,u)=>(t(),a("div",null,[r(y)(l)?h(n.$slots,`slot${u}`,{key:0,data:l},void 0,!0):c("",!0)]))),256))])):c("",!0)]))}},w=B($,[["__scopeId","data-v-5a886c5a"]]);export{w as c};

La diferencia del archivo ha sido suprimido porque es demasiado grande
+ 0 - 0
dist/assets/dataBlock-eecf7469.js


La diferencia del archivo ha sido suprimido porque es demasiado grande
+ 0 - 0
dist/assets/index-00b61474.js


La diferencia del archivo ha sido suprimido porque es demasiado grande
+ 0 - 0
dist/assets/index-058a85be.css


La diferencia del archivo ha sido suprimido porque es demasiado grande
+ 0 - 0
dist/assets/index-0e2defa2.js


La diferencia del archivo ha sido suprimido porque es demasiado grande
+ 0 - 0
dist/assets/index-0f489885.js


La diferencia del archivo ha sido suprimido porque es demasiado grande
+ 0 - 0
dist/assets/index-11baa58c.js


La diferencia del archivo ha sido suprimido porque es demasiado grande
+ 0 - 0
dist/assets/index-16368ce8.js


La diferencia del archivo ha sido suprimido porque es demasiado grande
+ 0 - 0
dist/assets/index-1cb7caad.js


+ 0 - 1
dist/assets/index-1eb89852.css

@@ -1 +0,0 @@
-[data-v-d8e9b864] .ant-divider-with-text{margin-top:0!important}.warning-set[data-v-d8e9b864]{display:flex;width:100%}.warning-set .warning-set__left[data-v-d8e9b864]{width:100%}.warning-set .warning-set__left .ant-btn[data-v-d8e9b864]{margin-bottom:10px}[data-v-d8e9b864] .warning-set .ant-form-item{margin-bottom:0!important}[data-v-d8e9b864] .ant-tabs-nav-add{display:none}

La diferencia del archivo ha sido suprimido porque es demasiado grande
+ 0 - 0
dist/assets/index-2a750655.js


+ 1 - 0
dist/assets/index-2ae735d7.css

@@ -0,0 +1 @@
+[data-v-3e2b2706] .ant-divider-with-text{margin-top:0!important}.warning-set[data-v-3e2b2706]{display:flex;width:100%}.warning-set .warning-set__left[data-v-3e2b2706]{width:100%}.warning-set .warning-set__left .ant-btn[data-v-3e2b2706]{margin-bottom:10px}[data-v-3e2b2706] .warning-set .ant-form-item{margin-bottom:0!important}[data-v-3e2b2706] .ant-tabs-nav-add{display:none}

La diferencia del archivo ha sido suprimido porque es demasiado grande
+ 0 - 0
dist/assets/index-2d6bdb53.js


+ 0 - 1
dist/assets/index-36784799.js

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

La diferencia del archivo ha sido suprimido porque es demasiado grande
+ 0 - 0
dist/assets/index-37ec4ca0.js


La diferencia del archivo ha sido suprimido porque es demasiado grande
+ 0 - 0
dist/assets/index-39998d38.js


La diferencia del archivo ha sido suprimido porque es demasiado grande
+ 0 - 0
dist/assets/index-41f3b828.js


La diferencia del archivo ha sido suprimido porque es demasiado grande
+ 0 - 0
dist/assets/index-47047f88.js


La diferencia del archivo ha sido suprimido porque es demasiado grande
+ 0 - 0
dist/assets/index-47a14acc.js


La diferencia del archivo ha sido suprimido porque es demasiado grande
+ 0 - 0
dist/assets/index-51054c6d.js


La diferencia del archivo ha sido suprimido porque es demasiado grande
+ 0 - 0
dist/assets/index-52546936.js


La diferencia del archivo ha sido suprimido porque es demasiado grande
+ 0 - 0
dist/assets/index-69fb055e.js


La diferencia del archivo ha sido suprimido porque es demasiado grande
+ 0 - 0
dist/assets/index-6bc6d473.js


La diferencia del archivo ha sido suprimido porque es demasiado grande
+ 0 - 0
dist/assets/index-6f50c540.js


La diferencia del archivo ha sido suprimido porque es demasiado grande
+ 0 - 0
dist/assets/index-703d7d6e.js


La diferencia del archivo ha sido suprimido porque es demasiado grande
+ 0 - 0
dist/assets/index-70aed998.js


+ 1 - 1
dist/assets/index-aa4a0f5c.js → dist/assets/index-739a7d5c.js

@@ -1 +1 @@
-import{l as n}from"./index-fd15bb38.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-676ffbd1.js";import"./vue-router-dd0356f0.js";import"./index.vue_vue_type_style_index_0_scoped_f6f545f0_lang-8cddb083.js";import"./index-68d225f8.js";import"./_plugin-vue_export-helper-c27b6911.js";import"./base-a980f6a2.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-6f50c540.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-676ffbd1.js";import"./vue-router-dd0356f0.js";import"./index.vue_vue_type_style_index_0_scoped_f6f545f0_lang-f3323519.js";import"./index-e15321ab.js";import"./_plugin-vue_export-helper-c27b6911.js";import"./base-3ae9c83b.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};

La diferencia del archivo ha sido suprimido porque es demasiado grande
+ 0 - 0
dist/assets/index-73cb1a89.js


La diferencia del archivo ha sido suprimido porque es demasiado grande
+ 0 - 0
dist/assets/index-749680c2.js


La diferencia del archivo ha sido suprimido porque es demasiado grande
+ 0 - 0
dist/assets/index-74de86aa.js


La diferencia del archivo ha sido suprimido porque es demasiado grande
+ 0 - 0
dist/assets/index-7674762e.js


La diferencia del archivo ha sido suprimido porque es demasiado grande
+ 0 - 0
dist/assets/index-7cd877e6.js


+ 1 - 1
dist/assets/index-6c7b837a.js → dist/assets/index-7f8e473f.js

@@ -1 +1 @@
-import{l as d}from"./index-fd15bb38.js";import{a as u,A as f}from"./index-68d225f8.js";import{u as x}from"./vue-router-dd0356f0.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-676ffbd1.js";import"./index.vue_vue_type_style_index_0_scoped_f6f545f0_lang-8cddb083.js";import"./base-a980f6a2.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-6f50c540.js";import{a as u,A as f}from"./index-e15321ab.js";import{u as x}from"./vue-router-dd0356f0.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-676ffbd1.js";import"./index.vue_vue_type_style_index_0_scoped_f6f545f0_lang-f3323519.js";import"./base-3ae9c83b.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};

La diferencia del archivo ha sido suprimido porque es demasiado grande
+ 0 - 0
dist/assets/index-84fe00a8.js


+ 1 - 0
dist/assets/index-859374dd.js

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

+ 1 - 1
dist/assets/index-57f07d9c.js → dist/assets/index-8947851c.js

@@ -1 +1 @@
-import{n as g}from"./index-93537b8b.js";import{m as k}from"./index-68d225f8.js";import{a as d,w as y,U as D,V as l,W as o,j as u,X as f,ac as _,R as r,F as p,G as R,a7 as S,u as c,H as C}from"./vue-676ffbd1.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:b,emit:m}){let s=d(),e=d(!1),v=()=>{if(!s.value.tableRecord.length)return k.warning("请选择数据");e.value=!1,m("selectRowData",s.value.tableRecord)};y(()=>e.value,(t,n)=>{t||s.value.reloadSelect()});let h=()=>{m("close")};return b({modeVisible:e,refreshTable:()=>{s.value.listData()},list:s}),(t,n)=>{const w=D("a-modal");return l(),o(p,null,[u(w,{visible:c(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:c(h),onOk:c(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(p,{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-fc87f2b0.js";import{m as k}from"./index-e15321ab.js";import{a as d,w as y,U as D,V as l,W as o,j as u,X as f,ac as _,R as r,F as p,G as R,a7 as S,u as c,H as C}from"./vue-676ffbd1.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:b,emit:m}){let s=d(),e=d(!1),v=()=>{if(!s.value.tableRecord.length)return k.warning("请选择数据");e.value=!1,m("selectRowData",s.value.tableRecord)};y(()=>e.value,(t,n)=>{t||s.value.reloadSelect()});let h=()=>{m("close")};return b({modeVisible:e,refreshTable:()=>{s.value.listData()},list:s}),(t,n)=>{const w=D("a-modal");return l(),o(p,null,[u(w,{visible:c(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:c(h),onOk:c(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(p,{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 _};

La diferencia del archivo ha sido suprimido porque es demasiado grande
+ 0 - 0
dist/assets/index-89c0fe28.js


La diferencia del archivo ha sido suprimido porque es demasiado grande
+ 0 - 0
dist/assets/index-8e3198ef.js


La diferencia del archivo ha sido suprimido porque es demasiado grande
+ 0 - 0
dist/assets/index-98fb2770.js


La diferencia del archivo ha sido suprimido porque es demasiado grande
+ 0 - 0
dist/assets/index-9b974c94.js


La diferencia del archivo ha sido suprimido porque es demasiado grande
+ 0 - 0
dist/assets/index-9d9680c5.js


La diferencia del archivo ha sido suprimido porque es demasiado grande
+ 0 - 0
dist/assets/index-a718cfc8.js


La diferencia del archivo ha sido suprimido porque es demasiado grande
+ 0 - 0
dist/assets/index-a7a3e850.js


La diferencia del archivo ha sido suprimido porque es demasiado grande
+ 0 - 0
dist/assets/index-b6e69698.js


+ 1 - 1
dist/assets/index-3ad01a75.js → dist/assets/index-b76c48d0.js

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

La diferencia del archivo ha sido suprimido porque es demasiado grande
+ 0 - 0
dist/assets/index-bf0b18bf.js


La diferencia del archivo ha sido suprimido porque es demasiado grande
+ 0 - 0
dist/assets/index-c12b206f.js


La diferencia del archivo ha sido suprimido porque es demasiado grande
+ 0 - 0
dist/assets/index-c4abedaa.js


La diferencia del archivo ha sido suprimido porque es demasiado grande
+ 0 - 0
dist/assets/index-c58f7f75.js


La diferencia del archivo ha sido suprimido porque es demasiado grande
+ 0 - 0
dist/assets/index-caa01878.css


La diferencia del archivo ha sido suprimido porque es demasiado grande
+ 0 - 0
dist/assets/index-d1bdfe67.js


La diferencia del archivo ha sido suprimido porque es demasiado grande
+ 0 - 0
dist/assets/index-e15321ab.js


La diferencia del archivo ha sido suprimido porque es demasiado grande
+ 0 - 0
dist/assets/index-e7c9a701.js


La diferencia del archivo ha sido suprimido porque es demasiado grande
+ 0 - 0
dist/assets/index-e82f0918.js


La diferencia del archivo ha sido suprimido porque es demasiado grande
+ 0 - 0
dist/assets/index-f88dc312.js


La diferencia del archivo ha sido suprimido porque es demasiado grande
+ 0 - 0
dist/assets/index-fc1a9389.js


La diferencia del archivo ha sido suprimido porque es demasiado grande
+ 0 - 0
dist/assets/index-fc87f2b0.js


La diferencia del archivo ha sido suprimido porque es demasiado grande
+ 0 - 0
dist/assets/index-fe37936d.js


+ 1 - 1
dist/assets/index.vue_vue_type_style_index_0_scoped_f6f545f0_lang-8cddb083.js → dist/assets/index.vue_vue_type_style_index_0_scoped_f6f545f0_lang-f3323519.js

@@ -1 +1 @@
-import{a as i,s as r,j as m,e as u,A as p}from"./index-68d225f8.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);console.log(l);let 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,j as m,e as u,A as p}from"./index-e15321ab.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);console.log(l);let 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};

La diferencia del archivo ha sido suprimido porque es demasiado grande
+ 0 - 0
dist/assets/index2-69434491.js


+ 1 - 1
dist/assets/login-d5a7fafc.js → dist/assets/login-8cf2ecf8.js

@@ -1,4 +1,4 @@
-import{u as useRouter}from"./vue-router-dd0356f0.js";import{c as commonjsGlobal,u as useRouteTabsStore,a as useAuthStore,s as storeToRefs,A as Api,m as message}from"./index-68d225f8.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-676ffbd1.js";var md5Exports={},md5$1={get exports(){return md5Exports},set exports(e){md5Exports=e}};/**
+import{u as useRouter}from"./vue-router-dd0356f0.js";import{c as commonjsGlobal,u as useRouteTabsStore,a as useAuthStore,s as storeToRefs,A as Api,m as message}from"./index-e15321ab.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-676ffbd1.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

La diferencia del archivo ha sido suprimido porque es demasiado grande
+ 0 - 0
dist/assets/map-027f9d5c.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-68d225f8.js"></script>
+    <script type="module" crossorigin src="./assets/index-e15321ab.js"></script>
     <link rel="modulepreload" crossorigin href="./assets/vue-676ffbd1.js">
     <link rel="modulepreload" crossorigin href="./assets/vue-router-dd0356f0.js">
     <link rel="stylesheet" href="./assets/index-8790befc.css">

+ 13 - 3
src/system/IOT/gatewayManage/modules/Add.vue

@@ -35,7 +35,7 @@
           </a-form-item>
         </a-col>
         <a-col :span="12">
-          <a-form-item  label="序列号" name="serialnumber" :rules="[{ required: true, message: '请输入序列号' }]">
+          <a-form-item  label="序列号" name="serialnumber" :rules="[{ required: true, message: '请输入序列号' },{validator:checkType,trigger:'blur'}]">
             <a-input v-model:value="form.serialnumber" placeholder="请输入序列号"></a-input>
           </a-form-item>
         </a-col>
@@ -67,12 +67,12 @@
           </a-form-item>
         </a-col> -->
         <a-col :span="12">
-          <a-form-item  label="品牌" name="brandname" :rules="[{ required: true, message: '请输入品牌' }]">
+          <a-form-item  label="品牌" name="brandname" :rules="[{ required: true, message: '请输入品牌' },{validator:checkType,trigger:'blur'}]">
             <a-input v-model:value="form.brandname" placeholder="请输入品牌"></a-input>
           </a-form-item>
         </a-col>
         <a-col :span="12">
-          <a-form-item  label="型号" name="model" :rules="[{ required: true, message: '请输入型号' }]">
+          <a-form-item  label="型号" name="model" :rules="[{ required: true, message: '请输入型号' },{validator:checkType,trigger:'blur'}]">
             <a-input v-model:value="form.model" placeholder="请输入型号"></a-input>
           </a-form-item>
         </a-col>
@@ -185,6 +185,16 @@ let checkNumber = async (rule,value) => {
   } 
 }
 
+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('不包含汉字');
+  }
+}
+
 let onSubmit = async () => {
   form.value.attinfos = upload.value.fileList.length ? '1' : '' 
   let isCheck = await formRef.value.validateFields()

+ 12 - 3
src/system/IOT/gatewayManage/modules/Edit.vue

@@ -35,7 +35,7 @@
           </a-form-item>
         </a-col>
         <a-col :span="12">
-          <a-form-item  label="序列号" name="serialnumber" :rules="[{ required: true, message: '请输入序列号' }]">
+          <a-form-item  label="序列号" name="serialnumber" :rules="[{ required: true, message: '请输入序列号' },{validator:checkType,trigger:'blur'}]">
             <a-input v-model:value="form.serialnumber" placeholder="请输入序列号"></a-input>
           </a-form-item>
         </a-col>
@@ -67,12 +67,12 @@
           </a-form-item>
         </a-col> -->
         <a-col :span="12">
-          <a-form-item  label="品牌" name="brandname" :rules="[{ required: true, message: '请输入品牌' }]">
+          <a-form-item  label="品牌" name="brandname" :rules="[{ required: true, message: '请输入品牌' },{validator:checkType,trigger:'blur'}]">
             <a-input v-model:value="form.brandname" placeholder="请输入品牌"></a-input>
           </a-form-item>
         </a-col>
         <a-col :span="12">
-          <a-form-item  label="型号" name="model" :rules="[{ required: true, message: '请输入型号' }]">
+          <a-form-item  label="型号" name="model" :rules="[{ required: true, message: '请输入型号' },{validator:checkType,trigger:'blur'}]">
             <a-input v-model:value="form.model" placeholder="请输入型号"></a-input>
           </a-form-item>
         </a-col>
@@ -171,6 +171,15 @@ let productParam = ref({
   },
 })
 
+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('不包含汉字');
+  }
+}
 
 let checkNumber = async (rule,value) => {
   if (isNaN(+value)) {

+ 19 - 3
src/system/IOT/warningSet/modules/Add.vue

@@ -112,7 +112,7 @@
                           </SelectModel>
                         </div>
                         <div v-else-if="column.dataIndex == 'symbol'">
-                          <a-form-item name="symbol" :rules="[{ required: true, message: '请选择判断符' }]">
+                          <a-form-item name="symbol" :rules="[{ required: true, message: '请选择判断符' },{validator:checkData,trigger:'blur'}]">
                             <a-select
                               v-model:value="record.symbol"
                               placeholder="请选择判断符"
@@ -292,7 +292,21 @@ let selectAtt = (data) => {
   selectTable.value.modeVisible = false
 }
 
-let instance = getCurrentInstance()
+let checkSubmit = () => {
+  try {
+    form.value.rules.forEach(item => {
+      item.rulemxs.forEach(mx => {
+        let arr = item.rulemxs.filter(i => i != mx)
+        if (mx.symbol != '' && arr.some(j => j.symbol == mx.symbol)) {
+          throw true
+        }
+      })
+    })
+  } catch (error) {
+    return true
+  }
+  
+}
 
 let onSubmit = async () => {
   let isCheck
@@ -304,7 +318,9 @@ let onSubmit = async () => {
     isCheck = await formRef1.value.validateFields()
   }
 
-  if (!isCheck) return message.warning('请填写完整内容!!')
+  if(checkSubmit()) {
+    return message.warning('存在相同条件或者互斥条件')
+  }
 
   loading.value = true
   let res = await Api.requested({

+ 18 - 1
src/system/IOT/warningSet/modules/Edit.vue

@@ -319,7 +319,20 @@ let selectAtt = (data) => {
   selectTable.value.modeVisible = false
 }
 
-let instance = getCurrentInstance()
+let checkSubmit = () => {
+  try {
+    form.value.rules.forEach(item => {
+      item.rulemxs.forEach(mx => {
+        let arr = item.rulemxs.filter(i => i != mx)
+        if (mx.symbol != '' && arr.some(j => j.symbol == mx.symbol)) {
+          throw true
+        }
+      })
+    })
+  } catch (error) {
+    return true
+  }
+}
 
 let onSubmit = async () => {
   let isCheck
@@ -330,6 +343,10 @@ let onSubmit = async () => {
   } else {
     isCheck = await formRef1.value.validateFields()
   }
+
+  if(checkSubmit()) {
+    return message.warning('存在相同条件或者互斥条件')
+  }
   
   loading.value = true
   let res = await Api.requested({

Algunos archivos no se mostraron porque demasiados archivos cambiaron en este cambio