Browse Source

2023-8-11

codeMan 2 years ago
parent
commit
30b93c454b
61 changed files with 97 additions and 85 deletions
  1. 1 1
      dist/assets/PlusCircleOutlined-0afe1f8d.js
  2. 0 0
      dist/assets/base-6121eb6c.js
  3. 1 1
      dist/assets/customBtn-7afe144f.js
  4. 0 0
      dist/assets/dataBlock-66d5441e.js
  5. 0 0
      dist/assets/dataBlock-f99e0410.css
  6. 0 0
      dist/assets/index-014ea971.js
  7. 0 0
      dist/assets/index-0257a33c.js
  8. 0 0
      dist/assets/index-147809a8.js
  9. 0 0
      dist/assets/index-29c5e677.js
  10. 0 0
      dist/assets/index-4183c27b.js
  11. 0 0
      dist/assets/index-49ec6760.js
  12. 0 0
      dist/assets/index-4c35ee8f.css
  13. 0 0
      dist/assets/index-4d50c223.js
  14. 0 0
      dist/assets/index-4e147e61.js
  15. 0 0
      dist/assets/index-550adcd8.js
  16. 0 0
      dist/assets/index-58f9c933.js
  17. 0 0
      dist/assets/index-592c1287.js
  18. 0 0
      dist/assets/index-5ae30a7d.js
  19. 0 0
      dist/assets/index-5b7056be.js
  20. 1 1
      dist/assets/index-5c424e3e.js
  21. 0 0
      dist/assets/index-5e0f757b.js
  22. 0 0
      dist/assets/index-615b25a1.js
  23. 0 0
      dist/assets/index-6239df8d.js
  24. 0 0
      dist/assets/index-66b62b85.js
  25. 0 0
      dist/assets/index-6b069b62.js
  26. 0 0
      dist/assets/index-738f763b.js
  27. 1 1
      dist/assets/index-78e2195b.js
  28. 0 0
      dist/assets/index-7a660497.js
  29. 0 0
      dist/assets/index-7caf06d4.js
  30. 0 0
      dist/assets/index-9063d67d.js
  31. 0 0
      dist/assets/index-945cc733.js
  32. 1 1
      dist/assets/index-9f1de1ab.js
  33. 0 0
      dist/assets/index-a0ced0f0.js
  34. 0 0
      dist/assets/index-a3ad5a33.js
  35. 0 0
      dist/assets/index-a57522ca.js
  36. 0 0
      dist/assets/index-a7356907.js
  37. 0 0
      dist/assets/index-d0b8d620.js
  38. 0 0
      dist/assets/index-d33cb99f.js
  39. 0 0
      dist/assets/index-d42d60e9.js
  40. 0 0
      dist/assets/index-d44d2c81.js
  41. 0 0
      dist/assets/index-ddc6fd60.js
  42. 0 0
      dist/assets/index-ed69e3a9.js
  43. 0 0
      dist/assets/index-f345f8c0.js
  44. 0 0
      dist/assets/index-f383976f.js
  45. 0 0
      dist/assets/index-f573e892.js
  46. 0 0
      dist/assets/index-fb19776c.js
  47. 0 0
      dist/assets/index-fcdc81a0.js
  48. 1 1
      dist/assets/index-fda85609.js
  49. 1 1
      dist/assets/index.vue_vue_type_style_index_0_scoped_f6f545f0_lang-5bf8e03f.js
  50. 0 0
      dist/assets/index2-c8eceda9.js
  51. 1 1
      dist/assets/login-cd45ccd5.js
  52. 0 0
      dist/assets/map-bf2bcb8d.js
  53. BIN
      dist/assets/控制器-9c2f635c.png
  54. BIN
      dist/assets/控制器-fc32ad88.png
  55. 1 1
      dist/index.html
  56. 2 4
      src/components/layout/modules/systemMod.vue
  57. 5 0
      src/router/index.js
  58. 4 0
      src/system/IOT/controlPanel/model/shidianxing/index.vue
  59. 49 59
      src/system/IOT/controlPanel/model/shidianxing/modules/controlPanel.vue
  60. 13 5
      src/system/IOT/controlPanel/model/shidianxing/modules/timeControl.vue
  61. 15 8
      src/views/controlPanel/index.vue

+ 1 - 1
dist/assets/PlusCircleOutlined-c2a6c9b0.js → dist/assets/PlusCircleOutlined-0afe1f8d.js

@@ -1 +1 @@
-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};
+import{b as a}from"./index-4e147e61.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-6121eb6c.js


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

@@ -1 +1 @@
-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};
+import"./index-4e147e61.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-66d5441e.js


File diff suppressed because it is too large
+ 0 - 0
dist/assets/dataBlock-f99e0410.css


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


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


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


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


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


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


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


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


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


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


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


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


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


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


+ 1 - 1
dist/assets/index-3e63b630.js → dist/assets/index-5c424e3e.js

@@ -1 +1 @@
-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 _};
+import{n as g}from"./index-592c1287.js";import{m as k}from"./index-4e147e61.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-5e0f757b.js


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


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


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


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


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


+ 1 - 1
dist/assets/index-710b55fd.js → dist/assets/index-78e2195b.js

@@ -1 +1 @@
-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};
+import{l as n}from"./index-5ae30a7d.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-5bf8e03f.js";import"./index-4e147e61.js";import"./_plugin-vue_export-helper-c27b6911.js";import"./base-6121eb6c.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-7a660497.js


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


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


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


+ 1 - 1
dist/assets/index-6deb600a.js → dist/assets/index-9f1de1ab.js

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

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


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


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


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


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


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


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


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


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


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


File diff suppressed because it is too large
+ 0 - 0
dist/assets/index-f345f8c0.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-f573e892.js


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


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


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

@@ -1 +1 @@
-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};
+import{l as d}from"./index-5ae30a7d.js";import{a as u,A as f}from"./index-4e147e61.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-5bf8e03f.js";import"./base-6121eb6c.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.vue_vue_type_style_index_0_scoped_f6f545f0_lang-b75f3235.js → dist/assets/index.vue_vue_type_style_index_0_scoped_f6f545f0_lang-5bf8e03f.js

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


+ 1 - 1
dist/assets/login-2ab24fbf.js → dist/assets/login-cd45ccd5.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-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}};/**
+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-4e147e61.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-bf2bcb8d.js


BIN
dist/assets/控制器-9c2f635c.png


BIN
dist/assets/控制器-fc32ad88.png


+ 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-e5883e5f.js"></script>
+    <script type="module" crossorigin src="./assets/index-4e147e61.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">

+ 2 - 4
src/components/layout/modules/systemMod.vue

@@ -7,10 +7,9 @@
         {{item.systemname}}
       </span>
     </div>
-    <!-- <div class="aside-item" @click="$refs.control.show=true">
+    <div class="aside-item" @click="router.push('/controlPanel')">
       <span class="menu-icon uncollapsed"><span class="aside-menu-icon">控</span></span>
-      <ControlPanel ref="control"></ControlPanel>
-    </div> -->
+    </div>
   </div>
 </template>
 
@@ -21,7 +20,6 @@ import { useAuthStore } from '@/stores/modules/auth'
 import { storeToRefs } from 'pinia'
 import { useRouter } from "vue-router"
 import { MenuFoldOutlined,MenuUnfoldOutlined} from '@ant-design/icons-vue'
-import ControlPanel from '@/views/controlPanel/index.vue'
 const router = useRouter()
 
 const store = useAuthStore()

+ 5 - 0
src/router/index.js

@@ -21,6 +21,11 @@ const routes = [
     component: ()=>import(/* webpackChunkName: "about" */ '@/components/layout/index.vue'),
     children:[]
   },
+  {
+    path: '/controlPanel',
+    name: 'controlPanel',
+    component: ()=>import(/* webpackChunkName: "about" */ '@/views/controlPanel/index.vue'),
+  },
   {
     path: '/404',
     name: '404',

+ 4 - 0
src/system/IOT/controlPanel/model/shidianxing/index.vue

@@ -98,6 +98,7 @@ let modelList = ref([
   {label:'远程开关阀模式',value:'远程开关阀模式'},
   {label:'远程不利点模式',value:'远程不利点模式'},
   {label:'恒压控制',value:'恒压控制启动'},
+  {label:'分时控制模式',value:'分时控制启动'},
 ])
 
 provide('detail',detail)
@@ -195,6 +196,9 @@ let detailFun = async () => {
     if (detail.value.paramcmdvalues[item.value] == '1.00') {
       detail.value.paramcmdvalues.控制模式 = item.label
     }
+    if (detail.value.paramcmdvalues[item.value] == '1.00') {
+      detail.value.paramcmdvalues.控制模式 = item.label
+    }
   })
 
   console.log(res.data);

+ 49 - 59
src/system/IOT/controlPanel/model/shidianxing/modules/controlPanel.vue

@@ -3,62 +3,9 @@
     <span style="color:#ffffff">控制面板</span>
   </div>
   <div style="height: calc(100% - 25px);overflow-y: scroll;scrollbar-width: none;">
-
-    <MyInput 
-        v-if="params.最不利点压力"
-        v-model:value="detailData.paramvalues.最不利点压力" 
-        name="最不利点压力" 
-        :unit="params.最不利点压力 && params.最不利点压力.unit" 
-        :title="params.最不利点压力 && params.最不利点压力.paramname"
-        btnName=""
-        :disabled="true"
-      >
-    </MyInput>
-
-    <MyInput 
-        v-if="params.阀门开度"
-        v-model:value="detailData.paramvalues.阀门开度" 
-        name="阀门开度" 
-        :unit="params.阀门开度 && params.阀门开度.unit" 
-        :title="params.阀门开度 && params.阀门开度.paramname"
-        btnName=""
-        :disabled="true"
-      >
-    </MyInput>
-
-    <MyInput 
-        v-if="params.瞬时流量"
-        v-model:value="detailData.paramvalues.瞬时流量" 
-        name="瞬时流量" 
-        :unit="params.瞬时流量 && params.瞬时流量.unit" 
-        :title="params.瞬时流量 && params.瞬时流量.paramname"
-        btnName=""
-        :disabled="true"
-      >
-    </MyInput>
-
-    <MyInput 
-        v-if="params.累计流量"
-        v-model:value="detailData.paramvalues.累计流量" 
-        name="累计流量" 
-        :unit="params.累计流量 && params.累计流量.unit" 
-        :title="params.累计流量 && params.累计流量.paramname"
-        btnName=""
-        :disabled="true"
-      >
-    </MyInput>
-
     <!--模式控制-->
-    <MyInput 
-        v-if="params.控制模式"
-        :form="detailData.paramvalues"
-        name="控制模式" 
-        :unit="params.控制模式 && params.控制模式.unit" 
-        :title="params.控制模式 && params.控制模式.paramname"
-        :btnName="detailData.isSite ? '更新' : ''"
-        v-model:value="detailData.paramvalues.控制模式"
-        :disabled="true"
-      >
+    <div v-if="params.控制模式" style="display: flex;margin-bottom: 10px;">
+      <p style="font-size: 12px;color: #ffffff;margin-right: 10px;">{{params.控制模式 && params.控制模式.paramname}}:<span style="font-size: 16px;">{{ detailData.paramvalues.控制模式 || '暂未设置' }}</span></p>
       <updataBtn :icon1="cmdForm.控制模式 ? true : false">
         <div style="display: flex;align-items: center;">
           <a-select
@@ -66,13 +13,12 @@
             v-model:value="cmdForm.控制模式"
             style="width: 150px;color: #000000;"
           >
-          <a-select-option :value="item.value" v-for="(item,index) in modelList">{{ item.label }}</a-select-option>
+          <a-select-option :value="item.value" v-for="(item,index) in modelList.slice(0,modelList.length - 1)">{{ item.label }}</a-select-option>
           </a-select>
           <customBtn style="margin-left: 10px;" btnColor="rgb(22,255,246)" textColor="#000000" :btnOptions="[{label:'更新'}]" @click="modelChange"></customBtn>
         </div>
       </updataBtn>
-    </MyInput>
-
+    </div>
     <!--最不利点-->
     <div v-if="detailData.paramvalues.控制模式 == '远程不利点模式'">
       <p v-if="params.不利点压力" style="font-size: 12px;color: #ffffff;">{{params.不利点压力 && params.不利点压力.paramname}}:<span style="font-size: 18px;">{{ form.不利点压力 }}MPa</span></p>
@@ -129,7 +75,7 @@
     <!--恒压控制-->
     <div v-else-if="detailData.paramvalues.控制模式 == '恒压控制启动'">
       <MyInput 
-          v-if="detailData.function['恒压控制'] && params.恒压控制启动"
+          v-if="params.恒压控制启动"
           :form="detailData.paramvalues"
           name="恒压控制启动" 
           :unit="params.恒压控制启动 && params.恒压控制启动.unit" 
@@ -142,6 +88,50 @@
         </updataBtn>
       </MyInput>
     </div>
+
+    <MyInput 
+        v-if="params.最不利点压力"
+        v-model:value="detailData.paramvalues.最不利点压力" 
+        name="最不利点压力" 
+        :unit="params.最不利点压力 && params.最不利点压力.unit" 
+        :title="params.最不利点压力 && params.最不利点压力.paramname"
+        btnName=""
+        :disabled="true"
+      >
+    </MyInput>
+
+    <MyInput 
+        v-if="params.阀门开度"
+        v-model:value="detailData.paramvalues.阀门开度" 
+        name="阀门开度" 
+        :unit="params.阀门开度 && params.阀门开度.unit" 
+        :title="params.阀门开度 && params.阀门开度.paramname"
+        btnName=""
+        :disabled="true"
+      >
+    </MyInput>
+
+    <MyInput 
+        v-if="params.瞬时流量"
+        v-model:value="detailData.paramvalues.瞬时流量" 
+        name="瞬时流量" 
+        :unit="params.瞬时流量 && params.瞬时流量.unit" 
+        :title="params.瞬时流量 && params.瞬时流量.paramname"
+        btnName=""
+        :disabled="true"
+      >
+    </MyInput>
+
+    <MyInput 
+        v-if="params.累计流量"
+        v-model:value="detailData.paramvalues.累计流量" 
+        name="累计流量" 
+        :unit="params.累计流量 && params.累计流量.unit" 
+        :title="params.累计流量 && params.累计流量.paramname"
+        btnName=""
+        :disabled="true"
+      >
+    </MyInput>
   </div>
     
     

+ 13 - 5
src/system/IOT/controlPanel/model/shidianxing/modules/timeControl.vue

@@ -163,19 +163,27 @@ let timeArr = [
 
 let Input = ref()
 
-let modelChange = (num) => {
+let modelChange = (e) => {
+  let value = e.target.value
   Modal.confirm({
     title:'确定改变模式吗?',
     async onOk () {
-      let model = cmdForm.value.分时控制启动 ? '分时控制启动' : '分时控制停止'
+
+      let model = value ? {
+        '分时控制启动':1,
+        '分时控制停止':0
+      }
+      : 
+      {
+        '分时控制启动':0,
+        '分时控制停止':1
+      }
       let res = await Api.requested({
         "id": "20230627163701",
         "content": {
           "w_deviceid": router.currentRoute.value.query.id,
           "w_functionid": detailData.value.function.分时控制模式.w_functionid,
-          "params": {
-            [model]: 1
-          }
+          "params": model
         }
       })
       utils.message(res,'操作成功',() => {

+ 15 - 8
src/views/controlPanel/index.vue

@@ -1,6 +1,8 @@
 <template>
-  <div v-if="show" class="control">
-    <a-button @click="goBack">退出</a-button>
+  <div class="control">
+    <div class="control_bg">
+      <video src="@/assets/controlPanel/bg.mp4"></video>
+    </div>
   </div>
 </template>
 
@@ -17,14 +19,19 @@ defineExpose({
 </script>
 
 <style scoped>
+*{
+  box-sizing: border-box;
+}
 .control {
-  position: fixed;
-  top: 0;
-  left: 0;
-  background: #ffffff;
+}
+.control .control_bg {
+  width: 100%;
+  height: 100vh;
+  overflow: hidden;
+}
+.control .control_bg video {
   width: 100%;
   height: 100vh;
-  z-index: 9999;
-  transition: all 0.3s ease-in-out;
+  object-fit: cover;
 }
 </style>

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