浏览代码

Merge remote-tracking branch 'origin/master'

qymljy 2 年之前
父节点
当前提交
5c978ca110
共有 44 个文件被更改,包括 35 次插入28 次删除
  1. 1 1
      dist/assets/LOGO-696877a3.js
  2. 0 0
      dist/assets/base-3f080380.js
  3. 1 1
      dist/assets/index-095a6e40.js
  4. 0 0
      dist/assets/index-0dd1f6b7.js
  5. 0 0
      dist/assets/index-1b016b6d.js
  6. 0 0
      dist/assets/index-20a04920.js
  7. 0 0
      dist/assets/index-27e99a02.js
  8. 0 0
      dist/assets/index-291a827f.js
  9. 0 0
      dist/assets/index-2cde612c.js
  10. 0 0
      dist/assets/index-3d2166ff.js
  11. 0 0
      dist/assets/index-4b2bcfd2.js
  12. 0 0
      dist/assets/index-53b7921b.js
  13. 0 0
      dist/assets/index-5bac2493.js
  14. 0 0
      dist/assets/index-5d4ca556.js
  15. 0 0
      dist/assets/index-5d846133.js
  16. 0 0
      dist/assets/index-63afc8e6.js
  17. 0 0
      dist/assets/index-6515cfc6.js
  18. 0 0
      dist/assets/index-737f1361.js
  19. 1 1
      dist/assets/index-755b3274.js
  20. 0 0
      dist/assets/index-7f71176f.js
  21. 0 0
      dist/assets/index-83aa9ad2.js
  22. 0 0
      dist/assets/index-8887e392.js
  23. 0 1
      dist/assets/index-8d631f6c.css
  24. 0 0
      dist/assets/index-b22fc951.js
  25. 0 0
      dist/assets/index-b3bc74c7.js
  26. 0 0
      dist/assets/index-d70d27b1.js
  27. 0 0
      dist/assets/index-dd78c6e3.js
  28. 0 0
      dist/assets/index-dee75045.js
  29. 0 0
      dist/assets/index-ef7cf9fb.js
  30. 1 0
      dist/assets/index-f205309b.css
  31. 0 0
      dist/assets/index-f3948b81.js
  32. 0 0
      dist/assets/index-f46c3ea4.js
  33. 1 1
      dist/assets/index-f9789c27.js
  34. 0 0
      dist/assets/index-fa2b6f80.js
  35. 1 1
      dist/assets/index-fb33dd43.js
  36. 1 1
      dist/assets/index-fc767f1c.js
  37. 0 0
      dist/assets/index-feb4fb00.js
  38. 1 1
      dist/assets/login-aa2a7f8f.js
  39. 1 1
      dist/index.html
  40. 15 15
      node_modules/.vite/deps/_metadata.json
  41. 1 1
      src/system/IOT/firmwareMag/index.vue
  42. 8 1
      src/system/IOT/firmwareMag/modules/site/modules/add.vue
  43. 1 1
      src/system/moduleNormal/userManage/detail/modules/edit.vue
  44. 1 1
      src/template/normalTable/index.vue

+ 1 - 1
dist/assets/LOGO-588966b4.js → dist/assets/LOGO-696877a3.js

@@ -1 +1 @@
-import{e as i,r}from"./index-a2447a35.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})}}}),h=""+new URL("LOGO-c1524a7d.svg",import.meta.url).href;export{h as _,u};
+import{e as i,r}from"./index-b3bc74c7.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})}}}),h=""+new URL("LOGO-c1524a7d.svg",import.meta.url).href;export{h as _,u};

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


+ 1 - 1
dist/assets/index-acce53b0.js → dist/assets/index-095a6e40.js

@@ -1 +1 @@
-import{l as n}from"./index-0a2fd59b.js";import{a as e,o as s,V as p,W as i,j as c,X as l,u as a}from"./vue-9608a1a9.js";import"./vue-router-2c2f7fb8.js";import"./index-a2447a35.js";import"./base-444b134a.js";import"./_plugin-vue_export-helper-c27b6911.js";const g={__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 s(()=>{}),(u,d)=>(p(),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{g as default};
+import{l as n}from"./index-5bac2493.js";import{a as e,o as s,V as p,W as i,j as c,X as l,u as a}from"./vue-9608a1a9.js";import"./vue-router-2c2f7fb8.js";import"./index-b3bc74c7.js";import"./base-3f080380.js";import"./_plugin-vue_export-helper-c27b6911.js";const g={__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 s(()=>{}),(u,d)=>(p(),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{g as default};

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


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


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


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


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


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


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


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


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


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


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


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


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


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


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


+ 1 - 1
dist/assets/index-e546b9e3.js → dist/assets/index-755b3274.js

@@ -1 +1 @@
-import{M as o,A as c,f as m}from"./index-a2447a35.js";import{U as l,V as u,a6 as p,X as y,G as d,a3 as g,u as S}from"./vue-9608a1a9.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,f as m}from"./index-b3bc74c7.js";import{U as l,V as u,a6 as p,X as y,G as d,a3 as g,u as S}from"./vue-9608a1a9.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 _};

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


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


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


+ 0 - 1
dist/assets/index-8d631f6c.css

@@ -1 +0,0 @@
-.ant-table-striped[data-v-ef173f70] td{font-size:12px}

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


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


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


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


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


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


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

@@ -0,0 +1 @@
+.ant-table-striped[data-v-2a6ff89d] td{font-size:12px}

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


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


+ 1 - 1
dist/assets/index-7fcd8961.js → dist/assets/index-f9789c27.js

@@ -1 +1 @@
-import{l as d}from"./index-0a2fd59b.js";import{A as m}from"./index-a2447a35.js";import{u}from"./vue-router-2c2f7fb8.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,u as c,G as h,a6 as k,$ as b,a3 as w,a4 as B}from"./vue-9608a1a9.js";import"./base-444b134a.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)},_=async t=>{console.log("http://60.204.153.188/");let e=await m.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(d,{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=>_(o.record)},w(o.record.name),9,v)]),_:2},1024)):B("",!0)]),_:1},8,["columns","param"])])}}},P=f(A,[["__scopeId","data-v-caca61d5"]]);export{P as default};
+import{l as d}from"./index-5bac2493.js";import{A as m}from"./index-b3bc74c7.js";import{u}from"./vue-router-2c2f7fb8.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,u as c,G as h,a6 as k,$ as b,a3 as w,a4 as B}from"./vue-9608a1a9.js";import"./base-3f080380.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)},_=async t=>{console.log("http://60.204.153.188/");let e=await m.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(d,{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=>_(o.record)},w(o.record.name),9,v)]),_:2},1024)):B("",!0)]),_:1},8,["columns","param"])])}}},P=f(A,[["__scopeId","data-v-caca61d5"]]);export{P as default};

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


+ 1 - 1
dist/assets/index-85d37040.js → dist/assets/index-fb33dd43.js

@@ -1 +1 @@
-import{d as c}from"./index-c4229fe9.js";import{_ as m}from"./index-365dbba9.js";import{u as v}from"./vue-router-2c2f7fb8.js";import{A as b}from"./index-a2447a35.js";import{a,o as d,V as p,W as _,j as r,X as f,u as D,$ as n}from"./vue-9608a1a9.js";import"./base-444b134a.js";import"./_plugin-vue_export-helper-c27b6911.js";const C=n("div",{class:"defaultInfo"},[n("span",null,"基本信息")],-1),V={__name:"index",setup(h){const l=v(),t=a({}),s=async()=>{const e=await b.requested({id:"20230619142003",content:{w_iotcardid:l.currentRoute.value.query.id}});t.value=e.data,i(e.data)},o=a([]),u=a([]),i=e=>{o.value=[{label:"ICCID",value:e.iccid},{label:"绑定设备",value:e.devicename},{label:"运营商",value:e.telecomoperator=="CM"?"移动":e.telecomoperator=="CT"?"电信":e.telecomoperator=="CU"?"联通":""},{label:"总流量",value:e.totalAmount},{label:"使用流量",value:e.useAmount},{label:"剩余流量",value:e.remainAmount},{label:"激活日期",value:e.activationdate},{label:"余额",value:e.amount},{label:"状态",value:e.status},{label:"站点",value:e.sitename}],u.value=[{label:"ICCID",value:e.iccid},{label:"绑定设备",value:e.devicename},{label:"运营商",value:e.telecomoperator},{label:"状态",value:e.status},{label:"激活日期",value:e.activationdate},{label:"站点",value:e.sitename}]};return d(()=>{s()}),(e,w)=>(p(),_("div",null,[r(c,{headData:o.value,title:"卡号:"+t.value.msisdn,tabs:["详细信息"],ownertable:"w_iotcard",delParam:{id:"20230619142203",content:{w_iotcardid:D(l).currentRoute.value.query.id}}},{tab0:f(()=>[C,r(m,{data:u.value},null,8,["data"])]),_:1},8,["headData","title","delParam"])]))}};export{V as default};
+import{d as c}from"./index-53b7921b.js";import{_ as m}from"./index-365dbba9.js";import{u as v}from"./vue-router-2c2f7fb8.js";import{A as b}from"./index-b3bc74c7.js";import{a,o as d,V as p,W as _,j as r,X as f,u as D,$ as n}from"./vue-9608a1a9.js";import"./base-3f080380.js";import"./_plugin-vue_export-helper-c27b6911.js";const C=n("div",{class:"defaultInfo"},[n("span",null,"基本信息")],-1),V={__name:"index",setup(h){const l=v(),t=a({}),s=async()=>{const e=await b.requested({id:"20230619142003",content:{w_iotcardid:l.currentRoute.value.query.id}});t.value=e.data,i(e.data)},o=a([]),u=a([]),i=e=>{o.value=[{label:"ICCID",value:e.iccid},{label:"绑定设备",value:e.devicename},{label:"运营商",value:e.telecomoperator=="CM"?"移动":e.telecomoperator=="CT"?"电信":e.telecomoperator=="CU"?"联通":""},{label:"总流量",value:e.totalAmount},{label:"使用流量",value:e.useAmount},{label:"剩余流量",value:e.remainAmount},{label:"激活日期",value:e.activationdate},{label:"余额",value:e.amount},{label:"状态",value:e.status},{label:"站点",value:e.sitename}],u.value=[{label:"ICCID",value:e.iccid},{label:"绑定设备",value:e.devicename},{label:"运营商",value:e.telecomoperator},{label:"状态",value:e.status},{label:"激活日期",value:e.activationdate},{label:"站点",value:e.sitename}]};return d(()=>{s()}),(e,w)=>(p(),_("div",null,[r(c,{headData:o.value,title:"卡号:"+t.value.msisdn,tabs:["详细信息"],ownertable:"w_iotcard",delParam:{id:"20230619142203",content:{w_iotcardid:D(l).currentRoute.value.query.id}}},{tab0:f(()=>[C,r(m,{data:u.value},null,8,["data"])]),_:1},8,["headData","title","delParam"])]))}};export{V as default};

+ 1 - 1
dist/assets/index-12fc134d.js → dist/assets/index-fc767f1c.js

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

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


+ 1 - 1
dist/assets/login-588f68f4.js → dist/assets/login-aa2a7f8f.js

@@ -1,4 +1,4 @@
-import{u as useRouter}from"./vue-router-2c2f7fb8.js";import{c as commonjsGlobal,u as useAuthStore,s as storeToRefs,A as Api,m as message}from"./index-a2447a35.js";import{u as useRouteTabsStore,_ as _imports_0}from"./LOGO-588966b4.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,$ as createBaseVNode,j as createVNode,X as withCtx,a as ref,r as reactive,a0 as normalizeStyle,G as createTextVNode,a1 as pushScopeId,a2 as popScopeId}from"./vue-9608a1a9.js";var md5Exports={},md5$1={get exports(){return md5Exports},set exports(e){md5Exports=e}};/**
+import{u as useRouter}from"./vue-router-2c2f7fb8.js";import{c as commonjsGlobal,u as useAuthStore,s as storeToRefs,A as Api,m as message}from"./index-b3bc74c7.js";import{u as useRouteTabsStore,_ as _imports_0}from"./LOGO-696877a3.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,$ as createBaseVNode,j as createVNode,X as withCtx,a as ref,r as reactive,a0 as normalizeStyle,G as createTextVNode,a1 as pushScopeId,a2 as popScopeId}from"./vue-9608a1a9.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

+ 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-a2447a35.js"></script>
+    <script type="module" crossorigin src="./assets/index-b3bc74c7.js"></script>
     <link rel="modulepreload" crossorigin href="./assets/vue-9608a1a9.js">
     <link rel="modulepreload" crossorigin href="./assets/vue-router-2c2f7fb8.js">
     <link rel="stylesheet" href="./assets/index-8790befc.css">

+ 15 - 15
node_modules/.vite/deps/_metadata.json

@@ -1,83 +1,83 @@
 {
-  "hash": "18bbf35d",
-  "browserHash": "174209d7",
+  "hash": "0d9d205c",
+  "browserHash": "81d05683",
   "optimized": {
     "@ant-design/icons-vue": {
       "src": "../../@ant-design/icons-vue/es/index.js",
       "file": "@ant-design_icons-vue.js",
-      "fileHash": "5938cea3",
+      "fileHash": "8e02ca6b",
       "needsInterop": false
     },
     "ant-design-vue": {
       "src": "../../ant-design-vue/es/index.js",
       "file": "ant-design-vue.js",
-      "fileHash": "45f9b0ec",
+      "fileHash": "829568bd",
       "needsInterop": false
     },
     "ant-design-vue/es/locale/zh_CN": {
       "src": "../../ant-design-vue/es/locale/zh_CN.js",
       "file": "ant-design-vue_es_locale_zh_CN.js",
-      "fileHash": "298e1579",
+      "fileHash": "a361d9d2",
       "needsInterop": false
     },
     "axios": {
       "src": "../../axios/index.js",
       "file": "axios.js",
-      "fileHash": "eb7df329",
+      "fileHash": "7514f3e7",
       "needsInterop": false
     },
     "dayjs": {
       "src": "../../dayjs/dayjs.min.js",
       "file": "dayjs.js",
-      "fileHash": "e0c0caf7",
+      "fileHash": "e5d604b4",
       "needsInterop": true
     },
     "dayjs/locale/zh-cn": {
       "src": "../../dayjs/locale/zh-cn.js",
       "file": "dayjs_locale_zh-cn.js",
-      "fileHash": "f34e927d",
+      "fileHash": "0ba0e49e",
       "needsInterop": true
     },
     "js-md5": {
       "src": "../../js-md5/src/md5.js",
       "file": "js-md5.js",
-      "fileHash": "9d8e97a5",
+      "fileHash": "5f92d7e8",
       "needsInterop": true
     },
     "less": {
       "src": "../../less/dist/less.js",
       "file": "less.js",
-      "fileHash": "9b1ce05e",
+      "fileHash": "1b1eb850",
       "needsInterop": true
     },
     "mathjs": {
       "src": "../../mathjs/lib/esm/index.js",
       "file": "mathjs.js",
-      "fileHash": "2c610573",
+      "fileHash": "a09badc9",
       "needsInterop": false
     },
     "pinia": {
       "src": "../../pinia/dist/pinia.mjs",
       "file": "pinia.js",
-      "fileHash": "fce44de8",
+      "fileHash": "24af44a4",
       "needsInterop": false
     },
     "pinia-plugin-persist": {
       "src": "../../pinia-plugin-persist/dist/pinia-persist.es.js",
       "file": "pinia-plugin-persist.js",
-      "fileHash": "02794d5a",
+      "fileHash": "029824d5",
       "needsInterop": false
     },
     "vue": {
       "src": "../../vue/dist/vue.runtime.esm-bundler.js",
       "file": "vue.js",
-      "fileHash": "7ad6386c",
+      "fileHash": "7bb21984",
       "needsInterop": false
     },
     "vue-router": {
       "src": "../../vue-router/dist/vue-router.mjs",
       "file": "vue-router.js",
-      "fileHash": "fe58ddc8",
+      "fileHash": "6e6e5f1d",
       "needsInterop": false
     }
   },

+ 1 - 1
src/system/IOT/firmwareMag/index.vue

@@ -1,5 +1,5 @@
 <template>
-  <listTemp ref="list" :param="param" :tableName="'firmwareTable'" keyRouteName="firmwarename" :searchType="searchType" :detailPage="{}" @listData="listData">
+  <listTemp ref="list" :param="param" :tableName="'firmwareTable'" :searchType="searchType" :detailPage="{}" @listData="listData">
     <template #operation>
       <Add @onSuccess="$refs.list.tableData()" :disabled="!utils.hasPermission('insert')"></Add>
     </template>

+ 8 - 1
src/system/IOT/firmwareMag/modules/site/modules/add.vue

@@ -26,7 +26,7 @@
 
 <script setup>
 import normalTable from '@/template/normalTable/index.vue'
-import {ref, defineProps, defineEmits, onMounted, nextTick} from 'vue'
+import {ref, defineProps, defineEmits, onMounted, nextTick, watch} from 'vue'
 import SelectModel from '@/components/selectModel/index.vue'
 import Api from '@/api/api'
 import utils from '@/utils/utils'
@@ -53,6 +53,13 @@ let param = ref({
 let list = ref()
 let sites = ref([])
 
+watch(() => param.value.content.where.condition,(val) => {
+  if (val == '') {
+    param.value.content.pageNumber = 1
+    list.value.listData()
+  }
+})
+
 let btn = () => {
   visible.value = true
   nextTick(() => {

+ 1 - 1
src/system/moduleNormal/userManage/detail/modules/edit.vue

@@ -27,7 +27,7 @@
           </a-col>
           <a-col :span="12">
             <a-form-item label="账号" name="accountno">
-              <a-input v-model:value="form.accountno" placeholder="账号" />
+              <a-input disabled v-model:value="form.accountno" placeholder="账号" />
             </a-form-item>
           </a-col>
           <a-col :span="12">

+ 1 - 1
src/template/normalTable/index.vue

@@ -75,7 +75,7 @@
   }
   const onSelect = async (record, selected, selectedRows, nativeEvent)=>{
     if (!selected) {
-      tableRecord.value = tableRecord.value.filter(e=>e.itemid !== record.itemid)
+      tableRecord.value = tableRecord.value.filter(e=>e[props.rowKey] !== record[props.rowKey])
     } else {
       tableRecord.value.push(record)
     }

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