2023-8-26

dist/assets/PlusCircleOutlined-c2b9cbd1.js → dist/assets/PlusCircleOutlined-ff47e049.js

@@ -1 +1 @@
-import{b as a}from"./index-c67b7cbd.js";import{j as u}from"./vue-676ffbd1.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 i(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=i({},t,e.attrs);return u(a,i({},n,{icon:o}),null)};l.displayName="PlusCircleOutlined";l.inheritAttrs=!1;const m=l;export{m as P};
+import{b as a}from"./index-6bad7ac7.js";import{j as u}from"./vue-676ffbd1.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 i(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=i({},t,e.attrs);return u(a,i({},n,{icon:o}),null)};l.displayName="PlusCircleOutlined";l.inheritAttrs=!1;const m=l;export{m as P};

dist/assets/base-7f7e34b3.js → dist/assets/base-cede35ff.js

@@ -1 +1 @@
-import{j as l,A as n}from"./index-c67b7cbd.js";import{u as c}from"./vue-router-dd0356f0.js";const d=l("base",{state:()=>({router:c(),classAct:null,Provinces:[],PageUpParam:{},nowPageData:[],pageTotal:0,keyid:"",tableRecord:[],requestedLoading:!1}),persist:{enabled:!0,strategies:[{storage:localStorage,paths:["PageUpParam","nowPageData","pageTotal","keyid"]}]},getters:{},actions:{optiontypeselect(t){return new Promise(async(a,s)=>{let r={classname:"sysmanage.develop.optiontype.optiontype",method:"optiontypeselect",content:{pageNumber:1,pageSize:1e3,typename:t,parameter:{}}};const e=await n.requested(r);a(e)})},async ProvincesData(){const t=await n.requested({classname:"system.tools",method:"query_arealist",content:{}});t.data;function a(s){let r=Object.keys(s).map((e,o,p)=>{var i={label:e,value:e,item:s[e]};return i});return r.forEach(e=>{e.item instanceof Array?(e.children=[],e.item.forEach(o=>{e.children.push({label:o,value:o})})):Object.keys(e.item).length!==0&&(e.children=a(e.item))}),r}return a(t.data)}}});export{d as u};
+import{j as l,A as n}from"./index-6bad7ac7.js";import{u as c}from"./vue-router-dd0356f0.js";const d=l("base",{state:()=>({router:c(),classAct:null,Provinces:[],PageUpParam:{},nowPageData:[],pageTotal:0,keyid:"",tableRecord:[],requestedLoading:!1}),persist:{enabled:!0,strategies:[{storage:localStorage,paths:["PageUpParam","nowPageData","pageTotal","keyid"]}]},getters:{},actions:{optiontypeselect(t){return new Promise(async(a,s)=>{let r={classname:"sysmanage.develop.optiontype.optiontype",method:"optiontypeselect",content:{pageNumber:1,pageSize:1e3,typename:t,parameter:{}}};const e=await n.requested(r);a(e)})},async ProvincesData(){const t=await n.requested({classname:"system.tools",method:"query_arealist",content:{}});t.data;function a(s){let r=Object.keys(s).map((e,o,p)=>{var i={label:e,value:e,item:s[e]};return i});return r.forEach(e=>{e.item instanceof Array?(e.children=[],e.item.forEach(o=>{e.children.push({label:o,value:o})})):Object.keys(e.item).length!==0&&(e.children=a(e.item))}),r}return a(t.data)}}});export{d as u};

dist/assets/customBtn-c2613500.js → dist/assets/customBtn-4379e1fd.js

@@ -1 +1 @@
-import"./index-c67b7cbd.js";import{_ as B}from"./_plugin-vue_export-helper-c27b6911.js";import{a as C,c as _,V as t,W as l,a4 as d,F as b,a2 as m,$ as c,a1 as k,a0 as g,u as r,a7 as S,R as x}from"./vue-676ffbd1.js";const h={class:"btn-box"},F=["onClick"],O={key:0,class:"icon1"},N={key:0,class:"content"},$={__name:"customBtn",props:{btnOptions:Array,btn:!1,tab:{type:Boolean,default:()=>!1},select:{type:Boolean,default:()=>!1},activeNormal:{type:Boolean,default:()=>!0},selectDisabled:{type:Boolean,default:()=>!1},btnColor:{type:String,default:()=>"rgb(22,255,246,.30)"},textColor:{type:String,default:()=>"#16FFF6"},icon1:{type:Boolean,default:()=>!1},myStyle:{type:Object,default:()=>{}}},emits:["clickBtn","selectChange"],setup(e,{expose:y,emit:f}){const i=e;let o=C(i.activeNormal?i.btnOptions[0].label:""),v=_(n=>s=>(console.log(s.value),s.label==o.value)),p=n=>{o.value=n.label,f("clickBtn",n)};return y({active:o}),(n,s)=>(t(),l("div",null,[d("div",{class:"btn-wrapper",style:k([{"--btnColor":e.btnColor},{"--textColor":e.textColor},e.myStyle])},[d("div",h,[(t(!0),l(b,null,m(e.btnOptions,a=>(t(),l("div",{class:g(["btn-item",r(o)==a.label?"active":"",{active:e.btn}]),onClick:u=>r(p)(a)},S(a.label),11,F))),256))]),e.icon1?(t(),l("div",O)):c("",!0)],4),e.tab?(t(),l("div",N,[(t(!0),l(b,null,m(e.btnOptions,(a,u)=>(t(),l("div",null,[r(v)(a)?x(n.$slots,`slot${u}`,{key:0,data:a},void 0,!0):c("",!0)]))),256))])):c("",!0)]))}},j=B($,[["__scopeId","data-v-4d9c96a6"]]);export{j as c};
+import"./index-6bad7ac7.js";import{_ as B}from"./_plugin-vue_export-helper-c27b6911.js";import{a as C,c as _,V as t,W as l,a4 as d,F as b,a2 as m,$ as c,a1 as k,a0 as g,u as r,a7 as S,R as x}from"./vue-676ffbd1.js";const h={class:"btn-box"},F=["onClick"],O={key:0,class:"icon1"},N={key:0,class:"content"},$={__name:"customBtn",props:{btnOptions:Array,btn:!1,tab:{type:Boolean,default:()=>!1},select:{type:Boolean,default:()=>!1},activeNormal:{type:Boolean,default:()=>!0},selectDisabled:{type:Boolean,default:()=>!1},btnColor:{type:String,default:()=>"rgb(22,255,246,.30)"},textColor:{type:String,default:()=>"#16FFF6"},icon1:{type:Boolean,default:()=>!1},myStyle:{type:Object,default:()=>{}}},emits:["clickBtn","selectChange"],setup(e,{expose:y,emit:f}){const i=e;let o=C(i.activeNormal?i.btnOptions[0].label:""),v=_(n=>s=>(console.log(s.value),s.label==o.value)),p=n=>{o.value=n.label,f("clickBtn",n)};return y({active:o}),(n,s)=>(t(),l("div",null,[d("div",{class:"btn-wrapper",style:k([{"--btnColor":e.btnColor},{"--textColor":e.textColor},e.myStyle])},[d("div",h,[(t(!0),l(b,null,m(e.btnOptions,a=>(t(),l("div",{class:g(["btn-item",r(o)==a.label?"active":"",{active:e.btn}]),onClick:u=>r(p)(a)},S(a.label),11,F))),256))]),e.icon1?(t(),l("div",O)):c("",!0)],4),e.tab?(t(),l("div",N,[(t(!0),l(b,null,m(e.btnOptions,(a,u)=>(t(),l("div",null,[r(v)(a)?x(n.$slots,`slot${u}`,{key:0,data:a},void 0,!0):c("",!0)]))),256))])):c("",!0)]))}},j=B($,[["__scopeId","data-v-4d9c96a6"]]);export{j as c};

dist/assets/index-a2f2ea39.js → dist/assets/index-629bcfc0.js

@@ -1 +1 @@
-import{l as n}from"./index-dcbf8d50.js";import{a as e,o as p,V as s,W as i,j as c,X as l,u as a}from"./vue-676ffbd1.js";import"./vue-router-dd0356f0.js";import"./index.vue_vue_type_style_index_0_scoped_24281060_lang-2d347597.js";import"./index-c67b7cbd.js";import"./_plugin-vue_export-helper-c27b6911.js";import"./base-7f7e34b3.js";const x={__name:"index",setup(m){const t=e();let r=e([{label:"范围",key:"isnext",type:"select",dataSource:[{remarks:"今年",value:"0"},{remarks:"明年",value:"1"}]},{label:"时间范围",key:"dateRange",type:"datepickerRange",objKeys:["begindate","enddate"]}]),o=e({content:{pageNumber:1,pageSize:20,where:{condition:""}},id:20221215165504});return p(()=>{}),(u,d)=>(s(),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{x as default};
+import{l as n}from"./index-a40264f5.js";import{a as e,o as p,V as s,W as i,j as c,X as l,u as a}from"./vue-676ffbd1.js";import"./vue-router-dd0356f0.js";import"./index.vue_vue_type_style_index_0_scoped_3d60c88d_lang-4bb3e49d.js";import"./index-6bad7ac7.js";import"./_plugin-vue_export-helper-c27b6911.js";import"./base-cede35ff.js";const x={__name:"index",setup(m){const t=e();let r=e([{label:"范围",key:"isnext",type:"select",dataSource:[{remarks:"今年",value:"0"},{remarks:"明年",value:"1"}]},{label:"时间范围",key:"dateRange",type:"datepickerRange",objKeys:["begindate","enddate"]}]),o=e({content:{pageNumber:1,pageSize:20,where:{condition:""}},id:20221215165504});return p(()=>{}),(u,d)=>(s(),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{x as default};

dist/assets/index-d51ea384.js → dist/assets/index-c73808be.js

@@ -1 +1 @@
-import{l as d}from"./index-dcbf8d50.js";import{a as u,A as f}from"./index-c67b7cbd.js";import{u as x}from"./vue-router-dd0356f0.js";import{_ as y}from"./_plugin-vue_export-helper-c27b6911.js";import{a as s,U as h,V as r,W as b,j as k,X as n,G as g,a3 as w,a4 as A,a7 as B,$ as v,u as i}from"./vue-676ffbd1.js";import"./index.vue_vue_type_style_index_0_scoped_24281060_lang-2d347597.js";import"./base-7f7e34b3.js";const N={class:"y-container"},S=["onClick"],C={__name:"index",setup(V){x();let c=s([]);s([]);let l=u(),p=s({content:{pageNumber:1,pageSize:20,systemappid:l.app.systemappid},id:20221213094401});const _=()=>{let t=window.location.href,e=t.indexOf("/"),o=0;for(;e!=-1;)if(o++,e=t.indexOf("/",e+1),o++==3)return t.slice(0,e)},m=async t=>{console.log("http://60.204.153.188/");let e=await f.requested({id:20221213094501,content:{sys_reportid:t.sys_reportid,dataid:0}});window.open(_()+e.data)};return(t,e)=>{const o=h("a-button");return r(),b("div",N,[k(d,{columns:i(c),param:i(p),tableName:"reportcenterTable"},{operation:n(()=>[g(" 报表中心 ")]),tb_cell:n(({data:a})=>[a.column.dataIndex=="name"?(r(),w(o,{key:0,type:"link"},{default:n(()=>[A("span",{class:"btn-link",onClick:I=>m(a.record)},B(a.record.name),9,S)]),_:2},1024)):v("",!0)]),_:1},8,["columns","param"])])}}},j=y(C,[["__scopeId","data-v-b9e552e1"]]);export{j as default};
+import{l as d}from"./index-a40264f5.js";import{a as u,A as f}from"./index-6bad7ac7.js";import{u as x}from"./vue-router-dd0356f0.js";import{_ as y}from"./_plugin-vue_export-helper-c27b6911.js";import{a as s,U as h,V as r,W as b,j as k,X as n,G as g,a3 as w,a4 as A,a7 as B,$ as v,u as i}from"./vue-676ffbd1.js";import"./index.vue_vue_type_style_index_0_scoped_3d60c88d_lang-4bb3e49d.js";import"./base-cede35ff.js";const N={class:"y-container"},S=["onClick"],C={__name:"index",setup(V){x();let c=s([]);s([]);let l=u(),p=s({content:{pageNumber:1,pageSize:20,systemappid:l.app.systemappid},id:20221213094401});const _=()=>{let t=window.location.href,e=t.indexOf("/"),o=0;for(;e!=-1;)if(o++,e=t.indexOf("/",e+1),o++==3)return t.slice(0,e)},m=async t=>{console.log("http://60.204.153.188/");let e=await f.requested({id:20221213094501,content:{sys_reportid:t.sys_reportid,dataid:0}});window.open(_()+e.data)};return(t,e)=>{const o=h("a-button");return r(),b("div",N,[k(d,{columns:i(c),param:i(p),tableName:"reportcenterTable"},{operation:n(()=>[g(" 报表中心 ")]),tb_cell:n(({data:a})=>[a.column.dataIndex=="name"?(r(),w(o,{key:0,type:"link"},{default:n(()=>[A("span",{class:"btn-link",onClick:I=>m(a.record)},B(a.record.name),9,S)]),_:2},1024)):v("",!0)]),_:1},8,["columns","param"])])}}},j=y(C,[["__scopeId","data-v-b9e552e1"]]);export{j as default};

dist/assets/index-7d7229ad.js → dist/assets/index-cb5f1e95.js

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

dist/assets/index-75e218d2.js → dist/assets/index-d0aba914.js

@@ -1 +1 @@
-import{n as g}from"./index-e44b905a.js";import{m as k}from"./index-c67b7cbd.js";import{a as d,w as y,U as D,V as s,W as o,j as u,X as f,ac as _,R as r,F as p,G as R,a7 as S,u as m,H as B}from"./vue-676ffbd1.js";const C={key:0},T={key:1},I={__name:"index",props:{title:String,wdith:String,custom:{type:Boolean,default:()=>!1}},emits:["selectRowData","close"],setup(i,{expose:v,emit:c}){let l=d(),e=d(!1),b=()=>{if(!l.value.tableRecord.length)return k.warning("请选择数据");e.value=!1,c("selectRowData",l.value.tableRecord)};y(()=>e.value,(t,n)=>{t||l.value.reloadSelect()});let h=()=>{c("close")};return v({modeVisible:e,refreshTable:()=>{l.value.listData()},list:l}),(t,n)=>{const w=D("a-modal");return s(),o(p,null,[u(w,{visible:m(e),"onUpdate:visible":n[0]||(n[0]=a=>B(e)?e.value=a:e=a),class:"custom-class",title:i.title||"标题",placement:"right",width:i.wdith||"1200px",closable:!1,onClose:m(h),onOk:m(b)},{default:f(()=>[u(g,_(t.$attrs,{ref_key:"list",ref:l,size:"small",onListData:t.listData}),{tb_cell:f(({data:a})=>[i.custom?(s(),o("div",C,[r(t.$slots,"custom",{data:a})])):(s(),o("div",T,[a.column.dataIndex==="operation"?r(t.$slots,"handleBtn",{key:0}):(s(),o(p,{key:1},[R(S(a.record[a.column.dataIndex]),1)],64))]))]),_:3},16,["onListData"])]),_:3},8,["visible","title","width","onClose","onOk"]),r(t.$slots,"slot1")],64)}}};export{I as _};
+import{n as g}from"./index-d699e125.js";import{m as k}from"./index-6bad7ac7.js";import{a as d,w as y,U as D,V as s,W as o,j as u,X as f,ac as _,R as r,F as p,G as R,a7 as S,u as m,H as B}from"./vue-676ffbd1.js";const C={key:0},T={key:1},I={__name:"index",props:{title:String,wdith:String,custom:{type:Boolean,default:()=>!1}},emits:["selectRowData","close"],setup(i,{expose:v,emit:c}){let l=d(),e=d(!1),b=()=>{if(!l.value.tableRecord.length)return k.warning("请选择数据");e.value=!1,c("selectRowData",l.value.tableRecord)};y(()=>e.value,(t,n)=>{t||l.value.reloadSelect()});let h=()=>{c("close")};return v({modeVisible:e,refreshTable:()=>{l.value.listData()},list:l}),(t,n)=>{const w=D("a-modal");return s(),o(p,null,[u(w,{visible:m(e),"onUpdate:visible":n[0]||(n[0]=a=>B(e)?e.value=a:e=a),class:"custom-class",title:i.title||"标题",placement:"right",width:i.wdith||"1200px",closable:!1,onClose:m(h),onOk:m(b)},{default:f(()=>[u(g,_(t.$attrs,{ref_key:"list",ref:l,size:"small",onListData:t.listData}),{tb_cell:f(({data:a})=>[i.custom?(s(),o("div",C,[r(t.$slots,"custom",{data:a})])):(s(),o("div",T,[a.column.dataIndex==="operation"?r(t.$slots,"handleBtn",{key:0}):(s(),o(p,{key:1},[R(S(a.record[a.column.dataIndex]),1)],64))]))]),_:3},16,["onListData"])]),_:3},8,["visible","title","width","onClose","onOk"]),r(t.$slots,"slot1")],64)}}};export{I as _};

dist/assets/index-1f0563ea.css → dist/assets/index-f49fbf10.css

@@ -1 +1 @@
-.fieldPanel{margin-bottom:10px}#components-form-demo-advanced-search .ant-form{max-width:none}#components-form-demo-advanced-search .search-result-list{margin-top:16px;border:1px dashed #e9e9e9;border-radius:2px;background-color:#fafafa;min-height:200px;text-align:center;padding-top:80px}[data-theme=dark] .ant-advanced-search-form{background:rgba(255,255,255,.04);border:1px solid #434343;padding:24px;border-radius:2px}[data-theme=dark] #components-form-demo-advanced-search .search-result-list{border:1px dashed #434343;background:rgba(255,255,255,.04)}.flex[data-v-c8810bd5]{padding:2px 5px;display:flex;align-items:center;justify-content:space-between}.title-panel[data-v-c8810bd5]{display:flex;align-items:center;justify-content:space-between;overflow:hidden}.fl-r[data-v-c8810bd5]{float:right}.btn-link[data-v-24281060]{text-decoration:underline}.ant-table-small[data-v-24281060] td{font-size:12px}.ant-table-small[data-v-24281060] .table-striped td{background-color:#f8f9fd}.ant-table-small[data-v-24281060] .table-striped-red td{color:#d9363e}.flex[data-v-24281060]{display:flex;justify-content:space-between;align-items:center}.pointer[data-v-24281060]{cursor:pointer;flex:1;text-align:right}.ant-dropdown-link[data-v-24281060]{color:#333}.flex-between[data-v-24281060]{display:flex;align-items:center;justify-content:space-between}
+.fieldPanel{margin-bottom:10px}#components-form-demo-advanced-search .ant-form{max-width:none}#components-form-demo-advanced-search .search-result-list{margin-top:16px;border:1px dashed #e9e9e9;border-radius:2px;background-color:#fafafa;min-height:200px;text-align:center;padding-top:80px}[data-theme=dark] .ant-advanced-search-form{background:rgba(255,255,255,.04);border:1px solid #434343;padding:24px;border-radius:2px}[data-theme=dark] #components-form-demo-advanced-search .search-result-list{border:1px dashed #434343;background:rgba(255,255,255,.04)}.flex[data-v-c8810bd5]{padding:2px 5px;display:flex;align-items:center;justify-content:space-between}.title-panel[data-v-c8810bd5]{display:flex;align-items:center;justify-content:space-between;overflow:hidden}.fl-r[data-v-c8810bd5]{float:right}.btn-link[data-v-3d60c88d]{text-decoration:underline}.ant-table-small[data-v-3d60c88d] td{font-size:12px}.ant-table-small[data-v-3d60c88d] .table-striped td{background-color:#f8f9fd}.ant-table-small[data-v-3d60c88d] .table-striped-red td{color:#d9363e}.flex[data-v-3d60c88d]{display:flex;justify-content:space-between;align-items:center}.pointer[data-v-3d60c88d]{cursor:pointer;flex:1;text-align:right}.ant-dropdown-link[data-v-3d60c88d]{color:#333}.flex-between[data-v-3d60c88d]{display:flex;align-items:center;justify-content:space-between}

dist/assets/index.vue_vue_type_style_index_0_scoped_24281060_lang-2d347597.js → dist/assets/index.vue_vue_type_style_index_0_scoped_3d60c88d_lang-4bb3e49d.js

@@ -1 +1 @@
-import{a as i,s as r,j as m,e as u,A as p}from"./index-c67b7cbd.js";const h=i();let{tableConfigs:c,app:d}=r(h);const v=m("columnStore",{state:()=>({colIndex:[],checkedColumns:[],columnsIndex:[],selectedColumns:0,cacheData:{},time:null}),persist:{enabled:!0,strategies:[{storage:localStorage,paths:[]}]},getters:{},actions:{userSetting(e){this.selectedColumns=new Date,c.value[`${d.value.systemappid}${e}`]={},c.value[`${d.value.systemappid}${e}`].columnsIndex=this.columnsIndex,c.value[`${d.value.systemappid}${e}`].checkedColumns=this.checkedColumns,this.saveConfig(c.value)},getUserSetting(e){console.log(d.value);let l=[],a=new Map,o=u.TBLayout(e),n=c.value[`${d.value.systemappid}${e}`];return n&&o.length==n.columnsIndex.length?(u.TBLayout(e).map(s=>({value:s.dataIndex,label:s.title})).forEach(s=>{a.set(s.value,s.label)}),this.checkedColumns=n.checkedColumns,n.columnsIndex=this.columnsIndex=n.columnsIndex.length==0?u.TBLayout(e).map(s=>s.dataIndex):n.columnsIndex,n.columnsIndex.forEach(s=>{l.push({value:s,label:a.get(s)})}),l):(this.checkedColumns=this.columnsIndex=u.TBLayout(e).map(t=>t.dataIndex),l=u.TBLayout(e).map(t=>({value:t.dataIndex,label:t.title})),l)},loadTableConfig(e){let l=u.TBLayout(e);console.log(l);let a=c.value[`${d.value.systemappid}${e}`],o=[],n=new Map;try{return a&&l.length==a.columnsIndex.length?(l.forEach(t=>{n.set(t.dataIndex,t)}),a.columnsIndex.forEach(t=>{o.push(n.get(t))}),o=o.filter(t=>{if(a.checkedColumns.some(s=>s===t.dataIndex))return t}),o):l}catch{}},async saveConfig(e){await p.requested({classname:"sysmanage.develop.users.users",method:"updateClientConfig",content:{config:JSON.stringify(e)}})}}});export{v as u};
+import{a as i,s as r,j as m,e as u,A as p}from"./index-6bad7ac7.js";const h=i();let{tableConfigs:c,app:d}=r(h);const v=m("columnStore",{state:()=>({colIndex:[],checkedColumns:[],columnsIndex:[],selectedColumns:0,cacheData:{},time:null}),persist:{enabled:!0,strategies:[{storage:localStorage,paths:[]}]},getters:{},actions:{userSetting(e){this.selectedColumns=new Date,c.value[`${d.value.systemappid}${e}`]={},c.value[`${d.value.systemappid}${e}`].columnsIndex=this.columnsIndex,c.value[`${d.value.systemappid}${e}`].checkedColumns=this.checkedColumns,this.saveConfig(c.value)},getUserSetting(e){console.log(d.value);let l=[],a=new Map,o=u.TBLayout(e),n=c.value[`${d.value.systemappid}${e}`];return n&&o.length==n.columnsIndex.length?(u.TBLayout(e).map(s=>({value:s.dataIndex,label:s.title})).forEach(s=>{a.set(s.value,s.label)}),this.checkedColumns=n.checkedColumns,n.columnsIndex=this.columnsIndex=n.columnsIndex.length==0?u.TBLayout(e).map(s=>s.dataIndex):n.columnsIndex,n.columnsIndex.forEach(s=>{l.push({value:s,label:a.get(s)})}),l):(this.checkedColumns=this.columnsIndex=u.TBLayout(e).map(t=>t.dataIndex),l=u.TBLayout(e).map(t=>({value:t.dataIndex,label:t.title})),l)},loadTableConfig(e){let l=u.TBLayout(e);console.log(l);let a=c.value[`${d.value.systemappid}${e}`],o=[],n=new Map;try{return a&&l.length==a.columnsIndex.length?(l.forEach(t=>{n.set(t.dataIndex,t)}),a.columnsIndex.forEach(t=>{o.push(n.get(t))}),o=o.filter(t=>{if(a.checkedColumns.some(s=>s===t.dataIndex))return t}),o):l}catch{}},async saveConfig(e){await p.requested({classname:"sysmanage.develop.users.users",method:"updateClientConfig",content:{config:JSON.stringify(e)}})}}});export{v as u};

dist/assets/login-05bd8f3a.js → dist/assets/login-0e5854bb.js

@@ -1,4 +1,4 @@
-import{u as useRouter}from"./vue-router-dd0356f0.js";import{c as commonjsGlobal,u as useRouteTabsStore,a as useAuthStore,s as storeToRefs,A as Api,m as message}from"./index-c67b7cbd.js";import{_ as _imports_0}from"./LOGO-5fe40572.js";import{_ as _export_sfc}from"./_plugin-vue_export-helper-c27b6911.js";import{d as defineComponent,U as resolveComponent,V as openBlock,W as createElementBlock,a4 as createBaseVNode,j as createVNode,X as withCtx,a1 as normalizeStyle,G as createTextVNode,a as ref,r as reactive,a5 as pushScopeId,a6 as popScopeId}from"./vue-676ffbd1.js";var md5Exports={},md5$1={get exports(){return md5Exports},set exports(e){md5Exports=e}};/**
+import{u as useRouter}from"./vue-router-dd0356f0.js";import{c as commonjsGlobal,u as useRouteTabsStore,a as useAuthStore,s as storeToRefs,A as Api,m as message}from"./index-6bad7ac7.js";import{_ as _imports_0}from"./LOGO-5fe40572.js";import{_ as _export_sfc}from"./_plugin-vue_export-helper-c27b6911.js";import{d as defineComponent,U as resolveComponent,V as openBlock,W as createElementBlock,a4 as createBaseVNode,j as createVNode,X as withCtx,a1 as normalizeStyle,G as createTextVNode,a as ref,r as reactive,a5 as pushScopeId,a6 as popScopeId}from"./vue-676ffbd1.js";var md5Exports={},md5$1={get exports(){return md5Exports},set exports(e){md5Exports=e}};/**
  * [js-md5]{@link https://github.com/emn178/js-md5}
  *
  * @namespace md5

dist/assets/myRadio-99934c7f.js → dist/assets/myRadio-f67acd43.js

@@ -1 +1 @@
-import"./index-c67b7cbd.js";import"./dataBlock-118c6a4c.js";import{_ as y}from"./_plugin-vue_export-helper-c27b6911.js";import{a as g,U as s,V as t,W as r,a4 as l,a1 as n,a7 as i,j as _,X as d,F as x,a2 as h,a3 as C,G as v,ac as S,u as b,R as B}from"./vue-676ffbd1.js";const V={class:"my-radio"},k={style:{display:"flex"}},N={__name:"myRadio",props:{title:{type:String},options:{type:Array,default:()=>[]},textColor:{type:String,default:()=>"#ffffff"},disabled:{type:Boolean,default:()=>!1}},emits:["Change"],setup(e,{emit:f}){const c=g({color:"#ffffff",marginBottom:"10px",fontSize:"12px"});let u=a=>{f("Change",a)};return(a,R)=>{const p=s("a-radio"),m=s("a-radio-group");return t(),r("div",V,[l("div",k,[l("span",{style:n([{"margin-right":"10px"},{color:e.textColor}])},i(e.title),5),_(m,S(a.$attrs,{style:[{"--textColor":e.textColor}],disabled:e.disabled,onChange:b(u)}),{default:d(()=>[(t(!0),r(x,null,h(e.options,o=>(t(),C(p,{style:n(c.value),value:o.value},{default:d(()=>[v(i(o.label),1)]),_:2},1032,["style","value"]))),256))]),_:1},16,["style","disabled","onChange"])]),B(a.$slots,"default",{},void 0,!0)])}}},j=y(N,[["__scopeId","data-v-126be1f9"]]);export{j as M};
+import"./index-6bad7ac7.js";import"./dataBlock-3d30df46.js";import{_ as y}from"./_plugin-vue_export-helper-c27b6911.js";import{a as g,U as s,V as t,W as r,a4 as l,a1 as n,a7 as i,j as _,X as d,F as x,a2 as h,a3 as C,G as v,ac as S,u as b,R as B}from"./vue-676ffbd1.js";const V={class:"my-radio"},k={style:{display:"flex"}},N={__name:"myRadio",props:{title:{type:String},options:{type:Array,default:()=>[]},textColor:{type:String,default:()=>"#ffffff"},disabled:{type:Boolean,default:()=>!1}},emits:["Change"],setup(e,{emit:f}){const c=g({color:"#ffffff",marginBottom:"10px",fontSize:"12px"});let u=a=>{f("Change",a)};return(a,R)=>{const p=s("a-radio"),m=s("a-radio-group");return t(),r("div",V,[l("div",k,[l("span",{style:n([{"margin-right":"10px"},{color:e.textColor}])},i(e.title),5),_(m,S(a.$attrs,{style:[{"--textColor":e.textColor}],disabled:e.disabled,onChange:b(u)}),{default:d(()=>[(t(!0),r(x,null,h(e.options,o=>(t(),C(p,{style:n(c.value),value:o.value},{default:d(()=>[v(i(o.label),1)]),_:2},1032,["style","value"]))),256))]),_:1},16,["style","disabled","onChange"])]),B(a.$slots,"default",{},void 0,!0)])}}},j=y(N,[["__scopeId","data-v-126be1f9"]]);export{j as M};

dist/index.html

@@ -5,7 +5,7 @@
     <link rel="icon" type="image/svg+xml" href="./vite.svg" />
     <meta name="viewport" content="width=device-width, initial-scale=1.0" />
     <title>班尼戈水务管理</title>
-    <script type="module" crossorigin src="./assets/index-c67b7cbd.js"></script>
+    <script type="module" crossorigin src="./assets/index-6bad7ac7.js"></script>
     <link rel="modulepreload" crossorigin href="./assets/vue-676ffbd1.js">
     <link rel="modulepreload" crossorigin href="./assets/vue-router-dd0356f0.js">
     <link rel="stylesheet" href="./assets/index-8790befc.css">

src/components/layout/modules/historyTabs.vue

@@ -4,7 +4,7 @@
       <a-tab-pane v-for="pane in historyRoutes" :key="pane.name" closable>
         <template #tab>
           <span class="sw-active">{{pane.meta.title}}&emsp;
-          <close-outlined style="transform: scale(0.8);color: #999999;" @click.stop="onEdit(pane)"/></span>
+          <close-outlined style="transform: scale(0.8);color: #999999;margin: 0 !important;padding: 5px 17px 5px 5px;" @click.stop="onEdit(pane)"/></span>
         </template>
       </a-tab-pane>
     </a-tabs>
@@ -69,4 +69,16 @@ const onChange = (val)=>{
   border-top-left-radius: 10px !important;
   border-top-right-radius: 10px !important;
 }
+/* /deep/.ant-tabs-tab-active {
+  position: relative;
+}
+/deep/.ant-tabs-tab-active::after {
+  content:'';
+  width: 20px;
+  height: 20px;
+  background: red;
+  position: absolute;
+  right: -20px;
+  bottom: 0;
+} */
 </style>

src/router/controlPanle.js

@@ -26,5 +26,23 @@ export default [
       keepAlive:false,
     },
     component: () => import(/* webpackChunkName: "about" */ '@/system/IOT/controlPanel/model/MT01/index.vue')
+  },{
+    path: '/MT04',
+    name: 'MT04',
+    meta: {
+      title: '控制台',
+      name: 'equipmentmag',
+      keepAlive:false,
+    },
+    component: () => import(/* webpackChunkName: "about" */ '@/system/IOT/controlPanel/model/MT01/index.vue')
+  },{
+    path: '/MT03',
+    name: 'MT03',
+    meta: {
+      title: '控制台',
+      name: 'equipmentmag',
+      keepAlive:false,
+    },
+    component: () => import(/* webpackChunkName: "about" */ '@/system/IOT/controlPanel/model/MT01/index.vue')
   },
 ]

src/system/IOT/IoTdashboard/index.vue

@@ -13,7 +13,7 @@
         </a-col>
       </a-row>
     </div>
-    <div class="content" style="--zIndex:9">
+    <div class="content" style="--zIndex:999">
       <!--顶部搜索已经其他操作-->
       <div class="header-control">
         <div class="left">
@@ -162,8 +162,8 @@ let param2 = ref({
 
 let list = ref([])
 let latlng = ref({
-  lat:39,
-  lng:117
+  lat:0,
+  lng:0
 })
 let zoom = ref(3)
 let model = ref(true)
@@ -348,6 +348,7 @@ onMounted(() => {
   getData()
   listData()
   set()
+  console.log(utils.TBLayout('equipmentTable'));
 })
 
 </script>

src/system/IOT/controlPanel/model/06/index.vue

@@ -44,7 +44,7 @@
               <a-button :type="+detail.paramcmdvalues.Emer ?  'danger' : 'primary'" size="small" @click="StopFun">{{+detail.paramcmdvalues.Emer ? detail.function.cease.funcname : '开启'  }}</a-button>
             </updataBtn>
           </div>
-          <img src="@/assets/deviced/电池.gif" alt="">
+          <img :src="imgUrl" alt="">
           <div style="clear: both;"></div>
         </div>
       </div>
@@ -106,6 +106,11 @@ let calcSizeFun = () => {
   },500)
 }
 
+let imgUrl = computed(() => {
+  let arr = detail.value.attinfos.filter(item => item.usetype == 'previewImage')
+  return arr[arr.length - 1] && arr[arr.length - 1].url
+})
+
 let clickBtn = (tag) => {
   tag.label == '进入全屏' ? wrapper.value = true : wrapper.value = false
   refresh.value = false

src/system/IOT/controlPanel/model/06/modules/controlPanel.vue

@@ -216,7 +216,7 @@
         :unit="params.ConMode && params.ConMode.unit" 
         :title="params.ConMode && params.ConMode.paramname"
         :btnName="detailData.isSite ? '更新' : ''"
-        :text="params.ConMode.options.filter(item => item.value == detailData.paramvalues.ConMode)[0].label"
+        :text="params.ConMode.options.filter(item => item.value == detailData.paramvalues.ConMode)[0] && params.ConMode.options.filter(item => item.value == detailData.paramvalues.ConMode)[0].label"
       >
       <updataBtn :icon1="cmdForm.ConMode && detailData.isfeedback ? true : false">
         <div style="display: flex;align-items: center;">

src/system/IOT/controlPanel/model/MT01/index.vue

@@ -39,7 +39,7 @@
             :left="350" 
             :data="[{value:detail.params.阀后压力显示.lastvalue,unit:detail.params.阀后压力显示.unit}]"
           ></dataBlock>
-          <img src="@/assets/deviced/MT01.gif" alt="">
+          <img :src="imgUrl" alt="">
           <div style="clear: both;"></div>
         </div>
       </div>
@@ -107,6 +107,11 @@ let calcSizeFun = () => {
   },500)
 }
 
+let imgUrl = computed(() => {
+  let arr = detail.value.attinfos.filter(item => item.usetype == 'previewImage')
+  return arr[arr.length - 1] ? arr[arr.length - 1].url : ''
+})
+
 let clickBtn = (tag) => {
   tag.label == '进入全屏' ? wrapper.value = true : wrapper.value = false
   refresh.value = false

src/system/IOT/controlPanel/model/MT02/index.vue

@@ -25,7 +25,7 @@
             :left="400" 
             :data="[{value:detail.params.DownP.lastvalue,unit:detail.params.DownP.unit}]"
           ></dataBlock>
-          <img src="@/assets/deviced/控制器.gif" alt="">
+          <img :src="imgUrl" alt="">
           <div style="clear: both;"></div>
         </div>
       </div>
@@ -101,6 +101,11 @@ let clickBtn = (tag) => {
   })
 }
 
+let imgUrl = computed(() => {
+  let arr = detail.value.attinfos.filter(item => item.usetype == 'previewImage')
+  return arr[arr.length - 1] ? arr[arr.length - 1].url : ''
+})
+
 let detailFun = async () => {
   let res = await Api.requested({
     "id": "20230628084901",

src/system/IOT/gatewayManage/index.vue

@@ -8,8 +8,9 @@
       <template v-if="data.column.dataIndex === 'attinfos'">
         <previewImage :list="data.record.attinfos || []"></previewImage>
       </template>
-      <template v-else-if="data.column.dataIndex === 'sitename'">
-        <a-tag>{{ data.record.sitename }}</a-tag>
+      <template v-else-if="data.column.dataIndex === 'itemname'">
+        <span>{{ data.record.itemname }}</span>
+        <a-tag color="blue" style="margin-left: 10px;">{{ data.record.sitename }}</a-tag>
       </template>
       <template v-if="data.column.dataIndex == 'operation'">
         <Edit :data="data.record" @onSuccess="onSuccess" :disabled="!utils.hasPermission('update')"></Edit>

src/system/IOT/iotcard/detail/index.vue

@@ -20,7 +20,7 @@
   import defaultInfo from '@/template/defaultInfo/index.vue'
   import { useRouter } from "vue-router";
   import Api from '@/api/api'
-  import tool  from '@/utils/utils'
+  import utils  from '@/utils/utils'
   import {onMounted, ref} from "vue";
   const router = useRouter()
   const listData = ref({})

src/system/IOT/productManage/detail/modules/Edit.vue

@@ -96,7 +96,7 @@
           </a-form-item>
         </a-col>
         <a-col :span="24">
-          <a-form-item  label="图片" name="attinfos" :rules="[{required:true,message:'请选择图片',validateTrigger:'onChange'}]">
+          <a-form-item  label="图片" name="attinfos">
             <Upload2 accept="image/png, image/jpeg" :bindData="bindData" ref="upload" v-model:value="form.attinfos"></Upload2>
           </a-form-item>
         </a-col>
@@ -175,7 +175,7 @@ let editBtn = () => {
   bindData.value = {
     "ownertable": 'w_product',
     "ownerid": form.value.w_productid,
-    "usetype": 'default',
+    "usetype": 'previewImage',
   }
   nextTick(() => {
     upload.value.fileList = form.value.attinfos

src/system/IOT/productManage/modules/Add.vue

@@ -96,7 +96,7 @@
           </a-form-item>
         </a-col>
         <a-col :span="24">
-          <a-form-item  label="图片" name="attinfos" :rules="[{required:true,message:'请选择图片',validateTrigger:'onChange'}]">
+          <a-form-item  label="图片" name="attinfos">
             <Upload2 accept="image/png, image/jpeg" :bindData="bindData" ref="upload" v-model:value="form.attinfos"></Upload2>
           </a-form-item>
         </a-col>
@@ -170,7 +170,7 @@ let onSubmit = async () => {
   bindData.value = {
     "ownertable": 'w_product',
     "ownerid": res.data.w_productid,
-    "usetype": 'default',
+    "usetype": 'previewImage',
   }
   loading.value = true
   upload.value.toUpload(() => {

src/system/IOT/valve/index.vue

@@ -8,8 +8,9 @@
       <template v-if="data.column.dataIndex === 'attinfos'">
         <previewImage :list="data.record.attinfos || []"></previewImage>
       </template>
-      <template v-else-if="data.column.dataIndex === 'sitename'">
-        <a-tag>{{ data.record.sitename }}</a-tag>
+      <template v-else-if="data.column.dataIndex === 'itemno'">
+        <span>{{ data.record.itemno }}</span>
+        <a-tag color="blue" style="margin-left: 10px;">{{ data.record.sitename }}</a-tag>
       </template>
     </template>
   </listTemp>

src/system/IOT/valveAssets/index.vue

@@ -7,8 +7,9 @@
       <template v-if="data.column.dataIndex === 'attinfos'">
         <previewImage :list="data.record.attinfos || []"></previewImage>
       </template>
-      <template v-else-if="data.column.dataIndex === 'sitename'">
-        <a-tag>{{ data.record.sitename }}</a-tag>
+      <template v-else-if="data.column.dataIndex === 'itemno'">
+        <span>{{ data.record.itemno }}</span>
+        <a-tag color="blue" style="margin-left: 10px;">{{ data.record.sitename }}</a-tag>
       </template>
     </template>
   </listTemp>

src/system/IOT/valveAssets/modules/Add.vue

@@ -12,7 +12,7 @@
     <a-form ref="formRef" :model="form" size="small" layout="vertical" mode="multiple" :validateTrigger="['onChange']">
       <a-row :gutter="16">
         <a-col :span="24">
-          <a-form-item  label="阀门产品" name="itemname">
+          <a-form-item  label="阀门产品" name="itemname" :rules="[{ required: true, message: '请选择产品' }]">
             <a-input v-model:value="form.itemname" placeholder="请选择阀门产品" @click="productInputClick"></a-input>
             <SelectModel 
               ref="product" 

src/system/IOT/warningHistory/index.vue

@@ -40,7 +40,7 @@ let searchType = ref([
   {label:'搜索',key:'condition',type:'input'},
   {label:'告警类型',key:'buildtype',type:'select',dataSource:buildTypeList.value},
   {label:'告警级别',key:'level',type:'select',dataSource:[{value:0,remarks:'停用'},{value:1,remarks:'启用'}]},
-  {label:'创建时间',key:'dateRange',type:'datepickerRange',objKeys:['begindate','enddate']},
+  {label:'告警时间',key:'dateRange',type:'datepickerRange',objKeys:['begindate','enddate']},
 ])
 provide('buildTypeList',buildTypeList)
 provide('eventlevelList',eventlevelList)

src/system/IOT/warningSet/detail/index.vue

@@ -24,8 +24,30 @@
         />
       </template>
       <template #tab0>
-        <p class="normal-title">基本信息</p>
-        <defaultInfo :data="defaultInfoData" style="margin-bottom: 16px;"></defaultInfo>
+        <p class="normal-title">告警规则</p>
+        <a-tabs
+          v-if="rules.length"
+          style="margin-bottom: 10px;"
+          v-model:activeKey="activeKey"
+          tab-position="left"
+        >
+          <a-tab-pane v-for="(item,i) in rules" :key="item.key" :forceRender="true">
+            <template #tab>
+              <span style="padding:2px 5px;border-radius: 3px;" :style="tabColor(item.levelname)">{{ item.levelname }}</span>
+            </template>
+              <a-table 
+                size="small"
+                :row-class-name="(_record, index) => (index % 2 === 1 ? 'table-striped' : null)" 
+                :dataSource="item.rulemxs" 
+                :columns="columns" 
+                :pagination="false"
+                bordered
+                :scroll="{x:'max-content'}"
+              >
+              </a-table>
+          </a-tab-pane>
+        </a-tabs>
+        <a-empty v-else />
         <p class="normal-title">系统信息</p>
         <defaultInfo :data="systemInfoData" :attinfos="userData.attinfos" :column="2"></defaultInfo>
       </template>
@@ -59,11 +81,63 @@ let systemInfoData = ref([])
 let buildTypeList = ref([])
 let eventlevelList = ref([])
 let eventsymbolList = ref([])
+let activeKey = ref()
+let columns = [
+  {title:'属性名称',dataIndex:'paramname'},
+  {title:'判断符',dataIndex:'symbol'},
+  {title:'值',dataIndex:'value'},
+]
+let rules = ref([])
 
 provide('buildTypeList',buildTypeList)
 provide('eventlevelList',eventlevelList)
 provide('eventsymbolList',eventsymbolList)
 
+//tab文字颜色
+let tabColor = computed(() => {
+  return (name) => {
+    let style
+    switch (name) {
+      case '紧急':
+        style = {
+          background:'#FFE3E6',
+          color:'#EA162D',
+          border:'1px solid #FF8B97'
+        }
+        break;
+      case '重要':
+        style = {
+          background:'#FFE4D3',
+          color:'#E55800',
+          border:'1px solid #FFA972'
+        }
+        break;  
+      case '一般':
+        style = {
+          background:'#E8FFE2',
+          color:'#27AD00',
+          border:'1px solid #87D96F'
+        }
+        break;
+      case '提醒':
+        style = {
+          background:'#e6f7ff',
+          color:'#096dd9',
+          border:'1px solid #91d5ff'
+        }
+        break;
+      case '其它':
+        style = {
+          background:'#F5F5F5',
+          color:'#777777',
+          border:'1px solid #CCCCCC'
+        }
+        break;
+    }
+    return style
+  }
+})
+
 const mianData = async ()=>{
   const res = await Api.requested({
     "id":20230810152501,
@@ -73,6 +147,7 @@ const mianData = async ()=>{
   })
   res.data.rules.forEach((item,index) => item.key = index)
   userData.value = res.data
+  rules.value = JSON.parse(JSON.stringify(res.data.rules))
   console.log(userData.value);
   changeDataStructure(userData.value)
 }
@@ -108,33 +183,6 @@ const changeDataStructure = (data) => {
       value:data.remarks
     },
   ]
-  defaultInfoData.value = [
-    {
-      label:'警告主题',
-      value:data.eventname
-    },
-    // {
-    //   label:'告警类型',
-    //   value:buildTypeList.value.length && buildTypeList.value.filter(item => item.value == data.buildtype)[0].remarks
-    // },
-    {
-      label:'检测对象',
-      value:data.objname
-    },
-    {
-      label:'状态',
-      value:data.isused ? '启用':'停用',
-      style:() => {
-        let style = {}
-        style.color = utils.statusAndColor(userData.value.isused ? '启用' : '停用')
-        return style
-      }
-    },
-    {
-      label:'描述',
-      value:data.remarks
-    },
-  ]
   systemInfoData.value = [
     {label:'创建时间',value:userData.value.createdate},
     {label:'创建人',value:userData.value.createby},

src/system/IOT/warningSet/index.vue

@@ -5,6 +5,17 @@
     </template>
     <template #tb_cell="{data}">
       <template v-if="data.column.dataIndex === 'operation'">
+        <customBtn
+          :btnName="data.record.isused ? '禁用' : '启用'"
+          idName="20230817100102"
+          keyName="w_eventid"
+          :id="data.record.w_eventid"
+          type="link"
+          size="middle"
+          :message="data.record.isused ? '确定禁用当前配置吗?' : '确定启用当前配置吗?'"
+          @onSuccess="$refs.list.tableData()"
+          :disabled="!utils.hasPermission('use')"
+        />
       </template>
       <template v-else-if="data.column.dataIndex === 'isused'">
         <span :style="{color:utils.statusAndColor(data.record.isused ? '启用' : '停用')}">{{ data.record.isused ? '启用' : '停用' }}</span>
@@ -16,6 +27,7 @@
         <a-tag :color="data.record.ownertable == 'w_device' ? 'cyan' : 'blue'" style="margin-right: 10px;">{{ data.record.ownertable == 'w_device' ? '设备' : '产品' }}</a-tag>
         <span>{{ data.record.objname }}</span>
       </template>
+      
     </template>
   </listTemp>
 </template>

src/system/IOT/warningSet/modules/Add.vue

@@ -109,7 +109,14 @@
                           :param="selectAttParam" 
                           :filterMultiple="true" 
                           :columns="utils.TBLayout('dataparamTable').splice(0,utils.TBLayout('dataparamTable').length - 1)" title="请选择"
+                          :custom="true"
                         >
+                        <template #custom="{ data }">
+                          <div v-if="data.column.dataIndex == 'rwtype'">
+                            {{ data.record.rwtype == 0 ? '读' : data.record.rwtype == 1 ? '写' : '上报' }}
+                          </div>
+                          <div v-else>{{ data.record[data.column.dataIndex] }}</div>
+                        </template>
                           <template v-slot:slot1>
                             <a-form-item name="name" :rules="[{ required: true, message: '请选择属性' }]">
                               <a-input v-model:value="record.name" placeholder="请选择" @click="clickAttInput($refs[`selectAttrite`+index],record)"></a-input>
@@ -327,7 +334,7 @@ let clickAttInput = (vm,data) => {
   target = data
   nextTick(() => {
     vm[0].modeVisible = true
-    vm[0].list.listData()
+    vm[0].list && vm[0].list.listData()
   })
 }
 

src/system/IOT/warningSet/modules/Edit.vue

@@ -102,15 +102,22 @@
                         <div v-if="column.dataIndex == 'levelname'">
                           <SelectModel 
                             :ref="'selectAttrite' + index" 
-                            @selectRowData="selectAtt($event,item.rulemxs[index])" 
+                            @selectRowData="selectAtt" 
                             rowKey="w_dataparamid" 
                             :param="selectAttParam" 
                             :filterMultiple="true" 
                             :columns="utils.TBLayout('dataparamTable').splice(0,utils.TBLayout('dataparamTable').length - 1)" title="请选择"
+                            :custom="true"
                           >
+                          <template #custom="{ data }">
+                            <div v-if="data.column.dataIndex == 'rwtype'">
+                              {{ data.record.rwtype == 0 ? '读' : data.record.rwtype == 1 ? '写' : '上报' }}
+                            </div>
+                            <div v-else>{{ data.record[data.column.dataIndex] }}</div>
+                          </template>
                             <template v-slot:slot1>
-                              <a-form-item name="paramname" :rules="[{ required: true, message: '请选择属性' }]">
-                                <a-input v-model:value="record.paramname" placeholder="请选择" @click="clickAttInput($refs[`selectAttrite`+index],record)"></a-input>
+                              <a-form-item name="name" :rules="[{ required: true, message: '请选择属性' }]">
+                                <a-input v-model:value="record.name" placeholder="请选择" @click="clickAttInput($refs[`selectAttrite`+index],record)"></a-input>
                               </a-form-item>
                             </template>
                           </SelectModel>
@@ -288,7 +295,7 @@ let editBtn = () => {
   selectAttParam.value.content.ownertable = form.value.ownertable
   selectAttParam.value.content.ownerid = form.value.ownerid
   form.value.ownertable == 'w_product' ? selectParam.value.content.type = 0 : selectParam.value.content.type = 1
-  activeKey.value = form.value.rules[0].key
+  activeKey.value = form.value.rules[0] ? form.value.rules[0].key : 0
   console.log(form.value);
 }
 
@@ -321,17 +328,20 @@ let delMx = async (datas,data) => {
           "w_event_rulemxid": temp[0].w_event_rulemxid
       },
     })
+    emit('onSuccess')
   }
 }
 
 let objChange = async (data,data2) => {
   let temp = form.value.rules.splice(form.value.rules.findIndex(item => item.key == data),1)
+  if (!temp[0].w_event_ruleid) return
   let res = await Api.requested({
     id:20230810152701,
     content: {
       w_event_ruleid:temp[0].w_event_ruleid
     }
   })
+  emit('onSuccess')
   utils.message(res,'操作成功')
   // form.value.rules.splice(data -1,1)
 } 
@@ -351,7 +361,7 @@ let target = ''
 let clickAttInput = (vm,data) => {
   target = data
   vm[0].modeVisible = true
-  vm[0].list.listData()
+  vm[0].list && vm[0].list.listData()
 }
 
 let selectRow = (data) => {

src/system/moduleNormal/userManage/index.vue

@@ -20,7 +20,7 @@
   import Api from '@/api/api'
   import listTemp from '@/components/listTemplate/index.vue';
   import add from './modules/add.vue';
-  import { ref,onMounted } from 'vue'
+  import { ref,onMounted, provide } from 'vue'
   import { useRouter } from "vue-router";
   const router = useRouter()
   const list = ref()
@@ -28,6 +28,7 @@
   let dataSource = ref([])
   const statusOptions = ref([])
   const typeOptions = ref([])
+  provide('typeOptions',() => typeOptions.value)
   let searchType = ref([
     {label:'状态',key:'status',type:'select',dataSource:statusOptions},
     {label:'用户类型:',key:'usertype',type:'select',dataSource:typeOptions},

src/system/moduleNormal/userManage/modules/add.vue

@@ -65,7 +65,7 @@
 </template>
 
 <script setup>
-import {ref,defineEmits, onMounted} from 'vue'
+import {ref,defineEmits, onMounted, inject} from 'vue'
 import Api from '@/api/api'
 import utils from '@/utils/utils'
 const emit = defineEmits(['onSuccess'])
@@ -75,7 +75,7 @@ const form = ref({
   remarks:'',
   usertype:undefined
 })
-let userTypeOptions = ref([])
+let userTypeOptions = inject('typeOptions')()
 const validatePhoneNumber = async (rule, value)=> {
   const phoneNumberPattern = /^1\d{10}$/;
   if (phoneNumberPattern.test(value)) {
@@ -113,12 +113,6 @@ const roles = async ()=>{
   rolesOptions.value = res.data
 }
 
-onMounted(async () => {
-  const res = await Api.optionstype('usertype')
-  userTypeOptions.value = res.data
-})
-
-
 </script>
 <style>
 </style>

src/template/defaultInfo/index.vue

@@ -1,6 +1,6 @@
 <template>
   <a-descriptions :column="column ? column : 3" :labelStyle="{color:'#666',width:'120px'}" :contentStyle="{marginRight:'20px',marginBottom:'5px'}"  size="small" bordered>
-    <a-descriptions-item :span="item.span ? item.span : 1"  v-for="item in props.data" :key="item.index" :label="item.label"><span :style="item.style?item.style():''">{{item.value || '--'}}</span></a-descriptions-item>
+    <a-descriptions-item :contentStyle="{width:'300px'}" :span="item.span ? item.span : 1"  v-for="item in props.data" :key="item.index" :label="item.label"><span :style="item.style?item.style():''">{{item.value || '--'}}</span></a-descriptions-item>
     <a-descriptions-item v-if="attinfos" label="图片"><previewImage :list="attinfos || []"></previewImage></a-descriptions-item>
   </a-descriptions>
 </template>