Bladeren bron

2023-7-28

codeMan 2 jaren geleden
bovenliggende
commit
eab36b52da
72 gewijzigde bestanden met toevoegingen van 151 en 73 verwijderingen
  1. 1 1
      dist/assets/Htabs-afa4cb4d.js
  2. 1 1
      dist/assets/PlusCircleOutlined-25aa10d2.js
  3. 0 0
      dist/assets/base-adc13a05.js
  4. 0 0
      dist/assets/base-e2bb8dff.js
  5. 1 1
      dist/assets/customBtn-b49e59af.js
  6. 0 0
      dist/assets/dataBlock-cd8b8540.js
  7. 0 0
      dist/assets/index-05b99587.js
  8. 0 0
      dist/assets/index-0ac53a00.js
  9. 0 0
      dist/assets/index-10246f56.js
  10. 0 0
      dist/assets/index-11187b71.js
  11. 0 0
      dist/assets/index-1462b25a.js
  12. 0 0
      dist/assets/index-16abbb71.css
  13. 0 0
      dist/assets/index-18e8bc4f.js
  14. 0 0
      dist/assets/index-1be8baf5.js
  15. 0 0
      dist/assets/index-233ab70d.js
  16. 0 0
      dist/assets/index-24f8236e.js
  17. 0 0
      dist/assets/index-25e19bb9.js
  18. 0 0
      dist/assets/index-27e51943.css
  19. 1 1
      dist/assets/index-2868fa7e.js
  20. 0 0
      dist/assets/index-35dd7448.js
  21. 0 0
      dist/assets/index-447155fa.js
  22. 0 0
      dist/assets/index-49676d31.js
  23. 0 0
      dist/assets/index-4a1e6d3b.js
  24. 1 1
      dist/assets/index-4bb13406.js
  25. 0 0
      dist/assets/index-4e4a5f0e.js
  26. 0 0
      dist/assets/index-5b6566c8.js
  27. 0 0
      dist/assets/index-617aeea2.js
  28. 0 0
      dist/assets/index-657d03f9.js
  29. 0 0
      dist/assets/index-66171237.js
  30. 0 0
      dist/assets/index-667d8499.js
  31. 0 0
      dist/assets/index-6fdf7ace.js
  32. 0 0
      dist/assets/index-792139e2.js
  33. 0 0
      dist/assets/index-7ea22c90.js
  34. 0 0
      dist/assets/index-82ece6f7.js
  35. 0 0
      dist/assets/index-986fbd0b.js
  36. 0 0
      dist/assets/index-b364732e.js
  37. 1 1
      dist/assets/index-ba362e2a.js
  38. 0 0
      dist/assets/index-bcf93e2b.js
  39. 0 0
      dist/assets/index-c38e2a76.js
  40. 1 1
      dist/assets/index-cbc6658e.js
  41. 0 0
      dist/assets/index-ce3ca513.js
  42. 0 0
      dist/assets/index-ce3d8feb.css
  43. 0 0
      dist/assets/index-e07fed71.js
  44. 0 0
      dist/assets/index-e44ad4a7.js
  45. 0 0
      dist/assets/index-ef719422.js
  46. 0 0
      dist/assets/index-f059b649.css
  47. 0 0
      dist/assets/index-f2eeba39.js
  48. 0 0
      dist/assets/index-fe03a776.js
  49. 1 1
      dist/assets/index.vue_vue_type_style_index_0_scoped_fa1f8c04_lang-79be2481.js
  50. 1 1
      dist/assets/login-f0eb9ecc.js
  51. 0 0
      dist/assets/map-986e60d8.js
  52. 1 1
      dist/index.html
  53. 7 3
      src/components/layout/modules/historyTabs.vue
  54. 3 2
      src/components/listTemplate/field/index.vue
  55. 11 10
      src/router/modelNormal.js
  56. 2 3
      src/system/IOT/IoTdashboard/index.vue
  57. 13 4
      src/system/IOT/IoTdashboard/modules/dataInfo.vue
  58. 9 5
      src/system/IOT/IoTdashboard/modules/deviceInfo.vue
  59. 9 5
      src/system/IOT/IoTdashboard/modules/productInfo.vue
  60. 4 4
      src/system/IOT/equipmentMag/detail/index.vue
  61. 5 1
      src/system/IOT/equipmentMag/detail/modules/serveTable/index.vue
  62. 10 1
      src/system/IOT/equipmentMag/detail/modules/serveTable/modules/Add.vue
  63. 12 3
      src/system/IOT/equipmentMag/detail/modules/serveTable/modules/Edit.vue
  64. 11 7
      src/system/IOT/equipmentMag/index.vue
  65. 1 3
      src/system/IOT/equipmentMag/modules/Edit.vue
  66. 13 4
      src/system/IOT/equipmentMag/modules/map.vue
  67. 1 1
      src/system/IOT/productManage/detail/modules/Edit.vue
  68. 4 0
      src/system/IOT/productManage/detail/modules/serveTable/index.vue
  69. 10 1
      src/system/IOT/productManage/detail/modules/serveTable/modules/Add.vue
  70. 12 3
      src/system/IOT/productManage/detail/modules/serveTable/modules/Edit.vue
  71. 1 2
      src/system/moduleNormal/productCategory/index.vue
  72. 3 1
      src/system/moduleNormal/reportcenter/index.vue

+ 1 - 1
dist/assets/Htabs-eb04e3b8.js → dist/assets/Htabs-afa4cb4d.js

@@ -1 +1 @@
-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};
+import{l as i,r}from"./index-667d8499.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-48af4dd8.js → dist/assets/PlusCircleOutlined-25aa10d2.js

@@ -1 +1 @@
-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};
+import{a as i}from"./index-667d8499.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


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


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

@@ -1 +1 @@
-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};
+import"./index-667d8499.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-cd8b8540.js


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


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


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


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


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


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


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


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


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


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


+ 1 - 1
dist/assets/index-c735f96b.js → dist/assets/index-2868fa7e.js

@@ -1 +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 _};
+import{n as g}from"./index-25e19bb9.js";import{m as k}from"./index-667d8499.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-35dd7448.js


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


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-4a1e6d3b.js


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

@@ -1 +1 @@
-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};
+import{l as _}from"./index-c38e2a76.js";import{A as d}from"./index-667d8499.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-79be2481.js";import"./base-e2bb8dff.js";import"./Htabs-afa4cb4d.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-4e4a5f0e.js


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


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


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


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


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


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


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


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


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


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


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


+ 1 - 1
dist/assets/index-1c740ff1.js → dist/assets/index-ba362e2a.js

@@ -1 +1 @@
-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};
+import{l as n}from"./index-c38e2a76.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-79be2481.js";import"./index-667d8499.js";import"./_plugin-vue_export-helper-c27b6911.js";import"./base-e2bb8dff.js";import"./Htabs-afa4cb4d.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-bcf93e2b.js


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


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

@@ -1 +1 @@
-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 _};
+import{M as o,A as c,e as m}from"./index-667d8499.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-ce3ca513.js


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


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


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


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


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


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


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


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

@@ -1 +1 @@
-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};
+import{u as i,s as r,l as m,e as u,A as p}from"./index-667d8499.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-4d54c825.js → dist/assets/login-f0eb9ecc.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-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}};/**
+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-667d8499.js";import{u as useRouteTabsStore}from"./Htabs-afa4cb4d.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-986e60d8.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-a7633adc.js"></script>
+    <script type="module" crossorigin src="./assets/index-667d8499.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">

+ 7 - 3
src/components/layout/modules/historyTabs.vue

@@ -4,7 +4,7 @@
       <a-tab-pane v-for="pane in historyRoutes" :key="pane.name" closable>
         <template #tab>
           <span class="sw-active">{{pane.meta.title}}&emsp;
-          <close-outlined @click.stop="onEdit(pane)"/></span>
+          <close-outlined style="transform: scale(0.8);color: #999999;" @click.stop="onEdit(pane)"/></span>
         </template>
       </a-tab-pane>
     </a-tabs>
@@ -48,7 +48,8 @@ router.beforeEach((to,from,next)=>{
 .sw-tabs .ant-tabs-tab-active{
   background: #143B88 !important;
   color:#fff !important;
-  border-radius: 10px !important;
+  border: none !important;
+  
 }
 .ant-tabs-tab-active .sw-active{
   color:#fff
@@ -63,6 +64,9 @@ router.beforeEach((to,from,next)=>{
 }
 /deep/.ant-tabs-tab {
   padding-right: 0px !important;
-  
+  border-top: 5px solid #ffffff !important;
+  border-bottom: none !important;
+  border-top-left-radius: 10px !important;
+  border-top-right-radius: 10px !important;
 }
 </style>

+ 3 - 2
src/components/listTemplate/field/index.vue

@@ -1,4 +1,6 @@
 <template>
+  <!-- :label-col="{ span: 6 }" 
+  :wrapper-col="{ span: 18 }" -->
   <div class="fieldPanel">
     <a-card :bodyStyle="{padding:'20px 10px 0 10px'}">
       <!-- <template #title>筛选</template> -->
@@ -6,8 +8,7 @@
         ref="formRef"
         name="advanced_search"
         class="ant-advanced-search-form"
-        :label-col="{ span: 6 }" 
-        :wrapper-col="{ span: 18 }"
+        labelAlign="left"
         :model="formState"
         @finish="onFinish">
           <a-row :gutter="16">

+ 11 - 10
src/router/modelNormal.js

@@ -1,14 +1,4 @@
 const moduleNormal = [
-  {
-    path: '/reportcenter',
-    name: 'reportcenter',
-    meta: {
-      title: '报表中心',
-      name: 'reportcenter',
-      keepAlive:false
-    },
-    component: ()=>import(/* webpackChunkName: "about" */ '@/system/moduleNormal/reportcenter/index.vue'),
-  },
   {
     path: '/custom_option',
     name: 'customclassification',
@@ -168,6 +158,17 @@ const moduleNormal = [
     },
     component: () => import(/* webpackChunkName: "about" */ '@/system/moduleNormal/tagManage/index.vue')
   },
+  {
+    path: '/reportcenter',
+    name: 'reportmag',
+    meta: {
+      title: '标签管理',
+      name: 'reportmag',
+      keepAlive:false
+    },
+    component: () => import(/* webpackChunkName: "about" */ '@/system/moduleNormal/reportcenter/index.vue')
+  },
+  
 
 
 ];

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

@@ -18,7 +18,7 @@
       <div class="header-control">
         <div class="left">
           <a-switch v-model:checked="model" checked-children="地图" un-checked-children="列表" style="margin-right: 10px;" @change="modelChange" />
-          <a-input v-if="model" placeholder="区域" v-model:value="param.content.where.areaname" @keyup.enter="listData"></a-input>
+          <!-- <a-input v-if="model" placeholder="区域" v-model:value="param.content.where.areaname" @keyup.enter="listData"></a-input> -->
         </div>
       </div>
       <!--地图-->
@@ -355,14 +355,13 @@ onMounted(() => {
 .M-container .deviced-info {
   width: 100%;
   padding: 10px 0;
-  font-size: calc(100 / 1140)vw;
 }
 .M-container .content {
   position: relative;
 }
 .M-container .M-map {
   width: 100%;
-  height: calc(100vh - 390rem);
+  height: calc(100vh - 290rem);
   position: relative;
 }
 .M-container .M-map .map {

+ 13 - 4
src/system/IOT/IoTdashboard/modules/dataInfo.vue

@@ -45,13 +45,22 @@ let props = defineProps(['data'])
     font-size: 30rem;
     margin-bottom: 0 !important;
   }
-  /deep/.ant-card-head-title {
-    font-size: 16rem !important;
+  .item p:last-child {
+    font-weight: bold;
+    font-size: 30rem;
+    margin-bottom: 0 !important;
   }
   /deep/.ant-card-body {
-    padding: 24rem !important;
+    padding: 16rem !important;
   }
   /deep/.ant-card-head-title {
-    padding-bottom: 10rem !important;
+    font-size: 16rem !important;
+    padding: 5rem 0 !important;
+  }
+
+  /deep/.ant-card-head {
+    display: flex!important;
+    align-items: center!important;
+    min-height: 30rem !important;
   }
 </style>

+ 9 - 5
src/system/IOT/IoTdashboard/modules/deviceInfo.vue

@@ -51,13 +51,17 @@ let props = defineProps(['data'])
     font-size: 30rem;
     margin-bottom: 0 !important;
   }
-  /deep/.ant-card-head-title {
-    font-size: 16rem !important;
-  }
   /deep/.ant-card-body {
-    padding: 24rem !important;
+    padding: 16rem !important;
   }
   /deep/.ant-card-head-title {
-    padding-bottom: 10rem !important;
+    font-size: 16rem !important;
+    padding: 5rem 0 !important;
+  }
+
+  /deep/.ant-card-head {
+    display: flex!important;
+    align-items: center!important;
+    min-height: 30rem !important;
   }
 </style>

+ 9 - 5
src/system/IOT/IoTdashboard/modules/productInfo.vue

@@ -51,13 +51,17 @@ let props = defineProps(['data'])
     font-size: 30rem;
     margin-bottom: 0 !important;
   }
-  /deep/.ant-card-head-title {
-    font-size: 16rem !important;
-  }
   /deep/.ant-card-body {
-    padding: 24rem !important;
+    padding: 16rem !important;
   }
   /deep/.ant-card-head-title {
-    padding-bottom: 10rem !important;
+    font-size: 16rem !important;
+    padding: 5rem 0 !important;
+  }
+
+  /deep/.ant-card-head {
+    display: flex!important;
+    align-items: center!important;
+    min-height: 30rem !important;
   }
 </style>

+ 4 - 4
src/system/IOT/equipmentMag/detail/index.vue

@@ -106,10 +106,10 @@ const changeDataStructure = (data) => {
       label:'设备名称',
       value:data.devicename
     },
-    {
-      label:'区域',
-      value:data.areaname
-    },
+    // {
+    //   label:'区域',
+    //   value:data.areaname
+    // },
     {
       label:'状态',
       value:data.isused ? '启用':'停用',

+ 5 - 1
src/system/IOT/equipmentMag/detail/modules/serveTable/index.vue

@@ -9,11 +9,15 @@
           keyName="w_functionid"
           :id="data.record.w_functionid"
           type="link"
-          message="确定删除当前产品功能吗?"
+          message="确定删除当前设备功能吗?"
           @onSuccess="$refs.list.listData()"
           :disabled="!utils.hasPermission('modelTab')"
         />
       </div>
+      <div v-else-if="data.column.dataIndex == 'func'" style="display: flex;align-items: center;">
+        <span>{{data.record.func}}</span>
+        <a-tag color="blue" size="small" v-if="data.record.issystem" style="margin-left: 10px;">系统</a-tag>
+      </div>
       <div v-else-if="data.column.dataIndex == 'isasyn'">
         {{ data.record.isasyn ? '异步' : '同步' }}
       </div>

+ 10 - 1
src/system/IOT/equipmentMag/detail/modules/serveTable/modules/Add.vue

@@ -34,6 +34,14 @@
             </a-radio-group>
           </a-form-item>
         </a-col>
+        <a-col :span="24">
+          <a-form-item  label="是否系统功能" name="issystem">
+            <a-radio-group v-model:value="form.issystem">
+              <a-radio :value="1">是</a-radio>
+              <a-radio :value="0">不是</a-radio>
+            </a-radio-group>
+          </a-form-item>
+        </a-col>
         <a-col :span="24">
           <a-form-item  label="选择属性" name="w_dataparamids" :rules="[{ required: true, message: '请选择属性',validateTrigger:'onChange'}]">
             <SelectModel 
@@ -114,7 +122,8 @@ let form = ref({
   "funcname": "",
   "isasyn": 0,
   "w_dataparamids": [],
-  "remarks":""
+  "remarks":"",
+  "issystem":0
 })
 let dataParam = ref({
   "id": 20230613091602,

+ 12 - 3
src/system/IOT/equipmentMag/detail/modules/serveTable/modules/Edit.vue

@@ -1,9 +1,9 @@
 <template>
-  <a-button type="link" @click="editBtn" style="margin-right:16px" :disabled="disabled">编辑</a-button>
+  <a-button type="link" @click="editBtn" style="margin-right:16px" :disabled="disabled">更新</a-button>
   <a-drawer
     v-model:visible="visible"
     class="custom-class"
-    title="编辑产品功能"
+    title="更新产品功能"
     placement="right"
     width="600px"
     :closable="false"
@@ -34,6 +34,14 @@
             </a-radio-group>
           </a-form-item>
         </a-col>
+        <a-col :span="24">
+          <a-form-item  label="是否系统功能" name="issystem">
+            <a-radio-group v-model:value="form.issystem">
+              <a-radio :value="1">是</a-radio>
+              <a-radio :value="0">不是</a-radio>
+            </a-radio-group>
+          </a-form-item>
+        </a-col>
         <a-col :span="24">
           <a-form-item  label="选择属性" name="w_dataparamids" :rules="[{ required: true, message: '请选择属性',validateTrigger:'onChange'}]">
             <SelectModel 
@@ -114,7 +122,8 @@ let form = ref({
   "funcname": "",
   "isasyn": 0,
   "w_dataparamids": [],
-  "remarks":""
+  "remarks":"",
+  "issystem":0
 })
 let dataParam = ref({
   "id": 20230613091602,

+ 11 - 7
src/system/IOT/equipmentMag/index.vue

@@ -10,14 +10,14 @@
         <span :style="{color:utils.statusAndColor(data.record.isused ? '启用' : '停用')}">{{ data.record.isused ? '启用' : '停用' }}</span>
       </template>
       <template v-else-if="data.column.dataIndex === 'sitename'">
-        <div v-if="data.record.isOffical == 0 && data.record.ispush == 0">
+        <div v-if="(authStore.nowAccount.siteid != data.record.siteid) && data.record.ispush == 1">
           <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>
+          <a-tag v-if="data.record.ispush == 1" :closable="true" @close.prevent="delSite(data.record)">{{ data.record.sitename }}</a-tag>
           <SelectModel 
             ref="site" 
-            @selectRowData="selectSite(data.record,$event)" 
+            @selectRowData="selectSite" 
             rowKey="siteid" 
             :param="siteParam" 
             :filterMultiple="true" 
@@ -25,7 +25,7 @@
             v-else
           >
             <template v-slot:slot1>
-              <a-button @click="$refs.site.modeVisible=true" type="link">推送站点</a-button>
+              <a-button @click="$refs.site.modeVisible=true;selectRow=data.record" type="link">推送站点</a-button>
             </template>
           </SelectModel>
         </div>
@@ -42,6 +42,8 @@ import customBtn from '@/components/customHandleBtn/index.vue'
 import Add from './modules/Add.vue'
 import {ref, defineProps, defineEmits, onMounted} from 'vue'
 import { useBaseStore } from '@/stores/modules/base'
+import { useAuthStore } from '@/stores/modules/auth'
+
 import {Modal} from 'ant-design-vue'
 import Api from '@/api/api'
 import utils from '@/utils/utils'
@@ -49,12 +51,14 @@ import { useRouter } from 'vue-router'
 
 let router = useRouter()
 let base = useBaseStore()
+let authStore = useAuthStore()
 let emit = defineEmits([])
 let props = defineProps({})
 let list = ref()
 let searchType = ref([
   {label:'搜索',key:'condition',type:'input'},
 ])
+let selectRow = ref({})
 let param = ref({
   "id": 20230704111702,
   "content": {
@@ -78,12 +82,12 @@ let siteParam = ref({
   },
 })
 
-let selectSite = async (data,site) => {
+let selectSite = async (site) => {
   let res = await Api.requested({
     "id": 20230705161302,
     "content": {
       "siteid": site[site.length - 1].siteid,
-      "w_deviceid":data.w_deviceid,
+      "w_deviceid":selectRow.value.w_deviceid,
       "ispush": 1//0取消,1推送
     },
   })
@@ -104,8 +108,8 @@ let delSite = async (data) => {
             "ispush": 0//0取消,1推送
         },
       })
+      list.value.tableData()
       utils.message(res,'操作成功', async () => {
-        list.value.tableData()
       })
     }
    })

+ 1 - 3
src/system/IOT/equipmentMag/modules/Edit.vue

@@ -13,7 +13,7 @@
       <a-row :gutter="16">
         <a-col :span="24">
           <a-form-item  label="设备编码" name="serialnumber" :rules="[{ required: true, message: '请输入设备编码' }]">
-            <a-input v-model:value="form.serialnumber" placeholder="请输入设备编码"></a-input>
+            <a-input :disabled="true" v-model:value="form.serialnumber" placeholder="请输入设备编码"></a-input>
           </a-form-item>
         </a-col>
         <a-col :span="24">
@@ -261,7 +261,6 @@ let onAddress = (data) => {
 
 
 let onSubmit = async () => {
-  console.log(form.value);
   let isCheck = await formRef.value.validateFields()
   if (!isCheck) return
   if (form.value.province) {
@@ -278,7 +277,6 @@ let onSubmit = async () => {
     visible.value = false
     emit('onSuccess')
     formRef.value.resetFields()
-    console.log(res);
   })
 }
 

+ 13 - 4
src/system/IOT/equipmentMag/modules/map.vue

@@ -2,7 +2,7 @@
   <a-modal
     v-model:visible="modeVisible"
     class="custom-class"
-    title="选择角色"
+    title="选择地址"
     placement="right"
     width="1000px"
     @ok="submit">
@@ -17,7 +17,7 @@
       </div>
     </div>
     <div class="map">
-      <a-input placeholder="请输入地址" v-model:value="address"></a-input>
+      <a-input placeholder="请输入地址" v-model:value="address" @focus="searchListShow=true"></a-input>
       <baidu-map
         class="view"
         :center="latlng"
@@ -26,9 +26,9 @@
         @ready="mapReady"
         @click="mapClick">
         <bm-marker :position="latlng" :dragging="true" animation="BMAP_ANIMATION_BOUNCE">
-          <bm-label content="当前标记点" :labelStyle="{color: 'red', fontSize : '24px'}" :offset="{width: -35, height: 30}"/>
+          <bm-label content="当前标记点" :labelStyle="{border:'none',color: '#000000', fontSize : '24px'}" :offset="{width: -55, height: 10}"/>
         </bm-marker>
-        <bm-local-search :keyword="address" :auto-viewport="true" @infohtmlset="infohtmlset"></bm-local-search>
+        <bm-local-search class="custom-search" :style="{display:searchListShow ? 'block' : 'none'}" :keyword="address" :auto-viewport="true" @infohtmlset="infohtmlset"></bm-local-search>
       </baidu-map>
     </div>
     
@@ -52,6 +52,7 @@ let address = ref('')
 
 let container = ref()
 let modeVisible = ref(false)
+let searchListShow = ref(false)
 
 let submit = () => {
   modeVisible.value = false
@@ -71,6 +72,7 @@ let mapClick = (e) => {
   console.log(e);
   latlng.value.lat = e.latlng.lat
   latlng.value.lng = e.latlng.lng
+  searchListShow.value = false
 }
 
 let infohtmlset = (data) => {
@@ -89,6 +91,13 @@ defineExpose({
 </script>
 
 <style scoped>
+.custom-search {
+  position: absolute;
+  top: 55px;
+  left: 20px;
+  width: 300px;
+  z-index: 999;
+}
 .view{
   width: 800px;
   height: 600px;

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

@@ -13,7 +13,7 @@
       <a-row :gutter="16">
         <a-col :span="24">
           <a-form-item  label="产品编码" name="prodnum" :rules="[{ required: true, message: '请输入产品编码' }]">
-            <a-input v-model:value="form.prodnum" placeholder="请输入产品编码"></a-input>
+            <a-input :disabled="true" v-model:value="form.prodnum" placeholder="请输入产品编码"></a-input>
           </a-form-item>
         </a-col>
         <a-col :span="24">

+ 4 - 0
src/system/IOT/productManage/detail/modules/serveTable/index.vue

@@ -17,6 +17,10 @@
       <div v-else-if="data.column.dataIndex == 'isasyn'">
         {{ data.record.isasyn ? '异步' : '同步' }}
       </div>
+      <div v-else-if="data.column.dataIndex == 'func'" style="display: flex;align-items: center;">
+        <span>{{data.record.func}}</span>
+        <a-tag color="blue" size="small" v-if="data.record.issystem" style="margin-left: 10px;">系统</a-tag>
+      </div>
       <div v-else-if="data.column.dataIndex == 'w_dataparamids'">
         <a-tag color="blue" v-for="item in data.record.dataparam" :key="item.w_functionid">{{ item.paramname }}</a-tag>
       </div>

+ 10 - 1
src/system/IOT/productManage/detail/modules/serveTable/modules/Add.vue

@@ -34,6 +34,14 @@
             </a-radio-group>
           </a-form-item>
         </a-col>
+        <a-col :span="24">
+          <a-form-item  label="是否系统功能" name="issystem">
+            <a-radio-group v-model:value="form.issystem">
+              <a-radio :value="1">是</a-radio>
+              <a-radio :value="0">不是</a-radio>
+            </a-radio-group>
+          </a-form-item>
+        </a-col>
         <a-col :span="24">
           <a-form-item  label="选择属性" name="w_dataparamids" :rules="[{ required: true, message: '请选择属性',validateTrigger:'onChange'}]">
             <SelectModel 
@@ -114,7 +122,8 @@ let form = ref({
   "funcname": "",
   "isasyn": 0,
   "w_dataparamids": [],
-  "remarks":""
+  "remarks":"",
+  "issystem":0
 })
 let dataParam = ref({
   "id": 20230613091602,

+ 12 - 3
src/system/IOT/productManage/detail/modules/serveTable/modules/Edit.vue

@@ -1,9 +1,9 @@
 <template>
-  <a-button type="link" @click="editBtn" style="margin-right:16px" :disabled="disabled">编辑</a-button>
+  <a-button type="link" @click="editBtn" style="margin-right:16px" :disabled="disabled">更新</a-button>
   <a-drawer
     v-model:visible="visible"
     class="custom-class"
-    title="编辑产品功能"
+    title="更新产品功能"
     placement="right"
     width="600px"
     :closable="false"
@@ -34,6 +34,14 @@
             </a-radio-group>
           </a-form-item>
         </a-col>
+        <a-col :span="24">
+          <a-form-item  label="是否系统功能" name="issystem">
+            <a-radio-group v-model:value="form.issystem">
+              <a-radio :value="1">是</a-radio>
+              <a-radio :value="0">不是</a-radio>
+            </a-radio-group>
+          </a-form-item>
+        </a-col>
         <a-col :span="24">
           <a-form-item  label="选择属性" name="w_dataparamids" :rules="[{ required: true, message: '请选择属性',validateTrigger:'onChange'}]">
             <SelectModel 
@@ -114,7 +122,8 @@ let form = ref({
   "funcname": "",
   "isasyn": 0,
   "w_dataparamids": [],
-  "remarks":""
+  "remarks":"",
+  "issystem":0
 })
 let dataParam = ref({
   "id": 20230613091602,

+ 1 - 2
src/system/moduleNormal/productCategory/index.vue

@@ -1,5 +1,5 @@
 <template>
-  <listTemp ref="list" :param="param" :tableName="'categoryTable'" :searchType="searchType" @emitRes="listData">
+  <listTemp ref="list" :param="param" :tableName="'categoryTable'" @emitRes="listData">
     <template #operation>
       <Add @onSuccess="$refs.list.tableData()"></Add>
     </template>
@@ -35,7 +35,6 @@ import Api from '@/api/api'
 import utils from '@/utils/utils'
 let emit = defineEmits([])
 let props = defineProps({})
-let searchType = ref([{label:'搜索',key:'condition',type:'input'}])
 let param = ref({
     "id": 20230609105302,
     "content": {},

+ 3 - 1
src/system/moduleNormal/reportcenter/index.vue

@@ -18,15 +18,17 @@
   import Api from '@/api/api'
   import { ref } from 'vue'
   import { useRouter } from "vue-router";
+  import { useAuthStore } from '@/stores/modules/auth.js'
   import { onMounted } from "vue";
   const router = useRouter()
   let columns = ref([])
   let dataSource = ref([])
+  let authStore = useAuthStore()
   let param = ref({
     "content": {
       "pageNumber":1,
       "pageSize":20,
-      "systemappid":JSON.parse(sessionStorage.getItem('app')).systemappid
+      "systemappid":authStore.app.systemappid
     },
     "id": 20221213094401,
   })

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