龙三郎 1 年之前
父节点
当前提交
b43166d4cc
共有 54 个文件被更改,包括 97 次插入82 次删除
  1. 0 0
      dist/assets/Changepassword-aaf2fee6.js
  2. 1 1
      dist/assets/CusNavigation-8aada1ef.js
  3. 0 0
      dist/assets/Detail-85b24ea8.js
  4. 0 0
      dist/assets/Index-033d5704.js
  5. 0 0
      dist/assets/Index-2701e669.js
  6. 0 0
      dist/assets/Index-31e3bc5b.js
  7. 0 0
      dist/assets/Index-397b063c.js
  8. 0 0
      dist/assets/Index-3fcffd2d.js
  9. 0 0
      dist/assets/Index-5df0577c.js
  10. 0 0
      dist/assets/Index-655af357.js
  11. 0 0
      dist/assets/Index-69323ec1.js
  12. 0 0
      dist/assets/Index-758cecb8.js
  13. 0 0
      dist/assets/Index-76058fec.js
  14. 0 0
      dist/assets/Index-99d5710d.js
  15. 1 0
      dist/assets/Index-ad799aa2.css
  16. 0 0
      dist/assets/Index-c06b46f5.js
  17. 0 0
      dist/assets/Index-c65d6303.js
  18. 0 0
      dist/assets/Index-d1d20e21.js
  19. 0 0
      dist/assets/Index-d88ed4a4.js
  20. 0 1
      dist/assets/Index-d8d0bba1.css
  21. 0 0
      dist/assets/Index-dba75789.js
  22. 0 0
      dist/assets/Index-ff720281.js
  23. 0 0
      dist/assets/Index3-a630f9e1.js
  24. 0 0
      dist/assets/Location-818bf533.js
  25. 0 0
      dist/assets/Log-3df2d099.js
  26. 0 0
      dist/assets/function-call-ac4377ab.js
  27. 1 1
      dist/assets/index-1f851396.js
  28. 0 0
      dist/assets/index-2a88824d.js
  29. 0 0
      dist/assets/index-2e65d505.js
  30. 0 0
      dist/assets/index-3da1d059.js
  31. 0 0
      dist/assets/index-41fe9b4a.js
  32. 1 1
      dist/assets/index-60c32ccb.js
  33. 1 1
      dist/assets/index-6b5cb84e.js
  34. 1 1
      dist/assets/index-7d33f6a1.js
  35. 1 1
      dist/assets/index-bf5bb4b8.js
  36. 0 0
      dist/assets/index-c243c59b.js
  37. 1 1
      dist/assets/index-c5ffe042.js
  38. 0 0
      dist/assets/index-c8038c66.js
  39. 1 1
      dist/assets/index-d60c87bc.js
  40. 0 0
      dist/assets/index-d9c5d705.js
  41. 1 1
      dist/assets/index-ec22364e.js
  42. 1 1
      dist/assets/mount-component-731e8ea5.js
  43. 1 1
      dist/assets/on-popup-reopen-3f924dd6.js
  44. 1 1
      dist/assets/request-45f793bd.js
  45. 1 1
      dist/assets/use-placeholder-06c0a3a8.js
  46. 1 1
      dist/assets/use-route-a3b990ac.js
  47. 1 0
      dist/assets/use-scope-id-23b9d357.js
  48. 0 1
      dist/assets/use-scope-id-eeb8698e.js
  49. 0 0
      dist/assets/util-d676f680.js
  50. 0 0
      dist/assets/vue-qrcode-reader-1477bfa1.js
  51. 1 1
      dist/index.html
  52. 3 3
      src/pages/device/ascend/Index.vue
  53. 72 61
      src/pages/device/detail/Index.vue
  54. 5 1
      src/router/index.ts

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


+ 1 - 1
dist/assets/CusNavigation-d160b4ee.js → dist/assets/CusNavigation-8aada1ef.js

@@ -1 +1 @@
-import{d as k,r as v,u as x,j as n,b as i,c as s,f as _,V as c,e as p,C as d,x as w,F as C,_ as P}from"./index-ba19c87a.js";import{P as B}from"./index-5cb3ebbf.js";import{I as N}from"./index-9c6666b7.js";const S={style:{height:"38px",padding:"10px",display:"flex","align-items":"center","border-bottom":"1px solid #f0f0f0"}},z={style:{"font-weight":"bold","font-size":"1.1rem",color:"#191A1A"}},A={style:{"flex-grow":"1"}},V=k({__name:"CusNavigation",props:{title:{type:String,default:void 0},gobackabled:{type:Boolean,default:!1},searchabled:{type:Boolean,default:!1},plusabled:{type:Boolean,default:!1}},setup(t,{expose:h}){const l=v(!1),a=v(!1),b=x(),y=o=>{console.log(o),b.go(-1)},f=()=>{l.value=!1},m=()=>{a.value=!1};return h({closeSearchPopup:f,closePlusPopup:m,closeAllPopup:()=>{f(),m()}}),(o,e)=>{const g=B,r=N;return n(),i(C,null,[s(g,{show:l.value,"onUpdate:show":e[0]||(e[0]=u=>l.value=u),position:"top","close-on-click-overlay":!0},{default:_(()=>[c(o.$slots,"search",{},void 0,!0)]),_:3},8,["show"]),s(g,{show:a.value,"onUpdate:show":e[1]||(e[1]=u=>a.value=u),position:"top"},{default:_(()=>[c(o.$slots,"plus",{},void 0,!0)]),_:3},8,["show"]),p("div",S,[t.gobackabled?(n(),i("div",{key:0,style:{"line-height":"0px"},class:"cus-goback",onClick:y},[s(r,{name:"static/images/icon-back.png",size:"1.7rem"})])):d("",!0),p("div",z,[p("span",null,w(t.title),1)]),p("div",A,[c(o.$slots,"default",{},void 0,!0)]),t.searchabled?(n(),i("div",{key:1,style:{"line-height":"0px","margin-left":"10px"},onClick:e[2]||(e[2]=()=>{l.value=!0})},[s(r,{name:"static/images/icon-search-black.png",size:"2rem"})])):d("",!0),t.plusabled?(n(),i("div",{key:2,style:{"line-height":"0px","margin-left":"10px"},onClick:e[3]||(e[3]=()=>{a.value=!0})},[s(r,{name:"plus",size:"1.5rem"})])):d("",!0)])],64)}}});const j=P(V,[["__scopeId","data-v-0288d4b2"]]);export{j as _};
+import{d as k,r as v,u as x,j as n,b as i,c as s,f as _,V as c,e as p,C as d,x as w,F as C,_ as P}from"./index-2e65d505.js";import{P as B}from"./index-c8038c66.js";import{I as N}from"./index-41fe9b4a.js";const S={style:{height:"38px",padding:"10px",display:"flex","align-items":"center","border-bottom":"1px solid #f0f0f0"}},z={style:{"font-weight":"bold","font-size":"1.1rem",color:"#191A1A"}},A={style:{"flex-grow":"1"}},V=k({__name:"CusNavigation",props:{title:{type:String,default:void 0},gobackabled:{type:Boolean,default:!1},searchabled:{type:Boolean,default:!1},plusabled:{type:Boolean,default:!1}},setup(t,{expose:h}){const l=v(!1),a=v(!1),b=x(),y=o=>{console.log(o),b.go(-1)},f=()=>{l.value=!1},m=()=>{a.value=!1};return h({closeSearchPopup:f,closePlusPopup:m,closeAllPopup:()=>{f(),m()}}),(o,e)=>{const g=B,r=N;return n(),i(C,null,[s(g,{show:l.value,"onUpdate:show":e[0]||(e[0]=u=>l.value=u),position:"top","close-on-click-overlay":!0},{default:_(()=>[c(o.$slots,"search",{},void 0,!0)]),_:3},8,["show"]),s(g,{show:a.value,"onUpdate:show":e[1]||(e[1]=u=>a.value=u),position:"top"},{default:_(()=>[c(o.$slots,"plus",{},void 0,!0)]),_:3},8,["show"]),p("div",S,[t.gobackabled?(n(),i("div",{key:0,style:{"line-height":"0px"},class:"cus-goback",onClick:y},[s(r,{name:"static/images/icon-back.png",size:"1.7rem"})])):d("",!0),p("div",z,[p("span",null,w(t.title),1)]),p("div",A,[c(o.$slots,"default",{},void 0,!0)]),t.searchabled?(n(),i("div",{key:1,style:{"line-height":"0px","margin-left":"10px"},onClick:e[2]||(e[2]=()=>{l.value=!0})},[s(r,{name:"static/images/icon-search-black.png",size:"2rem"})])):d("",!0),t.plusabled?(n(),i("div",{key:2,style:{"line-height":"0px","margin-left":"10px"},onClick:e[3]||(e[3]=()=>{a.value=!0})},[s(r,{name:"plus",size:"1.5rem"})])):d("",!0)])],64)}}});const j=P(V,[["__scopeId","data-v-0288d4b2"]]);export{j as _};

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


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


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


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


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


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


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


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


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


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


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


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


+ 1 - 0
dist/assets/Index-ad799aa2.css

@@ -0,0 +1 @@
+.van-tabbar--fixed[data-v-538b9095]{left:auto;max-width:475px}

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


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


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


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


+ 0 - 1
dist/assets/Index-d8d0bba1.css

@@ -1 +0,0 @@
-.van-tabbar--fixed[data-v-d199fd21]{left:auto;max-width:475px}

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


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


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


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


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


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


+ 1 - 1
dist/assets/index-30278767.js → dist/assets/index-1f851396.js

@@ -1 +1 @@
-import{r as z,u as I}from"./use-route-503f7a9f.js";import{c as R,e as p,d as l,n as C,I as w,v as D,w as L}from"./index-9c6666b7.js";import{L as N}from"./index-81336658.js";import{e as q}from"./constant-eba5e2d8.js";import{d as O,c as o}from"./index-ba19c87a.js";const[U,a]=R("button"),_=p({},z,{tag:l("button"),text:String,icon:String,type:l("default"),size:l("normal"),color:String,block:Boolean,plain:Boolean,round:Boolean,square:Boolean,loading:Boolean,hairline:Boolean,disabled:Boolean,iconPrefix:String,nativeType:l("button"),loadingSize:C,loadingText:String,loadingType:String,iconPosition:l("left")});var E=O({name:U,props:_,emits:["click"],setup(n,{emit:g,slots:t}){const f=I(),m=()=>t.loading?t.loading():o(N,{size:n.loadingSize,type:n.loadingType,class:a("loading")},null),c=()=>{if(n.loading)return m();if(t.icon)return o("div",{class:a("icon")},[t.icon()]);if(n.icon)return o(w,{name:n.icon,class:a("icon"),classPrefix:n.iconPrefix},null)},b=()=>{let e;if(n.loading?e=n.loadingText:e=t.default?t.default():n.text,e)return o("span",{class:a("text")},[e])},x=()=>{const{color:e,plain:r}=n;if(e){const i={color:r?e:"white"};return r||(i.background=e),e.includes("gradient")?i.border=0:i.borderColor=e,i}},y=e=>{n.loading?D(e):n.disabled||(g("click",e),f())};return()=>{const{tag:e,type:r,size:i,block:S,round:B,plain:P,square:k,loading:T,disabled:s,hairline:d,nativeType:v,iconPosition:u}=n,h=[a([r,i,{plain:P,block:S,round:B,square:k,loading:T,disabled:s,hairline:d}]),{[q]:d}];return o(e,{type:v,class:h,style:x(),disabled:s,onClick:y},{default:()=>[o("div",{class:a("content")},[u==="left"&&c(),b(),u==="right"&&c()])]})}}});const H=L(E);export{H as B};
+import{r as z,u as I}from"./use-route-a3b990ac.js";import{c as R,e as p,d as l,n as C,I as w,v as D,w as L}from"./index-41fe9b4a.js";import{L as N}from"./index-7d33f6a1.js";import{e as q}from"./constant-eba5e2d8.js";import{d as O,c as o}from"./index-2e65d505.js";const[U,a]=R("button"),_=p({},z,{tag:l("button"),text:String,icon:String,type:l("default"),size:l("normal"),color:String,block:Boolean,plain:Boolean,round:Boolean,square:Boolean,loading:Boolean,hairline:Boolean,disabled:Boolean,iconPrefix:String,nativeType:l("button"),loadingSize:C,loadingText:String,loadingType:String,iconPosition:l("left")});var E=O({name:U,props:_,emits:["click"],setup(n,{emit:g,slots:t}){const f=I(),m=()=>t.loading?t.loading():o(N,{size:n.loadingSize,type:n.loadingType,class:a("loading")},null),c=()=>{if(n.loading)return m();if(t.icon)return o("div",{class:a("icon")},[t.icon()]);if(n.icon)return o(w,{name:n.icon,class:a("icon"),classPrefix:n.iconPrefix},null)},b=()=>{let e;if(n.loading?e=n.loadingText:e=t.default?t.default():n.text,e)return o("span",{class:a("text")},[e])},x=()=>{const{color:e,plain:r}=n;if(e){const i={color:r?e:"white"};return r||(i.background=e),e.includes("gradient")?i.border=0:i.borderColor=e,i}},y=e=>{n.loading?D(e):n.disabled||(g("click",e),f())};return()=>{const{tag:e,type:r,size:i,block:S,round:B,plain:P,square:k,loading:T,disabled:s,hairline:d,nativeType:v,iconPosition:u}=n,h=[a([r,i,{plain:P,block:S,round:B,square:k,loading:T,disabled:s,hairline:d}]),{[q]:d}];return o(e,{type:v,class:h,style:x(),disabled:s,onClick:y},{default:()=>[o("div",{class:a("content")},[u==="left"&&c(),b(),u==="right"&&c()])]})}}});const H=L(E);export{H as B};

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


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


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


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


+ 1 - 1
dist/assets/index-490067f9.js → dist/assets/index-60c32ccb.js

@@ -1 +1 @@
-import{a as s}from"./use-scope-id-eeb8698e.js";import{c,t as d,w as m}from"./index-9c6666b7.js";import{d as u,c as r,F as f,m as p}from"./index-ba19c87a.js";import{B as v}from"./constant-eba5e2d8.js";const[g,a]=c("cell-group"),B={title:String,inset:Boolean,border:d};var O=u({name:g,inheritAttrs:!1,props:B,setup(e,{slots:t,attrs:l}){const n=()=>{var i;return r("div",p({class:[a({inset:e.inset}),{[v]:e.border&&!e.inset}]},l,s()),[(i=t.default)==null?void 0:i.call(t)])},o=()=>r("div",{class:a("title",{inset:e.inset})},[t.title?t.title():e.title]);return()=>e.title||t.title?r(f,null,[o(),n()]):n()}});const h=m(O);export{h as C};
+import{a as s}from"./use-scope-id-23b9d357.js";import{c,t as d,w as m}from"./index-41fe9b4a.js";import{d as u,c as r,F as f,m as p}from"./index-2e65d505.js";import{B as v}from"./constant-eba5e2d8.js";const[g,a]=c("cell-group"),B={title:String,inset:Boolean,border:d};var O=u({name:g,inheritAttrs:!1,props:B,setup(e,{slots:t,attrs:l}){const n=()=>{var i;return r("div",p({class:[a({inset:e.inset}),{[v]:e.border&&!e.inset}]},l,s()),[(i=t.default)==null?void 0:i.call(t)])},o=()=>r("div",{class:a("title",{inset:e.inset})},[t.title?t.title():e.title]);return()=>e.title||t.title?r(f,null,[o(),n()]):n()}});const h=m(O);export{h as C};

+ 1 - 1
dist/assets/index-3bf8e908.js → dist/assets/index-6b5cb84e.js

@@ -1 +1 @@
-import{c as V,u as y,n as A,t as h,v as T,w as C}from"./index-9c6666b7.js";import{u as M}from"./use-scope-id-eeb8698e.js";import{F as N}from"./constant-eba5e2d8.js";import{d as _,c as q}from"./index-ba19c87a.js";const[x,I]=V("form"),O={colon:Boolean,disabled:Boolean,readonly:Boolean,required:[Boolean,String],showError:Boolean,labelWidth:A,labelAlign:String,inputAlign:String,scrollToError:Boolean,validateFirst:Boolean,submitOnEnter:h,showErrorMessage:h,errorMessageAlign:String,validateTrigger:{type:[String,Array],default:"onBlur"}};var j=_({name:x,props:O,emits:["submit","failed"],setup(i,{emit:s,slots:u}){const{children:a,linkChildren:v}=y(N),l=e=>e?a.filter(t=>e.includes(t.name)):a,p=e=>new Promise((t,n)=>{const r=[];l(e).reduce((w,E)=>w.then(()=>{if(!r.length)return E.validate().then(g=>{g&&r.push(g)})}),Promise.resolve()).then(()=>{r.length?n(r):t()})}),b=e=>new Promise((t,n)=>{const r=l(e);Promise.all(r.map(o=>o.validate())).then(o=>{o=o.filter(Boolean),o.length?n(o):t()})}),B=e=>{const t=a.find(n=>n.name===e);return t?new Promise((n,r)=>{t.validate().then(o=>{o?r(o):n()})}):Promise.reject()},c=e=>typeof e=="string"?B(e):i.validateFirst?p(e):b(e),S=e=>{typeof e=="string"&&(e=[e]),l(e).forEach(n=>{n.resetValidation()})},F=()=>a.reduce((e,t)=>(e[t.name]=t.getValidationStatus(),e),{}),d=(e,t)=>{a.some(n=>n.name===e?(n.$el.scrollIntoView(t),!0):!1)},f=()=>a.reduce((e,t)=>(t.name!==void 0&&(e[t.name]=t.formValue.value),e),{}),m=()=>{const e=f();c().then(()=>s("submit",e)).catch(t=>{s("failed",{values:e,errors:t}),i.scrollToError&&t[0].name&&d(t[0].name)})},P=e=>{T(e),m()};return v({props:i}),M({submit:m,validate:c,getValues:f,scrollToField:d,resetValidation:S,getValidationStatus:F}),()=>{var e;return q("form",{class:I(),onSubmit:P},[(e=u.default)==null?void 0:e.call(u)])}}});const W=C(j);export{W as F};
+import{c as V,u as y,n as A,t as h,v as T,w as C}from"./index-41fe9b4a.js";import{u as M}from"./use-scope-id-23b9d357.js";import{F as N}from"./constant-eba5e2d8.js";import{d as _,c as q}from"./index-2e65d505.js";const[x,I]=V("form"),O={colon:Boolean,disabled:Boolean,readonly:Boolean,required:[Boolean,String],showError:Boolean,labelWidth:A,labelAlign:String,inputAlign:String,scrollToError:Boolean,validateFirst:Boolean,submitOnEnter:h,showErrorMessage:h,errorMessageAlign:String,validateTrigger:{type:[String,Array],default:"onBlur"}};var j=_({name:x,props:O,emits:["submit","failed"],setup(i,{emit:s,slots:u}){const{children:a,linkChildren:v}=y(N),l=e=>e?a.filter(t=>e.includes(t.name)):a,p=e=>new Promise((t,n)=>{const r=[];l(e).reduce((w,E)=>w.then(()=>{if(!r.length)return E.validate().then(g=>{g&&r.push(g)})}),Promise.resolve()).then(()=>{r.length?n(r):t()})}),b=e=>new Promise((t,n)=>{const r=l(e);Promise.all(r.map(o=>o.validate())).then(o=>{o=o.filter(Boolean),o.length?n(o):t()})}),B=e=>{const t=a.find(n=>n.name===e);return t?new Promise((n,r)=>{t.validate().then(o=>{o?r(o):n()})}):Promise.reject()},c=e=>typeof e=="string"?B(e):i.validateFirst?p(e):b(e),S=e=>{typeof e=="string"&&(e=[e]),l(e).forEach(n=>{n.resetValidation()})},F=()=>a.reduce((e,t)=>(e[t.name]=t.getValidationStatus(),e),{}),d=(e,t)=>{a.some(n=>n.name===e?(n.$el.scrollIntoView(t),!0):!1)},f=()=>a.reduce((e,t)=>(t.name!==void 0&&(e[t.name]=t.formValue.value),e),{}),m=()=>{const e=f();c().then(()=>s("submit",e)).catch(t=>{s("failed",{values:e,errors:t}),i.scrollToError&&t[0].name&&d(t[0].name)})},P=e=>{T(e),m()};return v({props:i}),M({submit:m,validate:c,getValues:f,scrollToField:d,resetValidation:S,getValidationStatus:F}),()=>{var e;return q("form",{class:I(),onSubmit:P},[(e=u.default)==null?void 0:e.call(u)])}}});const W=C(j);export{W as F};

+ 1 - 1
dist/assets/index-81336658.js → dist/assets/index-7d33f6a1.js

@@ -1 +1 @@
-import{c as u,e as d,l as f,n as l,d as m,f as y,w as S}from"./index-9c6666b7.js";import{c as a,d as p,a as x}from"./index-ba19c87a.js";const[g,r]=u("loading"),v=Array(12).fill(null).map((e,n)=>a("i",{class:r("line",String(n+1))},null)),z=a("svg",{class:r("circular"),viewBox:"25 25 50 50"},[a("circle",{cx:"50",cy:"50",r:"20",fill:"none"},null)]),I={size:l,type:m("circular"),color:String,vertical:Boolean,textSize:l,textColor:String};var C=p({name:g,props:I,setup(e,{slots:n}){const c=x(()=>d({color:e.color},f(e.size))),i=()=>{const t=e.type==="spinner"?v:z;return a("span",{class:r("spinner",e.type),style:c.value},[n.icon?n.icon():t])},o=()=>{var t;if(n.default)return a("span",{class:r("text"),style:{fontSize:y(e.textSize),color:(t=e.textColor)!=null?t:e.color}},[n.default()])};return()=>{const{type:t,vertical:s}=e;return a("div",{class:r([t,{vertical:s}]),"aria-live":"polite","aria-busy":!0},[i(),o()])}}});const _=S(C);export{_ as L};
+import{c as u,e as d,l as f,n as l,d as m,f as y,w as S}from"./index-41fe9b4a.js";import{c as a,d as p,a as x}from"./index-2e65d505.js";const[g,r]=u("loading"),v=Array(12).fill(null).map((e,n)=>a("i",{class:r("line",String(n+1))},null)),z=a("svg",{class:r("circular"),viewBox:"25 25 50 50"},[a("circle",{cx:"50",cy:"50",r:"20",fill:"none"},null)]),I={size:l,type:m("circular"),color:String,vertical:Boolean,textSize:l,textColor:String};var C=p({name:g,props:I,setup(e,{slots:n}){const c=x(()=>d({color:e.color},f(e.size))),i=()=>{const t=e.type==="spinner"?v:z;return a("span",{class:r("spinner",e.type),style:c.value},[n.icon?n.icon():t])},o=()=>{var t;if(n.default)return a("span",{class:r("text"),style:{fontSize:y(e.textSize),color:(t=e.textColor)!=null?t:e.color}},[n.default()])};return()=>{const{type:t,vertical:s}=e;return a("div",{class:r([t,{vertical:s}]),"aria-live":"polite","aria-busy":!0},[i(),o()])}}});const _=S(C);export{_ as L};

+ 1 - 1
dist/assets/index-1d17d6ab.js → dist/assets/index-bf5bb4b8.js

@@ -1 +1 @@
-import{c as L,m as M,n as D,r as R,J as O,C as _,K as z,v as A,y as F,w as J}from"./index-9c6666b7.js";import{u as K}from"./index-5cb3ebbf.js";import{u as V}from"./use-scope-id-eeb8698e.js";import{d as X,r as v,D as $,a as x,c as p}from"./index-ba19c87a.js";import{c as j}from"./on-popup-reopen-d453be07.js";const[q,C]=L("swipe-cell"),G={name:M(""),disabled:Boolean,leftWidth:D,rightWidth:D,beforeClose:Function,stopPropagation:Boolean};var Q=X({name:q,props:G,emits:["open","close","click"],setup(t,{emit:i,slots:f}){let n,c,u,l;const d=v(),k=v(),w=v(),o=$({offset:0,dragging:!1}),r=K(),T=e=>e.value?z(e).width:0,g=x(()=>R(t.leftWidth)?+t.leftWidth:T(k)),h=x(()=>R(t.rightWidth)?+t.rightWidth:T(w)),W=e=>{o.offset=e==="left"?g.value:-h.value,n||(n=!0,i("open",{name:t.name,position:e}))},m=e=>{o.offset=0,n&&(n=!1,i("close",{name:t.name,position:e}))},B=e=>{const a=Math.abs(o.offset),s=.15,I=n?1-s:s,y=e==="left"?g.value:h.value;y&&a>y*I?W(e):m(e)},H=e=>{t.disabled||(u=o.offset,r.start(e))},N=e=>{if(t.disabled)return;const{deltaX:a}=r;r.move(e),r.isHorizontal()&&(c=!0,o.dragging=!0,(!n||a.value*u<0)&&A(e,t.stopPropagation),o.offset=F(a.value+u,-h.value,g.value))},b=()=>{o.dragging&&(o.dragging=!1,B(o.offset>0?"left":"right"),setTimeout(()=>{c=!1},0))},P=(e="outside")=>{l||(i("click",e),n&&!c&&(l=!0,j(t.beforeClose,{args:[{name:t.name,position:e}],done:()=>{l=!1,m(e)},canceled:()=>l=!1,error:()=>l=!1})))},S=(e,a)=>s=>{a&&s.stopPropagation(),P(e)},E=(e,a)=>{const s=f[e];if(s)return p("div",{ref:a,class:C(e),onClick:S(e,!0)},[s()])};return V({open:W,close:m}),O(d,()=>P("outside"),{eventName:"touchstart"}),_("touchmove",N,{target:d}),()=>{var e;const a={transform:`translate3d(${o.offset}px, 0, 0)`,transitionDuration:o.dragging?"0s":".6s"};return p("div",{ref:d,class:C(),onClick:S("cell",c),onTouchstartPassive:H,onTouchend:b,onTouchcancel:b},[p("div",{class:C("wrapper"),style:a},[E("left",k),(e=f.default)==null?void 0:e.call(f),E("right",w)])])}}});const oe=J(Q);export{oe as S};
+import{c as L,m as M,n as D,r as R,J as O,C as _,K as z,v as A,y as F,w as J}from"./index-41fe9b4a.js";import{u as K}from"./index-c8038c66.js";import{u as V}from"./use-scope-id-23b9d357.js";import{d as X,r as v,D as $,a as x,c as p}from"./index-2e65d505.js";import{c as j}from"./on-popup-reopen-3f924dd6.js";const[q,C]=L("swipe-cell"),G={name:M(""),disabled:Boolean,leftWidth:D,rightWidth:D,beforeClose:Function,stopPropagation:Boolean};var Q=X({name:q,props:G,emits:["open","close","click"],setup(t,{emit:i,slots:f}){let n,c,u,l;const d=v(),k=v(),w=v(),o=$({offset:0,dragging:!1}),r=K(),T=e=>e.value?z(e).width:0,g=x(()=>R(t.leftWidth)?+t.leftWidth:T(k)),h=x(()=>R(t.rightWidth)?+t.rightWidth:T(w)),W=e=>{o.offset=e==="left"?g.value:-h.value,n||(n=!0,i("open",{name:t.name,position:e}))},m=e=>{o.offset=0,n&&(n=!1,i("close",{name:t.name,position:e}))},B=e=>{const a=Math.abs(o.offset),s=.15,I=n?1-s:s,y=e==="left"?g.value:h.value;y&&a>y*I?W(e):m(e)},H=e=>{t.disabled||(u=o.offset,r.start(e))},N=e=>{if(t.disabled)return;const{deltaX:a}=r;r.move(e),r.isHorizontal()&&(c=!0,o.dragging=!0,(!n||a.value*u<0)&&A(e,t.stopPropagation),o.offset=F(a.value+u,-h.value,g.value))},b=()=>{o.dragging&&(o.dragging=!1,B(o.offset>0?"left":"right"),setTimeout(()=>{c=!1},0))},P=(e="outside")=>{l||(i("click",e),n&&!c&&(l=!0,j(t.beforeClose,{args:[{name:t.name,position:e}],done:()=>{l=!1,m(e)},canceled:()=>l=!1,error:()=>l=!1})))},S=(e,a)=>s=>{a&&s.stopPropagation(),P(e)},E=(e,a)=>{const s=f[e];if(s)return p("div",{ref:a,class:C(e),onClick:S(e,!0)},[s()])};return V({open:W,close:m}),O(d,()=>P("outside"),{eventName:"touchstart"}),_("touchmove",N,{target:d}),()=>{var e;const a={transform:`translate3d(${o.offset}px, 0, 0)`,transitionDuration:o.dragging?"0s":".6s"};return p("div",{ref:d,class:C(),onClick:S("cell",c),onTouchstartPassive:H,onTouchend:b,onTouchcancel:b},[p("div",{class:C("wrapper"),style:a},[E("left",k),(e=f.default)==null?void 0:e.call(f),E("right",w)])])}}});const oe=J(Q);export{oe as S};

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


+ 1 - 1
dist/assets/index-e4b0f3a8.js → dist/assets/index-c5ffe042.js

@@ -1 +1 @@
-import{r as y,u as L}from"./use-route-503f7a9f.js";import{c as D,e as I,d as B,n as o,t as V,b as u,r as s,I as b,w as _}from"./index-9c6666b7.js";import{d as q,c as a}from"./index-ba19c87a.js";const[z,r]=D("cell"),A={tag:B("div"),icon:String,size:String,title:o,value:o,label:o,center:Boolean,isLink:Boolean,border:V,iconPrefix:String,valueClass:u,labelClass:u,titleClass:u,titleStyle:null,arrowDirection:String,required:{type:[Boolean,String],default:null},clickable:{type:Boolean,default:null}},N=I({},A,y);var R=q({name:z,props:N,setup(e,{slots:l}){const v=L(),m=()=>{if(l.label||s(e.label))return a("div",{class:[r("label"),e.labelClass]},[l.label?l.label():e.label])},g=()=>{var n;if(l.title||s(e.title)){const t=(n=l.title)==null?void 0:n.call(l);return Array.isArray(t)&&t.length===0?void 0:a("div",{class:[r("title"),e.titleClass],style:e.titleStyle},[t||a("span",null,[e.title]),m()])}},h=()=>{const n=l.value||l.default;if(n||s(e.value))return a("div",{class:[r("value"),e.valueClass]},[n?n():a("span",null,[e.value])])},w=()=>{if(l.icon)return l.icon();if(e.icon)return a(b,{name:e.icon,class:r("left-icon"),classPrefix:e.iconPrefix},null)},C=()=>{if(l["right-icon"])return l["right-icon"]();if(e.isLink){const n=e.arrowDirection&&e.arrowDirection!=="right"?`arrow-${e.arrowDirection}`:"arrow";return a(b,{name:n,class:r("right-icon")},null)}};return()=>{var n;const{tag:t,size:i,center:P,border:S,isLink:k,required:x}=e,c=(n=e.clickable)!=null?n:k,d={center:P,required:!!x,clickable:c,borderless:!S};return i&&(d[i]=!!i),a(t,{class:r(d),role:c?"button":void 0,tabindex:c?0:void 0,onClick:v},{default:()=>{var f;return[w(),g(),h(),C(),(f=l.extra)==null?void 0:f.call(l)]}})}}});const E=_(R);export{E as C,A as c};
+import{r as y,u as L}from"./use-route-a3b990ac.js";import{c as D,e as I,d as B,n as o,t as V,b as u,r as s,I as b,w as _}from"./index-41fe9b4a.js";import{d as q,c as a}from"./index-2e65d505.js";const[z,r]=D("cell"),A={tag:B("div"),icon:String,size:String,title:o,value:o,label:o,center:Boolean,isLink:Boolean,border:V,iconPrefix:String,valueClass:u,labelClass:u,titleClass:u,titleStyle:null,arrowDirection:String,required:{type:[Boolean,String],default:null},clickable:{type:Boolean,default:null}},N=I({},A,y);var R=q({name:z,props:N,setup(e,{slots:l}){const v=L(),m=()=>{if(l.label||s(e.label))return a("div",{class:[r("label"),e.labelClass]},[l.label?l.label():e.label])},g=()=>{var n;if(l.title||s(e.title)){const t=(n=l.title)==null?void 0:n.call(l);return Array.isArray(t)&&t.length===0?void 0:a("div",{class:[r("title"),e.titleClass],style:e.titleStyle},[t||a("span",null,[e.title]),m()])}},h=()=>{const n=l.value||l.default;if(n||s(e.value))return a("div",{class:[r("value"),e.valueClass]},[n?n():a("span",null,[e.value])])},w=()=>{if(l.icon)return l.icon();if(e.icon)return a(b,{name:e.icon,class:r("left-icon"),classPrefix:e.iconPrefix},null)},C=()=>{if(l["right-icon"])return l["right-icon"]();if(e.isLink){const n=e.arrowDirection&&e.arrowDirection!=="right"?`arrow-${e.arrowDirection}`:"arrow";return a(b,{name:n,class:r("right-icon")},null)}};return()=>{var n;const{tag:t,size:i,center:P,border:S,isLink:k,required:x}=e,c=(n=e.clickable)!=null?n:k,d={center:P,required:!!x,clickable:c,borderless:!S};return i&&(d[i]=!!i),a(t,{class:r(d),role:c?"button":void 0,tabindex:c?0:void 0,onClick:v},{default:()=>{var f;return[w(),g(),h(),C(),(f=l.extra)==null?void 0:f.call(l)]}})}}});const E=_(R);export{E as C,A as c};

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


+ 1 - 1
dist/assets/index-eb57ff01.js → dist/assets/index-d60c87bc.js

@@ -1 +1 @@
-import{d as S,c as t,M as k}from"./index-ba19c87a.js";import{c as x,t as B,d as I,I as P,w as T}from"./index-9c6666b7.js";import{H as h}from"./constant-eba5e2d8.js";const[p,r]=x("tag"),v={size:String,mark:Boolean,show:B,type:I("default"),color:String,plain:Boolean,round:Boolean,textColor:String,closeable:Boolean};var w=S({name:p,props:v,emits:["close"],setup(o,{slots:n,emit:s}){const c=e=>{e.stopPropagation(),s("close",e)},i=()=>o.plain?{color:o.textColor||o.color,borderColor:o.color}:{color:o.textColor,background:o.color},d=()=>{var e;const{type:m,mark:u,plain:f,round:g,size:a,closeable:C}=o,l={mark:u,plain:f,round:g};a&&(l[a]=a);const b=C&&t(P,{name:"cross",class:[r("close"),h],onClick:c},null);return t("span",{style:i(),class:r([l,m])},[(e=n.default)==null?void 0:e.call(n),b])};return()=>t(k,{name:o.closeable?"van-fade":void 0},{default:()=>[o.show?d():null]})}});const A=T(w);export{A as T};
+import{d as S,c as t,M as k}from"./index-2e65d505.js";import{c as x,t as B,d as I,I as P,w as T}from"./index-41fe9b4a.js";import{H as h}from"./constant-eba5e2d8.js";const[p,r]=x("tag"),v={size:String,mark:Boolean,show:B,type:I("default"),color:String,plain:Boolean,round:Boolean,textColor:String,closeable:Boolean};var w=S({name:p,props:v,emits:["close"],setup(o,{slots:n,emit:s}){const c=e=>{e.stopPropagation(),s("close",e)},i=()=>o.plain?{color:o.textColor||o.color,borderColor:o.color}:{color:o.textColor,background:o.color},d=()=>{var e;const{type:m,mark:u,plain:f,round:g,size:a,closeable:C}=o,l={mark:u,plain:f,round:g};a&&(l[a]=a);const b=C&&t(P,{name:"cross",class:[r("close"),h],onClick:c},null);return t("span",{style:i(),class:r([l,m])},[(e=n.default)==null?void 0:e.call(n),b])};return()=>t(k,{name:o.closeable?"van-fade":void 0},{default:()=>[o.show?d():null]})}});const A=T(w);export{A as T};

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


+ 1 - 1
dist/assets/index-b30dafa0.js → dist/assets/index-ec22364e.js

@@ -1 +1 @@
-import{a as m}from"./axios-9cbf0d09.js";import{q as f,U as u}from"./index-ba19c87a.js";import{s as l}from"./function-call-17d6ed33.js";const a=f(),i=m.create({baseURL:"/forward-service",timeout:1e4}),h=function(c,r,s){const{url:o,data:e}=c;i.post(o,e,{headers:{token:a.token}}).then(t=>{const n=t.data;n.code==0?r&&r(n):n.code==3?a.isLogin=!1:s&&s(n.msg)},t=>{s&&s(t.message)}).catch(t=>{console.log(t)})},k=function(c){const{url:r,data:s}=c;return i.post(r,s,{headers:{token:a.token}}).then(o=>{const e=o.data;if(e.code==0)return Promise.resolve(e);if(e.code==3)console.log(e),a.isLogin=!1,l({message:e.msg,onClose:()=>{u()}});else return Promise.reject(e.msg)},o=>Promise.reject(o.message))};export{h as a,k as p};
+import{a as m}from"./axios-9cbf0d09.js";import{q as f,U as u}from"./index-2e65d505.js";import{s as l}from"./function-call-ac4377ab.js";const a=f(),i=m.create({baseURL:"/forward-service",timeout:1e4}),h=function(c,r,s){const{url:o,data:e}=c;i.post(o,e,{headers:{token:a.token}}).then(t=>{const n=t.data;n.code==0?r&&r(n):n.code==3?a.isLogin=!1:s&&s(n.msg)},t=>{s&&s(t.message)}).catch(t=>{console.log(t)})},k=function(c){const{url:r,data:s}=c;return i.post(r,s,{headers:{token:a.token}}).then(o=>{const e=o.data;if(e.code==0)return Promise.resolve(e);if(e.code==3)console.log(e),a.isLogin=!1,l({message:e.msg,onClose:()=>{u()}});else return Promise.reject(e.msg)},o=>Promise.reject(o.message))};export{h as a,k as p};

+ 1 - 1
dist/assets/mount-component-6050520d.js → dist/assets/mount-component-731e8ea5.js

@@ -1 +1 @@
-import{X as r,D as u}from"./index-ba19c87a.js";import{e as a}from"./index-9c6666b7.js";import{u as m}from"./use-scope-id-eeb8698e.js";function d(){const e=u({show:!1}),t=n=>{e.show=n},o=n=>{a(e,n,{transitionAppear:!0}),t(!0)},s=()=>t(!1);return m({open:o,close:s,toggle:t}),{open:o,close:s,state:e,toggle:t}}function f(e){const t=r(e),o=document.createElement("div");return document.body.appendChild(o),{instance:t.mount(o),unmount(){t.unmount(),document.body.removeChild(o)}}}export{f as m,d as u};
+import{X as r,D as u}from"./index-2e65d505.js";import{e as a}from"./index-41fe9b4a.js";import{u as m}from"./use-scope-id-23b9d357.js";function d(){const e=u({show:!1}),t=n=>{e.show=n},o=n=>{a(e,n,{transitionAppear:!0}),t(!0)},s=()=>t(!1);return m({open:o,close:s,toggle:t}),{open:o,close:s,state:e,toggle:t}}function f(e){const t=r(e),o=document.createElement("div");return document.body.appendChild(o),{instance:t.mount(o),unmount(){t.unmount(),document.body.removeChild(o)}}}export{f as m,d as u};

+ 1 - 1
dist/assets/on-popup-reopen-d453be07.js → dist/assets/on-popup-reopen-3f924dd6.js

@@ -1 +1 @@
-import{Q as a,h as n}from"./index-9c6666b7.js";import{Y as e,w as r}from"./index-ba19c87a.js";function c(s,{args:t=[],done:o,canceled:i,error:p}){if(s){const f=s.apply(null,t);a(f)?f.then(l=>{l?o():i&&i()}).catch(p||n):f?o():i&&i()}else o()}const u=Symbol();function h(s){const t=e(u,null);t&&r(t,o=>{o&&s()})}export{u as P,c,h as o};
+import{Q as a,h as n}from"./index-41fe9b4a.js";import{Y as e,w as r}from"./index-2e65d505.js";function c(s,{args:t=[],done:o,canceled:i,error:p}){if(s){const f=s.apply(null,t);a(f)?f.then(l=>{l?o():i&&i()}).catch(p||n):f?o():i&&i()}else o()}const u=Symbol();function h(s){const t=e(u,null);t&&r(t,o=>{o&&s()})}export{u as P,c,h as o};

+ 1 - 1
dist/assets/request-a7e61e33.js → dist/assets/request-45f793bd.js

@@ -1 +1 @@
-import{a as s}from"./axios-9cbf0d09.js";import{N as n}from"./index-ba19c87a.js";const c=n("localStore",{state:()=>({username:"",password:"",rememberPassword:!0,token:""}),persist:{enabled:!0,encryptionKey:"nfgj",storage:localStorage}}),a="https://www.huifutiancai.com/huishou-service",r=c(),t=s.create({baseURL:a,timeout:5e3});t.interceptors.request.use(function(e){return r.token&&(e.headers.accessToken=r.token),e},function(e){return Promise.reject(e)});t.interceptors.response.use(function(e){return e},function(e){return Promise.reject(e)});const p=function(e,o){return t.post(e,o)};export{p,c as u};
+import{a as s}from"./axios-9cbf0d09.js";import{N as n}from"./index-2e65d505.js";const c=n("localStore",{state:()=>({username:"",password:"",rememberPassword:!0,token:""}),persist:{enabled:!0,encryptionKey:"nfgj",storage:localStorage}}),a="https://www.huifutiancai.com/huishou-service",r=c(),t=s.create({baseURL:a,timeout:5e3});t.interceptors.request.use(function(e){return r.token&&(e.headers.accessToken=r.token),e},function(e){return Promise.reject(e)});t.interceptors.response.use(function(e){return e},function(e){return Promise.reject(e)});const p=function(e,o){return t.post(e,o)};export{p,c as u};

+ 1 - 1
dist/assets/use-placeholder-eccc25ce.js → dist/assets/use-placeholder-06c0a3a8.js

@@ -1 +1 @@
-import{N as r,L as h,K as n}from"./index-9c6666b7.js";import{o as u}from"./on-popup-reopen-d453be07.js";import{r as c,o as l,A as a,w as d,c as p}from"./index-ba19c87a.js";const f=(o,s)=>{const t=c(),e=()=>{t.value=n(o).height};return l(()=>{if(a(e),s)for(let i=1;i<=3;i++)setTimeout(e,100*i)}),u(()=>a(e)),d([r,h],e),t};function v(o,s){const t=f(o,!0);return e=>p("div",{class:s("placeholder"),style:{height:t.value?`${t.value}px`:void 0}},[e()])}export{v as u};
+import{N as r,L as h,K as n}from"./index-41fe9b4a.js";import{o as u}from"./on-popup-reopen-3f924dd6.js";import{r as c,o as l,A as a,w as d,c as p}from"./index-2e65d505.js";const f=(o,s)=>{const t=c(),e=()=>{t.value=n(o).height};return l(()=>{if(a(e),s)for(let i=1;i<=3;i++)setTimeout(e,100*i)}),u(()=>a(e)),d([r,h],e),t};function v(o,s){const t=f(o,!0);return e=>p("div",{class:s("placeholder"),style:{height:t.value?`${t.value}px`:void 0}},[e()])}export{v as u};

+ 1 - 1
dist/assets/use-route-503f7a9f.js → dist/assets/use-route-a3b990ac.js

@@ -1 +1 @@
-import{g as n}from"./index-ba19c87a.js";const a={to:[String,Object],url:String,replace:Boolean};function c({to:e,url:o,replace:t,$router:r}){e&&r?r[t?"replace":"push"](e):o&&(t?location.replace(o):location.href=o)}function i(){const e=n().proxy;return()=>c(e)}export{a as r,i as u};
+import{g as n}from"./index-2e65d505.js";const a={to:[String,Object],url:String,replace:Boolean};function c({to:e,url:o,replace:t,$router:r}){e&&r?r[t?"replace":"push"](e):o&&(t?location.replace(o):location.href=o)}function i(){const e=n().proxy;return()=>c(e)}export{a as r,i as u};

+ 1 - 0
dist/assets/use-scope-id-23b9d357.js

@@ -0,0 +1 @@
+import{e as s}from"./index-41fe9b4a.js";import{g as o}from"./index-2e65d505.js";function a(n){const e=o();e&&s(e.proxy,n)}const c=()=>{var n;const{scopeId:e}=((n=o())==null?void 0:n.vnode)||{};return e?{[e]:""}:null};export{c as a,a as u};

+ 0 - 1
dist/assets/use-scope-id-eeb8698e.js

@@ -1 +0,0 @@
-import{e as s}from"./index-9c6666b7.js";import{g as o}from"./index-ba19c87a.js";function a(n){const e=o();e&&s(e.proxy,n)}const c=()=>{var n;const{scopeId:e}=((n=o())==null?void 0:n.vnode)||{};return e?{[e]:""}:null};export{c as a,a as u};

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


文件差异内容过多而无法显示
+ 0 - 0
dist/assets/vue-qrcode-reader-1477bfa1.js


+ 1 - 1
dist/index.html

@@ -7,7 +7,7 @@
     <meta name="viewport" content="width=device-width, initial-scale=1.0, user-scalable=no" />
     <title>驼人物联网平台</title>
     <script type="text/javascript" src="//api.map.baidu.com/api?type=webgl&v=1.0&ak=r6wmhUcG2BBUmqP4OjRlxLOMbQ3F1Ptn"></script>
-    <script type="module" crossorigin src="/wap/assets/index-ba19c87a.js"></script>
+    <script type="module" crossorigin src="/wap/assets/index-2e65d505.js"></script>
     <link rel="stylesheet" href="/wap/assets/index-6c308dfb.css">
   </head>
   <body>

+ 3 - 3
src/pages/device/ascend/Index.vue

@@ -51,7 +51,7 @@
 
 
     <div style="padding: 0px 20px; margin-top: 30px;">
-      <van-button type="primary" block size="large" round @click="onToHome">工作台</van-button>
+      <van-button type="primary" block size="large" round @click="onToDeviceDetail">查看设备详情</van-button>
     </div>
 
   </div>
@@ -67,8 +67,8 @@
   // 路由
   const router = useRouter();
 
-  const onToHome = () =>  {
-    router.push('/home');
+  const onToDeviceDetail = () =>  {
+    router.push('/device/detail/' + deviceId.value);
   }
 
   const onToArticle = () => {

+ 72 - 61
src/pages/device/detail/Index.vue

@@ -4,7 +4,7 @@
     height: 100vh;">
 
     <!-- 导航 -->
-    <CusNavigation ref="cusNavigation" gobackabled title="设备详情" searchabled>
+    <CusNavigation ref="cusNavigation" gobackabled title="设备详情" :searchabled="searchabled" plusabled>
       <!-- 搜索 -->
       <template #search>
         <div style="padding: 16px;">
@@ -28,80 +28,84 @@
           </div>
         </div>
       </template>
+      <!-- 更多 -->
+      <template #plus>
+        <div style="padding: 16px;">
+          <div style="margin-top: 10px;">
+            <van-button type="primary" size="normal" round block @click="onDisplay">切换布局</van-button>
+          </div>
+        </div>
+      </template>
     </CusNavigation>
 
 
     <div class="container" style="overflow-y: auto; flex-grow: 1; background-color: #F7F8FA;">
       <van-pull-refresh style="min-height: 100%;" v-model="refreshing" @refresh="onRefresh">
 
-        <van-swipe-cell style="background-color: #fff; margin-bottom: 10px;">
-          <van-cell clickable>
-            <div style="text-align: left;">
-              <!-- <div>{{ device }}</div> -->
-              <!-- 第一行 -->
-              <div style="display: flex; justify-content: space-between; margin-bottom: 5px;">
-                <div style="color: #000; font-weight: bold; font-size: 1.1rem;">
-                  <span>{{ deviceId }}</span>
-                </div>
-                <div style="font-size: 0.9rem;">设备编号</div>
-              </div>
-              <!-- 第二行 -->
-              <div style="display: flex; justify-content: space-between;">
-                <div style="font-weight: bold; font-size: 0.9rem; height: 31px;">
-                  <span>{{ device?.modifytime }}</span>
+        <template v-if="displayType">
+          123456
+        </template>
+        <template v-else>
+          <van-swipe-cell style="background-color: #fff; margin-bottom: 10px;">
+            <van-cell clickable>
+              <div style="text-align: left;">
+                <!-- <div>{{ device }}</div> -->
+                <!-- 第一行 -->
+                <div style="display: flex; justify-content: space-between; margin-bottom: 5px;">
+                  <div style="color: #000; font-weight: bold; font-size: 1.1rem;">
+                    <span>{{ deviceId }}</span>
+                  </div>
+                  <div style="font-size: 0.9rem;">设备编号</div>
                 </div>
-                <!-- <div style="display: flex; color: #aaa;">
-                  <div>
-                    <van-icon name="static/images/icon-check.png" size="1.5rem" />
+                <!-- 第二行 -->
+                <div style="display: flex; justify-content: space-between;">
+                  <div style="font-weight: bold; font-size: 0.9rem; height: 31px;">
+                    <span>{{ device?.modifytime }}</span>
                   </div>
-                  <div style="margin-left: 3px; font-size: 1rem;">查看数据</div>
-                </div> -->
-              </div>
-              
-            </div>
-          </van-cell>
-        </van-swipe-cell>
-
-        <van-swipe-cell v-for="item in showProperties" style="background-color: #fff; margin-bottom: 10px;">
-          <van-cell clickable>
-            <div style="text-align: left;">
-              <!-- <div>{{ item }}</div> -->
-              <!-- 第一行 -->
-              <div style="display: flex; justify-content: space-between; margin-bottom: 5px;">
-                <div style="color: #000; font-weight: bold; font-size: 1.1rem;">
-                  <span>{{item.value}}</span>
-                  <span v-if="item.model.type == 'enum'" style="margin-left: 5px;">
-                    <span>(</span>
-                    <span>{{ item.model.define.range[item.value] }}</span>
-                    <span>)</span>
-                  </span>
                 </div>
-                <div style="font-size: 0.9rem;">{{ item.name }}</div>
               </div>
-              <!-- 第二行 -->
-              <div style="display: flex; justify-content: space-between;">
-                <div style="font-weight: bold; font-size: 0.9rem;">
-                  <span>{{ item.date }}</span>
+            </van-cell>
+          </van-swipe-cell>
+          <van-swipe-cell v-for="item in showProperties" style="background-color: #fff; margin-bottom: 10px;">
+            <van-cell clickable>
+              <div style="text-align: left;">
+                <!-- <div>{{ item }}</div> -->
+                <!-- 第一行 -->
+                <div style="display: flex; justify-content: space-between; margin-bottom: 5px;">
+                  <div style="color: #000; font-weight: bold; font-size: 1.1rem;">
+                    <span>{{item.value}}</span>
+                    <span v-if="item.model.type == 'enum'" style="margin-left: 5px;">
+                      <span>(</span>
+                      <span>{{ item.model.define.range[item.value] }}</span>
+                      <span>)</span>
+                    </span>
+                  </div>
+                  <div style="font-size: 0.9rem;">{{ item.name }}</div>
                 </div>
-                <div style="display: flex; color: #000;">
-                  <div>
-                    <van-icon name="static/images/icon-check.png" size="1.5rem" />
+                <!-- 第二行 -->
+                <div style="display: flex; justify-content: space-between;">
+                  <div style="font-weight: bold; font-size: 0.9rem;">
+                    <span>{{ item.date }}</span>
+                  </div>
+                  <div style="display: flex; color: #000;">
+                    <div>
+                      <van-icon name="static/images/icon-check.png" size="1.5rem" />
+                    </div>
+                    <div style="margin-left: 3px; font-size: 1rem;">查看数据</div>
                   </div>
-                  <div style="margin-left: 3px; font-size: 1rem;">查看数据</div>
                 </div>
+                
               </div>
-              
+            </van-cell>
+          </van-swipe-cell>
+          <!-- 数据提示 -->
+          <div>
+            <div v-if="refreshing"></div>
+            <div v-else-if="showProperties.length == 0" style="text-align: center; padding: 20px; color: #ccc;">
+              <span>暂无数据</span>
             </div>
-          </van-cell>
-        </van-swipe-cell>
-
-        <!-- 数据提示 -->
-        <div>
-          <div v-if="refreshing"></div>
-          <div v-else-if="showProperties.length == 0" style="text-align: center; padding: 20px; color: #ccc;">
-            <span>暂无数据</span>
           </div>
-        </div>
+        </template>
 
       </van-pull-refresh>
       <!-- 返回顶部 -->
@@ -121,8 +125,15 @@ import { CusNavigation } from '@/components'
 import { timestampToTime } from '@/utils'
 import { showToast } from 'vant';
 
+const searchabled = ref(false);
 
-
+// 布局
+const displayType = ref(true);
+const onDisplay = () => {
+  displayType.value = !displayType.value
+  searchabled.value = !displayType.value
+  cusNavigation.value.closePlusPopup();
+}
 
 
 
@@ -279,7 +290,7 @@ const refreshList = async () => {
   .catch((msg: any) => {
     if(msg != 'ok'){
       console.log(msg)
-      showToast('msg');
+      showToast(msg);
     }
   })
 

+ 5 - 1
src/router/index.ts

@@ -138,7 +138,7 @@ export default router
 const title = "驼人物联网平台";
 const loginPath = '/login';
 const ascendPath = '/device/ascend';
-const accessList = [loginPath, '/register', '/findpassword', '/demo'];
+const accessList = [loginPath, '/register', '/findpassword', '/demo', 'article'];
 router.beforeEach((to, from) => {
   const userInfo = useStoreOfUserInfo();
   console.log('导航守卫', to, from);
@@ -165,6 +165,10 @@ router.beforeEach((to, from) => {
   if(to.path.includes(ascendPath)){
     return;
   }
+  // 判断文章详情页
+  if(to.path.includes("/article/detail")){
+    return;
+  }
   return {
     path: loginPath
   };

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