2023-7-6

dist/assets/LOGO-8004d243.js → dist/assets/LOGO-a339f31b.js

@@ -1 +1 @@
-import{e as i,r}from"./index-9b0b2868.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-8e4b3e0c.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};

dist/assets/PlusCircleOutlined-a2704ff1.js → dist/assets/PlusCircleOutlined-fcdb35e3.js

@@ -1 +1 @@
-import{a as i}from"./index-9b0b2868.js";import{j as u}from"./vue-7fdfccaf.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-8e4b3e0c.js";import{j as u}from"./vue-7fdfccaf.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};

dist/assets/index-321ab005.js → dist/assets/index-0522611b.js

@@ -1 +1 @@
-import{n as h}from"./index-7da703e7.js";import{m as k}from"./index-9b0b2868.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-7fdfccaf.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-a66bb76d.js";import{m as k}from"./index-8e4b3e0c.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-7fdfccaf.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 _};

dist/assets/index-ba798ffd.js → dist/assets/index-a5c3de10.js

@@ -1 +1 @@
-import{M as o,A as c,f as l}from"./index-9b0b2868.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-7fdfccaf.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-8e4b3e0c.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-7fdfccaf.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 _};

dist/assets/index-15d603f6.js → dist/assets/index-a7592e7c.js

@@ -1 +1 @@
-import{l as d}from"./index-2a1b5646.js";import{A as m}from"./index-9b0b2868.js";import{u}from"./vue-router-109fda95.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-7fdfccaf.js";/* empty css                                                              */import"./base-1aa59095.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-23ff4ed1.js";import{A as m}from"./index-8e4b3e0c.js";import{u}from"./vue-router-109fda95.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-7fdfccaf.js";/* empty css                                                              */import"./base-c5ceca9f.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};

dist/assets/index-aa2f97eb.css

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

dist/assets/index-cf36cb39.js → dist/assets/index-c2a4ee22.js

@@ -1 +1 @@
-import{l as n}from"./index-2a1b5646.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-7fdfccaf.js";import"./vue-router-109fda95.js";/* empty css                                                              */import"./index-9b0b2868.js";import"./base-1aa59095.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-23ff4ed1.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-7fdfccaf.js";import"./vue-router-109fda95.js";/* empty css                                                              */import"./index-8e4b3e0c.js";import"./base-c5ceca9f.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};

dist/assets/index-cfebefd5.css

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

dist/assets/login-a0fa0f00.js → dist/assets/login-1411f732.js

@@ -1,4 +1,4 @@
-import{u as useRouter}from"./vue-router-109fda95.js";import{c as commonjsGlobal,u as useAuthStore,s as storeToRefs,A as Api,m as message}from"./index-9b0b2868.js";import{u as useRouteTabsStore,_ as _imports_0}from"./LOGO-8004d243.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-7fdfccaf.js";var md5Exports={},md5$1={get exports(){return md5Exports},set exports(e){md5Exports=e}};/**
+import{u as useRouter}from"./vue-router-109fda95.js";import{c as commonjsGlobal,u as useAuthStore,s as storeToRefs,A as Api,m as message}from"./index-8e4b3e0c.js";import{u as useRouteTabsStore,_ as _imports_0}from"./LOGO-a339f31b.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-7fdfccaf.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/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-9b0b2868.js"></script>
+    <script type="module" crossorigin src="./assets/index-8e4b3e0c.js"></script>
     <link rel="modulepreload" crossorigin href="./assets/vue-7fdfccaf.js">
     <link rel="modulepreload" crossorigin href="./assets/vue-router-109fda95.js">
     <link rel="stylesheet" href="./assets/index-06454cca.css">

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

@@ -54,7 +54,7 @@
       <updataBtn :icon1="cmdForm.PresAcc ? true : false">
         <MyInput 
           v-if="detailData.function['pressure control'] && params.PresAcc"
-          :label="false"
+          :label="true"
           :form="cmdForm"
           :scale="params.PresAcc && params.PresAcc.num_scale" 
           v-model:value="cmdForm.PresAcc" 
@@ -67,6 +67,7 @@
           :min="params.PresAcc && params.PresAcc.num_minvalue"
           :step="params.PresAcc && params.PresAcc.num_step"
           inputBorder="1px solid #ccc"
+          :title="params.PresAcc && params.PresAcc.paramname"
         />
       </updataBtn>
     </MyInput>
@@ -107,7 +108,7 @@
       <updataBtn :icon1="cmdForm.SleepTime ? true : false">
         <MyInput 
           v-if="detailData.function['Sleep time'] && params.SleepTime"
-          :label="false"
+          :label="true"
           :form="cmdForm"
           :scale="params.SleepTime && params.SleepTime.num_scale" 
           v-model:value="cmdForm.SleepTime" 
@@ -115,11 +116,12 @@
           :unit="params.SleepTime && params.SleepTime.unit" 
           :isCheck="true" 
           btnName="更新"
-          @upData="updateData('pressure control')"
+          @upData="updateData('Sleep time')"
           :max="params.SleepTime && params.SleepTime.num_maxvalue"
           :min="params.SleepTime && params.SleepTime.num_minvalue"
           :step="params.SleepTime && params.SleepTime.num_step"
           inputBorder="1px solid #ccc"
+          :title="params.SleepTime && params.SleepTime.paramname"
         />
       </updataBtn>
     </MyInput>
@@ -139,7 +141,7 @@
       <updataBtn :icon1="cmdForm.FloMinP ? true : false">
         <MyInput 
           v-if="detailData.function['Minimum'] && params.FloMinP"
-          :label="false"
+          :label="true"
           :form="cmdForm"
           :scale="params.FloMinP && params.FloMinP.num_scale" 
           v-model:value="cmdForm.FloMinP" 
@@ -147,11 +149,12 @@
           :unit="params.FloMinP && params.FloMinP.unit" 
           :isCheck="true" 
           btnName="更新"
-          @upData="updateData('pressure control')"
+          @upData="updateData('Minimum')"
           :max="params.FloMinP && params.FloMinP.num_maxvalue"
           :min="params.FloMinP && params.FloMinP.num_minvalue"
           :step="params.FloMinP && params.FloMinP.num_step"
           inputBorder="1px solid #ccc"
+          :title="params.FloMinP && params.FloMinP.paramname"
         />
       </updataBtn>
     </MyInput>
@@ -170,7 +173,7 @@
       <updataBtn :icon1="cmdForm.FloMaxP ? true : false">
         <MyInput 
           v-if="detailData.function['MOP'] && params.FloMaxP"
-          :label="false"
+          :label="true"
           :form="cmdForm"
           :scale="params.FloMaxP && params.FloMaxP.num_scale" 
           v-model:value="cmdForm.FloMaxP" 
@@ -178,17 +181,19 @@
           :unit="params.FloMaxP && params.FloMaxP.unit" 
           :isCheck="true" 
           btnName="更新"
-          @upData="updateData('pressure control')"
+          @upData="updateData('MOP')"
           :max="params.FloMaxP && params.FloMaxP.num_maxvalue"
           :min="params.FloMaxP && params.FloMaxP.num_minvalue"
           :step="params.FloMaxP && params.FloMaxP.num_step"
           inputBorder="1px solid #ccc"
+          :title="params.FloMaxP && params.FloMaxP.paramname"
+
         />
       </updataBtn>
     </MyInput>
 
     <MyInput 
-        v-if="detailData.function['Config'] && params.ConMode"
+        v-if="detailData.function['Ctrl'] && params.ConMode"
         :form="form"
         name="ConMode" 
         :unit="params.ConMode && params.ConMode.unit" 
@@ -197,14 +202,17 @@
         :text="params.ConMode.options.filter(item => item.value == form.ConMode)[0].label"
       >
       <updataBtn :icon1="cmdForm.ConMode ? true : false">
-      <a-select
-        ref="select"
-        v-model:value="cmdForm.ConMode"
-        style="width: 120px;color: #000000;"
-        @change="modelChange"
-      >
-        <a-select-option :value="item.value" v-for="(item,index) in params.ConMode.options">{{ item.label }}</a-select-option>
-        </a-select>
+        <div style="display: flex;align-items: center;">
+          <a-select
+            ref="select"
+            v-model:value="cmdForm.ConMode"
+            style="width: 120px;color: #000000;"
+          >
+          <a-select-option :value="item.value" v-for="(item,index) in params.ConMode.options">{{ item.label }}</a-select-option>
+          </a-select>
+          <customBtn style="margin-left: 10px;" btnColor="rgb(22,255,246)" textColor="#000000" :btnOptions="[{label:'更新'}]" @click="modelChange"></customBtn>
+        </div>
+        
       </updataBtn>
     </MyInput>
   
@@ -225,7 +233,7 @@
       <updataBtn :icon1="cmdForm.UpTar ? true : false">
         <MyInput 
           v-if="detailData.function['Upstream'] && params.UpTar"
-          :label="false"
+          :label="true"
           :form="cmdForm"
           :scale="params.UpTar && params.UpTar.num_scale" 
           v-model:value="cmdForm.UpTar" 
@@ -238,6 +246,8 @@
           :min="params.UpTar && params.UpTar.num_minvalue"
           :step="params.UpTar && params.UpTar.num_step"
           inputBorder="1px solid #ccc"
+          :title="params.UpTar && params.UpTar.paramname"
+
         />
       </updataBtn>
     </MyInput>
@@ -257,8 +267,8 @@
       >
       <updataBtn :icon1="cmdForm.DownTar ? true : false">
         <MyInput 
-          v-if="detailData.function['Upstream'] && params.DownTar"
-          :label="false"
+          v-if="detailData.function['Downstream'] && params.DownTar"
+          :label="true"
           :form="cmdForm"
           :scale="params.DownTar && params.DownTar.num_scale" 
           v-model:value="cmdForm.DownTar" 
@@ -271,6 +281,7 @@
           :min="params.DownTar && params.DownTar.num_minvalue"
           :step="params.DownTar && params.DownTar.num_step"
           inputBorder="1px solid #ccc"
+          :title="params.DownTar && params.DownTar.paramname"
         />
       </updataBtn>
     </MyInput>
@@ -290,7 +301,7 @@
       <updataBtn :icon1="cmdForm.TatFlow ? true : false">
         <MyInput 
           v-if="detailData.function['Constantflow'] && params.TatFlow"
-          :label="false"
+          :label="true"
           :form="cmdForm"
           :scale="params.TatFlow && params.TatFlow.num_scale" 
           v-model:value="cmdForm.TatFlow" 
@@ -298,11 +309,12 @@
           :unit="params.TatFlow && params.TatFlow.unit" 
           :isCheck="true" 
           btnName="更新"
-          @upData="updateData('Downstream')"
+          @upData="updateData('Constantflow')"
           :max="params.TatFlow && params.TatFlow.num_maxvalue"
           :min="params.TatFlow && params.TatFlow.num_minvalue"
           :step="params.TatFlow && params.TatFlow.num_step"
           inputBorder="1px solid #ccc"
+          :title="params.TatFlow && params.TatFlow.paramname"
         />
       </updataBtn>
     </MyInput>
@@ -322,7 +334,7 @@
       <updataBtn :icon1="cmdForm.TarBad ? true : false">
         <MyInput 
           v-if="detailData.function['unfavorable'] && params.TarBad"
-          :label="false"
+          :label="true"
           :form="cmdForm"
           :scale="params.TarBad && params.TarBad.num_scale" 
           v-model:value="cmdForm.TarBad" 
@@ -330,11 +342,12 @@
           :unit="params.TarBad && params.TarBad.unit" 
           :isCheck="true" 
           btnName="更新"
-          @upData="updateData('Downstream')"
+          @upData="updateData('unfavorable')"
           :max="params.TarBad && params.TarBad.num_maxvalue"
           :min="params.TarBad && params.TarBad.num_minvalue"
           :step="params.TarBad && params.TarBad.num_step"
           inputBorder="1px solid #ccc"
+          :title="params.TarBad && params.TarBad.paramname"
         />
       </updataBtn>
     </MyInput>
@@ -399,20 +412,23 @@ let updateData = (funName) => {
 }
 
 let modelChange = async (data) => {
-  let res = await Api.requested({
-    "id": "20230627163701",
-    "content": {
-      "w_deviceid": router.currentRoute.value.query.id,
-      "w_functionid": detailData.value.function.Ctrl.w_functionid,
-      "params": {
-        'ConMode':data
+  if (cmdForm.value.ConMode == 0 || cmdForm.value.ConMode) {
+    let res = await Api.requested({
+      "id": "20230627163701",
+      "content": {
+        "w_deviceid": router.currentRoute.value.query.id,
+        "w_functionid": detailData.value.function.Ctrl.w_functionid,
+        "params": {
+          'ConMode':cmdForm.value.ConMode
+        }
       }
-    }
-  })
-  utils.message(res,() => {
-    utils.message(res,'模式变更成功')
-    emit('onSuccess')
-  })
+    })
+    utils.message(res,() => {
+      utils.message(res,'模式变更成功')
+      emit('onSuccess')
+    })
+  } 
+  
 }
 
 let sleepChange = async (data) => {
@@ -425,7 +441,7 @@ let sleepChange = async (data) => {
           "w_deviceid": router.currentRoute.value.query.id,
           "w_functionid": detailData.value.function.Config.w_functionid,
           "params": {
-            ['Config']: cmdForm.value.Config == 0 ? 1 : 0
+            ['Config']: cmdForm.value.Config
           }
         }
       })
@@ -434,6 +450,9 @@ let sleepChange = async (data) => {
       }
       utils.message(res,'操作成功',() => {
       })
+    },
+    onCancel () {
+      cmdForm.value.Config = cmdForm.value.Config == 1 ? 0 : 1 
     }
   })
   

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

@@ -132,7 +132,7 @@ let modelChange = (num) => {
           "w_deviceid": router.currentRoute.value.query.id,
           "w_functionid": detailData.value.function.TimeControl.w_functionid,
           "params": {
-            ['timeCon']: num.target.value
+            ['TimeCon']: num.target.value
           }
         }
       })
@@ -140,7 +140,7 @@ let modelChange = (num) => {
       })
     },
     onCancel () {
-      form.value.TimeCon = form.value.TimeCon == '0' ? '1' : '0'
+      cmdForm.value.TimeCon = cmdForm.value.TimeCon == 1 ? 0 : 1 
     }
   })
 }
@@ -154,7 +154,7 @@ let updateData = async (i,vm) => {
       let keys = Object.keys(detailData.value.function[`T${i}`].params)
       let obj = {}
       keys.forEach(item => {
-        obj[item] = cmdForm.value[item]
+        obj[item] = cmdForm.value[item].replace(':','_')
       })
       let res = await Api.requested({
         "id": "20230627163701",

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

@@ -20,6 +20,13 @@
             <a-tag v-for="item in data.record.content">{{ item.title }} : {{ item.value }}</a-tag>
           </div>
         </div>
+        <div v-else-if="data.column.dataIndex == 'isreceive'">
+          {{ data.record.isreceive ? '已接收' : '未接收' }}
+        </div>
+        <div v-else-if="data.column.dataIndex == 'invalid'">
+          {{ data.record.isreceive ? '已失效' : '未失效' }}
+        </div>
+        
       </template>
     </normalTable>
   </a-modal>

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

@@ -149,11 +149,11 @@ let checkNumScale = (rule,value) => {
 
 /* 验证时间 */
 let checkTime = (rule,value) => {
-  let temp = value.split(':')
+  let temp = value.split('_')
   if (temp.length == 2 && (+temp[0] <= 24 && +temp[0] > 0) && (+temp[1] <=60 && +temp[1] > 0)) {
     return Promise.resolve()
   } else {
-    return Promise.reject(`时间格式 00:00 `)
+    return Promise.reject(`时间格式 00_00 `)
   }
 }
 

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

@@ -1,5 +1,5 @@
 <template>
-  <normalTable rowKey="w_dataparamid" ref="list" size="small" :param="param" :columns="utils.TBLayout('dataparamTable')">
+  <normalTable :sequence="true" rowKey="w_dataparamid" ref="list" size="small" :param="param" :columns="utils.TBLayout('dataparamTable')">
     <template #tb_cell="{data}">
       <div v-if="data.column.dataIndex == 'operation'">
         <Edit :data="data.record" @onSuccess="$refs.list.listData()" :disabled="!utils.hasPermission('modelTab')"></Edit>

src/operation/moduleNormal/equipmentMag/detail/modules/eventTab/index.vue

@@ -1,5 +1,5 @@
 <template>
-  <normalTable rowKey="w_eventid" ref="list" size="small" :param="param" :columns="utils.TBLayout('eventTable')">
+  <normalTable :sequence="true" rowKey="w_eventid" ref="list" size="small" :param="param" :columns="utils.TBLayout('eventTable')">
     <template #tb_cell="{data}">
       <div v-if="data.column.dataIndex == 'operation'">
         <Edit :data="data.record" @onSuccess="$refs.list.listData()" :disabled="!utils.hasPermission('modelTab')"></Edit>

src/operation/moduleNormal/equipmentMag/detail/modules/serveTable/index.vue

@@ -1,5 +1,5 @@
 <template>
-  <normalTable rowKey="w_functionid" ref="list" size="small" :param="param" :columns="utils.TBLayout('serveTable')">
+  <normalTable :sequence="true" rowKey="w_functionid" ref="list" size="small" :param="param" :columns="utils.TBLayout('serveTable')">
     <template #tb_cell="{data}">
       <div v-if="data.column.dataIndex == 'operation'">
         <Edit :data="data.record" @onSuccess="$refs.list.listData()" :disabled="!utils.hasPermission('modelTab')"></Edit>

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

@@ -1,5 +1,5 @@
 <template>
-  <normalTable rowKey="w_dataparamid" ref="list" size="small" :param="param" :columns="utils.TBLayout('dataparamTable')">
+  <normalTable :sequence="true" rowKey="w_dataparamid" ref="list" size="small" :param="param" :columns="utils.TBLayout('dataparamTable')">
     <template #tb_cell="{data}">
       <div v-if="data.column.dataIndex == 'operation'">
         <Edit :data="data.record" @onSuccess="$refs.list.listData()" :disabled="!utils.hasPermission('modelTab')"></Edit>

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

@@ -1,5 +1,5 @@
 <template>
-  <normalTable rowKey="w_eventid" ref="list" size="small" :param="param" :columns="utils.TBLayout('eventTable')">
+  <normalTable :sequence="true" rowKey="w_eventid" ref="list" size="small" :param="param" :columns="utils.TBLayout('eventTable')">
     <template #tb_cell="{data}">
       <div v-if="data.column.dataIndex == 'operation'">
         <Edit :data="data.record" @onSuccess="$refs.list.listData()" :disabled="!utils.hasPermission('modelTab')"></Edit>

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

@@ -1,5 +1,5 @@
 <template>
-  <normalTable rowKey="w_functionid" ref="list" size="small" :param="param" :columns="utils.TBLayout('serveTable')">
+  <normalTable :sequence="true" rowKey="w_functionid" ref="list" size="small" :param="param" :columns="utils.TBLayout('serveTable')">
     <template #tb_cell="{data}">
       <div v-if="data.column.dataIndex == 'operation'">
         <Edit :data="data.record" @onSuccess="$refs.list.listData()" :disabled="!utils.hasPermission('modelTab')"></Edit>

src/template/normalTable/index.vue

@@ -16,6 +16,7 @@
       :size="size"
       :bordered="!hideBorder"
       :row-class-name="(_record, index) => (index % 2 === 1 ? 'table-striped' : null)"
+      :customRow="sequence ? customRow : noRequence"
       >
       <template #headerCell="{ column }">
         <div style="min-width:100px;" v-if="column.filter == 1 || column.filter == 2">
@@ -50,6 +51,10 @@
     loadOverHandle: {
       type:Boolean,
       default:() => true
+    },
+    sequence: {
+      type:Boolean,
+      default:() => false
     }
   })
   const columns = ref(props.columns)
@@ -98,6 +103,7 @@
   let sourceObj = ref({})
   let targetObj = ref({})
 
+let noRequence = () =>{}
 let customRow = (record, index) => {
       console.log(record, index);
       return {
@@ -127,7 +133,7 @@ let customRow = (record, index) => {
           ev.preventDefault();
         },
         // 鼠标松开
-        onDrop: (event) => {
+        onDrop: async (event) => {
           // 兼容IE
           var ev = event || window.event;
           // 阻止冒泡
@@ -137,16 +143,29 @@ let customRow = (record, index) => {
           const tempDta = data.value;
           tempDta[targetObj.value.weight] = sourceObj.value;
           tempDta[sourceObj.value.weight] = targetObj.value;
-          let weightList = [];
+          let source
+          let target
           tempDta.forEach((item, index) => {
             item.weight = index;
-            weightList.push({
-              id: item.id,
-              weight: index,
-            });
+            if (sourceObj.value[props.rowKey] == item[props.rowKey]) source = item
+            if (targetObj.value[props.rowKey] == item[props.rowKey]) target = item
           });
-          console.log(tempDta);
-          // this.handleWeightModify(weightList);// 更改顺序接口
+          let res = await Api.requested({
+            "id": "20221201134901",
+            "content": {
+              "ownertable": props.rowKey.substring(0,props.rowKey.indexOf('id')),
+              "sequencesorts": [
+                {
+                  "ownerid": source[props.rowKey],
+                  "sequence": props.param.content.pageSize * (props.param.content.pageNumber - 1) + source.weight
+                },
+                {
+                  "ownerid": target[props.rowKey],
+                  "sequence": props.param.content.pageSize * (props.param.content.pageNumber - 1) + target.weight
+                }
+              ]
+            }
+          })
         },
       };
     }