Merge remote-tracking branch 'origin/master'

ruoyi-ui/src/views/map/components/map.vue

@@ -259,6 +259,7 @@ let currentFeature = null
 let overlay = null
 const tableDataShanghaifeng = ref([])
 onMounted(async () => {
+  console.log(route.params.id)
   initMap();
   // 初始化完成后执行配置渲染
   if (route.params.id === '30') {
@@ -391,71 +392,15 @@ onMounted(async () => {
         console.log('未点击到任何要素');
       }
     })
-    if (route.params.id === '28') {
-      getFanganList().then(res => {
-        tableDataFangan.value = res.data.records
-        fanganId.value = tableDataFangan.value[0].id
-        getFanganDataList(fanganId.value).then(res => {
-          const outPutQUZ = res.data.outPutQUZ
-          const keys = Object.keys(outPutQUZ)
-          dateLength.value = keys.length - 1
-          keys.forEach(item => {
-            let par = {
-              content: '',
-              timestamp: item,
-              size: 'large',
-              type: 'primary',
-            }
-            activities.value.push(par)
-          })
-          var parTime = uniformSample(activities.value)
-          console.log(activities.value)
-          var a = Math.round((dateLength.value - 1) * 1 / 3)
-          var b = Math.round((dateLength.value - 1) * 2 / 3)
-          var c = dateLength.value
-          marks.value = {
-            0: {
-              style: {
-                color: '#1989FA',
-              },
-              label: parTime[0].timestamp.slice(5),
-            },
-          }
-          marks.value[a] = {
-            style: {
-              color: '#1989FA',
-            },
-            label: parTime[1].timestamp.slice(5),
-          }
-          marks.value[b] = {
-            style: {
-              color: '#1989FA',
-            },
-            label: parTime[2].timestamp.slice(5),
-          }
-          marks.value[c] = {
-            style: {
-              color: '#1989FA',
-            },
-            label: parTime[3].timestamp.slice(5),
-          }
-          suzhouJson.data.inputParam = JSON.parse(suzhouJson.data.inputParam)
-          console.log(suzhouJson.data)
-          timerId = setInterval(changeMap, 1000)
-          pointLayer.value = createPointlayer(suzhouPoint)
-          mapChart.value.addLayer(pointLayer.value);
-        })
-      })
-    }
-    if (route.params.id === '20') {
-      tableDataFangan.value = fangan.data.records
-      wendai()
-    }
     if (props.config) {
       // toCenter(props.config.center, props.config.zoom);
       await loadLayers(props.config.layers);
     }
   }
+  if (route.params.id === '20') {
+    tableDataFangan.value = fangan.data.records
+    wendai()
+  }
 });
 const titleSuzhou = ref('')
 const count = ref(0)

ruoyi-ui/src/views/register/componentReg/peizhi.vue

@@ -2040,6 +2040,7 @@ function removeDuplicateObjects(arr) {
     return uniqueArray;
 }
 async function showPei(row){
+  console.log(row.mdid)
   remarkVer.value = ''
   fileVersion.value = ''
   tableDataSer.value = []
@@ -2103,7 +2104,6 @@ async function showPei(row){
       item.label = item.parGroupName
       item.value = item.parGroupCode
     })
-    console.log(groupTreeData.value)
     var par1  = {
       data:groupTreeData.value[0]
     }

ruoyi-ui/src/views/standardization/bizDataShowConfig/show/GwTableTwo.vue

@@ -1,23 +1,10 @@
 <template>
   <div class="descriptions-container">
-    <!-- <el-descriptions :column="columnNumber" border>
+    <el-descriptions :column="columnNumber" border>
       <el-descriptions-item v-for="(item, index) in data" :key="index" :label="item.name">
         {{ item.value ? item.value : '-' }}
       </el-descriptions-item>
-    </el-descriptions> -->
-    <el-table
-        :data="data"
-        height="14vh"
-        :cell-style="{ padding: '5px' }"
-        :row-style="{ fontSize: '1rem', textAlign:'center' }"
-        border>
-      <el-table-column align="center" width="" prop="planName" label="方案名称"></el-table-column>
-      <el-table-column align="center" width="" prop="updateTime" label="更新时间">
-        <template #default="scope">
-
-        </template>
-      </el-table-column>
-    </el-table>
+    </el-descriptions>
   </div>
   <!--  <table class="gw-descriptions-table">-->
   <!--    <tbody>-->
@@ -42,51 +29,37 @@
   <!--    </tr>-->
   <!--    </tbody>-->
   <!--  </table>-->
-    
 </template>
 <script setup>
-import {
-  getForecastlist
-} from "@/api/standardization/bizDataShowConfig.js";
-import {useRoute} from "vue-router";
-const data = ref()
-const route = useRoute();
-function getYu(){
-  getForecastlist({appId: route.params.id}).then(res=>{
-    data.value = res.rows
-  })
-}
-onMounted(() => {
-  getYu();
-});
-// const props = defineProps({
-//   data: {
-//     type: Array,
-//     default: [],
-//   },
-//   columnNumber: {
-//     type: Number,
-//     default: 3,
-//   },
-// })
 
-// const row = computed(() => {
-//   return (num) => {
-//     let start = (num - 1) * props.columnNumber;
-//     let end = num * props.columnNumber;
-//     // if (end >= props.data.length && props.data.length > 1) {
-//     //   end = -1;
-//     // }
-//     return props.data.slice(start, end);
-//   }
-// })
+const props = defineProps({
+  data: {
+    type: Array,
+    default: [],
+  },
+  columnNumber: {
+    type: Number,
+    default: 3,
+  },
+})
 
-// const rowNumber = computed(() => {
-//   if (props.data) {
-//     return Math.ceil(props.data.length / props.columnNumber);
-//   }
-//   return 0;
-// })
+const row = computed(() => {
+  return (num) => {
+    let start = (num - 1) * props.columnNumber;
+    let end = num * props.columnNumber;
+    // if (end >= props.data.length && props.data.length > 1) {
+    //   end = -1;
+    // }
+    return props.data.slice(start, end);
+  }
+})
+
+const rowNumber = computed(() => {
+  if (props.data) {
+    return Math.ceil(props.data.length / props.columnNumber);
+  }
+  return 0;
+})
 </script>
 <style lang="scss" scoped>
 .descriptions-container {
@@ -156,4 +129,4 @@ onMounted(() => {
   }
 
 }
-</style>
+</style>