Merge branch 'xiaoqin'

dist/assets/LOGO-f90999a3.js → dist/assets/LOGO-4bcd1b4c.js

@@ -1 +1 @@
-import{e as i,r}from"./index-e3747290.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-f91fd879.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-ce95806c.js → dist/assets/PlusCircleOutlined-7e962e23.js

@@ -1 +1 @@
-import{a as i}from"./index-e3747290.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-f91fd879.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-1a6e67da.js → dist/assets/index-0deb22bc.js

@@ -1 +1 @@
-import{M as o,A as c,f as l}from"./index-e3747290.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-f91fd879.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-1fe5ba97.js → dist/assets/index-5ce88e3c.js

@@ -1 +1 @@
-import{l as n}from"./index-1e4e1f6b.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-e3747290.js";import"./base-c4ca4d2e.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-04ebacef.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-f91fd879.js";import"./base-f44017c5.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-1f5f49ab.js → dist/assets/index-6f245b6c.js

@@ -1 +1 @@
-import{n as h}from"./index-e01e6b5a.js";import{m as k}from"./index-e3747290.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-bc74c7c8.js";import{m as k}from"./index-f91fd879.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-4a200f3f.js → dist/assets/index-c0fd89b2.js

@@ -1 +1 @@
-import{l as d}from"./index-1e4e1f6b.js";import{A as m}from"./index-e3747290.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-c4ca4d2e.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-04ebacef.js";import{A as m}from"./index-f91fd879.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-f44017c5.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/login-12995ce6.css

@@ -0,0 +1 @@
+.conatiner[data-v-5b685ebd]{background-image:url(./bg-b584b93f.gif);background-size:cover;animation-direction:reverse}.title[data-v-5b685ebd]{height:33px;margin:0 0 48px;color:#fff;font-size:2rem;font-weight:500;animation:showup 3s forwards;display:flex;align-items:center}.login-wrap[data-v-5b685ebd]{overflow:hidden}.login-wrap .top[data-v-5b685ebd]{width:100%}.login-wrap .top[data-v-5b685ebd]{height:calc(100vh - 70px);width:100%}.login-wrap svg[data-v-5b685ebd]{height:70%}.login-form[data-v-5b685ebd]{position:absolute;right:50%;top:50vh;width:500px;margin-right:-250px;margin-top:-244px;padding:50px 80px;background-color:#fff3;border-radius:5px;box-shadow:0 0 12px #0000001a;z-index:9999}.login-item[data-v-5b685ebd]{text-align:center}.input-wrap[data-v-5b685ebd]{width:100%}.color-info[data-v-5b685ebd]{color:#999;font-weight:300}.introduce[data-v-5b685ebd]{position:absolute;left:10%;top:10vh;font-size:20px;color:#fff;text-indent:3rem;line-height:3rem;text-shadow:0 0px 5px #666}.introduce[data-v-5b685ebd]{white-space:pre-wrap;overflow:hidden;max-width:700px;animation:typingH-5b685ebd 5s forwards;display:inline-block}[data-v-5b685ebd] .ant-input{color:#fff;background:none!important}[data-v-5b685ebd] .ant-input-affix-wrapper{background:rgba(43,141,195,1)!important;border:none}[data-v-5b685ebd] .ant-input-affix-wrapper input{background:none}[data-v-5b685ebd] .anticon{color:#fff}.introduce[data-v-5b685ebd]:after{content:"";display:inline-block;width:5px;height:1.2em;margin-left:5px}@keyframes typingH-5b685ebd{0%{height:0px}to{height:300px}}@media (max-width: 1600px){.login-form[data-v-5b685ebd]{transform:scale(.8)}.introduce[data-v-5b685ebd]{font-size:15px}}

dist/assets/login-c6d5d20a.css

@@ -1 +0,0 @@
-.conatiner[data-v-3a77a2a3]{background-image:url(./bg-b584b93f.gif);background-size:cover;animation-direction:reverse}.title[data-v-3a77a2a3]{height:33px;margin:0 0 48px;color:#fff;font-size:2rem;font-weight:500;animation:showup 3s forwards;display:flex;align-items:center}.login-wrap[data-v-3a77a2a3]{overflow:hidden}.login-wrap .top[data-v-3a77a2a3]{width:100%}.login-wrap .top[data-v-3a77a2a3]{height:calc(100vh - 70px);width:100%}.login-wrap svg[data-v-3a77a2a3]{height:70%}.login-form[data-v-3a77a2a3]{position:absolute;right:50%;top:50vh;width:500px;margin-right:-250px;margin-top:-244px;padding:50px 80px;background-color:#fff3;border-radius:5px;box-shadow:0 0 12px #0000001a;z-index:9999}.login-item[data-v-3a77a2a3]{text-align:center}.input-wrap[data-v-3a77a2a3]{width:100%}.color-info[data-v-3a77a2a3]{color:#999;font-weight:300}.introduce[data-v-3a77a2a3]{position:absolute;left:10%;top:10vh;font-size:20px;color:#fff;text-indent:3rem;line-height:3rem;text-shadow:0 0px 5px #666}.introduce[data-v-3a77a2a3]{white-space:pre-wrap;overflow:hidden;max-width:700px;animation:typingH-3a77a2a3 5s forwards;display:inline-block}[data-v-3a77a2a3] .ant-input{color:#fff;background:none!important}[data-v-3a77a2a3] .ant-input-affix-wrapper{background:rgba(43,141,195,1)!important;border:none}[data-v-3a77a2a3] .ant-input-affix-wrapper input{background:none}[data-v-3a77a2a3] .anticon{color:#fff}.introduce[data-v-3a77a2a3]:after{content:"";display:inline-block;width:5px;height:1.2em;margin-left:5px}@keyframes typingH-3a77a2a3{0%{height:0px}to{height:300px}}@media (max-width: 1600px){.login-form[data-v-3a77a2a3]{transform:scale(.8)}.introduce[data-v-3a77a2a3]{font-size:15px}}

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-e3747290.js"></script>
+    <script type="module" crossorigin src="./assets/index-f91fd879.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/index.vue

@@ -227,7 +227,7 @@ onMounted( () => {
   position: relative;
   display: flex;
   align-items: center;
-  padding: 0 130px;
+  padding: 0 130rem;
   min-width: 770px;
 }
 .control .control-content .map img {
@@ -259,5 +259,6 @@ onMounted( () => {
   border-radius: 50%;
   width: 80rem;
   height: 80rem;
+  font-size: 14rem;
 }
 </style>

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

@@ -2,7 +2,7 @@
   <div class="header">
     <span style="color:#ffffff">控制面板</span>
   </div>
-  <div style="overflow-y: scroll;">
+  <div>
     <div>
       <MyInput 
           v-if="params.FlowAcc"

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

@@ -45,6 +45,7 @@ let props = defineProps(['title','data','top','left'])
     padding: 10rem 35rem 10rem 10rem;
     margin-bottom: 10rem;
     position: relative;
+    font-size: 14rem;
   }
   .content {
     padding: 0 10rem 10rem 10rem;

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

@@ -4,7 +4,7 @@
     <detail-template 
       :headData="mainAreaData" 
       :title="`${userData.devicename}(${userData.serialnumber})`" 
-      :tabs="['详情信息','物模型','检查项']" 
+      :tabs="['详情信息','物模型','检查项','日志']" 
       ownertable="user" 
       :delParam="{id:'20230616134502',content:{w_deviceid:router.currentRoute.value.query.id}}" 
       >
@@ -49,6 +49,9 @@
 
         <eventTab :data="userData" v-else></eventTab>
       </template>
+      <template #tab3>
+        <HistoryHandle></HistoryHandle>
+      </template>
     </detail-template>
   </div>
 </template>
@@ -67,6 +70,7 @@ import AddServe from './modules/serveTable/modules/Add.vue'
 import AttributeTab from './modules/attributeTab/index.vue'
 import serveTable from './modules/serveTable/index.vue'
 import eventTab from './modules/eventTab/index.vue'
+import HistoryHandle from './modules/historyHandle/index.vue'
 
 import { message, Modal } from 'ant-design-vue'
 import { ExclamationCircleOutlined } from '@ant-design/icons-vue'

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

@@ -0,0 +1,65 @@
+<template>
+  <normalTable rowKey="w_deviceid" ref="list" size="small" :param="param" :columns="utils.TBLayout('historyTable')">
+    <template #tb_cell="{data}">
+      <div v-if="data.column.dataIndex == 'operation'">
+      
+      </div>
+      <div v-else-if="data.column.dataIndex == 'issend'">
+        {{ data.record.issend == 0 ? '未发送' : '已发送' }}
+      </div>
+      <div v-else-if="data.column.dataIndex == 'content'">
+        <a-tag v-for="item in data.record.content">{{ item.title }} : {{ item.value }}</a-tag>
+      </div>
+      <div v-else>
+        {{ data.record[data.column.dataIndex] }}
+      </div>
+    </template>
+    <template #operation>
+      <div style="display:flex;margin-bottom:16px">
+        <div style="margin-right:16px">
+          <span>数据类型：</span>
+          <a-select
+            ref="select"
+            v-model:value="param.content.where.datatype"
+            placeholder="选择数据类型"
+            style="width: 200px"
+            @change="$refs.list.listData()"
+            allowClear
+          >
+            <a-select-option :value="item.value" v-for="(item,index) in typeList" :key="index">{{ item.value }}</a-select-option>
+          </a-select>
+        </div>
+      </div>
+    </template>
+  </normalTable>
+</template>
+
+<script setup>
+import customBtn from '@/components/customHandleBtn/index.vue'
+import normalTable from '@/template/normalTable/index.vue'
+import { useBaseStore } from '@/stores/modules/base'
+import {ref, defineProps, defineEmits, onMounted, provide} from 'vue'
+import { useRouter } from 'vue-router'
+import Api from '@/api/api'
+import utils from '@/utils/utils'
+
+let base = useBaseStore()
+let router = useRouter()
+let emit = defineEmits([])
+let props = defineProps(['data'])
+let param = ref({
+  "id": 20230701132202,
+  "content": {
+    "w_deviceid": router.currentRoute.value.query.id,
+    "where": {
+    "begindate": "",
+    "enddate": ""
+    }
+  },
+})
+let searchType = ref([{label:'搜索',key:'condition',type:'input'}])
+</script>
+
+<style scoped>
+
+</style>

src/operation/moduleNormal/productManage/detail/modules/Edit.vue

@@ -63,16 +63,11 @@
             <a-textarea v-model:value="form.remarks" placeholder="请输入描述"></a-textarea>
           </a-form-item>
         </a-col>
-        <a-col :span="24">
+        <!-- <a-col :span="24">
           <a-form-item  label="是否启用" name="isused">
             <a-checkbox v-model:checked="form.isused"></a-checkbox>
           </a-form-item>
-        </a-col>
-        <a-col :span="24">
-          <a-form-item  label="path">
-            <a-input v-model:value="form.dashboardpath" placeholder="请输入产品名称"></a-input>
-          </a-form-item>
-        </a-col>
+        </a-col> -->
       </a-row>
     </a-form>
     <template #extra>