2.18

dist/assets/Login-CYs9f3M2.js

@@ -1 +1 @@
-import{d as x,u as V,a as h,r as c,b as d,o as I,t as b,c as k,e as s,w as f,v as g,f as u,g as S,h as v,i as w,j as y,E as F,k as B,l as C,m as _,_ as N}from"./index-CV-n4caa.js";import{_ as L,s as U}from"./sha1-CSjfys27.js";const E={id:"login"},T={class:"loginCon"},j={slot:"header",class:"clearfix formTitlt"},q={class:"inputLine"},z={class:"inputItem"},K={class:"inputItem",style:{"margin-bottom":"10px"}},M={class:"checkBox"},O=x({__name:"Login",setup(P){let m=V();h();let n=c({ruleForm:{username:"",pwd:""}});const r=d(!1),i=d(!1);I(()=>{let l=localStorage.getItem("username"),e=localStorage.getItem("pwd");l&&(n.ruleForm.username=l,r.value=!0),e&&(n.ruleForm.pwd=e,i.value=!0)});let{ruleForm:a}=b(n);c({username:[{required:!0,message:"账号不能为空",trigger:"blur"}],pwd:[{validator:(l,e,t)=>{e===""?t("请输入正确密码"):t()},trigger:"blur",required:!0}]}),d();const p=()=>{const l=U(a.value.pwd);y({password:l,username:a.value.username}).then(e=>{if(e.code===200){sessionStorage.setItem("token",e.data.token);const t=JSON.stringify(e.data.userVO);sessionStorage.setItem("userInfo",t),r&&localStorage.setItem("username",n.ruleForm.username),i&&localStorage.setItem("pwd",n.ruleForm.pwd),m.push("/home/index")}else m.push("/home/index"),F({title:"错误",message:e.message,duration:3e3})})};return(l,e)=>{const t=B("el-checkbox");return C(),k("div",E,[s("div",T,[s("div",j,[e[7]||(e[7]=s("view",{class:"loginSpan"},[s("img",{src:L}),s("span",null,"欢迎登录")],-1)),s("view",q,[s("view",z,[f(s("input",{placeholder:"请输入账号","placeholder-style":"font-size: 14px;color: #949494;",class:"userInput input","onUpdate:modelValue":e[0]||(e[0]=o=>u(a).username=o)},null,512),[[g,u(a).username]])]),s("view",K,[f(s("input",{placeholder:"请输入密码",type:"password","placeholder-style":"font-size: 14px;color: #949494;",class:"userInput input","onUpdate:modelValue":e[1]||(e[1]=o=>u(a).pwd=o),onKeyup:S(p,["enter","native"])},null,544),[[g,u(a).pwd]])])]),s("view",M,[v(t,{modelValue:r.value,"onUpdate:modelValue":e[2]||(e[2]=o=>r.value=o)},{default:w(()=>e[4]||(e[4]=[_("记住账号")])),_:1},8,["modelValue"]),v(t,{modelValue:i.value,"onUpdate:modelValue":e[3]||(e[3]=o=>i.value=o)},{default:w(()=>e[5]||(e[5]=[_("记住密码")])),_:1},8,["modelValue"])]),s("view",{class:"loginButton",onClick:p},e[6]||(e[6]=[s("button",{class:"button"},"登录",-1)]))])])])}}}),J=N(O,[["__scopeId","data-v-f9ebbb27"]]);export{J as default};
+import{d as x,u as V,a as h,r as c,b as d,o as I,t as b,c as k,e as s,w as f,v as g,f as u,g as S,h as v,i as w,j as y,E as F,k as B,l as C,m as _,_ as N}from"./index-CssZNYL_.js";import{_ as L,s as U}from"./sha1-DCCrd4Bj.js";const E={id:"login"},T={class:"loginCon"},j={slot:"header",class:"clearfix formTitlt"},q={class:"inputLine"},z={class:"inputItem"},K={class:"inputItem",style:{"margin-bottom":"10px"}},M={class:"checkBox"},O=x({__name:"Login",setup(P){let m=V();h();let n=c({ruleForm:{username:"",pwd:""}});const r=d(!1),i=d(!1);I(()=>{let l=localStorage.getItem("username"),e=localStorage.getItem("pwd");l&&(n.ruleForm.username=l,r.value=!0),e&&(n.ruleForm.pwd=e,i.value=!0)});let{ruleForm:a}=b(n);c({username:[{required:!0,message:"账号不能为空",trigger:"blur"}],pwd:[{validator:(l,e,t)=>{e===""?t("请输入正确密码"):t()},trigger:"blur",required:!0}]}),d();const p=()=>{const l=U(a.value.pwd);y({password:l,username:a.value.username}).then(e=>{if(e.code===200){sessionStorage.setItem("token",e.data.token);const t=JSON.stringify(e.data.userVO);sessionStorage.setItem("userInfo",t),r&&localStorage.setItem("username",n.ruleForm.username),i&&localStorage.setItem("pwd",n.ruleForm.pwd),m.push("/home/index")}else m.push("/home/index"),F({title:"错误",message:e.message,duration:3e3})})};return(l,e)=>{const t=B("el-checkbox");return C(),k("div",E,[s("div",T,[s("div",j,[e[7]||(e[7]=s("view",{class:"loginSpan"},[s("img",{src:L}),s("span",null,"欢迎登录")],-1)),s("view",q,[s("view",z,[f(s("input",{placeholder:"请输入账号","placeholder-style":"font-size: 14px;color: #949494;",class:"userInput input","onUpdate:modelValue":e[0]||(e[0]=o=>u(a).username=o)},null,512),[[g,u(a).username]])]),s("view",K,[f(s("input",{placeholder:"请输入密码",type:"password","placeholder-style":"font-size: 14px;color: #949494;",class:"userInput input","onUpdate:modelValue":e[1]||(e[1]=o=>u(a).pwd=o),onKeyup:S(p,["enter","native"])},null,544),[[g,u(a).pwd]])])]),s("view",M,[v(t,{modelValue:r.value,"onUpdate:modelValue":e[2]||(e[2]=o=>r.value=o)},{default:w(()=>e[4]||(e[4]=[_("记住账号")])),_:1},8,["modelValue"]),v(t,{modelValue:i.value,"onUpdate:modelValue":e[3]||(e[3]=o=>i.value=o)},{default:w(()=>e[5]||(e[5]=[_("记住密码")])),_:1},8,["modelValue"])]),s("view",{class:"loginButton",onClick:p},e[6]||(e[6]=[s("button",{class:"button"},"登录",-1)]))])])])}}}),J=N(O,[["__scopeId","data-v-f9ebbb27"]]);export{J as default};

dist/assets/index-BEb8PyCV.js

@@ -1 +0,0 @@
-/* empty css                                                              */import{d as B,r as D,b as d,o as I,a4 as y,c as C,e as l,h as t,i,k as n,l as N,_ as P}from"./index-CV-n4caa.js";const M={class:"TableBoxPadding"},W={class:"table-header TableMarginBottom"},Y={class:"TableFrom"},z={class:"formLine"},R={style:{"margin-top":"7px"}},S={class:"Table"},U={class:"example-pagination-block"},F=B({__name:"index",setup(L){const a=D({gasWellName:"",startTime:"",endTime:"",deviceId:""});d();const u=d(),_=d([]);d(!1),I(()=>{c({currentPage:1,pageSize:10})});const m=d(),b=o=>{a.startTime=o[0],a.endTime=o[1]},v=o=>{const e=new Date;return o.getTime()>e.getTime()},c=async o=>{let e=await y(o);e.code===200&&(_.value=e.data.records,u.value=e.total)},f=(o,e)=>{c({currentPage:o,pageSize:e,...a})},h=async()=>{c({currentPage:1,pageSize:10,...a})},w=()=>{a.gasWellName="",a.startTime="",a.endTime="",a.deviceId="",m.value="",c({currentPage:1,pageSize:10})};return(o,e)=>{const g=n("el-input"),p=n("el-form-item"),T=n("el-date-picker"),V=n("el-form"),r=n("el-table-column"),x=n("el-table"),k=n("el-pagination");return N(),C("view",M,[l("view",W,[e[3]||(e[3]=l("view",{class:"TableHeaderTitle TableMarginBottom"},[l("text",null,"提醒记录")],-1)),l("view",Y,[l("view",z,[t(V,{inline:!0,model:a,class:"demo-form-inline"},{default:i(()=>[t(p,{label:"气井名称："},{default:i(()=>[t(g,{modelValue:a.gasWellName,"onUpdate:modelValue":e[0]||(e[0]=s=>a.gasWellName=s),placeholder:"请输入",clearable:""},null,8,["modelValue"])]),_:1}),t(p,{label:"设备ID："},{default:i(()=>[t(g,{modelValue:a.deviceId,"onUpdate:modelValue":e[1]||(e[1]=s=>a.deviceId=s),placeholder:"请输入",clearable:""},null,8,["modelValue"])]),_:1}),l("view",R,[t(p,{label:"时间范围："},{default:i(()=>[t(T,{modelValue:m.value,"onUpdate:modelValue":e[2]||(e[2]=s=>m.value=s),clearable:!1,type:"daterange","range-separator":"到","start-placeholder":"开始时间","end-placeholder":"结束时间","value-format":"YYYY-MM-DD hh:mm:ss ",onChange:b,"disabled-date":v},null,8,["modelValue"])]),_:1})])]),_:1},8,["model"])]),l("view",{class:"FormButton"},[l("button",{class:"Button",onClick:h},"搜索"),l("button",{class:"ButtonInfo",onClick:w},"重置")])])]),l("view",S,[t(x,{"header-cell-style":{background:"#eef1f6"},data:_.value,style:{width:"100%"},height:"500"},{default:i(()=>[t(r,{prop:"deviceId",label:"设备编码",width:"220"}),t(r,{prop:"gasWell.name",label:"所属气井",width:"220"}),t(r,{prop:"content","show-overflow-tooltip":"",label:"提醒信息",width:"500"}),t(r,{prop:"createTime",label:"提醒时间",width:"300"})]),_:1},8,["data"]),l("div",U,[t(k,{onChange:f,total:u.value},null,8,["total"])])])])}}}),j=P(F,[["__scopeId","data-v-bc96be27"]]);export{j as default};

dist/assets/index-BVTvKRWz.css

@@ -0,0 +1 @@
+.table-header[data-v-930072e8]{margin-bottom:30px}.el-form-item[data-v-930072e8]{margin-bottom:0}.el-form-item[data-v-cf5f92ea][data-v-930072e8]{margin-bottom:20px}

dist/assets/index-BhopNcvX.js

@@ -1 +1 @@
-import{d as _,b as d,o as h,B as m,l as o,c as r,k as u,e as n,h as l,i as f,m as v,q as w,_ as p,F as x,n as g,C}from"./index-CV-n4caa.js";import{i as D}from"./index-CUeaqhHS.js";const b=_({__name:"echartsPie",props:{chartsData:{}},setup(i){const t=d();let a=d(null);const e=i,s=()=>{if(t.value){a=D(t.value);const c={legend:{orient:"vertical",left:"left",width:"20px",top:"5%"},tooltip:{trigger:"item",formatter:"{b0}: {c0}<br/> 占比：{d}%",position:["50%","50%"]},series:[{name:e.chartsData.title,type:"pie",radius:["40%","70%"],center:["60%","40%"],data:e.chartsData.data,label:{formatter:"{b0}: {c0}  "},labelLine:{length:6}}]};a.setOption(c)}};return h(()=>{s()}),m(()=>e.chartsData,()=>{s()},{immediate:!0}),(c,R)=>(o(),r("div",{ref_key:"chartRef",ref:t,style:{height:"240px",width:"100%"}},null,512))}}),y={class:"cardShadow"},k={class:"header"},B={id:"container"},$={class:"charts"},N=_({__name:"echartsCard",props:{data:{}},setup(i){const t=i;return h(()=>{}),(a,e)=>{const s=u("el-text");return o(),r("view",y,[n("view",k,[l(s,{class:"mx",size:"large"},{default:f(()=>[v(w(t.data.title),1)]),_:1})]),n("view",B,[n("view",$,[l(b,{chartsData:a.data},null,8,["chartsData"])])])])}}}),I=p(N,[["__scopeId","data-v-84ccb7ec"]]),V={class:"CommonBacCor"},E={class:"container"},F={class:"card1"},L=_({__name:"index",setup(i){const t=d(),a=async()=>{let e=await C();e.code==200&&(t.value=e.data)};return h(()=>{a()}),(e,s)=>(o(),r("view",V,[n("view",E,[(o(!0),r(x,null,g(t.value,c=>(o(),r("view",{class:"width",key:c.chartName},[n("view",F,[l(I,{data:c},null,8,["data"])])]))),128))])]))}}),z=p(L,[["__scopeId","data-v-f1288da3"]]);export{z as default};
+import{d as _,b as d,o as h,B as m,l as o,c as r,k as u,e as n,h as l,i as f,m as v,q as w,_ as p,F as x,n as g,C}from"./index-CssZNYL_.js";import{i as D}from"./index-CUeaqhHS.js";const b=_({__name:"echartsPie",props:{chartsData:{}},setup(i){const t=d();let a=d(null);const e=i,s=()=>{if(t.value){a=D(t.value);const c={legend:{orient:"vertical",left:"left",width:"20px",top:"5%"},tooltip:{trigger:"item",formatter:"{b0}: {c0}<br/> 占比：{d}%",position:["50%","50%"]},series:[{name:e.chartsData.title,type:"pie",radius:["40%","70%"],center:["60%","40%"],data:e.chartsData.data,label:{formatter:"{b0}: {c0}  "},labelLine:{length:6}}]};a.setOption(c)}};return h(()=>{s()}),m(()=>e.chartsData,()=>{s()},{immediate:!0}),(c,R)=>(o(),r("div",{ref_key:"chartRef",ref:t,style:{height:"240px",width:"100%"}},null,512))}}),y={class:"cardShadow"},k={class:"header"},B={id:"container"},$={class:"charts"},N=_({__name:"echartsCard",props:{data:{}},setup(i){const t=i;return h(()=>{}),(a,e)=>{const s=u("el-text");return o(),r("view",y,[n("view",k,[l(s,{class:"mx",size:"large"},{default:f(()=>[v(w(t.data.title),1)]),_:1})]),n("view",B,[n("view",$,[l(b,{chartsData:a.data},null,8,["chartsData"])])])])}}}),I=p(N,[["__scopeId","data-v-84ccb7ec"]]),V={class:"CommonBacCor"},E={class:"container"},F={class:"card1"},L=_({__name:"index",setup(i){const t=d(),a=async()=>{let e=await C();e.code==200&&(t.value=e.data)};return h(()=>{a()}),(e,s)=>(o(),r("view",V,[n("view",E,[(o(!0),r(x,null,g(t.value,c=>(o(),r("view",{class:"width",key:c.chartName},[n("view",F,[l(I,{data:c},null,8,["data"])])]))),128))])]))}}),z=p(L,[["__scopeId","data-v-f1288da3"]]);export{z as default};

dist/assets/index-CcxQmGq5.js

@@ -0,0 +1 @@
+/* empty css                                                              */import{d as k,r as B,b as d,o as I,a4 as Y,c as y,e as l,h as t,i,k as n,l as C,_ as M}from"./index-CssZNYL_.js";const N={class:"TableBoxPadding"},P={class:"table-header TableMarginBottom"},H={class:"TableFrom"},W={class:"formLine"},z={style:{"margin-top":"7px"}},R={class:"Table"},S={class:"example-pagination-block"},U=k({__name:"index",setup(F){const a=B({gasWellName:"",startTime:"",endTime:"",deviceId:""});d();const u=d(),_=d([]);d(!1),I(()=>{c({currentPage:1,pageSize:10})});const m=d(),b=o=>{a.startTime=o[0],a.endTime=o[1]},f=o=>{const e=new Date;return o.getTime()>e.getTime()},c=async o=>{let e=await Y(o);e.code===200&&(_.value=e.data.records,u.value=e.total)},v=(o,e)=>{c({currentPage:o,pageSize:e,...a})},h=async()=>{c({currentPage:1,pageSize:10,...a})},w=()=>{a.gasWellName="",a.startTime="",a.endTime="",a.deviceId="",m.value="",c({currentPage:1,pageSize:10})};return(o,e)=>{const g=n("el-input"),p=n("el-form-item"),T=n("el-date-picker"),V=n("el-form"),r=n("el-table-column"),x=n("el-table"),D=n("el-pagination");return C(),y("view",N,[l("view",P,[e[3]||(e[3]=l("view",{class:"TableHeaderTitle TableMarginBottom"},[l("text",null,"提醒记录")],-1)),l("view",H,[l("view",W,[t(V,{inline:!0,model:a,class:"demo-form-inline"},{default:i(()=>[t(p,{label:"气井名称："},{default:i(()=>[t(g,{modelValue:a.gasWellName,"onUpdate:modelValue":e[0]||(e[0]=s=>a.gasWellName=s),placeholder:"请输入",clearable:""},null,8,["modelValue"])]),_:1}),t(p,{label:"设备ID："},{default:i(()=>[t(g,{modelValue:a.deviceId,"onUpdate:modelValue":e[1]||(e[1]=s=>a.deviceId=s),placeholder:"请输入",clearable:""},null,8,["modelValue"])]),_:1}),l("view",z,[t(p,{label:"时间范围："},{default:i(()=>[t(T,{modelValue:m.value,"onUpdate:modelValue":e[2]||(e[2]=s=>m.value=s),clearable:!1,type:"daterange","range-separator":"到","start-placeholder":"开始时间","end-placeholder":"结束时间","value-format":"YYYY-MM-DD HH:mm:ss ",format:"YYYY-MM-DD HH:mm:ss ",onChange:b,"disabled-date":f},null,8,["modelValue"])]),_:1})])]),_:1},8,["model"])]),l("view",{class:"FormButton"},[l("button",{class:"Button",onClick:h},"搜索"),l("button",{class:"ButtonInfo",onClick:w},"重置")])])]),l("view",R,[t(x,{"header-cell-style":{background:"#eef1f6"},data:_.value,style:{width:"100%"},height:"500"},{default:i(()=>[t(r,{prop:"deviceId",label:"设备编码",width:"220"}),t(r,{prop:"gasWell.name",label:"所属气井",width:"220"}),t(r,{prop:"content","show-overflow-tooltip":"",label:"提醒信息",width:"500"}),t(r,{prop:"createTime",label:"提醒时间",width:"300"})]),_:1},8,["data"]),l("div",S,[t(D,{onChange:v,total:u.value},null,8,["total"])])])])}}}),j=M(U,[["__scopeId","data-v-930072e8"]]);export{j as default};

dist/assets/index-D0dAqmg8.css

@@ -1 +0,0 @@
-.table-header[data-v-0eea24de]{margin-bottom:30px}.el-form-item[data-v-0eea24de]{margin-bottom:0}

dist/assets/index-DToPQlk3.css

@@ -0,0 +1 @@
+.table-header[data-v-28580893]{margin-bottom:30px}.el-form-item[data-v-28580893]{margin-bottom:0}

dist/assets/index-DmeyDF4G.css

@@ -1 +0,0 @@
-.table-header[data-v-bc96be27]{margin-bottom:30px}.el-form-item[data-v-bc96be27]{margin-bottom:0}.el-form-item[data-v-cf5f92ea][data-v-bc96be27]{margin-bottom:20px}

dist/assets/index-DruP3eTh.js

@@ -0,0 +1 @@
+/* empty css                                                              */import{d as V,r as Y,b as c,o as C,c as M,e as n,h as o,i as m,Z as P,k as l,l as y,_ as H}from"./index-CssZNYL_.js";const z={class:"TableBoxPadding"},N={class:"table-header TableMarginBottom"},S={class:"TableFrom"},U={class:"formLine"},F={class:"Table"},I={class:"example-pagination-block"},L=V({__name:"index",setup(E){const t=Y({name:"",startTime:"",endTime:""}),g=c(),b=a=>{t.startTime=a[0],t.endTime=a[1],console.log(a)},f=a=>{const e=new Date;return a.getTime()>e.getTime()},p=c([]),u=c(200),d=async a=>{let e=await P(a);e.code==200&&(p.value=e.data.records,u.value=Number(e.data.total))};C(()=>{d({pageSize:10,currentPage:1})});const T=()=>{g.value="",t.name="",t.date="",s.value=1,d({pageSize:10,currentPage:1})},s=c(1),v=(a,e)=>{s.value=a,d({pageSize:e,currentPage:a,nickname:t.name,startTime:t.startTime,endTime:t.endTime})},h=async()=>{s.value=1,d({pageSize:10,currentPage:1,nickname:t.name,startTime:t.startTime,endTime:t.endTime})};return(a,e)=>{const w=l("el-date-picker"),_=l("el-form-item"),k=l("el-input"),D=l("el-form"),i=l("el-table-column"),x=l("el-table"),B=l("el-pagination");return y(),M("view",z,[n("view",N,[e[3]||(e[3]=n("view",{class:"TableHeaderTitle TableMarginBottom"},[n("text",null,"日志管理")],-1)),n("view",S,[n("view",U,[o(D,{inline:!0,model:t,class:"demo-form-inline"},{default:m(()=>[o(_,{label:"时间范围："},{default:m(()=>[o(w,{modelValue:t.date,"onUpdate:modelValue":e[0]||(e[0]=r=>t.date=r),type:"daterange","range-separator":"To","start-placeholder":"开始时间","end-placeholder":"结束时间","value-format":"YYYY-MM-DD HH:mm:ss ",format:"YYYY-MM-DD HH:mm:ss ",onChange:b,"disabled-date":f},null,8,["modelValue"])]),_:1}),o(_,{label:"操作人："},{default:m(()=>[o(k,{modelValue:t.name,"onUpdate:modelValue":e[1]||(e[1]=r=>t.name=r),placeholder:"请输入",clearable:""},null,8,["modelValue"])]),_:1})]),_:1},8,["model"])]),n("view",{class:"FormButton"},[n("button",{class:"Button",onClick:h},"搜索"),n("button",{class:"ButtonInfo",onClick:T},"重置")])])]),n("view",F,[o(x,{"header-cell-style":{background:"#eef1f6"},data:p.value,style:{width:"100%"},height:"370","default-sort":{prop:"date",order:"descending"}},{default:m(()=>[o(i,{prop:"nickname",label:"操作人",width:"320"}),o(i,{prop:"ip",label:"ip地址",width:"320"}),o(i,{prop:"name",label:"日志详情",width:"400"}),o(i,{prop:"createTime",label:"操作时间",width:"300",sortable:""})]),_:1},8,["data"]),n("div",I,[o(B,{"current-page":s.value,"onUpdate:currentPage":e[2]||(e[2]=r=>s.value=r),onChange:v,total:u.value},null,8,["current-page","total"])])])])}}}),j=H(L,[["__scopeId","data-v-28580893"]]);export{j as default};

dist/assets/index-Dv-IXsu0.js

@@ -1 +0,0 @@
-/* empty css                                                              */import{d as V,r as C,b as c,o as P,c as y,e as n,h as o,i as m,Z as M,k as l,l as Y,_ as z}from"./index-CV-n4caa.js";const N={class:"TableBoxPadding"},S={class:"table-header TableMarginBottom"},U={class:"TableFrom"},F={class:"formLine"},I={class:"Table"},L={class:"example-pagination-block"},E=V({__name:"index",setup(H){const t=C({name:"",startTime:"",endTime:""}),g=c(),b=a=>{t.startTime=a[0],t.endTime=a[1],console.log(a)},T=a=>{const e=new Date;return a.getTime()>e.getTime()},p=c([]),u=c(200),i=async a=>{let e=await M(a);e.code==200&&(p.value=e.data.records,u.value=Number(e.data.total))};P(()=>{i({pageSize:10,currentPage:1})});const f=()=>{g.value="",t.name="",t.date="",s.value=1,i({pageSize:10,currentPage:1})},s=c(1),h=(a,e)=>{s.value=a,i({pageSize:e,currentPage:a,nickname:t.name,startTime:t.startTime,endTime:t.endTime})},v=async()=>{s.value=1,i({pageSize:10,currentPage:1,nickname:t.name,startTime:t.startTime,endTime:t.endTime})};return(a,e)=>{const w=l("el-date-picker"),_=l("el-form-item"),k=l("el-input"),x=l("el-form"),r=l("el-table-column"),B=l("el-table"),D=l("el-pagination");return Y(),y("view",N,[n("view",S,[e[3]||(e[3]=n("view",{class:"TableHeaderTitle TableMarginBottom"},[n("text",null,"日志管理")],-1)),n("view",U,[n("view",F,[o(x,{inline:!0,model:t,class:"demo-form-inline"},{default:m(()=>[o(_,{label:"时间范围："},{default:m(()=>[o(w,{modelValue:t.date,"onUpdate:modelValue":e[0]||(e[0]=d=>t.date=d),type:"daterange","range-separator":"To","start-placeholder":"开始时间","end-placeholder":"结束时间","value-format":"YYYY-MM-DD hh:mm:ss ",onChange:b,"disabled-date":T},null,8,["modelValue"])]),_:1}),o(_,{label:"操作人："},{default:m(()=>[o(k,{modelValue:t.name,"onUpdate:modelValue":e[1]||(e[1]=d=>t.name=d),placeholder:"请输入",clearable:""},null,8,["modelValue"])]),_:1})]),_:1},8,["model"])]),n("view",{class:"FormButton"},[n("button",{class:"Button",onClick:v},"搜索"),n("button",{class:"ButtonInfo",onClick:f},"重置")])])]),n("view",I,[o(B,{"header-cell-style":{background:"#eef1f6"},data:p.value,style:{width:"100%"},height:"370","default-sort":{prop:"date",order:"descending"}},{default:m(()=>[o(r,{prop:"nickname",label:"操作人",width:"320"}),o(r,{prop:"ip",label:"ip地址",width:"320"}),o(r,{prop:"name",label:"日志详情",width:"400"}),o(r,{prop:"createTime",label:"操作时间",width:"300",sortable:""})]),_:1},8,["data"]),n("div",L,[o(D,{"current-page":s.value,"onUpdate:currentPage":e[2]||(e[2]=d=>s.value=d),onChange:h,total:u.value},null,8,["current-page","total"])])])])}}}),j=z(E,[["__scopeId","data-v-0eea24de"]]);export{j as default};

dist/assets/sha1-DCCrd4Bj.js

@@ -1 +1 @@
-import{A as E}from"./index-CV-n4caa.js";const z="/assets/logo-Bsvp36gZ.png";var T={exports:{}},F={exports:{}};(function(){var e="ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/",a={rotl:function(r,t){return r<<t|r>>>32-t},rotr:function(r,t){return r<<32-t|r>>>t},endian:function(r){if(r.constructor==Number)return a.rotl(r,8)&16711935|a.rotl(r,24)&4278255360;for(var t=0;t<r.length;t++)r[t]=a.endian(r[t]);return r},randomBytes:function(r){for(var t=[];r>0;r--)t.push(Math.floor(Math.random()*256));return t},bytesToWords:function(r){for(var t=[],n=0,o=0;n<r.length;n++,o+=8)t[o>>>5]|=r[n]<<24-o%32;return t},wordsToBytes:function(r){for(var t=[],n=0;n<r.length*32;n+=8)t.push(r[n>>>5]>>>24-n%32&255);return t},bytesToHex:function(r){for(var t=[],n=0;n<r.length;n++)t.push((r[n]>>>4).toString(16)),t.push((r[n]&15).toString(16));return t.join("")},hexToBytes:function(r){for(var t=[],n=0;n<r.length;n+=2)t.push(parseInt(r.substr(n,2),16));return t},bytesToBase64:function(r){for(var t=[],n=0;n<r.length;n+=3)for(var o=r[n]<<16|r[n+1]<<8|r[n+2],u=0;u<4;u++)n*8+u*6<=r.length*8?t.push(e.charAt(o>>>6*(3-u)&63)):t.push("=");return t.join("")},base64ToBytes:function(r){r=r.replace(/[^A-Z0-9+\/]/ig,"");for(var t=[],n=0,o=0;n<r.length;o=++n%4)o!=0&&t.push((e.indexOf(r.charAt(n-1))&Math.pow(2,-2*o+8)-1)<<o*2|e.indexOf(r.charAt(n))>>>6-o*2);return t}};F.exports=a})();var I=F.exports,x={utf8:{stringToBytes:function(e){return x.bin.stringToBytes(unescape(encodeURIComponent(e)))},bytesToString:function(e){return decodeURIComponent(escape(x.bin.bytesToString(e)))}},bin:{stringToBytes:function(e){for(var a=[],r=0;r<e.length;r++)a.push(e.charCodeAt(r)&255);return a},bytesToString:function(e){for(var a=[],r=0;r<e.length;r++)a.push(String.fromCharCode(e[r]));return a.join("")}}},B=x;(function(){var e=I,a=B.utf8,r=B.bin,t=function(o){o.constructor==String?o=a.stringToBytes(o):typeof Buffer<"u"&&typeof Buffer.isBuffer=="function"&&Buffer.isBuffer(o)?o=Array.prototype.slice.call(o,0):Array.isArray(o)||(o=o.toString());var u=e.bytesToWords(o),i=o.length*8,h=[],l=1732584193,c=-271733879,s=-1732584194,p=271733878,v=-1009589776;u[i>>5]|=128<<24-i%32,u[(i+64>>>9<<4)+15]=i;for(var g=0;g<u.length;g+=16){for(var d=l,S=c,A=s,H=p,C=v,f=0;f<80;f++){if(f<16)h[f]=u[g+f];else{var y=h[f-3]^h[f-8]^h[f-14]^h[f-16];h[f]=y<<1|y>>>31}var _=(l<<5|l>>>27)+v+(h[f]>>>0)+(f<20?(c&s|~c&p)+1518500249:f<40?(c^s^p)+1859775393:f<60?(c&s|c&p|s&p)-1894007588:(c^s^p)-899497514);v=p,p=s,s=c<<30|c>>>2,c=l,l=_}l+=d,c+=S,s+=A,p+=H,v+=C}return[l,c,s,p,v]},n=function(o,u){var i=e.wordsToBytes(t(o));return u&&u.asBytes?i:u&&u.asString?r.bytesToString(i):e.bytesToHex(i)};n._blocksize=16,n._digestsize=20,T.exports=n})();var M=T.exports;const O=E(M);export{z as _,O as s};
+import{A as E}from"./index-CssZNYL_.js";const z="/assets/logo-Bsvp36gZ.png";var T={exports:{}},F={exports:{}};(function(){var e="ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/",a={rotl:function(r,t){return r<<t|r>>>32-t},rotr:function(r,t){return r<<32-t|r>>>t},endian:function(r){if(r.constructor==Number)return a.rotl(r,8)&16711935|a.rotl(r,24)&4278255360;for(var t=0;t<r.length;t++)r[t]=a.endian(r[t]);return r},randomBytes:function(r){for(var t=[];r>0;r--)t.push(Math.floor(Math.random()*256));return t},bytesToWords:function(r){for(var t=[],n=0,o=0;n<r.length;n++,o+=8)t[o>>>5]|=r[n]<<24-o%32;return t},wordsToBytes:function(r){for(var t=[],n=0;n<r.length*32;n+=8)t.push(r[n>>>5]>>>24-n%32&255);return t},bytesToHex:function(r){for(var t=[],n=0;n<r.length;n++)t.push((r[n]>>>4).toString(16)),t.push((r[n]&15).toString(16));return t.join("")},hexToBytes:function(r){for(var t=[],n=0;n<r.length;n+=2)t.push(parseInt(r.substr(n,2),16));return t},bytesToBase64:function(r){for(var t=[],n=0;n<r.length;n+=3)for(var o=r[n]<<16|r[n+1]<<8|r[n+2],u=0;u<4;u++)n*8+u*6<=r.length*8?t.push(e.charAt(o>>>6*(3-u)&63)):t.push("=");return t.join("")},base64ToBytes:function(r){r=r.replace(/[^A-Z0-9+\/]/ig,"");for(var t=[],n=0,o=0;n<r.length;o=++n%4)o!=0&&t.push((e.indexOf(r.charAt(n-1))&Math.pow(2,-2*o+8)-1)<<o*2|e.indexOf(r.charAt(n))>>>6-o*2);return t}};F.exports=a})();var I=F.exports,x={utf8:{stringToBytes:function(e){return x.bin.stringToBytes(unescape(encodeURIComponent(e)))},bytesToString:function(e){return decodeURIComponent(escape(x.bin.bytesToString(e)))}},bin:{stringToBytes:function(e){for(var a=[],r=0;r<e.length;r++)a.push(e.charCodeAt(r)&255);return a},bytesToString:function(e){for(var a=[],r=0;r<e.length;r++)a.push(String.fromCharCode(e[r]));return a.join("")}}},B=x;(function(){var e=I,a=B.utf8,r=B.bin,t=function(o){o.constructor==String?o=a.stringToBytes(o):typeof Buffer<"u"&&typeof Buffer.isBuffer=="function"&&Buffer.isBuffer(o)?o=Array.prototype.slice.call(o,0):Array.isArray(o)||(o=o.toString());var u=e.bytesToWords(o),i=o.length*8,h=[],l=1732584193,c=-271733879,s=-1732584194,p=271733878,v=-1009589776;u[i>>5]|=128<<24-i%32,u[(i+64>>>9<<4)+15]=i;for(var g=0;g<u.length;g+=16){for(var d=l,S=c,A=s,H=p,C=v,f=0;f<80;f++){if(f<16)h[f]=u[g+f];else{var y=h[f-3]^h[f-8]^h[f-14]^h[f-16];h[f]=y<<1|y>>>31}var _=(l<<5|l>>>27)+v+(h[f]>>>0)+(f<20?(c&s|~c&p)+1518500249:f<40?(c^s^p)+1859775393:f<60?(c&s|c&p|s&p)-1894007588:(c^s^p)-899497514);v=p,p=s,s=c<<30|c>>>2,c=l,l=_}l+=d,c+=S,s+=A,p+=H,v+=C}return[l,c,s,p,v]},n=function(o,u){var i=e.wordsToBytes(t(o));return u&&u.asBytes?i:u&&u.asString?r.bytesToString(i):e.bytesToHex(i)};n._blocksize=16,n._digestsize=20,T.exports=n})();var M=T.exports;const O=E(M);export{z as _,O as s};

dist/index.html

@@ -5,8 +5,8 @@
     <!-- <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-CV-n4caa.js"></script>
+    <script type="module" crossorigin src="/assets/index-CssZNYL_.js"></script>
-    <link rel="stylesheet" crossorigin href="/assets/index-Clo0IEUZ.css">
+    <link rel="stylesheet" crossorigin href="/assets/index-BYOAOayj.css">
   </head>
   <body>
     <div id="app"></div>

src/components/LogManage/index.vue

@@ -14,7 +14,8 @@
                 range-separator="To"
                 start-placeholder="开始时间"
                 end-placeholder="结束时间"
-                value-format="YYYY-MM-DD hh:mm:ss "
+                value-format="YYYY-MM-DD HH:mm:ss "
+                format="YYYY-MM-DD HH:mm:ss "
                 @change="handleDate"
                 :disabled-date="disabledDate"
               />

src/components/gasManage/KNPCDataAna.vue/charts.vue

@@ -2,7 +2,7 @@
   <div
     class="charts"
     ref="chartRef"
-    style="height: 300px; width: 1000px; display: block"
+    :style="'height: 300px; width: 1000px; display: block'"
   ></div>
 </template>
 
@@ -19,9 +19,24 @@ const props = defineProps<{
   data?: string;
 }>();
 
+// 开关折线图处理
+// const handelData = () => {
+//   let data = props.chartsData.series;
+//   console.log(data.data);
+//   data.data.forEach((element) => {
+//     element == "0" ? data.push("关井") : data.push("开井");
+//   });
+//   return data;
+// };
 const initChart = () => {
   if (chartRef.value) {
     chart = echarts.init(chartRef.value);
+    let series;
+    // if (props.data == "开关状态") {
+    //   series = handelData();
+    // } else {
+    //   series = props.chartsData.series;
+    // }
     const option = {
       title: {
         text: props.chartsData.title,
@@ -68,6 +83,9 @@ const initChart = () => {
       },
       yAxis: {
         type: "value",
+        splitLine: {
+          show: false,
+        },
         name: props.data,
         nameLocation: "end",
         nameTextStyle: {

src/components/gasManage/KNPCDataAna.vue/charts1.vue

@@ -0,0 +1,135 @@
+<template>
+  <div
+    class="charts"
+    ref="chartRef"
+    :style="'height: 200px; width: 1000px; display: block'"
+  ></div>
+</template>
+
+<script lang="ts" setup>
+import { ref, onMounted, defineProps, watch } from "vue";
+import { useStore } from "vuex";
+import * as echarts from "echarts";
+import { useRoute, useRouter } from "vue-router";
+
+const chartRef = ref();
+let chart = ref(null);
+const props = defineProps<{
+  chartsData?: any;
+  data?: string;
+}>();
+
+// 开关折线图处理
+// const handelData = () => {
+//   let data = props.chartsData.series;
+//   console.log(data.data);
+//   data.data.forEach((element) => {
+//     element == "0" ? data.push("关井") : data.push("开井");
+//   });
+//   return data;
+// };
+const initChart = () => {
+  if (chartRef.value) {
+    chart = echarts.init(chartRef.value);
+    let series;
+    // if (props.data == "开关状态") {
+    //   series = handelData();
+    // } else {
+    //   series = props.chartsData.series;
+    // }
+    const option = {
+      title: {
+        text: props.chartsData.title,
+        textStyle: {
+          fontSize: 16,
+          color: "rgba(0,0,0,0.9)",
+          lineHeight: 10,
+        },
+      },
+      tooltip: {
+        trigger: "axis",
+      },
+      toolbox: {
+        feature: {
+          dataZoom: {
+            yAxisIndex: "none",
+            title: {
+              zoom: "区域缩放",
+              back: "区域缩放还原",
+            },
+          },
+        },
+      },
+      legend: {
+        data: props.chartsData.legendData,
+
+        padding: 5,
+      },
+      grid: {
+        left: "3%",
+        right: "4%",
+        bottom: "3%",
+        containLabel: true,
+      },
+
+      xAxis: {
+        type: "category",
+        boundaryGap: false,
+        data: props.chartsData.xaxisData,
+        axisLabel: {
+          align: "left",
+        },
+        // nameLocation: "middle",
+      },
+      yAxis: {
+        type: "value",
+        splitLine: {
+          show: false,
+        },
+        name: props.data,
+        nameLocation: "end",
+        nameTextStyle: {
+          fontSize: 12,
+          color: "rgba(0, 0, 0, 0.40)",
+          align: "right",
+          padding: [10, 6, 7, 10],
+        },
+        axisLabel: {
+          show: true,
+          formatter: function (value, index) {
+            if (value == 1) {
+              return "开井";
+            } else if (value == 0) {
+              return "关井";
+            }
+          },
+        },
+      },
+
+      series: props.chartsData.series || [],
+    };
+    // 使用刚指定的配置项和数据显示图表。
+
+    chart.setOption(option);
+    window.addEventListener("resize", () => {
+      chart.resize();
+    });
+  }
+};
+
+//dom 渲染后钩子
+// onMounted(() => {
+//   initChart();
+// });
+watch(
+  () => props.chartsData,
+  () => {
+    initChart();
+  },
+  {
+    immediate: true,
+  }
+);
+</script>
+
+<style lang="scss" scoped></style>

src/components/gasManage/KNPCDataAna.vue/index.vue

@@ -9,10 +9,12 @@
             range-separator="到"
             start-placeholder="开始时间"
             end-placeholder="结束时间"
-            value-format="YYYY-MM-DD hh:mm:ss "
+            value-format="YYYY-MM-DD HH:mm:ss "
+            format="YYYY-MM-DD HH:mm:ss "
             @change="handleDate"
             :disabled-date="disabledDate"
             :clearable="false"
+            :shortcuts="shortcuts"
           />
         </el-form-item>
       </el-form>
@@ -24,7 +26,7 @@
   </view>
   <view style="width: 98%; margin-top: 24px; display: block">
     <KNPCCharts :chartsData="PressData" :data="'压力'"></KNPCCharts>
-    <KNPCCharts :chartsData="switchData" :data="'开关状态'"></KNPCCharts>
+    <KNPCCharts1 :chartsData="switchData" :data="'开关状态'"></KNPCCharts1>
   </view>
 </template>
 
@@ -33,6 +35,7 @@ import { ref, reactive, onMounted } from "vue";
 import moment from "moment";
 import { useStore } from "vuex";
 import KNPCCharts from "./charts.vue";
+import KNPCCharts1 from "./charts1.vue";
 import { getSwitchChartData, getPressureChartData } from "../../../request/api";
 import { useRoute, useRouter } from "vue-router";
 const value1 = ref();
@@ -58,12 +61,12 @@ const disabledDate = (time) => {
 // 初始日期
 const normalDate = () => {
   searchData.startTime = moment()
-    .subtract(30, "days")
+    .subtract(7, "days")
     .format("YYYY-MM-DD HH:mm:ss");
   searchData.endTime = moment().format("YYYY-MM-DD HH:mm:ss");
 
   value1.value = [
-    moment().subtract(30, "days").format("YYYY-MM-DD HH:mm:ss"),
+    moment().subtract(7, "days").format("YYYY-MM-DD HH:mm:ss"),
     moment().format("YYYY-MM-DD HH:mm:ss"),
   ];
 };
@@ -76,6 +79,18 @@ const getSwitch = async () => {
     ...searchData,
   });
   if (re.code == 200) {
+    // let data = re.data;
+    // data.series.forEach((value) => {
+    //   if (value.data.length > 0) {
+    //     let data1 = [];
+    //     value.data.forEach((element) => {
+    //       element == "0" ? data1.push("关井") : data1.push("开井");
+    //     });
+    //     value.data = data1;
+    //   }
+    // });
+
+    // switchData.value = data;
     switchData.value = re.data;
   }
 };
@@ -98,6 +113,45 @@ onMounted(() => {
   getPress();
   getSwitch();
 });
+// 日期范围
+const shortcuts = [
+  {
+    text: "最近一天",
+    value: () => {
+      const end = new Date();
+      const start = new Date();
+      start.setTime(start.getTime() - 3600 * 1000 * 24 * 1);
+      return [start, end];
+    },
+  },
+  {
+    text: "最近三天",
+    value: () => {
+      const end = new Date();
+      const start = new Date();
+      start.setTime(start.getTime() - 3600 * 1000 * 24 * 3);
+      return [start, end];
+    },
+  },
+  {
+    text: "最近一周",
+    value: () => {
+      const end = new Date();
+      const start = new Date();
+      start.setTime(start.getTime() - 3600 * 1000 * 24 * 7);
+      return [start, end];
+    },
+  },
+  {
+    text: "最近一个月",
+    value: () => {
+      const end = new Date();
+      const start = new Date();
+      start.setTime(start.getTime() - 3600 * 1000 * 24 * 30);
+      return [start, end];
+    },
+  },
+];
 </script>
 
 <style lang="scss" scoped>

src/components/gasManage/TimerMeter/TimeMeter2.vue

@@ -87,6 +87,14 @@ watch(
 
 <style lang="scss" scoped>
 .timer {
+  :deep(.el-menu:focus) {
+    outline: none;
+  }
+}
+.timer {
+  :deep(input) {
+    outline: none;
+  }
 }
 .margin {
   margin-left: 10px;

src/components/gasManage/TimerMeter/TimerMeter.vue

@@ -87,6 +87,14 @@ watch(
 
 <style lang="scss" scoped>
 .timer {
+  :deep(.el-menu:focus) {
+    outline: none;
+  }
+}
+.timer {
+  :deep(input) {
+    outline: none;
+  }
 }
 .margin {
   margin-left: 10px;

src/components/gasManage/Zhusai/DeviceLog.vue

@@ -9,9 +9,11 @@
             range-separator="到"
             start-placeholder="开始时间"
             end-placeholder="结束时间"
-            value-format="YYYY-MM-DD hh:mm:ss "
+            value-format="YYYY-MM-DD HH:mm:ss "
+            format="YYYY-MM-DD HH:mm:ss "
             @change="handleDate"
             :disabled-date="disabledDate"
+            :shortcuts="shortcuts"
           />
         </el-form-item>
       </el-form>
@@ -187,6 +189,45 @@ const search = async () => {
     endTime: searchData.endTime,
   });
 };
+// 日期范围
+const shortcuts = [
+  {
+    text: "最近一天",
+    value: () => {
+      const end = new Date();
+      const start = new Date();
+      start.setTime(start.getTime() - 3600 * 1000 * 24 * 1);
+      return [start, end];
+    },
+  },
+  {
+    text: "最近三天",
+    value: () => {
+      const end = new Date();
+      const start = new Date();
+      start.setTime(start.getTime() - 3600 * 1000 * 24 * 3);
+      return [start, end];
+    },
+  },
+  {
+    text: "最近一周",
+    value: () => {
+      const end = new Date();
+      const start = new Date();
+      start.setTime(start.getTime() - 3600 * 1000 * 24 * 7);
+      return [start, end];
+    },
+  },
+  {
+    text: "最近一个月",
+    value: () => {
+      const end = new Date();
+      const start = new Date();
+      start.setTime(start.getTime() - 3600 * 1000 * 24 * 30);
+      return [start, end];
+    },
+  },
+];
 </script>
 
 <style lang="scss" scoped>

src/components/gasManage/Zhusai/ETCdiaglog/DeviceLog.vue

@@ -9,9 +9,11 @@
             range-separator="到"
             start-placeholder="开始时间"
             end-placeholder="结束时间"
-            value-format="YYYY-MM-DD hh:mm:ss "
+            value-format="YYYY-MM-DD HH:mm:ss "
+            format="YYYY-MM-DD HH:mm:ss "
             @change="handleDate"
             :disabled-date="disabledDate"
+            :shortcuts="shortcuts"
           />
         </el-form-item>
       </el-form>
@@ -171,6 +173,45 @@ const search = async () => {
     endTime: searchData.endTime,
   });
 };
+// 日期范围
+const shortcuts = [
+  {
+    text: "最近一天",
+    value: () => {
+      const end = new Date();
+      const start = new Date();
+      start.setTime(start.getTime() - 3600 * 1000 * 24 * 1);
+      return [start, end];
+    },
+  },
+  {
+    text: "最近三天",
+    value: () => {
+      const end = new Date();
+      const start = new Date();
+      start.setTime(start.getTime() - 3600 * 1000 * 24 * 3);
+      return [start, end];
+    },
+  },
+  {
+    text: "最近一周",
+    value: () => {
+      const end = new Date();
+      const start = new Date();
+      start.setTime(start.getTime() - 3600 * 1000 * 24 * 7);
+      return [start, end];
+    },
+  },
+  {
+    text: "最近一个月",
+    value: () => {
+      const end = new Date();
+      const start = new Date();
+      start.setTime(start.getTime() - 3600 * 1000 * 24 * 30);
+      return [start, end];
+    },
+  },
+];
 </script>
 
 <style lang="scss" scoped>

src/components/gasManage/Zhusai/ETCdiaglog/ETCfrom1.vue

@@ -45,9 +45,7 @@
               v-if="runMode == '0'"
             >
               <template #reference>
-                <el-button type="default" :icon="Setting"
+                <el-button type="default" :icon="Setting">设置</el-button>
-                  >保存计时器模式</el-button
-                >
               </template>
             </el-popconfirm>
             <el-popconfirm
@@ -59,9 +57,7 @@
               v-if="runMode == '1'"
             >
               <template #reference>
-                <el-button type="default" :icon="Setting"
+                <el-button type="default" :icon="Setting">设置</el-button>
-                  >保存套压优化数据</el-button
-                >
               </template>
             </el-popconfirm>
             <el-popconfirm
@@ -73,9 +69,7 @@
               v-if="runMode == '2'"
             >
               <template #reference>
-                <el-button type="default" :icon="Setting"
+                <el-button type="default" :icon="Setting">设置</el-button>
-                  >保存油压优化数据</el-button
-                >
               </template>
             </el-popconfirm>
           </view>
@@ -530,7 +524,7 @@ const runModeOptions = reactive([
   display: flex;
   justify-content: flex-end;
   position: absolute;
-  left: 790px;
+  left: 720px;
 }
 .buttonLocation4 {
   width: 130px;

src/components/gasManage/Zhusai/ETCdiaglog/HistoryData.vue

@@ -9,9 +9,11 @@
             range-separator="到"
             start-placeholder="开始时间"
             end-placeholder="结束时间"
-            value-format="YYYY-MM-DD hh:mm:ss "
+            value-format="YYYY-MM-DD HH:mm:ss "
+            format="YYYY-MM-DD HH:mm:ss "
             @change="handleDate"
             :disabled-date="disabledDate"
+            :shortcuts="shortcuts"
           />
         </el-form-item>
       </el-form>
@@ -230,6 +232,45 @@ const downloadAll = async () => {
     fileLink.click();
   }
 };
+// 日期范围
+const shortcuts = [
+  {
+    text: "最近一天",
+    value: () => {
+      const end = new Date();
+      const start = new Date();
+      start.setTime(start.getTime() - 3600 * 1000 * 24 * 1);
+      return [start, end];
+    },
+  },
+  {
+    text: "最近三天",
+    value: () => {
+      const end = new Date();
+      const start = new Date();
+      start.setTime(start.getTime() - 3600 * 1000 * 24 * 3);
+      return [start, end];
+    },
+  },
+  {
+    text: "最近一周",
+    value: () => {
+      const end = new Date();
+      const start = new Date();
+      start.setTime(start.getTime() - 3600 * 1000 * 24 * 7);
+      return [start, end];
+    },
+  },
+  {
+    text: "最近一个月",
+    value: () => {
+      const end = new Date();
+      const start = new Date();
+      start.setTime(start.getTime() - 3600 * 1000 * 24 * 30);
+      return [start, end];
+    },
+  },
+];
 </script>
 
 <style lang="scss" scoped>

src/components/gasManage/Zhusai/HistoryData.vue

@@ -9,9 +9,11 @@
             range-separator="到"
             start-placeholder="开始时间"
             end-placeholder="结束时间"
-            value-format="YYYY-MM-DD hh:mm:ss "
+            value-format="YYYY-MM-DD HH:mm:ss "
+            format="YYYY-MM-DD HH:mm:ss "
             @change="handleDate"
             :disabled-date="disabledDate"
+            :shortcuts="shortcuts"
           />
         </el-form-item>
       </el-form>
@@ -256,6 +258,45 @@ const downloadAll = async () => {
     fileLink.click();
   }
 };
+// 日期范围
+const shortcuts = [
+  {
+    text: "最近一天",
+    value: () => {
+      const end = new Date();
+      const start = new Date();
+      start.setTime(start.getTime() - 3600 * 1000 * 24 * 1);
+      return [start, end];
+    },
+  },
+  {
+    text: "最近三天",
+    value: () => {
+      const end = new Date();
+      const start = new Date();
+      start.setTime(start.getTime() - 3600 * 1000 * 24 * 3);
+      return [start, end];
+    },
+  },
+  {
+    text: "最近一周",
+    value: () => {
+      const end = new Date();
+      const start = new Date();
+      start.setTime(start.getTime() - 3600 * 1000 * 24 * 7);
+      return [start, end];
+    },
+  },
+  {
+    text: "最近一个月",
+    value: () => {
+      const end = new Date();
+      const start = new Date();
+      start.setTime(start.getTime() - 3600 * 1000 * 24 * 30);
+      return [start, end];
+    },
+  },
+];
 </script>
 
 <style lang="scss" scoped>

src/components/gasManage/Zhusai/SCdialog/DeviceLog.vue

@@ -9,9 +9,11 @@
             range-separator="到"
             start-placeholder="开始时间"
             end-placeholder="结束时间"
-            value-format="YYYY-MM-DD hh:mm:ss "
+            value-format="YYYY-MM-DD HH:mm:ss "
+            format="YYYY-MM-DD HH:mm:ss "
             @change="handleDate"
             :disabled-date="disabledDate"
+            :shortcuts="shortcuts"
           />
         </el-form-item>
       </el-form>
@@ -176,6 +178,45 @@ const search = async () => {
     endTime: searchData.endTime,
   });
 };
+// 日期范围
+const shortcuts = [
+  {
+    text: "最近一天",
+    value: () => {
+      const end = new Date();
+      const start = new Date();
+      start.setTime(start.getTime() - 3600 * 1000 * 24 * 1);
+      return [start, end];
+    },
+  },
+  {
+    text: "最近三天",
+    value: () => {
+      const end = new Date();
+      const start = new Date();
+      start.setTime(start.getTime() - 3600 * 1000 * 24 * 3);
+      return [start, end];
+    },
+  },
+  {
+    text: "最近一周",
+    value: () => {
+      const end = new Date();
+      const start = new Date();
+      start.setTime(start.getTime() - 3600 * 1000 * 24 * 7);
+      return [start, end];
+    },
+  },
+  {
+    text: "最近一个月",
+    value: () => {
+      const end = new Date();
+      const start = new Date();
+      start.setTime(start.getTime() - 3600 * 1000 * 24 * 30);
+      return [start, end];
+    },
+  },
+];
 </script>
 
 <style lang="scss" scoped>

src/components/gasManage/Zhusai/SCdialog/HistoryData.vue

@@ -9,10 +9,13 @@
             range-separator="到"
             start-placeholder="开始时间"
             end-placeholder="结束时间"
-            value-format="YYYY-MM-DD hh:mm:ss "
             @change="handleDate"
+            format="YYYY-MM-DD HH:mm:ss "
+            value-format="YYYY-MM-DD HH:mm:ss "
             :disabled-date="disabledDate"
+            :shortcuts="shortcuts"
           />
+          <!-- - -->
         </el-form-item>
       </el-form>
     </view>
@@ -122,6 +125,7 @@ const totalPage = ref(200);
 const handleDate = (val) => {
   searchData.startTime = val[0];
   searchData.endTime = val[1];
+  console.log(val, value1.value);
 };
 // 日期限制
 const disabledDate = (time) => {
@@ -246,6 +250,45 @@ const downloadAll = async () => {
     fileLink.click();
   }
 };
+// 日期范围
+const shortcuts = [
+  {
+    text: "最近一天",
+    value: () => {
+      const end = new Date();
+      const start = new Date();
+      start.setTime(start.getTime() - 3600 * 1000 * 24 * 1);
+      return [start, end];
+    },
+  },
+  {
+    text: "最近三天",
+    value: () => {
+      const end = new Date();
+      const start = new Date();
+      start.setTime(start.getTime() - 3600 * 1000 * 24 * 3);
+      return [start, end];
+    },
+  },
+  {
+    text: "最近一周",
+    value: () => {
+      const end = new Date();
+      const start = new Date();
+      start.setTime(start.getTime() - 3600 * 1000 * 24 * 7);
+      return [start, end];
+    },
+  },
+  {
+    text: "最近一个月",
+    value: () => {
+      const end = new Date();
+      const start = new Date();
+      start.setTime(start.getTime() - 3600 * 1000 * 24 * 30);
+      return [start, end];
+    },
+  },
+];
 </script>
 
 <style lang="scss" scoped>

src/components/gasManage/Zhusai/SCdialog/SCForm1.vue

@@ -182,7 +182,7 @@ import TimerMeter2 from "../../TimerMeter/TimerMeter.vue";
 const props = defineProps<{
   deviceId: string;
 }>();
-const runMode = ref("0");
+const runMode = ref("1");
 const formline = {
   SCSSSAMPLINGINTERVAL: {
     continuousSamplingIntervalDuration: "",

src/components/gasManage/Zhusai/Zhusai.vue

@@ -16,6 +16,21 @@
             clearable
           />
         </el-form-item>
+        <el-form-item label="控制器筛选：">
+          <el-select
+            value-key="id"
+            v-model="product"
+            placeholder="请选择"
+            style="width: 240px"
+          >
+            <el-option
+              v-for="item in productOptions"
+              :key="item.id"
+              :label="item.name"
+              :value="item.id"
+            />
+          </el-select>
+        </el-form-item>
       </el-form>
     </view>
     <view class="FormButton">
@@ -71,6 +86,7 @@
         prop="plugStatus"
         label="柱塞状态"
       />
+      <el-table-column show-overflow-tooltip prop="voltage" label="电压" />
       <el-table-column prop="wellStatus" label="气井状态" align="center">
         <template #default="scope">
           <view class="table_icon">
@@ -174,7 +190,12 @@
 import { ref, onMounted, reactive, watch, computed } from "vue";
 import { useStore } from "vuex";
 import { useRoute, useRouter } from "vue-router";
-import { getDevice, delDevice, downHistoryData } from "../../../request/api";
+import {
+  getDevice,
+  delDevice,
+  downHistoryData,
+  getByType,
+} from "../../../request/api";
 import ZhusaiTab from "./ZhusaiTab.vue";
 import ETCTabs from "./ETCdiaglog/ETCTabs.vue";
 import SCTabs from "./SCdialog/SCTabs.vue";
@@ -190,6 +211,7 @@ const searchData = reactive({
   gasWellName: "",
   gasStationName: "",
 });
+const product = ref();
 // 点击每行数据
 const roleId = ref();
 // 表格数据
@@ -236,6 +258,7 @@ onMounted(() => {
     gasStationName: searchData.gasStationName,
   });
   getUserInfo();
+  getType();
 });
 const id = ref();
 const getUserInfo = () => {
@@ -266,6 +289,7 @@ const handlePage = (currentPage: number) => {
     currentPage: currentPage,
     gasWellName: searchData.gasWellName,
     gasStationName: searchData.gasStationName,
+    product: product.value,
   });
 };
 // 改变每页
@@ -277,6 +301,7 @@ const handleSizeChange = (val) => {
     currentPage: currentPage1.value,
     gasWellName: searchData.gasWellName,
     gasStationName: searchData.gasStationName,
+    product: product.value,
   });
 };
 // 删除
@@ -316,6 +341,7 @@ const search = async () => {
     currentPage: 1,
     gasWellName: searchData.gasWellName,
     gasStationName: searchData.gasStationName,
+    product: product.value,
   });
 };
 // 重置
@@ -323,6 +349,7 @@ const handleReset = () => {
   searchData.gasWellName = "";
   currentPage1.value = 1;
   searchData.gasStationName = "";
+  product.value = "";
   getGasList({
     blockId: props.blockId,
     deviceTypeId: props.deviceTypeId,
@@ -371,6 +398,15 @@ watch(
   },
   { deep: true }
 );
+// -----------选择器数据
+const productOptions = ref([]);
+// 获取字典表(tab页数据)
+const getType = async () => {
+  let re = await getByType({ type: "deviceProduct" });
+  if (re.code == 200) {
+    productOptions.value = re.data;
+  }
+};
 </script>
 
 <style lang="scss" scoped>

src/components/gasManage/Zhusai/ZhusaiForm.vue

@@ -106,6 +106,26 @@
                 />
               </el-select>
             </el-form-item>
+            <el-form-item label="定时器3使能：">
+              <el-select v-model="form.timerMode.timer3" placeholder="请选择">
+                <el-option
+                  v-for="item in timer3Options"
+                  :key="item.id"
+                  :label="item.name"
+                  :value="item.id"
+                />
+              </el-select>
+            </el-form-item>
+            <el-form-item label="定时器4使能：">
+              <el-select v-model="form.timerMode.timer4" placeholder="请选择">
+                <el-option
+                  v-for="item in timer4Options"
+                  :key="item.id"
+                  :label="item.name"
+                  :value="item.id"
+                />
+              </el-select>
+            </el-form-item>
           </view>
           <view class="inputByForm">
             <el-form-item label="定时器1开井时间：">
@@ -135,6 +155,34 @@
               ></TimerMeter2>
             </el-form-item>
           </view>
+          <view class="inputByForm">
+            <el-form-item label="定时器3开井时间：">
+              <TimerMeter2
+                :time="form.timerMode.timer3Open"
+                @getTime="timer3OpenFnc"
+              ></TimerMeter2>
+            </el-form-item>
+            <el-form-item label="定时器3开井时间：">
+              <TimerMeter2
+                :time="form.timerMode.timer3Close"
+                @getTime="timer3CloseFnc"
+              ></TimerMeter2>
+            </el-form-item>
+          </view>
+          <view class="inputByForm">
+            <el-form-item label="定时器4开井时间：">
+              <TimerMeter2
+                :time="form.timerMode.timer4Open"
+                @getTime="timer4OpenFnc"
+              ></TimerMeter2>
+            </el-form-item>
+            <el-form-item label="定时器4开井时间：">
+              <TimerMeter2
+                :time="form.timerMode.timer4Close"
+                @getTime="timer4CloseFnc"
+              ></TimerMeter2>
+            </el-form-item>
+          </view>
         </view>
         <!-- 计时器 -->
         <view class="formItem" v-if="form.runMode == '2'">
@@ -472,10 +520,16 @@ const formline = {
   timerMode: {
     timer1: "",
     timer2: "",
+    timer3: "",
+    timer4: "",
     timer1Open: "",
     timer2Open: "",
+    timer3Open: "",
+    timer4Open: "",
     timer2Close: "",
     timer1Close: "",
+    timer3Close: "",
+    timer4Close: "",
   },
   t2mode: {
     timingOpen: "",
@@ -658,7 +712,7 @@ const SettingData = async () => {
   });
   if (re.code == 200) {
     ElMessage({
-      message: "新增成功",
+      message: "设置成功",
       type: "success",
     });
   } else {
@@ -790,12 +844,24 @@ const timer1OpenFnc = (data?: any) => {
 const timer2OpenFnc = (data?: any) => {
   form.timerMode.timer2Open = data;
 };
+const timer3OpenFnc = (data?: any) => {
+  form.timerMode.timer3Open = data;
+};
+const timer4OpenFnc = (data?: any) => {
+  form.timerMode.timer4Open = data;
+};
 const timer1CloseFnc = (data?: any) => {
   form.timerMode.timer1Close = data;
 };
 const timer2CloseFnc = (data?: any) => {
   form.timerMode.timer2Close = data;
 };
+const timer3CloseFnc = (data?: any) => {
+  form.timerMode.timer3Close = data;
+};
+const timer4CloseFnc = (data?: any) => {
+  form.timerMode.timer4Close = data;
+};
 // -----------选择器数据
 const runModeOptions = reactive([
   {
@@ -859,6 +925,26 @@ const timer2Options = reactive([
     name: "使能",
   },
 ]);
+const timer3Options = reactive([
+  {
+    id: "0",
+    name: "禁止",
+  },
+  {
+    id: "1",
+    name: "使能",
+  },
+]);
+const timer4Options = reactive([
+  {
+    id: "0",
+    name: "禁止",
+  },
+  {
+    id: "1",
+    name: "使能",
+  },
+]);
 const presourceOptions = reactive([
   {
     id: "0",

src/components/gasManage/tabGas.vue

@@ -114,7 +114,7 @@ watch(
   padding: 7px;
 }
 .tabs {
-  height: 85%;
+  height: 100%;
   display: block;
   :deep(.el-tabs__item.is-active, .el-tabs__item:hover) {
     color: #fa9402;

src/components/recordingManage/index.vue

@@ -30,7 +30,8 @@
                   range-separator="到"
                   start-placeholder="开始时间"
                   end-placeholder="结束时间"
-                  value-format="YYYY-MM-DD hh:mm:ss "
+                  value-format="YYYY-MM-DD HH:mm:ss "
+                  format="YYYY-MM-DD HH:mm:ss "
                   @change="handleDate"
                   :disabled-date="disabledDate"
                 />

src/request/request.ts

@@ -9,11 +9,11 @@ const instance = axios.create({
   //window
   // baseURL: "http://192.168.31.108:8090",
   //mac
-  baseURL: "http://192.168.31.139:8090",
+  // baseURL: "http://192.168.31.139:8090",
   //mac2
   // baseURL: "http://172.20.10.7:8090",
   //正式
-  // baseURL: "http://10.132.235.161:8090",
+  baseURL: "http://10.132.235.161:8090",
 
   timeout: 10000, //请求超时时间
 });