2023-7-4

dist/assets/LOGO-0ad01ede.js

@@ -0,0 +1,5 @@
+<<<<<<<< HEAD:dist/assets/LOGO-5cfd52be.js
+import{e as i,r}from"./index-3d860e00.js";const u=i("routeTabs",{state:()=>({historyRoutes:[],activeKey:0}),persist:{enabled:!0,strategies:[{storage:localStorage,paths:["historyRoutes","activeKey"]}]},getters:{},actions:{saveRoute(e){if(!this.historyRoutes.some(o=>o.name==e.name))return this.historyRoutes.push(e)},delRoute(e,s){if(r.options.routes[1].children.forEach(t=>{t.name==e&&(t.keepAlive=!1)}),this.historyRoutes=this.historyRoutes.filter(t=>{if(t.name!==e)return t}),e==s&&this.historyRoutes.length>0)return r.replace({name:this.historyRoutes[0].meta.name})}}}),h=""+new URL("LOGO-c1524a7d.svg",import.meta.url).href;export{h as _,u};
+========
+import{e as i,r}from"./index-6c600258.js";const u=i("routeTabs",{state:()=>({historyRoutes:[],activeKey:0}),persist:{enabled:!0,strategies:[{storage:localStorage,paths:["historyRoutes","activeKey"]}]},getters:{},actions:{saveRoute(e){if(!this.historyRoutes.some(o=>o.name==e.name))return this.historyRoutes.push(e)},delRoute(e,s){if(r.options.routes[1].children.forEach(t=>{t.name==e&&(t.keepAlive=!1)}),this.historyRoutes=this.historyRoutes.filter(t=>{if(t.name!==e)return t}),e==s&&this.historyRoutes.length>0)return r.replace({name:this.historyRoutes[0].meta.name})}}}),h=""+new URL("LOGO-c1524a7d.svg",import.meta.url).href;export{h as _,u};
+>>>>>>>> xiaoqin:dist/assets/LOGO-0ad01ede.js

dist/assets/LOGO-5cfd52be.js

@@ -1 +1,5 @@
+<<<<<<<< HEAD:dist/assets/LOGO-5cfd52be.js
 import{e as i,r}from"./index-3d860e00.js";const u=i("routeTabs",{state:()=>({historyRoutes:[],activeKey:0}),persist:{enabled:!0,strategies:[{storage:localStorage,paths:["historyRoutes","activeKey"]}]},getters:{},actions:{saveRoute(e){if(!this.historyRoutes.some(o=>o.name==e.name))return this.historyRoutes.push(e)},delRoute(e,s){if(r.options.routes[1].children.forEach(t=>{t.name==e&&(t.keepAlive=!1)}),this.historyRoutes=this.historyRoutes.filter(t=>{if(t.name!==e)return t}),e==s&&this.historyRoutes.length>0)return r.replace({name:this.historyRoutes[0].meta.name})}}}),h=""+new URL("LOGO-c1524a7d.svg",import.meta.url).href;export{h as _,u};
+========
+import{e as i,r}from"./index-6c600258.js";const u=i("routeTabs",{state:()=>({historyRoutes:[],activeKey:0}),persist:{enabled:!0,strategies:[{storage:localStorage,paths:["historyRoutes","activeKey"]}]},getters:{},actions:{saveRoute(e){if(!this.historyRoutes.some(o=>o.name==e.name))return this.historyRoutes.push(e)},delRoute(e,s){if(r.options.routes[1].children.forEach(t=>{t.name==e&&(t.keepAlive=!1)}),this.historyRoutes=this.historyRoutes.filter(t=>{if(t.name!==e)return t}),e==s&&this.historyRoutes.length>0)return r.replace({name:this.historyRoutes[0].meta.name})}}}),h=""+new URL("LOGO-c1524a7d.svg",import.meta.url).href;export{h as _,u};
+>>>>>>>> xiaoqin:dist/assets/LOGO-0ad01ede.js

dist/assets/PlusCircleOutlined-50684d56.js

@@ -0,0 +1,5 @@
+<<<<<<<< HEAD:dist/assets/PlusCircleOutlined-ca92286c.js
+import{a as i}from"./index-3d860e00.js";import{j as u}from"./vue-48d59694.js";var s={icon:{tag:"svg",attrs:{viewBox:"64 64 896 896",focusable:"false"},children:[{tag:"path",attrs:{d:"M696 480H544V328c0-4.4-3.6-8-8-8h-48c-4.4 0-8 3.6-8 8v152H328c-4.4 0-8 3.6-8 8v48c0 4.4 3.6 8 8 8h152v152c0 4.4 3.6 8 8 8h48c4.4 0 8-3.6 8-8V544h152c4.4 0 8-3.6 8-8v-48c0-4.4-3.6-8-8-8z"}},{tag:"path",attrs:{d:"M512 64C264.6 64 64 264.6 64 512s200.6 448 448 448 448-200.6 448-448S759.4 64 512 64zm0 820c-205.4 0-372-166.6-372-372s166.6-372 372-372 372 166.6 372 372-166.6 372-372 372z"}}]},name:"plus-circle",theme:"outlined"};const o=s;function a(r){for(var t=1;t<arguments.length;t++){var e=arguments[t]!=null?Object(arguments[t]):{},n=Object.keys(e);typeof Object.getOwnPropertySymbols=="function"&&(n=n.concat(Object.getOwnPropertySymbols(e).filter(function(c){return Object.getOwnPropertyDescriptor(e,c).enumerable}))),n.forEach(function(c){f(r,c,e[c])})}return r}function f(r,t,e){return t in r?Object.defineProperty(r,t,{value:e,enumerable:!0,configurable:!0,writable:!0}):r[t]=e,r}var l=function(t,e){var n=a({},t,e.attrs);return u(i,a({},n,{icon:o}),null)};l.displayName="PlusCircleOutlined";l.inheritAttrs=!1;const m=l;export{m as P};
+========
+import{a as i}from"./index-6c600258.js";import{j as u}from"./vue-48d59694.js";var s={icon:{tag:"svg",attrs:{viewBox:"64 64 896 896",focusable:"false"},children:[{tag:"path",attrs:{d:"M696 480H544V328c0-4.4-3.6-8-8-8h-48c-4.4 0-8 3.6-8 8v152H328c-4.4 0-8 3.6-8 8v48c0 4.4 3.6 8 8 8h152v152c0 4.4 3.6 8 8 8h48c4.4 0 8-3.6 8-8V544h152c4.4 0 8-3.6 8-8v-48c0-4.4-3.6-8-8-8z"}},{tag:"path",attrs:{d:"M512 64C264.6 64 64 264.6 64 512s200.6 448 448 448 448-200.6 448-448S759.4 64 512 64zm0 820c-205.4 0-372-166.6-372-372s166.6-372 372-372 372 166.6 372 372-166.6 372-372 372z"}}]},name:"plus-circle",theme:"outlined"};const o=s;function a(r){for(var t=1;t<arguments.length;t++){var e=arguments[t]!=null?Object(arguments[t]):{},n=Object.keys(e);typeof Object.getOwnPropertySymbols=="function"&&(n=n.concat(Object.getOwnPropertySymbols(e).filter(function(c){return Object.getOwnPropertyDescriptor(e,c).enumerable}))),n.forEach(function(c){f(r,c,e[c])})}return r}function f(r,t,e){return t in r?Object.defineProperty(r,t,{value:e,enumerable:!0,configurable:!0,writable:!0}):r[t]=e,r}var l=function(t,e){var n=a({},t,e.attrs);return u(i,a({},n,{icon:o}),null)};l.displayName="PlusCircleOutlined";l.inheritAttrs=!1;const m=l;export{m as P};
+>>>>>>>> xiaoqin:dist/assets/PlusCircleOutlined-50684d56.js

dist/assets/PlusCircleOutlined-ca92286c.js

@@ -1 +1,5 @@
+<<<<<<<< HEAD:dist/assets/PlusCircleOutlined-ca92286c.js
 import{a as i}from"./index-3d860e00.js";import{j as u}from"./vue-48d59694.js";var s={icon:{tag:"svg",attrs:{viewBox:"64 64 896 896",focusable:"false"},children:[{tag:"path",attrs:{d:"M696 480H544V328c0-4.4-3.6-8-8-8h-48c-4.4 0-8 3.6-8 8v152H328c-4.4 0-8 3.6-8 8v48c0 4.4 3.6 8 8 8h152v152c0 4.4 3.6 8 8 8h48c4.4 0 8-3.6 8-8V544h152c4.4 0 8-3.6 8-8v-48c0-4.4-3.6-8-8-8z"}},{tag:"path",attrs:{d:"M512 64C264.6 64 64 264.6 64 512s200.6 448 448 448 448-200.6 448-448S759.4 64 512 64zm0 820c-205.4 0-372-166.6-372-372s166.6-372 372-372 372 166.6 372 372-166.6 372-372 372z"}}]},name:"plus-circle",theme:"outlined"};const o=s;function a(r){for(var t=1;t<arguments.length;t++){var e=arguments[t]!=null?Object(arguments[t]):{},n=Object.keys(e);typeof Object.getOwnPropertySymbols=="function"&&(n=n.concat(Object.getOwnPropertySymbols(e).filter(function(c){return Object.getOwnPropertyDescriptor(e,c).enumerable}))),n.forEach(function(c){f(r,c,e[c])})}return r}function f(r,t,e){return t in r?Object.defineProperty(r,t,{value:e,enumerable:!0,configurable:!0,writable:!0}):r[t]=e,r}var l=function(t,e){var n=a({},t,e.attrs);return u(i,a({},n,{icon:o}),null)};l.displayName="PlusCircleOutlined";l.inheritAttrs=!1;const m=l;export{m as P};
+========
+import{a as i}from"./index-6c600258.js";import{j as u}from"./vue-48d59694.js";var s={icon:{tag:"svg",attrs:{viewBox:"64 64 896 896",focusable:"false"},children:[{tag:"path",attrs:{d:"M696 480H544V328c0-4.4-3.6-8-8-8h-48c-4.4 0-8 3.6-8 8v152H328c-4.4 0-8 3.6-8 8v48c0 4.4 3.6 8 8 8h152v152c0 4.4 3.6 8 8 8h48c4.4 0 8-3.6 8-8V544h152c4.4 0 8-3.6 8-8v-48c0-4.4-3.6-8-8-8z"}},{tag:"path",attrs:{d:"M512 64C264.6 64 64 264.6 64 512s200.6 448 448 448 448-200.6 448-448S759.4 64 512 64zm0 820c-205.4 0-372-166.6-372-372s166.6-372 372-372 372 166.6 372 372-166.6 372-372 372z"}}]},name:"plus-circle",theme:"outlined"};const o=s;function a(r){for(var t=1;t<arguments.length;t++){var e=arguments[t]!=null?Object(arguments[t]):{},n=Object.keys(e);typeof Object.getOwnPropertySymbols=="function"&&(n=n.concat(Object.getOwnPropertySymbols(e).filter(function(c){return Object.getOwnPropertyDescriptor(e,c).enumerable}))),n.forEach(function(c){f(r,c,e[c])})}return r}function f(r,t,e){return t in r?Object.defineProperty(r,t,{value:e,enumerable:!0,configurable:!0,writable:!0}):r[t]=e,r}var l=function(t,e){var n=a({},t,e.attrs);return u(i,a({},n,{icon:o}),null)};l.displayName="PlusCircleOutlined";l.inheritAttrs=!1;const m=l;export{m as P};
+>>>>>>>> xiaoqin:dist/assets/PlusCircleOutlined-50684d56.js

dist/assets/index-1ce52788.js

@@ -1 +1,5 @@
+<<<<<<<< HEAD:dist/assets/index-1ce52788.js
 import{l as d}from"./index-3e01a3ea.js";import{A as m}from"./index-3d860e00.js";import{u}from"./vue-router-499a53c9.js";import{_ as f}from"./_plugin-vue_export-helper-c27b6911.js";import{a as s,U as x,V as r,W as y,j as b,X as n,u as i,G as g,a6 as h,$ as k,a3 as w,a4 as B}from"./vue-48d59694.js";/* empty css                                                              */import"./base-74a52a4c.js";const N={class:"y-container"},v=["onClick"],A={__name:"index",setup(S){u();let c=s([]);s([]);let p=s({content:{pageNumber:1,pageSize:20,systemappid:JSON.parse(sessionStorage.getItem("app")).systemappid},id:20221213094401});const l=()=>{let t=window.location.href,e=t.indexOf("/"),a=0;for(;e!=-1;)if(a++,e=t.indexOf("/",e+1),a++==3)return t.slice(0,e)},_=async t=>{console.log("http://60.204.153.188/");let e=await m.requested({id:20221213094501,content:{sys_reportid:t.sys_reportid,dataid:0}});window.open(l()+e.data)};return(t,e)=>{const a=x("a-button");return r(),y("div",N,[b(d,{columns:i(c),param:i(p),tableName:"reportcenterTable"},{operation:n(()=>[g(" 报表中心 ")]),tb_cell:n(({data:o})=>[o.column.dataIndex=="name"?(r(),h(a,{key:0,type:"link"},{default:n(()=>[k("span",{class:"btn-link",onClick:C=>_(o.record)},w(o.record.name),9,v)]),_:2},1024)):B("",!0)]),_:1},8,["columns","param"])])}}},U=f(A,[["__scopeId","data-v-103da97b"]]);export{U as default};
+========
+import{l as d}from"./index-bb416348.js";import{A as m}from"./index-6c600258.js";import{u}from"./vue-router-499a53c9.js";import{_ as f}from"./_plugin-vue_export-helper-c27b6911.js";import{a as s,U as x,V as r,W as y,j as b,X as n,u as i,G as g,a6 as h,$ as k,a3 as w,a4 as B}from"./vue-48d59694.js";/* empty css                                                              */import"./base-677f834d.js";const N={class:"y-container"},v=["onClick"],A={__name:"index",setup(S){u();let c=s([]);s([]);let p=s({content:{pageNumber:1,pageSize:20,systemappid:JSON.parse(sessionStorage.getItem("app")).systemappid},id:20221213094401});const l=()=>{let t=window.location.href,e=t.indexOf("/"),a=0;for(;e!=-1;)if(a++,e=t.indexOf("/",e+1),a++==3)return t.slice(0,e)},_=async t=>{console.log("http://60.204.153.188/");let e=await m.requested({id:20221213094501,content:{sys_reportid:t.sys_reportid,dataid:0}});window.open(l()+e.data)};return(t,e)=>{const a=x("a-button");return r(),y("div",N,[b(d,{columns:i(c),param:i(p),tableName:"reportcenterTable"},{operation:n(()=>[g(" 报表中心 ")]),tb_cell:n(({data:o})=>[o.column.dataIndex=="name"?(r(),h(a,{key:0,type:"link"},{default:n(()=>[k("span",{class:"btn-link",onClick:C=>_(o.record)},w(o.record.name),9,v)]),_:2},1024)):B("",!0)]),_:1},8,["columns","param"])])}}},U=f(A,[["__scopeId","data-v-103da97b"]]);export{U as default};
+>>>>>>>> xiaoqin:dist/assets/index-e0027cd0.js

dist/assets/index-1f110d13.js

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

dist/assets/index-4ca9df37.js

@@ -0,0 +1,5 @@
+<<<<<<<< HEAD:dist/assets/index-bbc78cbe.js
+import{l as n}from"./index-3e01a3ea.js";import{a as e,o as s,V as p,W as i,j as c,X as l,u as a}from"./vue-48d59694.js";import"./vue-router-499a53c9.js";/* empty css                                                              */import"./index-3d860e00.js";import"./base-74a52a4c.js";import"./_plugin-vue_export-helper-c27b6911.js";const g={__name:"index",setup(m){const t=e();let r=e([{label:"范围",key:"isnext",type:"select",dataSource:[{remarks:"今年",value:"0"},{remarks:"明年",value:"1"}]},{label:"时间范围",key:"dateRange",type:"datepickerRange",objKeys:["begindate","enddate"]}]),o=e({content:{pageNumber:1,pageSize:20,isnext:0,where:{condition:""}},id:20221215165504});return s(()=>{}),(u,d)=>(p(),i("div",null,[c(n,{ref_key:"list",ref:t,keyRouteName:"accountno",param:a(o),tableName:"vacationTable",searchType:a(r)},{operation:l(()=>[]),_:1},8,["param","searchType"])]))}};export{g as default};
+========
+import{l as n}from"./index-bb416348.js";import{a as e,o as s,V as p,W as i,j as c,X as l,u as a}from"./vue-48d59694.js";import"./vue-router-499a53c9.js";/* empty css                                                              */import"./index-6c600258.js";import"./base-677f834d.js";import"./_plugin-vue_export-helper-c27b6911.js";const g={__name:"index",setup(m){const t=e();let r=e([{label:"范围",key:"isnext",type:"select",dataSource:[{remarks:"今年",value:"0"},{remarks:"明年",value:"1"}]},{label:"时间范围",key:"dateRange",type:"datepickerRange",objKeys:["begindate","enddate"]}]),o=e({content:{pageNumber:1,pageSize:20,isnext:0,where:{condition:""}},id:20221215165504});return s(()=>{}),(u,d)=>(p(),i("div",null,[c(n,{ref_key:"list",ref:t,keyRouteName:"accountno",param:a(o),tableName:"vacationTable",searchType:a(r)},{operation:l(()=>[]),_:1},8,["param","searchType"])]))}};export{g as default};
+>>>>>>>> xiaoqin:dist/assets/index-4ca9df37.js

dist/assets/index-62241903.js

@@ -1 +1,5 @@
+<<<<<<<< HEAD:dist/assets/index-62241903.js
 import{M as o,A as c,f as l}from"./index-3d860e00.js";import{U as m,V as d,a6 as u,X as p,G as y,a3 as f,u as g}from"./vue-48d59694.js";const k={__name:"index",props:{type:String,btnName:String,message:String,idName:String,keyName:String,id:[String,Number],paramData:{type:Array,default(){return[]}},size:String,disabled:{type:Boolean,default(){return!1}}},emits:["onSuccess"],setup(e,{emit:i}){const t=e;let r=()=>{o.confirm({title:t.message||"确定操作当前数据吗?",async onOk(){let a={content:{}};a.id=t.idName,a.content[t.keyName]=t.id,t.paramData.forEach(n=>{a.content[n.key]=n.value});let s=await c.requested(a);l.message(s,"操作成功",()=>{i("onSuccess")})},onCancel(){}})};return(a,s)=>{const n=m("a-button");return d(),u(n,{type:e.type?e.type:"primary",onClick:g(r),size:e.size||"small",disabled:e.disabled},{default:p(()=>[y(f(e.btnName),1)]),_:1},8,["type","onClick","size","disabled"])}}};export{k as _};
+========
+import{M as o,A as c,f as l}from"./index-6c600258.js";import{U as m,V as d,a6 as u,X as p,G as y,a3 as f,u as g}from"./vue-48d59694.js";const k={__name:"index",props:{type:String,btnName:String,message:String,idName:String,keyName:String,id:[String,Number],paramData:{type:Array,default(){return[]}},size:String,disabled:{type:Boolean,default(){return!1}}},emits:["onSuccess"],setup(e,{emit:i}){const t=e;let r=()=>{o.confirm({title:t.message||"确定操作当前数据吗?",async onOk(){let a={content:{}};a.id=t.idName,a.content[t.keyName]=t.id,t.paramData.forEach(n=>{a.content[n.key]=n.value});let s=await c.requested(a);l.message(s,"操作成功",()=>{i("onSuccess")})},onCancel(){}})};return(a,s)=>{const n=m("a-button");return d(),u(n,{type:e.type?e.type:"primary",onClick:g(r),size:e.size||"small",disabled:e.disabled},{default:p(()=>[y(f(e.btnName),1)]),_:1},8,["type","onClick","size","disabled"])}}};export{k as _};
+>>>>>>>> xiaoqin:dist/assets/index-82e71e41.js

dist/assets/index-82e71e41.js

@@ -0,0 +1,5 @@
+<<<<<<<< HEAD:dist/assets/index-62241903.js
+import{M as o,A as c,f as l}from"./index-3d860e00.js";import{U as m,V as d,a6 as u,X as p,G as y,a3 as f,u as g}from"./vue-48d59694.js";const k={__name:"index",props:{type:String,btnName:String,message:String,idName:String,keyName:String,id:[String,Number],paramData:{type:Array,default(){return[]}},size:String,disabled:{type:Boolean,default(){return!1}}},emits:["onSuccess"],setup(e,{emit:i}){const t=e;let r=()=>{o.confirm({title:t.message||"确定操作当前数据吗?",async onOk(){let a={content:{}};a.id=t.idName,a.content[t.keyName]=t.id,t.paramData.forEach(n=>{a.content[n.key]=n.value});let s=await c.requested(a);l.message(s,"操作成功",()=>{i("onSuccess")})},onCancel(){}})};return(a,s)=>{const n=m("a-button");return d(),u(n,{type:e.type?e.type:"primary",onClick:g(r),size:e.size||"small",disabled:e.disabled},{default:p(()=>[y(f(e.btnName),1)]),_:1},8,["type","onClick","size","disabled"])}}};export{k as _};
+========
+import{M as o,A as c,f as l}from"./index-6c600258.js";import{U as m,V as d,a6 as u,X as p,G as y,a3 as f,u as g}from"./vue-48d59694.js";const k={__name:"index",props:{type:String,btnName:String,message:String,idName:String,keyName:String,id:[String,Number],paramData:{type:Array,default(){return[]}},size:String,disabled:{type:Boolean,default(){return!1}}},emits:["onSuccess"],setup(e,{emit:i}){const t=e;let r=()=>{o.confirm({title:t.message||"确定操作当前数据吗?",async onOk(){let a={content:{}};a.id=t.idName,a.content[t.keyName]=t.id,t.paramData.forEach(n=>{a.content[n.key]=n.value});let s=await c.requested(a);l.message(s,"操作成功",()=>{i("onSuccess")})},onCancel(){}})};return(a,s)=>{const n=m("a-button");return d(),u(n,{type:e.type?e.type:"primary",onClick:g(r),size:e.size||"small",disabled:e.disabled},{default:p(()=>[y(f(e.btnName),1)]),_:1},8,["type","onClick","size","disabled"])}}};export{k as _};
+>>>>>>>> xiaoqin:dist/assets/index-82e71e41.js

dist/assets/index-98e1d187.js

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

dist/assets/index-bbc78cbe.js

@@ -1 +1,5 @@
+<<<<<<<< HEAD:dist/assets/index-bbc78cbe.js
 import{l as n}from"./index-3e01a3ea.js";import{a as e,o as s,V as p,W as i,j as c,X as l,u as a}from"./vue-48d59694.js";import"./vue-router-499a53c9.js";/* empty css                                                              */import"./index-3d860e00.js";import"./base-74a52a4c.js";import"./_plugin-vue_export-helper-c27b6911.js";const g={__name:"index",setup(m){const t=e();let r=e([{label:"范围",key:"isnext",type:"select",dataSource:[{remarks:"今年",value:"0"},{remarks:"明年",value:"1"}]},{label:"时间范围",key:"dateRange",type:"datepickerRange",objKeys:["begindate","enddate"]}]),o=e({content:{pageNumber:1,pageSize:20,isnext:0,where:{condition:""}},id:20221215165504});return s(()=>{}),(u,d)=>(p(),i("div",null,[c(n,{ref_key:"list",ref:t,keyRouteName:"accountno",param:a(o),tableName:"vacationTable",searchType:a(r)},{operation:l(()=>[]),_:1},8,["param","searchType"])]))}};export{g as default};
+========
+import{l as n}from"./index-bb416348.js";import{a as e,o as s,V as p,W as i,j as c,X as l,u as a}from"./vue-48d59694.js";import"./vue-router-499a53c9.js";/* empty css                                                              */import"./index-6c600258.js";import"./base-677f834d.js";import"./_plugin-vue_export-helper-c27b6911.js";const g={__name:"index",setup(m){const t=e();let r=e([{label:"范围",key:"isnext",type:"select",dataSource:[{remarks:"今年",value:"0"},{remarks:"明年",value:"1"}]},{label:"时间范围",key:"dateRange",type:"datepickerRange",objKeys:["begindate","enddate"]}]),o=e({content:{pageNumber:1,pageSize:20,isnext:0,where:{condition:""}},id:20221215165504});return s(()=>{}),(u,d)=>(p(),i("div",null,[c(n,{ref_key:"list",ref:t,keyRouteName:"accountno",param:a(o),tableName:"vacationTable",searchType:a(r)},{operation:l(()=>[]),_:1},8,["param","searchType"])]))}};export{g as default};
+>>>>>>>> xiaoqin:dist/assets/index-4ca9df37.js

dist/assets/index-e0027cd0.js

@@ -0,0 +1,5 @@
+<<<<<<<< HEAD:dist/assets/index-1ce52788.js
+import{l as d}from"./index-3e01a3ea.js";import{A as m}from"./index-3d860e00.js";import{u}from"./vue-router-499a53c9.js";import{_ as f}from"./_plugin-vue_export-helper-c27b6911.js";import{a as s,U as x,V as r,W as y,j as b,X as n,u as i,G as g,a6 as h,$ as k,a3 as w,a4 as B}from"./vue-48d59694.js";/* empty css                                                              */import"./base-74a52a4c.js";const N={class:"y-container"},v=["onClick"],A={__name:"index",setup(S){u();let c=s([]);s([]);let p=s({content:{pageNumber:1,pageSize:20,systemappid:JSON.parse(sessionStorage.getItem("app")).systemappid},id:20221213094401});const l=()=>{let t=window.location.href,e=t.indexOf("/"),a=0;for(;e!=-1;)if(a++,e=t.indexOf("/",e+1),a++==3)return t.slice(0,e)},_=async t=>{console.log("http://60.204.153.188/");let e=await m.requested({id:20221213094501,content:{sys_reportid:t.sys_reportid,dataid:0}});window.open(l()+e.data)};return(t,e)=>{const a=x("a-button");return r(),y("div",N,[b(d,{columns:i(c),param:i(p),tableName:"reportcenterTable"},{operation:n(()=>[g(" 报表中心 ")]),tb_cell:n(({data:o})=>[o.column.dataIndex=="name"?(r(),h(a,{key:0,type:"link"},{default:n(()=>[k("span",{class:"btn-link",onClick:C=>_(o.record)},w(o.record.name),9,v)]),_:2},1024)):B("",!0)]),_:1},8,["columns","param"])])}}},U=f(A,[["__scopeId","data-v-103da97b"]]);export{U as default};
+========
+import{l as d}from"./index-bb416348.js";import{A as m}from"./index-6c600258.js";import{u}from"./vue-router-499a53c9.js";import{_ as f}from"./_plugin-vue_export-helper-c27b6911.js";import{a as s,U as x,V as r,W as y,j as b,X as n,u as i,G as g,a6 as h,$ as k,a3 as w,a4 as B}from"./vue-48d59694.js";/* empty css                                                              */import"./base-677f834d.js";const N={class:"y-container"},v=["onClick"],A={__name:"index",setup(S){u();let c=s([]);s([]);let p=s({content:{pageNumber:1,pageSize:20,systemappid:JSON.parse(sessionStorage.getItem("app")).systemappid},id:20221213094401});const l=()=>{let t=window.location.href,e=t.indexOf("/"),a=0;for(;e!=-1;)if(a++,e=t.indexOf("/",e+1),a++==3)return t.slice(0,e)},_=async t=>{console.log("http://60.204.153.188/");let e=await m.requested({id:20221213094501,content:{sys_reportid:t.sys_reportid,dataid:0}});window.open(l()+e.data)};return(t,e)=>{const a=x("a-button");return r(),y("div",N,[b(d,{columns:i(c),param:i(p),tableName:"reportcenterTable"},{operation:n(()=>[g(" 报表中心 ")]),tb_cell:n(({data:o})=>[o.column.dataIndex=="name"?(r(),h(a,{key:0,type:"link"},{default:n(()=>[k("span",{class:"btn-link",onClick:C=>_(o.record)},w(o.record.name),9,v)]),_:2},1024)):B("",!0)]),_:1},8,["columns","param"])])}}},U=f(A,[["__scopeId","data-v-103da97b"]]);export{U as default};
+>>>>>>>> xiaoqin:dist/assets/index-e0027cd0.js

dist/assets/login-ef543e4f.js

@@ -1,4 +1,8 @@
+<<<<<<<< HEAD:dist/assets/login-ef543e4f.js
 import{u as useRouter}from"./vue-router-499a53c9.js";import{c as commonjsGlobal,u as useAuthStore,s as storeToRefs,A as Api,m as message}from"./index-3d860e00.js";import{u as useRouteTabsStore,_ as _imports_0}from"./LOGO-5cfd52be.js";import{_ as _export_sfc}from"./_plugin-vue_export-helper-c27b6911.js";import{d as defineComponent,U as resolveComponent,V as openBlock,W as createElementBlock,$ as createBaseVNode,j as createVNode,X as withCtx,a as ref,r as reactive,a0 as normalizeStyle,G as createTextVNode,a1 as pushScopeId,a2 as popScopeId}from"./vue-48d59694.js";var md5Exports={},md5$1={get exports(){return md5Exports},set exports(e){md5Exports=e}};/**
+========
+import{u as useRouter}from"./vue-router-499a53c9.js";import{c as commonjsGlobal,u as useAuthStore,s as storeToRefs,A as Api,m as message}from"./index-6c600258.js";import{u as useRouteTabsStore,_ as _imports_0}from"./LOGO-0ad01ede.js";import{_ as _export_sfc}from"./_plugin-vue_export-helper-c27b6911.js";import{d as defineComponent,U as resolveComponent,V as openBlock,W as createElementBlock,$ as createBaseVNode,j as createVNode,X as withCtx,a as ref,r as reactive,a0 as normalizeStyle,G as createTextVNode,a1 as pushScopeId,a2 as popScopeId}from"./vue-48d59694.js";var md5Exports={},md5$1={get exports(){return md5Exports},set exports(e){md5Exports=e}};/**
+>>>>>>>> xiaoqin:dist/assets/login-d0bfd4e6.js
  * [js-md5]{@link https://github.com/emn178/js-md5}
  *
  * @namespace md5

dist/index.html

@@ -5,7 +5,11 @@
     <link rel="icon" type="image/svg+xml" href="./vite.svg" />
     <meta name="viewport" content="width=device-width, initial-scale=1.0" />
     <title>班尼戈水务管理</title>
+<<<<<<< HEAD
     <script type="module" crossorigin src="./assets/index-3d860e00.js"></script>
+=======
+    <script type="module" crossorigin src="./assets/index-6c600258.js"></script>
+>>>>>>> xiaoqin
     <link rel="modulepreload" crossorigin href="./assets/vue-48d59694.js">
     <link rel="modulepreload" crossorigin href="./assets/vue-router-499a53c9.js">
     <link rel="stylesheet" href="./assets/index-06454cca.css">

src/components/layout/index.vue

@@ -81,5 +81,4 @@ const router = useRouter()
   transform: scale(0.9);
 }
 
-
 </style>

src/operation/moduleNormal/controlPanel/model/dianci/index.vue

@@ -30,7 +30,7 @@
           left="400" 
           :data="[{title:detail.params.Batt4.paramname,value:detail.params.Batt4.lastvalue,unit:detail.params.Batt4.unit},{title:detail.params.Batt12.paramname,value,value:detail.params.Batt12.lastvalue,unit:detail.params.Batt12.unit},{title:detail.params.BatFlow.paramname,value:detail.params.BatFlow.lastvalue,unit:detail.params.BatFlow.unit}]"
         ></dataBlock>
-        <dataBlock title="导阀模式" top="300" left="500" v-if="detail.params.DaoFa">
+        <dataBlock :title="detail.params.DaoFa.paramname" top="300" left="500" v-if="detail.function['Pilot valve'] && detail.params.DaoFa">
           <div style="padding: 0 5px;">
             <a-button type="default" size="small" style="margin:5px;" v-for="item in detail.params.DaoFa.options" @click="controlBtn(item)" :disabled="detail.params.DaoFa.lastvalue == item.value">{{ item.label }}</a-button>
           </div>
@@ -42,7 +42,7 @@
           left="300" 
           :data="[{value:detail.params.DownP.lastvalue,unit:detail.params.DownP.unit}]"
         ></dataBlock>
-        <div class="stop">
+        <div class="stop" v-if="detail.function['cease']">
           <a-button :type="detail.params.Emer && +detail.params.Emer.lastvalue ?  'primary' : 'danger'" size="small" @click="StopFun">{{detail.params.Emer && +detail.params.Emer.lastvalue ?  '开启' : detail.function.cease && detail.function.cease.funcname }}</a-button>
         </div>
         <img src="@/assets/deviced/电池.png" alt="">

src/operation/moduleNormal/controlPanel/model/dianci/modules/controlPanel.vue

@@ -4,7 +4,7 @@
   </div>
   <div style="height: calc(100% - 25px);overflow-y: scroll;scrollbar-width: none;">
     <MyInput 
-        v-if="params.FlowAcc"
+        v-if="detailData.function['Flow control'] && params.FlowAcc"
         :form="form"
         :scale="params.FlowAcc && params.FlowAcc.num_scale" 
         v-model:value="form.FlowAcc" 
@@ -21,7 +21,7 @@
     </MyInput>
 
     <MyInput 
-        v-if="params.PresAcc"
+        v-if="detailData.function['pressure control'] && params.PresAcc"
         type="int" 
         :scale="params.PresAcc && params.PresAcc.num_scale" 
         :isCheck="true" 
@@ -37,10 +37,10 @@
         :step="params.PresAcc && params.PresAcc.num_step"
       >
     </MyInput>
-    <MyRadio @Change="sleepChange" v-model:value="form.Config" :title="detailData.function.Config.funcname" :options="params.Config.options"></MyRadio>
+    <MyRadio v-if="detailData.function.Config" @Change="sleepChange" v-model:value="form.Config" :title="detailData.function.Config.funcname" :options="params.Config.options"></MyRadio>
 
     <MyInput 
-        v-if="params.SleepTime"
+        v-if="detailData.function['Sleep time'] && params.SleepTime"
         type="int" 
         :scale="params.SleepTime && params.SleepTime.num_scale" 
         :isCheck="true" 
@@ -58,7 +58,7 @@
     </MyInput>
 
     <MyInput 
-        v-if="params.FloMinP"
+        v-if="detailData.function['Minimum'] && params.FloMinP"
         :form="form"
         v-model:value="form.FloMinP" 
         name="FloMinP" 
@@ -75,7 +75,7 @@
     </MyInput>
 
     <MyInput 
-        v-if="params.FloMaxP"
+        v-if="detailData.function['MOP'] && params.FloMaxP"
         :form="form"
         v-model:value="form.FloMaxP" 
         name="FloMaxP" 
@@ -90,13 +90,13 @@
         :step="params.FloMaxP && params.FloMaxP.num_step"
       >
     </MyInput>
-    <span v-if="params.ConMode">当前模式：</span>
+    <span v-if="detailData.function['Ctrl'] && params.ConMode">当前模式：</span>
   <customBtn 
-    v-if="params.ConMode"
+    v-if="detailData.function['Ctrl'] && params.ConMode"
     style="margin-top: 20px;"
     ref="tab"
     :select="true"
-    v-model:value="form.Control"
+    v-model:value="form.ConMode"
     :btnOptions="params.ConMode.options" 
     :tab="true" 
     @selectChange="modelChange"
@@ -105,7 +105,7 @@
       <div>
         <p style="font-size: 12px;">{{params.UpP && params.UpP.paramname}}：<span style="font-size: 18px;">{{ form.UpP }}MPa</span></p>
         <MyInput 
-            v-if="params.UpTar"
+            v-if="detailData.function['Upstream'] && params.UpTar"
             type="int" 
             :scale="params.UpTar && params.UpTar.num_scale" 
             :isCheck="true" 
@@ -130,7 +130,7 @@
       <div>
         <p style="font-size: 12px;">{{params.DownP && params.DownP.paramname}}：<span style="font-size: 18px;">{{ form.DownP }}MPa</span></p>
           <MyInput 
-              v-if="params.DownTar"
+              v-if="detailData.function['Downstream'] && params.DownTar"
               type="int" 
               scale="2" 
               :scale="params.DownTar && params.DownTar.num_scale" 
@@ -156,7 +156,7 @@
       <div>
         <p style="font-size: 12px;">{{params.NowFlow && params.NowFlow.paramname}}：<span style="font-size: 18px;">{{ form.NowFlow }}m³/h</span></p>
           <MyInput 
-              v-if="params.TatFlow"
+              v-if="detailData.function['Constantflow'] && params.TatFlow"
               type="int" 
               :scale="params.TatFlow && params.TatFlow.num_scale" 
               :isCheck="true" 
@@ -181,7 +181,7 @@
       <div>
         <p style="font-size: 12px;">{{params.MostBad && params.MostBad.paramname}}：<span style="font-size: 18px;">{{ form.MostBad }}MPa</span></p>
           <MyInput 
-              v-if="params.TarBad"
+              v-if="detailData.function['unfavorable'] && params.TarBad"
               type="int" 
               :scale="params.TarBad && params.TarBad.num_scale" 
               :isCheck="true" 
@@ -230,7 +230,7 @@ console.log(params,'params');
 console.log(form.value,'formData');
 
 nextTick(() => {
-  tab.value.active = form.value.Control
+  tab.value.active = form.value.ConMode
 })
 
 let updateData = (funName) => {
@@ -266,11 +266,12 @@ let modelChange = async (data) => {
       "w_deviceid": router.currentRoute.value.query.id,
       "w_functionid": detailData.value.function.Ctrl.w_functionid,
       "params": {
-        'Control':data
+        'ConMode':data
       }
     }
   })
-  utils.message(res,'操作成功',() => {
+  utils.message(res,() => {
+    utils.message(res,'模式变更成功')
     emit('onSuccess')
   })
 }

src/operation/moduleNormal/controlPanel/model/dianci/modules/timeControl.vue

@@ -1,9 +1,9 @@
 <template>
   <div class="header">
     <span style="color:#ffffff">分时控制设置</span>
-    <customBtn :btnOptions="[{label:'保存',value:'timeshared'}]" @clickBtn="updateData"></customBtn>
+    <customBtn :btnOptions="[{label:'保存',value:'timeshared'}]" @clickBtn="updateData" v-if="detailData.function['timeshared']"></customBtn>
   </div>
-  <div v-if="params.TimeCon">
+  <div v-if="detailData.function['TimeControl'] && params.TimeCon">
     <span style="color:#ffffff">{{ params.TimeCon && params.TimeCon.paramname }}：</span>
     <a-radio-group v-model:value="form.TimeCon" @change="modelChange">
       <a-radio :style="radioStyle" :value="item.value" v-for="item in params.TimeCon.options">{{ item.label }}</a-radio>

src/operation/moduleNormal/controlPanel/modules/customBtn.vue

@@ -7,7 +7,7 @@
     style="width: 120px"
     @change="handleChange"
   >
-    <a-select-option :value="item.label" v-for="(item,index) in btnOptions">{{ item.label }}</a-select-option>
+    <a-select-option :value="item.value" v-for="(item,index) in btnOptions">{{ item.label }}</a-select-option>
   </a-select>
   <div class="btn-wrapper" v-else>
     <div class="btn-box">
@@ -49,7 +49,7 @@ let active = ref(props.activeNormal ? props.btnOptions[0].label : '')
 let isSlot = computed((data) => {
   return (data) => {
     console.log(active.value);
-    return data.label == active.value
+    return data.value == active.value
   }
 })
 

src/operation/moduleNormal/controlPanel/modules/handleHistory.vue

@@ -79,6 +79,7 @@ defineExpose({
   type,
   param,
   modeVisible,
+  param,
   listData
 })
 </script>

src/operation/moduleNormal/productManage/detail/modules/attributeTab/index.vue

@@ -52,6 +52,9 @@
             <a-select-option value="2">2</a-select-option>
           </a-select>
         </div>
+        <div>
+          <a-input v-model:value="param.content.where.condition" @keyup.enter="$refs.list.listData()"  placeholder="名称/标识" autocomplete="off"></a-input>
+        </div>
       </div>
     </template>
   </normalTable>

src/template/normalTable/index.vue

@@ -45,7 +45,11 @@
     size:String,
     tableid:Number,
     rowKey:String,
-    filterMultiple:Boolean
+    filterMultiple:Boolean,
+    loadOverHandle: {
+      type:Boolean,
+      default:() => true
+    }
   })
   const columns = ref(props.columns)
   const data = ref([])
@@ -90,7 +94,7 @@
     props.param.content.where.tablefilter[title] = value
   }
   onMounted(()=>{
-    listData()
+    props.loadOverHandle && listData()
   })
   onUnmounted(()=>{
     tableRecord.value = []