浏览代码

Merge branch 'xiaoqin'

codeMan 2 年之前
父节点
当前提交
32a65b214f
共有 78 个文件被更改,包括 21 次插入29 次删除
  1. 1 1
      dist/assets/PlusCircleOutlined-8c58f89e.js
  2. 0 0
      dist/assets/base-233725df.js
  3. 1 1
      dist/assets/customBtn-85b23b7a.js
  4. 0 0
      dist/assets/dataBlock-06d49288.js
  5. 0 0
      dist/assets/dataBlock-85e92b8f.js
  6. 0 0
      dist/assets/dataBlock-b38b26f2.css
  7. 0 0
      dist/assets/dataBlock-b7f604ca.css
  8. 0 0
      dist/assets/index-0b4733b2.js
  9. 0 0
      dist/assets/index-0ce6b281.css
  10. 0 0
      dist/assets/index-16833271.js
  11. 0 0
      dist/assets/index-16da068f.js
  12. 0 0
      dist/assets/index-206e533d.js
  13. 0 0
      dist/assets/index-24846f4f.js
  14. 0 0
      dist/assets/index-267fb5d1.js
  15. 0 0
      dist/assets/index-27ee44b4.js
  16. 0 0
      dist/assets/index-2a967188.js
  17. 0 0
      dist/assets/index-2d874db3.js
  18. 0 0
      dist/assets/index-374ea151.js
  19. 0 0
      dist/assets/index-4520c825.js
  20. 1 0
      dist/assets/index-4bfc230b.css
  21. 0 0
      dist/assets/index-4d2f9246.css
  22. 0 0
      dist/assets/index-52c3a9a3.css
  23. 0 0
      dist/assets/index-532580b3.js
  24. 0 0
      dist/assets/index-580f8422.js
  25. 0 0
      dist/assets/index-58816a05.css
  26. 0 0
      dist/assets/index-589b17e6.js
  27. 0 0
      dist/assets/index-5e561be0.js
  28. 0 0
      dist/assets/index-5f13e25e.js
  29. 0 0
      dist/assets/index-6460175f.js
  30. 0 0
      dist/assets/index-6918842c.js
  31. 0 0
      dist/assets/index-6cd12742.js
  32. 0 0
      dist/assets/index-6db1625b.js
  33. 0 0
      dist/assets/index-6fe184e6.js
  34. 0 0
      dist/assets/index-711ccc4f.js
  35. 0 0
      dist/assets/index-74a1be86.js
  36. 0 0
      dist/assets/index-7599a662.js
  37. 0 0
      dist/assets/index-762b6ca6.css
  38. 0 0
      dist/assets/index-7ca20eff.js
  39. 1 1
      dist/assets/index-7ccc48f9.js
  40. 0 0
      dist/assets/index-80ad7d9b.js
  41. 0 0
      dist/assets/index-85b27790.js
  42. 1 1
      dist/assets/index-89b2b1d0.js
  43. 0 0
      dist/assets/index-8d593f8b.js
  44. 1 0
      dist/assets/index-973a8129.css
  45. 0 0
      dist/assets/index-a111b4c6.js
  46. 0 0
      dist/assets/index-a4f4b3e9.js
  47. 0 0
      dist/assets/index-a958dc3d.js
  48. 1 1
      dist/assets/index-accaa4db.js
  49. 0 0
      dist/assets/index-b369ab09.js
  50. 0 0
      dist/assets/index-bc5e16f4.js
  51. 0 0
      dist/assets/index-ca9d8a5f.js
  52. 0 0
      dist/assets/index-cc6d0083.js
  53. 0 0
      dist/assets/index-ce5e1eed.js
  54. 1 1
      dist/assets/index-d9ff6710.js
  55. 0 0
      dist/assets/index-daa74f54.js
  56. 0 0
      dist/assets/index-dc652a12.js
  57. 0 0
      dist/assets/index-dcb8685d.js
  58. 0 0
      dist/assets/index-dfe2046c.js
  59. 0 0
      dist/assets/index-e0f1e4a2.js
  60. 0 0
      dist/assets/index-e468c447.css
  61. 0 0
      dist/assets/index-e65c39b4.js
  62. 0 0
      dist/assets/index-ecb04618.js
  63. 0 0
      dist/assets/index-eeca13ef.js
  64. 0 0
      dist/assets/index-f3bc27c1.js
  65. 0 0
      dist/assets/index-f98eee7a.js
  66. 0 0
      dist/assets/index-fa21df64.js
  67. 0 0
      dist/assets/index-fc1cb7fe.js
  68. 1 1
      dist/assets/index.vue_vue_type_style_index_0_scoped_f6f545f0_lang-17ece31c.js
  69. 0 0
      dist/assets/index2-183ad1fa.js
  70. 1 1
      dist/assets/login-633d8718.js
  71. 0 0
      dist/assets/map-82c79029.js
  72. 1 1
      dist/assets/myRadio-6bef43af.js
  73. 1 1
      dist/index.html
  74. 1 12
      src/system/IOT/controlPanel/model/06/index.vue
  75. 1 1
      src/system/IOT/controlPanel/model/MT01/index.vue
  76. 1 1
      src/system/IOT/controlPanel/model/MT02/index.vue
  77. 6 4
      src/system/IOT/controlPanel/modules/myInput.vue
  78. 0 1
      src/system/IOT/equipmentMag/detail/index.vue

+ 1 - 1
dist/assets/PlusCircleOutlined-ddfee0ba.js → dist/assets/PlusCircleOutlined-8c58f89e.js

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

文件差异内容过多而无法显示
+ 0 - 0
dist/assets/base-233725df.js


+ 1 - 1
dist/assets/customBtn-937bf284.js → dist/assets/customBtn-85b23b7a.js

@@ -1 +1 @@
-import"./index-be1b3208.js";import{_ as B}from"./_plugin-vue_export-helper-c27b6911.js";import{a as C,c as _,V as t,W as l,a4 as d,F as b,a2 as m,$ as c,a1 as k,a0 as g,u as r,a7 as S,R as x}from"./vue-676ffbd1.js";const h={class:"btn-box"},F=["onClick"],O={key:0,class:"icon1"},N={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},myStyle:{type:Object,default:()=>{}}},emits:["clickBtn","selectChange"],setup(e,{expose:y,emit:f}){const i=e;let o=C(i.activeNormal?i.btnOptions[0].label:""),v=_(n=>s=>(console.log(s.value),s.label==o.value)),p=n=>{o.value=n.label,f("clickBtn",n)};return y({active:o}),(n,s)=>(t(),l("div",null,[d("div",{class:"btn-wrapper",style:k([{"--btnColor":e.btnColor},{"--textColor":e.textColor},e.myStyle])},[d("div",h,[(t(!0),l(b,null,m(e.btnOptions,a=>(t(),l("div",{class:g(["btn-item",r(o)==a.label?"active":"",{active:e.btn}]),onClick:u=>r(p)(a)},S(a.label),11,F))),256))]),e.icon1?(t(),l("div",O)):c("",!0)],4),e.tab?(t(),l("div",N,[(t(!0),l(b,null,m(e.btnOptions,(a,u)=>(t(),l("div",null,[r(v)(a)?x(n.$slots,`slot${u}`,{key:0,data:a},void 0,!0):c("",!0)]))),256))])):c("",!0)]))}},j=B($,[["__scopeId","data-v-4d9c96a6"]]);export{j as c};
+import"./index-532580b3.js";import{_ as B}from"./_plugin-vue_export-helper-c27b6911.js";import{a as C,c as _,V as t,W as l,a4 as d,F as b,a2 as m,$ as c,a1 as k,a0 as g,u as r,a7 as S,R as x}from"./vue-676ffbd1.js";const h={class:"btn-box"},F=["onClick"],O={key:0,class:"icon1"},N={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},myStyle:{type:Object,default:()=>{}}},emits:["clickBtn","selectChange"],setup(e,{expose:y,emit:f}){const i=e;let o=C(i.activeNormal?i.btnOptions[0].label:""),v=_(n=>s=>(console.log(s.value),s.label==o.value)),p=n=>{o.value=n.label,f("clickBtn",n)};return y({active:o}),(n,s)=>(t(),l("div",null,[d("div",{class:"btn-wrapper",style:k([{"--btnColor":e.btnColor},{"--textColor":e.textColor},e.myStyle])},[d("div",h,[(t(!0),l(b,null,m(e.btnOptions,a=>(t(),l("div",{class:g(["btn-item",r(o)==a.label?"active":"",{active:e.btn}]),onClick:u=>r(p)(a)},S(a.label),11,F))),256))]),e.icon1?(t(),l("div",O)):c("",!0)],4),e.tab?(t(),l("div",N,[(t(!0),l(b,null,m(e.btnOptions,(a,u)=>(t(),l("div",null,[r(v)(a)?x(n.$slots,`slot${u}`,{key:0,data:a},void 0,!0):c("",!0)]))),256))])):c("",!0)]))}},j=B($,[["__scopeId","data-v-4d9c96a6"]]);export{j as c};

文件差异内容过多而无法显示
+ 0 - 0
dist/assets/dataBlock-06d49288.js


文件差异内容过多而无法显示
+ 0 - 0
dist/assets/dataBlock-85e92b8f.js


文件差异内容过多而无法显示
+ 0 - 0
dist/assets/dataBlock-b38b26f2.css


文件差异内容过多而无法显示
+ 0 - 0
dist/assets/dataBlock-b7f604ca.css


文件差异内容过多而无法显示
+ 0 - 0
dist/assets/index-0b4733b2.js


文件差异内容过多而无法显示
+ 0 - 0
dist/assets/index-0ce6b281.css


文件差异内容过多而无法显示
+ 0 - 0
dist/assets/index-16833271.js


文件差异内容过多而无法显示
+ 0 - 0
dist/assets/index-16da068f.js


文件差异内容过多而无法显示
+ 0 - 0
dist/assets/index-206e533d.js


文件差异内容过多而无法显示
+ 0 - 0
dist/assets/index-24846f4f.js


文件差异内容过多而无法显示
+ 0 - 0
dist/assets/index-267fb5d1.js


文件差异内容过多而无法显示
+ 0 - 0
dist/assets/index-27ee44b4.js


文件差异内容过多而无法显示
+ 0 - 0
dist/assets/index-2a967188.js


文件差异内容过多而无法显示
+ 0 - 0
dist/assets/index-2d874db3.js


文件差异内容过多而无法显示
+ 0 - 0
dist/assets/index-374ea151.js


文件差异内容过多而无法显示
+ 0 - 0
dist/assets/index-4520c825.js


+ 1 - 0
dist/assets/index-4bfc230b.css

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

文件差异内容过多而无法显示
+ 0 - 0
dist/assets/index-4d2f9246.css


文件差异内容过多而无法显示
+ 0 - 0
dist/assets/index-52c3a9a3.css


文件差异内容过多而无法显示
+ 0 - 0
dist/assets/index-532580b3.js


文件差异内容过多而无法显示
+ 0 - 0
dist/assets/index-580f8422.js


文件差异内容过多而无法显示
+ 0 - 0
dist/assets/index-58816a05.css


文件差异内容过多而无法显示
+ 0 - 0
dist/assets/index-589b17e6.js


文件差异内容过多而无法显示
+ 0 - 0
dist/assets/index-5e561be0.js


文件差异内容过多而无法显示
+ 0 - 0
dist/assets/index-5f13e25e.js


文件差异内容过多而无法显示
+ 0 - 0
dist/assets/index-6460175f.js


文件差异内容过多而无法显示
+ 0 - 0
dist/assets/index-6918842c.js


文件差异内容过多而无法显示
+ 0 - 0
dist/assets/index-6cd12742.js


文件差异内容过多而无法显示
+ 0 - 0
dist/assets/index-6db1625b.js


文件差异内容过多而无法显示
+ 0 - 0
dist/assets/index-6fe184e6.js


文件差异内容过多而无法显示
+ 0 - 0
dist/assets/index-711ccc4f.js


文件差异内容过多而无法显示
+ 0 - 0
dist/assets/index-74a1be86.js


文件差异内容过多而无法显示
+ 0 - 0
dist/assets/index-7599a662.js


文件差异内容过多而无法显示
+ 0 - 0
dist/assets/index-762b6ca6.css


文件差异内容过多而无法显示
+ 0 - 0
dist/assets/index-7ca20eff.js


+ 1 - 1
dist/assets/index-d7636b18.js → dist/assets/index-7ccc48f9.js

@@ -1 +1 @@
-import{n as g}from"./index-7f94280a.js";import{m as k}from"./index-be1b3208.js";import{a as d,w as y,U as D,V as s,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 m,H as B}from"./vue-676ffbd1.js";const C={key:0},T={key:1},I={__name:"index",props:{title:String,wdith:String,custom:{type:Boolean,default:()=>!1}},emits:["selectRowData","close"],setup(i,{expose:v,emit:c}){let l=d(),e=d(!1),b=()=>{if(!l.value.tableRecord.length)return k.warning("请选择数据");e.value=!1,c("selectRowData",l.value.tableRecord)};y(()=>e.value,(t,n)=>{t||l.value.reloadSelect()});let h=()=>{c("close")};return v({modeVisible:e,refreshTable:()=>{l.value.listData()},list:l}),(t,n)=>{const w=D("a-modal");return s(),o(p,null,[u(w,{visible:m(e),"onUpdate:visible":n[0]||(n[0]=a=>B(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(b)},{default:f(()=>[u(g,_(t.$attrs,{ref_key:"list",ref:l,size:"small",onListData:t.listData}),{tb_cell:f(({data:a})=>[i.custom?(s(),o("div",C,[r(t.$slots,"custom",{data:a})])):(s(),o("div",T,[a.column.dataIndex==="operation"?r(t.$slots,"handleBtn",{key:0}):(s(),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{I as _};
+import{n as g}from"./index-206e533d.js";import{m as k}from"./index-532580b3.js";import{a as d,w as y,U as D,V as s,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 m,H as B}from"./vue-676ffbd1.js";const C={key:0},T={key:1},I={__name:"index",props:{title:String,wdith:String,custom:{type:Boolean,default:()=>!1}},emits:["selectRowData","close"],setup(i,{expose:v,emit:c}){let l=d(),e=d(!1),b=()=>{if(!l.value.tableRecord.length)return k.warning("请选择数据");e.value=!1,c("selectRowData",l.value.tableRecord)};y(()=>e.value,(t,n)=>{t||l.value.reloadSelect()});let h=()=>{c("close")};return v({modeVisible:e,refreshTable:()=>{l.value.listData()},list:l}),(t,n)=>{const w=D("a-modal");return s(),o(p,null,[u(w,{visible:m(e),"onUpdate:visible":n[0]||(n[0]=a=>B(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(b)},{default:f(()=>[u(g,_(t.$attrs,{ref_key:"list",ref:l,size:"small",onListData:t.listData}),{tb_cell:f(({data:a})=>[i.custom?(s(),o("div",C,[r(t.$slots,"custom",{data:a})])):(s(),o("div",T,[a.column.dataIndex==="operation"?r(t.$slots,"handleBtn",{key:0}):(s(),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{I as _};

文件差异内容过多而无法显示
+ 0 - 0
dist/assets/index-80ad7d9b.js


文件差异内容过多而无法显示
+ 0 - 0
dist/assets/index-85b27790.js


+ 1 - 1
dist/assets/index-c1982c43.js → dist/assets/index-89b2b1d0.js

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

文件差异内容过多而无法显示
+ 0 - 0
dist/assets/index-8d593f8b.js


+ 1 - 0
dist/assets/index-973a8129.css

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

文件差异内容过多而无法显示
+ 0 - 0
dist/assets/index-a111b4c6.js


文件差异内容过多而无法显示
+ 0 - 0
dist/assets/index-a4f4b3e9.js


文件差异内容过多而无法显示
+ 0 - 0
dist/assets/index-a958dc3d.js


+ 1 - 1
dist/assets/index-c4ebcaf5.js → dist/assets/index-accaa4db.js

@@ -1 +1 @@
-import{l as n}from"./index-4ceacff0.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-55b0c42b.js";import"./index-be1b3208.js";import"./_plugin-vue_export-helper-c27b6911.js";import"./base-e59873e1.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-6cd12742.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-17ece31c.js";import"./index-532580b3.js";import"./_plugin-vue_export-helper-c27b6911.js";import"./base-233725df.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};

文件差异内容过多而无法显示
+ 0 - 0
dist/assets/index-b369ab09.js


文件差异内容过多而无法显示
+ 0 - 0
dist/assets/index-bc5e16f4.js


文件差异内容过多而无法显示
+ 0 - 0
dist/assets/index-ca9d8a5f.js


文件差异内容过多而无法显示
+ 0 - 0
dist/assets/index-cc6d0083.js


文件差异内容过多而无法显示
+ 0 - 0
dist/assets/index-ce5e1eed.js


+ 1 - 1
dist/assets/index-b286021b.js → dist/assets/index-d9ff6710.js

@@ -1 +1 @@
-import{l as d}from"./index-4ceacff0.js";import{a as u,A as f}from"./index-be1b3208.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-55b0c42b.js";import"./base-e59873e1.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-6cd12742.js";import{a as u,A as f}from"./index-532580b3.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-17ece31c.js";import"./base-233725df.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};

文件差异内容过多而无法显示
+ 0 - 0
dist/assets/index-daa74f54.js


文件差异内容过多而无法显示
+ 0 - 0
dist/assets/index-dc652a12.js


文件差异内容过多而无法显示
+ 0 - 0
dist/assets/index-dcb8685d.js


文件差异内容过多而无法显示
+ 0 - 0
dist/assets/index-dfe2046c.js


文件差异内容过多而无法显示
+ 0 - 0
dist/assets/index-e0f1e4a2.js


文件差异内容过多而无法显示
+ 0 - 0
dist/assets/index-e468c447.css


文件差异内容过多而无法显示
+ 0 - 0
dist/assets/index-e65c39b4.js


文件差异内容过多而无法显示
+ 0 - 0
dist/assets/index-ecb04618.js


文件差异内容过多而无法显示
+ 0 - 0
dist/assets/index-eeca13ef.js


文件差异内容过多而无法显示
+ 0 - 0
dist/assets/index-f3bc27c1.js


文件差异内容过多而无法显示
+ 0 - 0
dist/assets/index-f98eee7a.js


文件差异内容过多而无法显示
+ 0 - 0
dist/assets/index-fa21df64.js


文件差异内容过多而无法显示
+ 0 - 0
dist/assets/index-fc1cb7fe.js


+ 1 - 1
dist/assets/index.vue_vue_type_style_index_0_scoped_f6f545f0_lang-55b0c42b.js → dist/assets/index.vue_vue_type_style_index_0_scoped_f6f545f0_lang-17ece31c.js

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

文件差异内容过多而无法显示
+ 0 - 0
dist/assets/index2-183ad1fa.js


+ 1 - 1
dist/assets/login-6aef6eca.js → dist/assets/login-633d8718.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-be1b3208.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-532580b3.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

文件差异内容过多而无法显示
+ 0 - 0
dist/assets/map-82c79029.js


+ 1 - 1
dist/assets/myRadio-a8930507.js → dist/assets/myRadio-6bef43af.js

@@ -1 +1 @@
-import"./index-be1b3208.js";import"./dataBlock-85e92b8f.js";import{_ as y}from"./_plugin-vue_export-helper-c27b6911.js";import{a as g,U as s,V as t,W as r,a4 as l,a1 as n,a7 as i,j as _,X as d,F as x,a2 as h,a3 as C,G as v,ac as S,u as b,R as B}from"./vue-676ffbd1.js";const V={class:"my-radio"},k={style:{display:"flex"}},N={__name:"myRadio",props:{title:{type:String},options:{type:Array,default:()=>[]},textColor:{type:String,default:()=>"#ffffff"},disabled:{type:Boolean,default:()=>!1}},emits:["Change"],setup(e,{emit:f}){const c=g({color:"#ffffff",marginBottom:"10px",fontSize:"12px"});let u=a=>{f("Change",a)};return(a,R)=>{const p=s("a-radio"),m=s("a-radio-group");return t(),r("div",V,[l("div",k,[l("span",{style:n([{"margin-right":"10px"},{color:e.textColor}])},i(e.title),5),_(m,S(a.$attrs,{style:[{"--textColor":e.textColor}],disabled:e.disabled,onChange:b(u)}),{default:d(()=>[(t(!0),r(x,null,h(e.options,o=>(t(),C(p,{style:n(c.value),value:o.value},{default:d(()=>[v(i(o.label),1)]),_:2},1032,["style","value"]))),256))]),_:1},16,["style","disabled","onChange"])]),B(a.$slots,"default",{},void 0,!0)])}}},j=y(N,[["__scopeId","data-v-126be1f9"]]);export{j as M};
+import"./index-532580b3.js";import"./dataBlock-06d49288.js";import{_ as y}from"./_plugin-vue_export-helper-c27b6911.js";import{a as g,U as s,V as t,W as r,a4 as l,a1 as n,a7 as i,j as _,X as d,F as x,a2 as h,a3 as C,G as v,ac as S,u as b,R as B}from"./vue-676ffbd1.js";const V={class:"my-radio"},k={style:{display:"flex"}},N={__name:"myRadio",props:{title:{type:String},options:{type:Array,default:()=>[]},textColor:{type:String,default:()=>"#ffffff"},disabled:{type:Boolean,default:()=>!1}},emits:["Change"],setup(e,{emit:f}){const c=g({color:"#ffffff",marginBottom:"10px",fontSize:"12px"});let u=a=>{f("Change",a)};return(a,R)=>{const p=s("a-radio"),m=s("a-radio-group");return t(),r("div",V,[l("div",k,[l("span",{style:n([{"margin-right":"10px"},{color:e.textColor}])},i(e.title),5),_(m,S(a.$attrs,{style:[{"--textColor":e.textColor}],disabled:e.disabled,onChange:b(u)}),{default:d(()=>[(t(!0),r(x,null,h(e.options,o=>(t(),C(p,{style:n(c.value),value:o.value},{default:d(()=>[v(i(o.label),1)]),_:2},1032,["style","value"]))),256))]),_:1},16,["style","disabled","onChange"])]),B(a.$slots,"default",{},void 0,!0)])}}},j=y(N,[["__scopeId","data-v-126be1f9"]]);export{j as M};

+ 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-be1b3208.js"></script>
+    <script type="module" crossorigin src="./assets/index-532580b3.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">

+ 1 - 12
src/system/IOT/controlPanel/model/06/index.vue

@@ -31,17 +31,6 @@
             :left="350" 
             :data="[{title:detail.params.Batt4.paramname,value:detail.params.Batt4.lastvalue,unit:detail.params.Batt4.unit},{title:detail.params.Batt12.paramname,value,value:detail.params.Batt12.lastvalue,unit:detail.params.Batt12.unit},{title:detail.params.BatFlow.paramname,value:detail.params.BatFlow.lastvalue,unit:detail.params.BatFlow.unit}]"
           ></dataBlock>
-          <!-- <dataBlock :title="detail.params.DaoFa.paramname" top="0" :left="wrapper ? 600 : 400" v-if="detail.function['Pilot valve'] && detail.params.DaoFa">
-            <div style="display: flex;">
-              <div style="padding: 0 5px;">
-                <a-tag color="blue">{{ detail.params.DaoFa.options.filter(item => item.value == detail.params.DaoFa.lastvalue).length && detail.params.DaoFa.options.filter(item => item.value == detail.params.DaoFa.lastvalue)[0].label }}</a-tag>
-              </div>
-              <updataBtn :icon1="detail.paramcmdvalues.DaoFa ? true : false">
-                <a-button type="default" size="small" style="margin:5px;" v-for="item in detail.params.DaoFa.options" @click="controlBtn(item)" :disabled="detail.paramcmdvalues.DaoFa == item.value">{{ item.label }}</a-button>
-              </updataBtn>
-            </div>
-            
-          </dataBlock> -->
           <dataBlock 
             v-if="detail.params.DownP"
             :title="detail.params.DownP.paramname" 
@@ -114,7 +103,7 @@ let calcSizeFun = () => {
     let currentSize = document.getElementsByClassName('control-content')[0].clientWidth
     calcSize.value = currentSize/baseSize
     console.log(currentSize);
-  },400)
+  },500)
 }
 
 let clickBtn = (tag) => {

+ 1 - 1
src/system/IOT/controlPanel/model/MT01/index.vue

@@ -104,7 +104,7 @@ let calcSizeFun = () => {
     let currentSize = document.getElementsByClassName('control-content')[0].clientWidth
     calcSize.value = currentSize/baseSize
     console.log(currentSize);
-  },200)
+  },500)
 }
 
 let clickBtn = (tag) => {

+ 1 - 1
src/system/IOT/controlPanel/model/MT02/index.vue

@@ -90,7 +90,7 @@ let calcSizeFun = () => {
     let currentSize = document.getElementsByClassName('control-content')[0].clientWidth
     calcSize.value = currentSize/baseSize
     console.log(currentSize);
-  },400)
+  },500)
 }
 
 let clickBtn = (tag) => {

+ 6 - 4
src/system/IOT/controlPanel/modules/myInput.vue

@@ -1,5 +1,5 @@
 <template>
-  <!-- {{ MyCmdValue }} -->
+  {{ modelValue }}
   <a-form ref="Form" style="width:100%" :model="form" size="small" layout="vertical" mode="multiple" :validateTrigger="['blur']" v-if="isCheck">
     <a-form-item :rules="returnCheck" :name="name">
       <div style="display: flex;align-items: center;flex-wrap: nowrap">
@@ -70,7 +70,7 @@
 import customBtn from './customBtn.vue'
 import { number } from 'mathjs'
 import {ref, defineProps, defineEmits, computed, onMounted, getCurrentInstance, nextTick} from 'vue'
-let emit = defineEmits(['upData'])
+let emit = defineEmits(['upData','update:value'])
 let props = defineProps({
   name: String,
   isCheck: {
@@ -120,6 +120,9 @@ let props = defineProps({
   descript: {
     type: String,
     default:() => ''
+  },
+  value: {
+    type:[Number,String]
   }
 })
 
@@ -149,12 +152,11 @@ let checkInt = (rule,value) => {
 }
 /* 验证小数位数 */
 let checkNumScale = (rule,value) => {
-  console.log(value);
   if (typeof value == 'number') return Promise.resolve()
   let index = value.indexOf('.')
   if (isNaN(+value)) {
     return Promise.reject('请输入数字')
-  } else if (index == -1 || value.slice(index).length - 1 > props.scale) {
+  } else if (index == -1 || value.slice(index).length - 1 != props.scale) {
     return Promise.reject(`小数位需保留${props.scale}位`)
   } else {
     return Promise.resolve()

+ 0 - 1
src/system/IOT/equipmentMag/detail/index.vue

@@ -174,7 +174,6 @@ const changeDataStructure = (data) => {
     {label:'创建人',value:userData.value.createby},
     {label:'最近编辑时间',value:userData.value.changedate},
     {label:'最近编辑人',value:userData.value.changeby},
-    {label:'描述',value:userData.value.remarks},
   ]
 }
 

部分文件因为文件数量过多而无法显示