423

src/views/titlecomponent/MathFunc.vue

@@ -43,8 +43,8 @@
         </el-table>
     </div>
 
-    <div v-show="currentTab1 == '1'" style="margin-top: 10px">
-        <PythonEdit  :value="equation" language="python" @change="updateEquation"/>
+    <div v-if="currentTab1 == '1'" style="margin-top: 10px;height: 280px">
+        <PythonEdit  v-model:value="equation" language="python" />
     </div> 
 
     <div v-show="currentTab1 == '2'" class="eldesign classtable" style="margin-top: 10px">
@@ -204,7 +204,6 @@ const headerCellClassName = ({ column }) => {
   return '';
 };
 
-
 const convertToStringArray = (result, Data) => {
   console.log('Data:', Data);
 
@@ -214,6 +213,29 @@ const convertToStringArray = (result, Data) => {
     return result; // 返回原 result 或者根据需要返回其他默认值
   }
 
+  result = Data.map(row => {
+    // 获取每一行的 `code`, `name`, `value` 和 `flag`
+    const code = row.code || ' ';
+    const name = row.name || ' ';
+    const value = (row.value === null || row.value === undefined || row.value === '') ? ' ' : row.value;
+    const flag = (row.flag === null || row.flag === undefined || row.flag === '') ? ' ' : row.flag;
+
+    // 将字段连接为一个以逗号分隔的字符串
+    return `${code},${name},${value},${flag}`;
+  }).join(';');  // 每行之间用分号分隔
+
+  return result;
+}
+
+const convertToStringArray1 = (result, Data) => {
+  console.log('Data:', Data);
+
+  // 安全检查 Data，确保它是一个数组
+  if (!Array.isArray(Data)) {
+    console.error('Data should be an array');
+    return result; // 返回原 result 或者根据需要返回其他默认值
+  }
+
   result = Data.map(row => {
     // 获取每一行的 `code`, `name`, `value` 和 `flag`
     const paramid = row.paramid || ' ';
@@ -265,22 +287,6 @@ const getmathfuncAssign = (data) => {
   outParams.value = data.outParams;
 }
 
-let newequation = ref(`import os
-import numpy as np
-from surromdao.solver import BaseSolver
-
-class Branin(BaseSolver):
-    def __init__(self, filename=os.path):
-        super().__init__(filename)
-
-    def compute(self, xdict):
-        x = np.zeros(2)
-        # x[1] = x[2]`);
-let updateEquation = (value) => {
-  // console.log('updateEquation:', value);
-  newequation.value = value;
-}
-
 const getmathfuncsave = (id,nowid) => {
   if(nowid){
     wid.value = nowid
@@ -291,8 +297,8 @@ const getmathfuncsave = (id,nowid) => {
     transCode: "MDO0064",
     pid: pid.value,
     wid: wid.value,
-    equation: newequation.value,
-    inParams: convertToStringArray([],inParams.value),
+    equation: equation.value,
+    inParams: convertToStringArray1([],inParams.value),
     outParams: convertToStringArray([],outParams.value)
   };
   request(params).then((res) => {