flx：优化

src/api/modules/projectOverview.ts

@@ -166,6 +166,10 @@ export const getBigScreenCountJdpzPageApi = (params: {}) => {
 export const getWeldingRecordPageApi = (params: {}) => {
 	return http.get(BASEURL + `/xmgl/gsWeldingRecord/page`, params, { headers: { noLoading: true } });
 };
+// 查询焊接项目配置
+export const getProjectConfigListApi = (params: {}) => {
+	return http.post(BASEURL + `/xmgl/projectConfig/getProjectConfigList`, params, { headers: { noLoading: true } });
+};
 // 桥位环缝列表
 export const getBridgeSitePageApi = (params: {}) => {
 	return http.get(BASEURL + `/xmgl/gsBridgeSite/page`, params, { headers: { noLoading: true } });

src/views/sevenLargeScreen/comprehensiveManage/integratedView/bottomDwon.vue

@@ -38,7 +38,11 @@
                 <div style="width: 33%">小节段号</div>
                 <div style="width: 33%">重量(吨)</div>
               </div>
-              <SeamlessScroll :key="1" :limitMoveNum="7" :memberCareList="bigScreenCountJdpzList">
+              <SeamlessScroll
+                :key="1"
+                :limitMoveNum="7"
+                :memberCareList="bigScreenCountJdpzList"
+              >
                 <div class="list-box">
                   <div
                     v-for="(item, index) in bigScreenCountJdpzList"
@@ -92,7 +96,9 @@
                     <div style="width: 7.5%">{{ item.weldBead }}</div>
                     <div style="width: 16%">{{ item.startWeldingTime }}</div>
                     <div style="width: 16%">{{ item.endWeldingTime }}</div>
-                    <div class="weldbox" @click="onWeldClick(item)" style="width: 7.5%">{{ item.duration }}</div>
+                    <div class="weldbox" @click="onWeldClick(item)" style="width: 7.5%">
+                      {{ item.duration }}
+                    </div>
                   </div>
                   <div class="not-data" v-if="weldingList.length == 0">
                     <img src="@/assets/images/noData.png" alt="" />
@@ -124,7 +130,11 @@
                   >
                     <div style="width: 25%">{{ index + 1 }}</div>
                     <div style="width: 25%">{{ item.bridgeSiteNumber }}</div>
-                    <div style="width: 25%">{{ item.status == 2 ? '已完成' : item.status == 1 ? '未完成' : '--' }}</div>
+                    <div style="width: 25%">
+                      {{
+                        item.status == 2 ? "已完成" : item.status == 1 ? "未完成" : "--"
+                      }}
+                    </div>
                     <div style="width: 25%">{{ item.date }}</div>
                   </div>
                   <div class="not-data" v-if="bridgeSiteList.length == 0">
@@ -149,6 +159,7 @@ import {
   getBigScreenCountJdpzPageApi,
   getWeldingRecordPageApi,
   getBridgeSitePageApi,
+  getProjectConfigListApi,
 } from "@/api/modules/projectOverview";
 import SeamlessScroll from "./components/seamlessScroll.vue";
 import projectInfoDialog from "./projectInfoDialog.vue";
@@ -172,6 +183,7 @@ const pageInfo = reactive({
 const bridgeSiteList = ref([]);
 const bigScreenCountJdpzList = ref([]);
 const weldingList = ref([]);
+const showBigScreenType = ref(0);
 // 桥位环缝列表
 function getBridgeSitePage() {
   let data = {
@@ -205,12 +217,31 @@ function getWeldingRecordPage() {
     pageSize: 100,
     projectSn: store.sn,
   };
+  if(showBigScreenType.value == 0) {
+    data.showBigScreenType = 1;
+  }
   getWeldingRecordPageApi(data).then((res) => {
     if (res.code == 200) {
       weldingList.value = res.result.records;
     }
   });
 }
+// 焊接项目配置
+function getProjectConfigList() {
+  const data = {
+    projectSn: store.sn,
+  };
+  getProjectConfigListApi(data).then((res) => {
+    if (res.code == 200) {
+      if (!res.result || res.result.length == 0) {
+        showBigScreenType.value = 0;
+      } else {
+        showBigScreenType.value = res.result[0].showBigScreenType;
+      }
+      getWeldingRecordPage();
+    }
+  });
+}
 const onWeldClick = (item) => {
   console.log(7744, item);
   projectInfoDialogRef.value.openDialog(item);
@@ -220,8 +251,8 @@ defineExpose({
   // projectTypeEnum
 });
 onMounted(() => {
+  getProjectConfigList();
   getBigScreenCountJdpzPage();
-  getWeldingRecordPage();
   getBridgeSitePage();
 });
 </script>
@@ -229,7 +260,7 @@ onMounted(() => {
 <style lang="scss" scoped>
 .weldbox {
   cursor: pointer;
-    color: #65D7F9;
+  color: #65d7f9;
 }
 .content-main {
   margin-top: 20px;

src/views/sevenLargeScreen/comprehensiveManage/integratedView/components/seamlessScroll.vue

@@ -40,8 +40,9 @@ const defaultOption = computed(() => ({
   step: 0.1, // 数值越大速度滚动越快
   limitMoveNum: props.limitMoveNum, // 开始无缝滚动的数据量
   hoverStop: true, // 是否开启鼠标悬停stop
+  wheelStop: true, // 是否开启鼠标滚轮stop
   direction: 1, // 0向下 1向上 2向左 3向右
-  openWatch: true, // 开启数据实时监控刷新dom
+  openWatch: false, // 开启数据实时监控刷新dom
   singleHeight: 0, // 单步运动停止的高度(默认值0是无缝不停止的滚动) direction => 0/1
   singleWidth: 0, // 单步运动停止的宽度(默认值0是无缝不停止的滚动) direction => 2/3
   waitTime: 1000, // 单步运动停止的时间(默认值1000ms)

src/views/sevenLargeScreen/comprehensiveManage/integratedView/projectInfoDialog.vue

@@ -13,10 +13,10 @@
       <div class="box2_main">
         <div class="chart-box" ref="riskTrendLineCharts"></div>
       </div>
-      <div class="footer-btn">
+      <!-- <div class="footer-btn">
         <el-button type="danger" @click="closeDialog">取消</el-button>
         <el-button type="primary" @click="closeDialog">确定</el-button>
-      </div>
+      </div> -->
     </div>
   </div>
 </template>
@@ -58,23 +58,24 @@ const getWeldingWaveformList = (row) => {
   }).then((res) => {
     if (res.code == 200) {
       nextTick(() => {
+        const resultList = res.result instanceof Array ? res.result.reverse() : [];
         const params = {
           series: [
             {
               name: "焊接电流",
-              data: res.result.map((item) => item.weldingCurrent),
+              data: resultList.map((item) => item.weldingCurrent),
             },
             {
               name: "焊接电压",
-              data: res.result.map((item) => item.weldingVoltage),
+              data: resultList.map((item) => item.weldingVoltage),
             },
             {
               name: "预置电压",
-              data: res.result.map((item) => item.presetVoltage),
+              data: resultList.map((item) => item.presetVoltage),
             },
             {
               name: "预置电流",
-              data: res.result.map((item) => item.presetCurrent),
+              data: resultList.map((item) => item.presetCurrent),
             },
           ],
           x: res.result.map((item) => item.uploadTime),