Browse Source

2023-7-27

codeMan 1 year ago
parent
commit
97e136acdb
61 changed files with 39 additions and 41 deletions
  1. 1 1
      dist/assets/Htabs-eb04e3b8.js
  2. 1 1
      dist/assets/PlusCircleOutlined-48af4dd8.js
  3. 0 0
      dist/assets/base-adc13a05.js
  4. 1 1
      dist/assets/customBtn-37ad3fcd.js
  5. 0 0
      dist/assets/dataBlock-5b8bb193.css
  6. 0 0
      dist/assets/dataBlock-90cf9aeb.css
  7. 0 0
      dist/assets/dataBlock-cbed81cc.js
  8. 0 0
      dist/assets/index-06d90881.js
  9. 0 0
      dist/assets/index-0f463ad0.js
  10. 0 0
      dist/assets/index-10246f56.js
  11. 0 0
      dist/assets/index-19477f47.js
  12. 0 0
      dist/assets/index-1b336ac5.css
  13. 1 1
      dist/assets/index-1c740ff1.js
  14. 0 0
      dist/assets/index-29a4089e.js
  15. 0 0
      dist/assets/index-2a7a1c6b.js
  16. 0 0
      dist/assets/index-2cb67b79.js
  17. 0 1
      dist/assets/index-2d150411.js
  18. 0 0
      dist/assets/index-32038393.js
  19. 0 0
      dist/assets/index-3e844633.js
  20. 0 0
      dist/assets/index-42864e14.js
  21. 1 1
      dist/assets/index-4555838c.js
  22. 0 0
      dist/assets/index-49676d31.js
  23. 0 0
      dist/assets/index-57391c4b.js
  24. 0 0
      dist/assets/index-5f19c3f3.js
  25. 0 0
      dist/assets/index-642117a4.js
  26. 1 1
      dist/assets/index-67b71d64.js
  27. 0 0
      dist/assets/index-6aa0d36a.js
  28. 0 0
      dist/assets/index-74f976b6.js
  29. 0 0
      dist/assets/index-7bcffab0.js
  30. 0 0
      dist/assets/index-8ae09a3c.js
  31. 0 0
      dist/assets/index-8e0e5113.js
  32. 0 0
      dist/assets/index-99210791.js
  33. 0 0
      dist/assets/index-9be7aa23.js
  34. 0 0
      dist/assets/index-9d0b588f.js
  35. 0 0
      dist/assets/index-9d9ee949.js
  36. 0 0
      dist/assets/index-a5af44e6.js
  37. 0 0
      dist/assets/index-a67b11d9.js
  38. 0 0
      dist/assets/index-a7633adc.js
  39. 0 0
      dist/assets/index-a7ef2a9c.css
  40. 0 0
      dist/assets/index-b5dbb7c7.css
  41. 0 0
      dist/assets/index-b789effc.js
  42. 0 0
      dist/assets/index-c28f0274.js
  43. 0 0
      dist/assets/index-c629be7f.js
  44. 1 0
      dist/assets/index-c735f96b.js
  45. 0 0
      dist/assets/index-ce696d20.js
  46. 0 0
      dist/assets/index-d0245ae7.js
  47. 0 0
      dist/assets/index-d4c6eb7a.js
  48. 0 0
      dist/assets/index-e10e8bfd.js
  49. 0 0
      dist/assets/index-e41aa4a1.js
  50. 0 0
      dist/assets/index-ec734227.js
  51. 0 0
      dist/assets/index-ee2f3f31.js
  52. 1 1
      dist/assets/index.vue_vue_type_style_index_0_scoped_fa1f8c04_lang-67e98032.js
  53. 1 1
      dist/assets/login-4d54c825.js
  54. 0 0
      dist/assets/map-85f5367c.js
  55. 1 1
      dist/index.html
  56. 10 4
      src/components/layout/modules/historyTabs.vue
  57. 11 21
      src/system/IOT/IoTdashboard/index.vue
  58. 2 1
      src/system/IOT/IoTdashboard/modules/dataInfo.vue
  59. 2 1
      src/system/IOT/IoTdashboard/modules/deviceInfo.vue
  60. 2 1
      src/system/IOT/IoTdashboard/modules/productInfo.vue
  61. 2 3
      src/system/IOT/equipmentMag/index.vue

+ 1 - 1
dist/assets/Htabs-356fbd92.js → dist/assets/Htabs-eb04e3b8.js

@@ -1 +1 @@
-import{k as i,r}from"./index-7f173c4b.js";const u=i("routeTabs",{state:()=>({historyRoutes:[],activeKey:0}),persist:{enabled:!0,strategies:[{storage:localStorage,paths:["historyRoutes","activeKey"]}]},getters:{},actions:{saveRoute(e){if(!this.historyRoutes.some(o=>o.name==e.name))return this.historyRoutes.push(e)},delRoute(e,s){if(r.options.routes[1].children.forEach(t=>{t.name==e&&(t.keepAlive=!1)}),this.historyRoutes=this.historyRoutes.filter(t=>{if(t.name!==e)return t}),e==s&&this.historyRoutes.length>0)return r.replace({name:this.historyRoutes[0].meta.name})}}});export{u};
+import{k as i,r}from"./index-a7633adc.js";const u=i("routeTabs",{state:()=>({historyRoutes:[],activeKey:0}),persist:{enabled:!0,strategies:[{storage:localStorage,paths:["historyRoutes","activeKey"]}]},getters:{},actions:{saveRoute(e){if(!this.historyRoutes.some(o=>o.name==e.name))return this.historyRoutes.push(e)},delRoute(e,s){if(r.options.routes[1].children.forEach(t=>{t.name==e&&(t.keepAlive=!1)}),this.historyRoutes=this.historyRoutes.filter(t=>{if(t.name!==e)return t}),e==s&&this.historyRoutes.length>0)return r.replace({name:this.historyRoutes[0].meta.name})}}});export{u};

+ 1 - 1
dist/assets/PlusCircleOutlined-70a5ad6e.js → dist/assets/PlusCircleOutlined-48af4dd8.js

@@ -1 +1 @@
-import{a as i}from"./index-7f173c4b.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 a(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=a({},t,e.attrs);return u(i,a({},n,{icon:o}),null)};l.displayName="PlusCircleOutlined";l.inheritAttrs=!1;const m=l;export{m as P};
+import{a as i}from"./index-a7633adc.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 a(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=a({},t,e.attrs);return u(i,a({},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-adc13a05.js


+ 1 - 1
dist/assets/customBtn-ab5e305d.js → dist/assets/customBtn-37ad3fcd.js

@@ -1 +1 @@
-import"./index-7f173c4b.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-a7633adc.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-5b8bb193.css


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


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


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


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


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


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


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


+ 1 - 1
dist/assets/index-6df63c6f.js → dist/assets/index-1c740ff1.js

@@ -1 +1 @@
-import{l as n}from"./index-c66cb523.js";import{a as e,o as p,V as s,W as i,j as m,X as c,u as a}from"./vue-b109b72f.js";import"./vue-router-e4a270fb.js";import"./index.vue_vue_type_style_index_0_scoped_fa1f8c04_lang-c25ebd7d.js";import"./index-7f173c4b.js";import"./_plugin-vue_export-helper-c27b6911.js";import"./base-cc2be8df.js";import"./Htabs-356fbd92.js";const T={__name:"index",setup(l){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,[m(n,{ref_key:"list",ref:t,keyRouteName:"accountno",param:a(o),tableName:"vacationTable",searchType:a(r)},{operation:c(()=>[]),_:1},8,["param","searchType"])]))}};export{T as default};
+import{l as n}from"./index-9d9ee949.js";import{a as e,o as p,V as s,W as i,j as m,X as c,u as a}from"./vue-b109b72f.js";import"./vue-router-e4a270fb.js";import"./index.vue_vue_type_style_index_0_scoped_fa1f8c04_lang-67e98032.js";import"./index-a7633adc.js";import"./_plugin-vue_export-helper-c27b6911.js";import"./base-adc13a05.js";import"./Htabs-eb04e3b8.js";const T={__name:"index",setup(l){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,[m(n,{ref_key:"list",ref:t,keyRouteName:"accountno",param:a(o),tableName:"vacationTable",searchType:a(r)},{operation:c(()=>[]),_:1},8,["param","searchType"])]))}};export{T as default};

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


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


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


+ 0 - 1
dist/assets/index-2d150411.js

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

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


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


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


+ 1 - 1
dist/assets/index-1e2ffc45.js → dist/assets/index-4555838c.js

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

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


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


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


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


+ 1 - 1
dist/assets/index-c78f9348.js → dist/assets/index-67b71d64.js

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

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


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


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


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


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


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


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


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


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


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


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


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


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


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


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


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


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


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

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


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


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


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


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


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


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


+ 1 - 1
dist/assets/index.vue_vue_type_style_index_0_scoped_fa1f8c04_lang-c25ebd7d.js → dist/assets/index.vue_vue_type_style_index_0_scoped_fa1f8c04_lang-67e98032.js

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

+ 1 - 1
dist/assets/login-d7a7c902.js → dist/assets/login-4d54c825.js

@@ -1,4 +1,4 @@
-import{u as useRouter}from"./vue-router-e4a270fb.js";import{c as commonjsGlobal,u as useAuthStore,s as storeToRefs,A as Api,m as message}from"./index-7f173c4b.js";import{u as useRouteTabsStore}from"./Htabs-356fbd92.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 useAuthStore,s as storeToRefs,A as Api,m as message}from"./index-a7633adc.js";import{u as useRouteTabsStore}from"./Htabs-eb04e3b8.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-85f5367c.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-7f173c4b.js"></script>
+    <script type="module" crossorigin src="./assets/index-a7633adc.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">

+ 10 - 4
src/components/layout/modules/historyTabs.vue

@@ -4,14 +4,14 @@
       <a-tab-pane v-for="pane in historyRoutes" :key="pane.name" closable>
         <template #tab>
           <span class="sw-active">{{pane.meta.title}}&emsp;
-          <close-circle-outlined @click.stop="onEdit(pane)"/></span>
+          <close-outlined @click.stop="onEdit(pane)"/></span>
         </template>
       </a-tab-pane>
     </a-tabs>
   </div>
 </template>
 <script setup>
-import { CloseCircleOutlined } from '@ant-design/icons-vue';
+import { CloseCircleOutlined,CloseOutlined } from '@ant-design/icons-vue';
 
 import {ref,watch} from 'vue'
 import { useRouteTabsStore } from '@/stores/modules/Htabs'
@@ -37,8 +37,8 @@ const onChange = (val)=>{
 }
 router.beforeEach((to,from,next)=>{
   let rs = historyRoutes.value.some(item=>item.name == from.name)
+ 
   rotTabs.saveRoute(to)
-  console.log(to.meta.name,'---')
   store.appData(to.meta.name)
   activeKey.value = to.name
   next()
@@ -48,6 +48,7 @@ router.beforeEach((to,from,next)=>{
 .sw-tabs .ant-tabs-tab-active{
   background: #143B88 !important;
   color:#fff !important;
+  border-radius: 10px !important;
 }
 .ant-tabs-tab-active .sw-active{
   color:#fff
@@ -56,7 +57,12 @@ router.beforeEach((to,from,next)=>{
 <style scoped>
 .sw-tabs{
   /* height: 56px; */
-  padding: 0 1px;
+  padding: 0 1px 0 3px;
+  margin-left: 10px;
   background: #fafafa;
 }
+/deep/.ant-tabs-tab {
+  padding-right: 0px !important;
+  
+}
 </style>

+ 11 - 21
src/system/IOT/IoTdashboard/index.vue

@@ -36,9 +36,9 @@
             v-for="item in list" 
             :position="{lat:item.latitude,lng:item.longitude}" 
             @click="devicedClick($event,item)"
-            :icon="{url:MarkerIcon,size:{width:40,height:40}}"
+            :icon="{url:MarkerIcon,size:{width:25,height:25}}"
           >
-            <bm-label :content="item.devicename" :offset="{width: -35, height: 30}"/>
+            <bm-label :content="item.devicename" :labelStyle="{border:'none'}" :offset="{width: -35, height: 16}"/>
           </bm-marker>
         </baidu-map>
 
@@ -49,7 +49,7 @@
               <span>设备信息</span>
             </div>
             <div class="right">
-              <customBtn :btn="true" :btn-options="[{'label':'控制面板'}]" @clickBtn="goControl"></customBtn>
+              <customBtn :btn="true" :btn-options="[{'label':'控制面板'}]" @clickBtn="router.push({path:infoPanel.baseInfo.dashboardpath,query:{id:infoPanel.baseInfo.w_deviceid}})"></customBtn>
             </div>
           </div>
           <div class="map-deviced-info">
@@ -68,7 +68,7 @@
           </div>
         </div>
         <!--控制点显示面板-->
-        <div class="point-control">
+        <!-- <div class="point-control">
           <div class="title">
             图层控制
           </div>
@@ -95,14 +95,14 @@
             </div>
           </div>
           
-        </div>
+        </div> -->
       </div>
         <!--列表-->
       <div class="M-list" v-if="!model">
         <normalTable rowKey="w_deviceid" ref="list" size="small" :param="param2" :columns="utils.TBLayout('equipmentTable')">
           <template #tb_cell="{data}">
             <div v-if="data.column.dataIndex == 'operation'">
-              <a-button type="link" @click="infoPanel.baseInfo=data.record;goControl()">控制界面</a-button>
+              <a-button type="link" @click="router.push({path:data.record.dashboardpath,query:{id:data.record.w_deviceid}})">控制界面</a-button>
             </div>
             <div v-else-if="data.column.dataIndex == 'rwtype'">
               {{ data.record.rwtype == 0 ? '读' : data.record.rwtype == 1 ? '写' : '上报' }}
@@ -130,10 +130,9 @@ import deviceInfo from './modules/deviceInfo.vue'
 import dataInfo from './modules/dataInfo.vue'
 import normalTable from '@/template/normalTable/index.vue'
 import { useRouter } from 'vue-router'
-import {ref, defineProps, defineEmits, onMounted, watch} from 'vue'
+import {ref, defineProps, defineEmits, onMounted} from 'vue'
 import Api from '@/api/api'
 import utils from '@/utils/utils'
-import { message } from 'ant-design-vue'
 let emit = defineEmits([])
 let props = defineProps({})
 let param = ref({
@@ -285,15 +284,6 @@ let listData = async () => {
   console.log(list.value);
 }
 
-let goControl = async () => {
-  console.log(infoPanel.value);
-  if (infoPanel.value.baseInfo.dashboardpath) {
-    router.push({path:infoPanel.value.baseInfo.dashboardpath,query:{id:infoPanel.value.baseInfo.w_deviceid}})
-  } else {
-    message.warning('暂无控制台路径')
-  }
-}
-
 let getData = async () => {
   let res = await Api.requested({
     "id": 20230711101902,
@@ -336,16 +326,16 @@ let modelChange = () => {
   }
 }
 
+router.afterEach( route => {
+  if (route.path == '/IoTdashboard') set()
+})
+
 /* 适配 */
 let set =  () => {
   let baseWidth = 2133
   document.querySelector('html').style.fontSize = `${100 / baseWidth}vw`
 }
 
-router.afterEach( route => {
-  if (route.path == '/IoTdashboard') set()
-})
-
 onMounted(() => {
   getData()
   listData()

+ 2 - 1
src/system/IOT/IoTdashboard/modules/dataInfo.vue

@@ -32,12 +32,13 @@ let props = defineProps(['data'])
 <style scoped>
   .item {
     background: linear-gradient(to right,rgba(235, 245, 253, 1),rgba(255, 255, 255, 1));
-    padding: 12rem;
+    padding: 12rem 12rem 0 12rem;
     box-shadow: 0px 0px 6rem 1px rgba(0,70,132,0.2);
     margin-right: 16rem;
   }
   .title {
     font-size: 14rem;
+    margin-bottom: 0px;
   }
   .item p:last-child {
     font-weight: bold;

+ 2 - 1
src/system/IOT/IoTdashboard/modules/deviceInfo.vue

@@ -38,12 +38,13 @@ let props = defineProps(['data'])
 <style scoped>
   .item {
     background: linear-gradient(to right,rgba(235, 245, 253, 1),rgba(255, 255, 255, 1));
-    padding: 12rem;
+    padding: 12rem 12rem 0 12rem;
     box-shadow: 0px 0px 6rem 1px rgba(0,70,132,0.2);
     margin-right: 16rem;
   }
   .title {
     font-size: 14rem;
+    margin-bottom: 0px;
   }
   .item p:last-child {
     font-weight: bold;

+ 2 - 1
src/system/IOT/IoTdashboard/modules/productInfo.vue

@@ -38,12 +38,13 @@ let props = defineProps(['data'])
 <style scoped>
   .item {
     background: linear-gradient(to right,rgba(235, 245, 253, 1),rgba(255, 255, 255, 1));
-    padding: 12rem;
+    padding: 12rem 12rem 0 12rem;
     box-shadow: 0px 0px 6rem 1px rgba(0,70,132,0.2);
     margin-right: 16rem;
   }
   .title {
     font-size: 14rem;
+    margin-bottom: 0px;
   }
   .item p:last-child {
     font-weight: bold;

+ 2 - 3
src/system/IOT/equipmentMag/index.vue

@@ -14,11 +14,10 @@
           <a-tag>{{ data.record.sitename }}</a-tag>
         </div>
         <div v-else>
-          
           <a-tag v-if="data.record.isOffical == 0 && data.record.ispush == 1" :closable="true" @close="delSite(data.record)">{{ data.record.sitename }}</a-tag>
           <SelectModel 
             ref="site" 
-            @selectRowData="selectSite($event,data.record)" 
+            @selectRowData="selectSite(data.record,$event)" 
             rowKey="siteid" 
             :param="siteParam" 
             :filterMultiple="true" 
@@ -79,7 +78,7 @@ let siteParam = ref({
   },
 })
 
-let selectSite = async (site,data) => {
+let selectSite = async (data,site) => {
   let res = await Api.requested({
     "id": 20230705161302,
     "content": {

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