Merge branch 'master' of http://adicom-hxx.natapp1.cc/CQ_ADI/airoptweb

dist/assets/delete-4e843524.js → dist/assets/delete-98806419.js

@@ -1 +1 @@
-import{r as s}from"./index-c25338d9.js";const a=s(!1),o=s("");let r;function i(){return{isVisible:a,message:o,resolve:e=>{r&&r(e)}}}function l(){return{confirm(e){return a.value=!0,o.value=e,new Promise(t=>{r=t})}}}export{l as a,i as u};
+import{r as s}from"./index-d6fb523b.js";const a=s(!1),o=s("");let r;function i(){return{isVisible:a,message:o,resolve:e=>{r&&r(e)}}}function l(){return{confirm(e){return a.value=!0,o.value=e,new Promise(t=>{r=t})}}}export{l as a,i as u};

dist/assets/openpage-a4633bbe.js → dist/assets/openpage-5707657f.js

@@ -1 +1 @@
-import{_ as f,u as g,r as u,c as v,a as n,o as w,b as x,d as e,w as t,e as s,f as i,g as a,R as E,p as S,h as B}from"./index-c25338d9.js";import"./request-37282809.js";import{m as N}from"./header-2c32aa21.js";const Q="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAKdJREFUOE9jZKAQMBKj//+1IHmG3wwzGN6982V0PPAHWQ9BA6CadzD8ZyxgNFi7E91CvAYQ0gwyDKcBxGjGaQCxmrEaQIpmDAP+73dgYRASuowrwLDFGEoY/N/vwMEgJHSagZkhg1Fn3VFiohgjEP+fD1BgYGLaTKwhWGOBFENwRyORLsGfkIgwhHBSJmAIQQNAMQENk+UM797ZkpyZYFEJSiPomkFyAM83WhGVK0eFAAAAAElFTkSuQmCC";const y=c=>(S("data-v-c862a3c8"),c=c(),B(),c),F={class:"openpage"},G={class:"user lbg_color2"},I={class:"container border"},R={class:"user-slider lbg_color3 el-menu"},C=y(()=>s("div",{class:"ve_logo_img"},null,-1)),V={class:"zjmian"},k={class:"user-main"},K={__name:"openpage",setup(c){const _=g();u(new Date().getTime());let r=u("/home/newfile");const d=v(()=>{const o=_.currentRoute.value.fullPath;return console.log(o),o==="/"&&_.replace({path:r.value}),o});function m(o){_.replace({path:o}),o=="/home/querylist"&&console.log(11111)}return(o,P)=>{const p=n("el-header"),A=n("el-image"),l=n("el-menu-item"),h=n("el-menu");return w(),x("div",F,[e(p,null,{default:t(()=>[e(N)]),_:1}),s("div",G,[s("div",I,[s("div",R,[e(h,{class:"lbg_color3 menuclass",router:!0,"default-active":d.value,onSelect:m},{default:t(()=>[C,s("h3",V,[s("span",null,[e(A,{style:{height:"100%"},src:i(Q),fit:"contain"},null,8,["src"])]),a("主界面")]),e(l,{index:"/home/newfile"},{default:t(()=>[a("新建")]),_:1}),e(l,{index:"/home/querylist"},{default:t(()=>[a("打开")]),_:1}),e(l,{index:"/home/savefile"},{default:t(()=>[a("保存")]),_:1}),e(l,null,{default:t(()=>[a("另存")]),_:1}),e(l,null,{default:t(()=>[a("信息")]),_:1}),e(l,null,{default:t(()=>[a("帮助")]),_:1})]),_:1},8,["default-active"])]),s("section",k,[e(i(E))])])])])}}},Y=f(K,[["__scopeId","data-v-c862a3c8"]]);export{Y as default};
+import{_ as f,u as g,r as u,c as v,a as n,o as w,b as x,d as e,w as t,e as s,f as i,g as a,R as E,p as S,h as B}from"./index-d6fb523b.js";import"./request-a46054a8.js";import{m as N}from"./header-7456a02e.js";const Q="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAKdJREFUOE9jZKAQMBKj//+1IHmG3wwzGN6982V0PPAHWQ9BA6CadzD8ZyxgNFi7E91CvAYQ0gwyDKcBxGjGaQCxmrEaQIpmDAP+73dgYRASuowrwLDFGEoY/N/vwMEgJHSagZkhg1Fn3VFiohgjEP+fD1BgYGLaTKwhWGOBFENwRyORLsGfkIgwhHBSJmAIQQNAMQENk+UM797ZkpyZYFEJSiPomkFyAM83WhGVK0eFAAAAAElFTkSuQmCC";const y=c=>(S("data-v-c862a3c8"),c=c(),B(),c),F={class:"openpage"},G={class:"user lbg_color2"},I={class:"container border"},R={class:"user-slider lbg_color3 el-menu"},C=y(()=>s("div",{class:"ve_logo_img"},null,-1)),V={class:"zjmian"},k={class:"user-main"},K={__name:"openpage",setup(c){const _=g();u(new Date().getTime());let r=u("/home/newfile");const d=v(()=>{const o=_.currentRoute.value.fullPath;return console.log(o),o==="/"&&_.replace({path:r.value}),o});function m(o){_.replace({path:o}),o=="/home/querylist"&&console.log(11111)}return(o,P)=>{const p=n("el-header"),A=n("el-image"),l=n("el-menu-item"),h=n("el-menu");return w(),x("div",F,[e(p,null,{default:t(()=>[e(N)]),_:1}),s("div",G,[s("div",I,[s("div",R,[e(h,{class:"lbg_color3 menuclass",router:!0,"default-active":d.value,onSelect:m},{default:t(()=>[C,s("h3",V,[s("span",null,[e(A,{style:{height:"100%"},src:i(Q),fit:"contain"},null,8,["src"])]),a("主界面")]),e(l,{index:"/home/newfile"},{default:t(()=>[a("新建")]),_:1}),e(l,{index:"/home/querylist"},{default:t(()=>[a("打开")]),_:1}),e(l,{index:"/home/savefile"},{default:t(()=>[a("保存")]),_:1}),e(l,null,{default:t(()=>[a("另存")]),_:1}),e(l,null,{default:t(()=>[a("信息")]),_:1}),e(l,null,{default:t(()=>[a("帮助")]),_:1})]),_:1},8,["default-active"])]),s("section",k,[e(i(E))])])])])}}},Y=f(K,[["__scopeId","data-v-c862a3c8"]]);export{Y as default};

dist/assets/querylist-33b608e4.js → dist/assets/querylist-16e68542.js

@@ -1,4 +1,4 @@
-import{_ as Is,r as et,u as Ls,i as Hs,E as tt,a as ke,o as Es,b as As,e as Se,d as W,f as U,w as re,F as Vs,g as We,x as Gs,l as Ct,t as Ut,y as js,p as zs,h as $s}from"./index-c25338d9.js";import{r as It}from"./request-37282809.js";//! moment.js
+import{_ as Is,r as et,u as Ls,i as Hs,E as tt,a as ke,o as Es,b as As,e as Se,d as W,f as U,w as re,F as Vs,g as We,x as Gs,l as Ct,t as Ut,y as js,p as zs,h as $s}from"./index-d6fb523b.js";import{r as It}from"./request-a46054a8.js";//! moment.js
 //! version : 2.30.1
 //! authors : Tim Wood, Iskren Chernev, Moment.js contributors
 //! license : MIT

dist/assets/savefile-498f1eff.js

@@ -1 +0,0 @@
-import"./request-37282809.js";import{o as t,b as s,F as o,e}from"./index-c25338d9.js";const a=e("h3",{class:"opt_tltie"},"保存",-1),l=e("div",null,null,-1),p={__name:"savefile",setup(n){return(_,c)=>(t(),s(o,null,[a,l],64))}};export{p as default};

dist/assets/savefile-a312ca55.js

@@ -0,0 +1 @@
+import"./request-a46054a8.js";import{o as t,b as s,F as o,e}from"./index-d6fb523b.js";const a=e("h3",{class:"opt_tltie"},"保存",-1),l=e("div",null,null,-1),p={__name:"savefile",setup(n){return(_,c)=>(t(),s(o,null,[a,l],64))}};export{p as default};

dist/index.html

@@ -8,12 +8,14 @@
     <meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1, minimum-scale=1, user-scalable=no">
  
     <title></title>
-    <script type="module" crossorigin src="./assets/index-c25338d9.js"></script>
+    <script type="module" crossorigin src="./assets/index-d6fb523b.js"></script>
     <link rel="stylesheet" href="./assets/index-831287df.css">
   </head>
   <body>
     <div id="app"></div>
     
+    <script src="/public/jquery/jquery.min.js"></script>
+    <script src="/public/webuploader/webuploader.min.js"></script>
     <!-- <script type="module" src="./public/static/Build/Build.data"></script>
     <script type="module" src="./public/static/Build/Build.wasm"></script> -->
   </body>

src/views/home.vue

@@ -2561,8 +2561,8 @@ const initoptimize = () => {
     console.log('3:', res3.checked);
 
     Joptimizeref.value.getoptimizeAssign(res1);
-
-
+    Doptimizeref.value.getDoptimizeAssign(res2);
+    Toptimizeref.value.getToptimizeAssign(res3);
 
     
     // 根据返回值来设置 activeadf

src/views/titlecomponent/Doptimize.vue

@@ -236,35 +236,38 @@ const getDoptimize = (id) => {
   request(params).then((res) => {
     console.log('chushihua')
     if (res.hasOwnProperty('suid')) {
-      suid.value = res.suid;
-      youhua.value.algorithm = res.algorithm;
-      youhua.value.iout = res.iout;
-      youhua.value.irestart = res.irestart;
-      youhua.value.ndoe = res.ndoe;
-      youhua.value.ns = res.ns;
-      youhua.value.nsmax = res.nsmax;
-      youhua.value.nslf = res.nslf;
-      youhua.value.nsmaxlf = res.nsmaxlf;
-      youhua.value.nsmk = res.nsmk;
-      youhua.value.nsmaxmk = res.nsmaxmk;
-      youhua.value.xtol = res.xtol;
-      youhua.value.feasibilitytolreal = res.feasibilitytolreal;
-      youhua.value.feasibilitytolsurro = res.feasibilitytolsurro;
-      youhua.value.surromod = res.surromod;
-      youhua.value.corr = res.corr;
-      youhua.value.consttheta = res.consttheta;
-      youhua.value.porder = res.porder;
-      youhua.value.dcmp = res.dcmp;
-      youhua.value.paraopt = res.paraopt;
-      youhua.value.regular = res.regular;
-      youhua.value.infill = res.infill;
-      youhua.value.nparallel = res.nparallel;
-      youhua.value.iopt = res.iopt;
-      youhua.value.icstr = res.icstr;
-      youhua.value.ipopsize = res.ipopsize;
-      youhua.value.maxgen = res.maxgen;
-      youhua.value.pc = res.pc;
-      youhua.value.pm = res.pm;
+      // suid.value = res.suid;
+      // youhua.value.algorithm = res.algorithm;
+      // youhua.value.iout = res.iout;
+      // youhua.value.irestart = res.irestart;
+      // youhua.value.ndoe = res.ndoe;
+      // youhua.value.ns = res.ns;
+      // youhua.value.nsmax = res.nsmax;
+      // youhua.value.nslf = res.nslf;
+      // youhua.value.nsmaxlf = res.nsmaxlf;
+      // youhua.value.nsmk = res.nsmk;
+      // youhua.value.nsmaxmk = res.nsmaxmk;
+      // youhua.value.xtol = res.xtol;
+      // youhua.value.feasibilitytolreal = res.feasibilitytolreal;
+      // youhua.value.feasibilitytolsurro = res.feasibilitytolsurro;
+      // youhua.value.surromod = res.surromod;
+      // youhua.value.corr = res.corr;
+      // youhua.value.consttheta = res.consttheta;
+      // youhua.value.porder = res.porder;
+      // youhua.value.dcmp = res.dcmp;
+      // youhua.value.paraopt = res.paraopt;
+      // youhua.value.regular = res.regular;
+      // youhua.value.infill = res.infill;
+      // youhua.value.nparallel = res.nparallel;
+      // youhua.value.iopt = res.iopt;
+      // youhua.value.icstr = res.icstr;
+      // youhua.value.ipopsize = res.ipopsize;
+      // youhua.value.maxgen = res.maxgen;
+      // youhua.value.pc = res.pc;
+      // youhua.value.pm = res.pm;
+
+      getDoptimizeAssign(res);
+
     } else {
     }
   })
@@ -273,6 +276,38 @@ const getDoptimize = (id) => {
   })
 }
 
+const getDoptimizeAssign = (data) => {
+  suid.value = data.suid;
+  youhua.value.algorithm = data.algorithm;
+  youhua.value.iout = data.iout;
+  youhua.value.irestart = data.irestart;
+  youhua.value.ndoe = data.ndoe;
+  youhua.value.ns = data.ns;
+  youhua.value.nsmax = data.nsmax;
+  youhua.value.nslf = data.nslf;
+  youhua.value.nsmaxlf = data.nsmaxlf;
+  youhua.value.nsmk = data.nsmk;
+  youhua.value.nsmaxmk = data.nsmaxmk;
+  youhua.value.xtol = data.xtol;
+  youhua.value.feasibilitytolreal = data.feasibilitytolreal;
+  youhua.value.feasibilitytolsurro = data.feasibilitytolsurro;
+  youhua.value.surromod = data.surromod;
+  youhua.value.corr = data.corr;
+  youhua.value.consttheta = data.consttheta;
+  youhua.value.porder = data.porder;
+  youhua.value.dcmp = data.dcmp;
+  youhua.value.paraopt = data.paraopt;
+  youhua.value.regular = data.regular;
+  youhua.value.infill = data.infill;
+  youhua.value.nparallel = data.nparallel;
+  youhua.value.iopt = data.iopt;
+  youhua.value.icstr = data.icstr;
+  youhua.value.ipopsize = data.ipopsize;
+  youhua.value.maxgen = data.maxgen;
+  youhua.value.pc = data.pc;
+  youhua.value.pm = data.pm;
+}
+
 //代理优化器，添加保存
 const getaddDsave = () => {
   const params = {
@@ -321,6 +356,7 @@ const getaddDsave = () => {
 }
 defineExpose({
   getDoptimize,
+  getDoptimizeAssign,
   getaddDsave
 });
 </script>

src/views/titlecomponent/Toptimize.vue

@@ -73,14 +73,16 @@ const getToptimize = (id) => {
   }
   request(params).then((res) => {
     if (res.hasOwnProperty('grid')) {
-      grid.value = res.grid;
-      youhua.value.algorithm = res.algorithm;
-      youhua.value.majoriterationslimit = res.majoriterationslimit;
-      youhua.value.majorprintlevel = res.majorprintlevel;
-      youhua.value.linearfeasibilitytolerance = res.linearfeasibilitytolerance;
-      youhua.value.nonlinearfeasibilitytolerance = res.nonlinearfeasibilitytolerance;
-      youhua.value.optimalitytolerance = res.optimalitytolerance;
-      youhua.value.verifylevel = res.verifylevel;
+      // grid.value = res.grid;
+      // youhua.value.algorithm = res.algorithm;
+      // youhua.value.majoriterationslimit = res.majoriterationslimit;
+      // youhua.value.majorprintlevel = res.majorprintlevel;
+      // youhua.value.linearfeasibilitytolerance = res.linearfeasibilitytolerance;
+      // youhua.value.nonlinearfeasibilitytolerance = res.nonlinearfeasibilitytolerance;
+      // youhua.value.optimalitytolerance = res.optimalitytolerance;
+      // youhua.value.verifylevel = res.verifylevel;
+
+      getToptimizeAssign(res);
 
     } else {
       
@@ -91,6 +93,18 @@ const getToptimize = (id) => {
   })
 }
 
+const getToptimizeAssign = (data) => {
+  pid.value = data.pid;
+  grid.value = data.grid;
+  youhua.value.algorithm = data.algorithm;
+  youhua.value.majoriterationslimit = data.majoriterationslimit;
+  youhua.value.majorprintlevel = data.majorprintlevel;
+  youhua.value.linearfeasibilitytolerance = data.linearfeasibilitytolerance;
+  youhua.value.nonlinearfeasibilitytolerance = data.nonlinearfeasibilitytolerance;
+  youhua.value.optimalitytolerance = data.optimalitytolerance;
+  youhua.value.verifylevel = data.verifylevel;
+}
+
 //代理优化器，添加保存
 const getaddTsave = () => {
   const params = {
@@ -119,6 +133,7 @@ const getaddTsave = () => {
 }
 defineExpose({
   getToptimize,
+  getToptimizeAssign,
   getaddTsave
 });
 </script>

src/views/titlecomponent/ffds.vue

@@ -191,15 +191,17 @@ const getffds = (id) => {
   };
   request(params).then((res) => {
     if (res.hasOwnProperty("ffdid")) {
-      ffdid.value = res.ffdid;
-      ffdvalue.value.fname = res.fname;
-      ffdvalue.value.nx = res.nx;
-      ffdvalue.value.ny = res.ny;
-      ffdvalue.value.nz = res.nz;
-      order.value = Number(res.order);
-      vars.value = res.vars;
-      generateTable();
-      initializeTableFromVars();
+      // ffdid.value = res.ffdid;
+      // ffdvalue.value.fname = res.fname;
+      // ffdvalue.value.nx = res.nx;
+      // ffdvalue.value.ny = res.ny;
+      // ffdvalue.value.nz = res.nz;
+      // order.value = Number(res.order);
+      // vars.value = res.vars;
+      // generateTable();
+      // initializeTableFromVars();
+
+      getffdsAssign(res);
     }
   })
   .catch((err) => {
@@ -207,6 +209,18 @@ const getffds = (id) => {
     })
 };
 
+const getffdsAssign = (data) => {
+  ffdid.value = data.ffdid;
+  ffdvalue.value.fname = data.fname;
+  ffdvalue.value.nx = data.nx;
+  ffdvalue.value.ny = data.ny;
+  ffdvalue.value.nz = data.nz;
+  order.value = Number(data.order);
+  vars.value = data.vars;
+  generateTable();
+  initializeTableFromVars();
+};
+
 // ffd保存
 const getffdsave = () => {
   generateVars();