Merge branch 'master' of http://192.168.0.130:13000/CQ_ADI/airoptweb

src/views/echart/BarChart.vue

@@ -28,9 +28,9 @@ let state = reactive({
 })
 const getData = () => {}
 onMounted(() => {
-  var chartDom = document.getElementById("bargraphbar")
-  myChart = echarts.init(chartDom)
-  setOptionfun()
+  // var chartDom = document.getElementById("bargraphbar")
+  // myChart = echarts.init(chartDom)
+  // setOptionfun()
 })
 
 const props = defineProps({

src/views/home.vue

@@ -2242,7 +2242,7 @@ const handleClick = (tab, event) => {
 
   tabactive.value = tab.props.name;
   if (tabactive.value == 'User') {
-    // vuefval.value.logToObject1();
+    vuefval.value.logToObject1();
     router.replace({ path: '/' })
   } else {
 

src/views/home/newfile.vue

@@ -286,15 +286,19 @@ const clickimg=(data,index,id)=>{
     }
 }
 .hoveredImageContainer {
-  height: 220px;
-  width: 180px;
+  height: 120%;
+  width: 120%;
   position: absolute;
-  left: calc(100% + 5px); /* 或者调整到合适的距离 */
-  top: -10px;
+  display: flex;
+  justify-content: center;
+  align-items: center;
+  left: calc(100% + 0px); /* 或者调整到合适的距离 */
+  top: -15px;
   z-index: 10; /* 确保悬浮图片在其他内容之上 */
 }
 
 .showImgDiv {
+  padding-top:5px;
   position: relative; /* 确保 .hoveredImageContainer 相对于 .showImgDiv 定位 */
 }
 .modelStyle{

src/views/home/querylist.vue

@@ -133,8 +133,9 @@ const handleCurrentChange2=(val)=>{
 }
 //点击列表
 const handlerow=(val)=>{
-    router.push({ path: "/home",query:{id:'2',pid:val.pid}});
+    // console.log("val的值：",val)
     sessionStorage.setItem("objlist",JSON.stringify(val));
+    router.push({ path: "/home",query:{id:'2',pid:val.pid}});
 }
 
 const formatDate = datetime => !datetime ? '' : moment(datetime).format('YYYY-MM-DD HH:mm:ss');

src/views/openpage.vue

@@ -67,7 +67,8 @@ const activeIndex=computed(()=>{
 
 const gohome = () => {
   let objlist = JSON.parse(sessionStorage.getItem("objlist"));
-  router.push({path:"/home",query:{pid:objlist.pid}});
+  // console.log("objlist的值：",objlist);
+  router.push({path:"/home",query:{id:'2',pid:objlist.pid}});
 }
 
 </script>

src/views/titlecomponent/Cloudsecond.vue

@@ -71,7 +71,7 @@
       </div>
     </div>
     <!-- 云图 -->
-    <div v-show="activesd.cloud">
+    <div v-show="activesd.cloud" style="height: 550px; overflow: auto;">
       <div>
         <el-collapse v-model="activeNames">
           <el-collapse-item  name="1">

src/views/titlecomponent/ffds.vue

@@ -60,29 +60,36 @@
         </el-col>
       </el-row>
     </el-form-item>
-    <div class="classtable">
+    
+    <div style="height: 260px; overflow: hidden;">
+      <cloudChart :data="xyzData" />
+    </div>
+
+    <div class="classtable" style="margin-top: 20px;">
       <el-table
         :data="tableDatacst1"
-        style="width: 100%"
+        style="width: 100%;height: 400px;"
         border
         :header-cell-class-name="headerCellClassName"
       >
-        <el-table-column prop="axis" label="" width="60" />
-        <el-table-column
-          v-for="(item, index) in tablecstHeaders"
-          :key="index"
-          :prop="item.prop"
-          :label="item.label"
-        >
+        <el-table-column type="index" label="" width="60" />
+        <el-table-column prop="x" label="X">
+          <template #default="{ row }">
+            <el-input v-model="row.x" />
+          </template>
+        </el-table-column>
+        <el-table-column prop="y" label="Y">
           <template #default="{ row }">
-            <el-input v-model="row[item.prop]" />
+            <el-input v-model="row.y" />
+          </template>
+        </el-table-column>
+        <el-table-column prop="z" label="Z">
+          <template #default="{ row }">
+            <el-input v-model="row.z" />
           </template>
         </el-table-column>
       </el-table>
     </div>
-    <div style="height: 260px">
-      <cloudChart :data="xyzData" />
-    </div>
   </div>
 </template>
 <script  setup>
@@ -109,30 +116,8 @@ let ffdvalue = ref({
 let order = ref(1)
 let vars = ref()
 let tableDatacst1 = ref([
-  {
-    axis: "Z1",
-    X1: "1",
-    X2: "2",
-    X3: "3",
-    X4: "4",
-    X5: "5",
-    X6: "6",
-    X7: "7",
-    X8: "8",
-    X9: "9"
-  },
-  {
-    axis: "Z2",
-    X1: "1",
-    X2: "2",
-    X3: "3",
-    X4: "4",
-    X5: "5",
-    X6: "6",
-    X7: "7",
-    X8: "8",
-    X9: "9"
-  }
+  {x: 0, y: -3.1, z: -23.5},
+  {x: 10.00333333, y: -3.1, z: -23.5},
 ])
 let tablecstHeaders = ref([
   { prop: "X1", label: "X1" },
@@ -156,96 +141,133 @@ const headerCellClassName = ({ columnIndex }) => {
   return ""
 }
 
+// const generateTable = () => {
+//   console.log("generateTable")
+
+//   // 获取X, Y, Z方向的数值
+//   const xCount = Number(ffdvalue.value.nx)
+//   const yCount = Number(ffdvalue.value.ny)
+//   const zCount = Number(ffdvalue.value.nz)
+
+//   // 根据选中的参考坐标系来确定列名和行名
+//   let columns = []
+//   let rows = []
+
+//   switch (order.value) {
+//     case 0: // x-y-z
+//       columns = Array.from({ length: xCount }, (_, i) => ({
+//         label: `X${i + 1}`,
+//         prop: `X${i + 1}`
+//       }))
+//       rows = Array.from({ length: yCount }, (_, i) => ({
+//         label: `Y${i + 1}`,
+//         prop: `Y${i + 1}`
+//       }))
+//       break
+//     case 1: // x-z-y
+//       columns = Array.from({ length: xCount }, (_, i) => ({
+//         label: `X${i + 1}`,
+//         prop: `X${i + 1}`
+//       }))
+//       rows = Array.from({ length: zCount }, (_, i) => ({
+//         label: `Z${i + 1}`,
+//         prop: `Z${i + 1}`
+//       }))
+//       break
+//     case 2: // y-x-z
+//       columns = Array.from({ length: yCount }, (_, i) => ({
+//         label: `Y${i + 1}`,
+//         prop: `Y${i + 1}`
+//       }))
+//       rows = Array.from({ length: xCount }, (_, i) => ({
+//         label: `X${i + 1}`,
+//         prop: `X${i + 1}`
+//       }))
+//       break
+//     case 3: // y-z-x
+//       columns = Array.from({ length: yCount }, (_, i) => ({
+//         label: `Y${i + 1}`,
+//         prop: `Y${i + 1}`
+//       }))
+//       rows = Array.from({ length: zCount }, (_, i) => ({
+//         label: `Z${i + 1}`,
+//         prop: `Z${i + 1}`
+//       }))
+//       break
+//     case 4: // z-x-y
+//       columns = Array.from({ length: zCount }, (_, i) => ({
+//         label: `Z${i + 1}`,
+//         prop: `Z${i + 1}`
+//       }))
+//       rows = Array.from({ length: xCount }, (_, i) => ({
+//         label: `X${i + 1}`,
+//         prop: `X${i + 1}`
+//       }))
+//       break
+//     case 5: // z-y-x
+//       columns = Array.from({ length: zCount }, (_, i) => ({
+//         label: `Z${i + 1}`,
+//         prop: `Z${i + 1}`
+//       }))
+//       rows = Array.from({ length: yCount }, (_, i) => ({
+//         label: `Y${i + 1}`,
+//         prop: `Y${i + 1}`
+//       }))
+//       break
+//     default:
+//       break
+//   }
+
+//   // 更新表格列头
+//   tablecstHeaders.value = columns
+
+//   // 生成表格的数据行
+//   tableDatacst1.value = []
+//   for (let i = 1; i <= rows.length; i++) {
+//     let row = { axis: rows[i - 1].label }
+//     columns.forEach((column) => {
+//       row[column.prop] = null // 每个单元格初始化为空
+//     })
+//     tableDatacst1.value.push(row)
+//   }
+// }
+
 const generateTable = () => {
-  console.log("generateTable")
-
-  // 获取X, Y, Z方向的数值
-  const xCount = Number(ffdvalue.value.nx)
-  const yCount = Number(ffdvalue.value.ny)
-  const zCount = Number(ffdvalue.value.nz)
-
-  // 根据选中的参考坐标系来确定列名和行名
-  let columns = []
-  let rows = []
-
-  switch (order.value) {
-    case 0: // x-y-z
-      columns = Array.from({ length: xCount }, (_, i) => ({
-        label: `X${i + 1}`,
-        prop: `X${i + 1}`
-      }))
-      rows = Array.from({ length: yCount }, (_, i) => ({
-        label: `Y${i + 1}`,
-        prop: `Y${i + 1}`
-      }))
-      break
-    case 1: // x-z-y
-      columns = Array.from({ length: xCount }, (_, i) => ({
-        label: `X${i + 1}`,
-        prop: `X${i + 1}`
-      }))
-      rows = Array.from({ length: zCount }, (_, i) => ({
-        label: `Z${i + 1}`,
-        prop: `Z${i + 1}`
-      }))
-      break
-    case 2: // y-x-z
-      columns = Array.from({ length: yCount }, (_, i) => ({
-        label: `Y${i + 1}`,
-        prop: `Y${i + 1}`
-      }))
-      rows = Array.from({ length: xCount }, (_, i) => ({
-        label: `X${i + 1}`,
-        prop: `X${i + 1}`
-      }))
-      break
-    case 3: // y-z-x
-      columns = Array.from({ length: yCount }, (_, i) => ({
-        label: `Y${i + 1}`,
-        prop: `Y${i + 1}`
-      }))
-      rows = Array.from({ length: zCount }, (_, i) => ({
-        label: `Z${i + 1}`,
-        prop: `Z${i + 1}`
-      }))
-      break
-    case 4: // z-x-y
-      columns = Array.from({ length: zCount }, (_, i) => ({
-        label: `Z${i + 1}`,
-        prop: `Z${i + 1}`
-      }))
-      rows = Array.from({ length: xCount }, (_, i) => ({
-        label: `X${i + 1}`,
-        prop: `X${i + 1}`
-      }))
-      break
-    case 5: // z-y-x
-      columns = Array.from({ length: zCount }, (_, i) => ({
-        label: `Z${i + 1}`,
-        prop: `Z${i + 1}`
-      }))
-      rows = Array.from({ length: yCount }, (_, i) => ({
-        label: `Y${i + 1}`,
-        prop: `Y${i + 1}`
-      }))
-      break
-    default:
-      break
-  }
+  // 获取 X, Y, Z 方向的数值
+  const xCount = Number(ffdvalue.value.nx);
+  const yCount = Number(ffdvalue.value.ny);
+  const zCount = Number(ffdvalue.value.nz);
 
-  // 更新表格列头
-  tablecstHeaders.value = columns
+  // 计算总行数
+  const rowCount = xCount * yCount * zCount;
 
-  // 生成表格的数据行
-  tableDatacst1.value = []
-  for (let i = 1; i <= rows.length; i++) {
-    let row = { axis: rows[i - 1].label }
-    columns.forEach((column) => {
-      row[column.prop] = null // 每个单元格初始化为空
-    })
-    tableDatacst1.value.push(row)
+  // 确定最大维度
+  const maxCount = Math.max(xCount, yCount, zCount);
+  let maxAxis = "x";
+  if (yCount === maxCount) maxAxis = "y";
+  if (zCount === maxCount) maxAxis = "z";
+
+  // 清空表格数据
+  tableDatacst1.value = [];
+
+  // 循环填充数据
+  for (let i = 0; i < rowCount; i++) {
+    // 计算 x, y, z 的索引
+    const xIndex = i + 1;
+    const yIndex = i + 1;
+    const zIndex = i + 1;
+
+    // 构造 row 数据
+    const row = {
+      x: maxAxis === "x" ? xIndex : i < xCount ? xIndex : "/",
+      y: maxAxis === "y" ? yIndex : i < yCount ? yIndex : "/",
+      z: maxAxis === "z" ? zIndex : i < zCount ? zIndex : "/",
+    };
+
+    // 追加到 table 数据中
+    tableDatacst1.value.push(row);
   }
-}
+};
 
 const handleFileUploadSuccess = (data) => {
   ffdvalue.value.fname = data.fname
@@ -372,12 +394,12 @@ const getffdsAssign = (data) => {
   order.value = Number(data.order)
   vars.value = data.vars
   generateTable()
-  initializeTableFromVars()
+  // initializeTableFromVars()
 }
 
 // ffd保存
 const getffdsave = () => {
-  generateVars()
+  // generateVars()
   const params = {
     transCode: "MDO0044",
     pid: pid.value,

src/views/vuetree/index.vue

@@ -843,7 +843,20 @@ async  function logToObject1() {
 const addflow = () => {
     const savedObj = JSON.parse(sessionStorage.getItem("objlist"));
     const stypeValue = savedObj ? savedObj.stype : '';
-    console.log(stypeValue);
+
+    // 用于首页主界面切换数据一致
+    const updateobjlist = {
+      pid: pid.value,
+      name: newobj.value.name,
+      remark: newobj.value.description,
+      image: vueflowimg.value,
+      isshare: '1',
+      flow: mergedObj.value,
+      stype: stypeValue,
+    }
+    sessionStorage.setItem("objlist",JSON.stringify(updateobjlist));
+    
+    console.log("打印stypeValue:",stypeValue);
     const params = {
         transCode: 'MDO0002',
         pid: pid.value,
@@ -859,7 +872,7 @@ const addflow = () => {
         .then((res) => {
             console.log(res);
             ElMessage({
-                  message: res.returnMsg,
+                  message: '工程保存成功',
                   type: 'success',
               })
         })
@@ -990,7 +1003,7 @@ watch(() => seledge.value, (newItems, oldItems) => {
     // seledge.value.style.stroke =  linecolor.value;
   }
     });
-defineExpose({changeAllEdgesColor,linestrokeWidth,getroter,onSelection,bgcolorfunc});
+defineExpose({changeAllEdgesColor,linestrokeWidth,getroter,onSelection,bgcolorfunc,logToObject1});
 </script>
 
 <style>