优化

src/components/grid/TableList.vue

@@ -92,6 +92,7 @@
                         <!-- 序号-->
                         <template v-if="typeof index && index">
                             <el-table-column
+                                    :fixed="indexFixed"
                                     type="index"
                                     label="序号"
                                     width="60">
@@ -260,7 +261,7 @@
                 default:'',
                 type: String
             },
-            propHeight:String,
+            propHeight: [String, Number],
             propHeaderCellClassName:Function,
             propDefaultExpandAll:{
                 default:true,
@@ -284,7 +285,11 @@
                 type: Function
             },
             propIndent:Number,
-            propMaxHeight:String,
+            propMaxHeight: [String, Number],
+            indexFixed:{
+                default: false,
+                type: [String, Boolean]
+            },
             //loaddata接口报错时是否清空列表
             errorClearing: {
                 type: Boolean,

src/views/modelLibrary/components/vehicleModelCarsim.vue

@@ -932,10 +932,16 @@
                     <tableList
                         :columns="columns1"
                         :getDataWay="getDataWay1"
-                        propMaxHeight="calc(85vh - 294px)"
+                        :propMaxHeight="propMaxHeight"
+                        :indexFixed="true"
                         style="margin: 0 -10px 15px -10px"
                         index
-                    >
+                        >
+                        <!-- 
+                            :indexFixed="true"
+                            propHeight="300"
+                            propMaxHeight="calc(85vh - 294px)"
+                        -->
                         <el-table-column
                             v-for="(column, index) in columns1"
                             :key="`col_${index}`"
@@ -1027,7 +1033,8 @@
                     <tableList
                         :columns="columns2"
                         :getDataWay="getDataWay2"
-                        propMaxHeight="calc(85vh - 294px)"
+                        :propMaxHeight="propMaxHeight"
+                        :indexFixed="true"
                         style="margin: 0 -10px 15px -10px"
                         index
                     >
@@ -1083,7 +1090,8 @@
                     <tableList
                         :columns="columns2A"
                         :getDataWay="getDataWay2A"
-                        propMaxHeight="calc(85vh - 294px)"
+                        :propMaxHeight="propMaxHeight"
+                        :indexFixed="true"
                         style="margin: 0 -10px 15px -10px"
                         index
                     >
@@ -1168,7 +1176,8 @@
                     <tableList
                         :columns="columns3"
                         :getDataWay="getDataWay3"
-                        propMaxHeight="calc(85vh - 294px)"
+                        :propMaxHeight="propMaxHeight"
+                        :indexFixed="true"
                         style="margin: 0 -10px 15px -10px"
                         index
                     >
@@ -1238,7 +1247,8 @@
                     <tableList
                         :columns="columns3A"
                         :getDataWay="getDataWay3A"
-                        propMaxHeight="calc(85vh - 294px)"
+                        :propMaxHeight="propMaxHeight"
+                        :indexFixed="true"
                         style="margin: 0 -10px 15px -10px"
                         index
                     >
@@ -1975,6 +1985,7 @@ export default {
             dia2Type: 0, // 判断可输入单y轴数据的dialog类型
             // xName: "", // 图表x轴name
             // yName: "", // 图表y轴name
+            propMaxHeight: 300, // table最大高度
         };
     },
 
@@ -3117,9 +3128,18 @@ export default {
         isSorted(arr = []) {
             return arr.every((x, i) => i === 0 || +x > +arr[i - 1]);
         },
+        getMaxHeight() {
+            this.propMaxHeight = $(window).height() -294;
+        },
     },
 
-    mounted() {},
+    mounted() {
+        this.getMaxHeight();
+
+        window.addEventListener("resize", () => {
+            this.getMaxHeight();
+        }, false);
+    },
 };
 </script>
 

src/views/modelLibrary/sensorModel.vue

@@ -341,11 +341,17 @@ export default {
 .sensorModelPanel {
     display: flex;
     flex: 1;
-    padding: 15px 30px 30px;
+    padding: 15px 30px 30px 363px;
+
+    .modelList {
+        position: fixed;
+        top: 65px;
+        left: 180px;
+    }
 
     .modelList /deep/ .listPanel {
         min-height: 400px;
-        height: calc(100vh - 200px);
+        height: calc(100vh - 150px);
     }
 
     .contentPanel {

src/views/modelLibrary/vehicleModel.vue

@@ -823,11 +823,17 @@ export default {
 .vehicleModelPanel {
     display: flex;
     flex: 1;
-    padding: 15px 30px 10px;
+    padding: 15px 30px 10px 363px;
+
+    .modelList {
+        position: fixed;
+        top: 65px;
+        left: 180px;
+    }
 
     .modelList /deep/ .listPanel {
         min-height: 400px;
-        height: calc(100vh - 120px);
+        height: calc(100vh - 150px);
     }
 
     .contentPanel {

src/views/sceneLibrary/components/templateView.vue

@@ -67,19 +67,35 @@ export default {
     mounted() {
         this.jm = new jsMind(this.options);
         this.load_jsmind();
+
+        setTimeout(()=>{
+            let body = $('.templateViewDia .el-dialog__body').height();
+            let panel = $('.templateViewDia .templateViewPanel').height();
+
+            if(panel < body - 10 ) {
+                $('.templateViewDia .el-dialog__body').addClass('toCenter');
+            }
+        }, 0)
     },
 };
 </script>
 
 <style lang='less' scoped>
 .templateViewPanel {
+    display: flex;
+    justify-content: center;
+    align-items: center;
+
     #jsmind_container {
-        width: 100%;
+        // display: flex;
+        // justify-content: center;
+        // align-items: center;
+        // width: 94%;
         // height: calc(100% - 130px);
-        height: 100%;
+        // height: 100%;
         // min-height: 400px;
-        border: solid 1px #ccc;
-        background: #f4f4f4;
+        // border: solid 1px #ccc;
+        // background: #f4f4f4;
         overflow: auto;
     }
 }

src/views/sceneLibrary/scenePacketList.vue

@@ -264,6 +264,7 @@
 
         <el-dialog
             title="模板预览"
+            v-if="templateViewVisible"
             :visible.sync="templateViewVisible"
             width="90%"
             class="templateViewDia"
@@ -1138,7 +1139,7 @@ export default {
     .templateViewDia {
         /deep/ .el-dialog {
             // max-height: 80%;
-            height: calc(100% - 12vh);
+            height: calc(100% - 12vh - 15px);
             margin-top: 6vh !important;
             // height: 600px;
             // overflow: auto;
@@ -1148,6 +1149,12 @@ export default {
                 // height: 100%;
                 height: calc(100% - 130px);
                 overflow: auto;
+
+                &.toCenter {
+                    display: flex;
+                    justify-content: center;
+                    align-items: center;
+                }
             }
         }
     }

src/views/systemManagement/sceneUploadList.vue

@@ -337,6 +337,7 @@ export default {
                 name: this.searchParams.name,
                 timeBegin,
                 timeEnd,
+                resetPageNum: this.pagination.currentPage || 1,
             };
             this.refreshList(pageMap);
 

src/views/workManagement/autoRunProjectList.vue

@@ -219,6 +219,7 @@ export default {
             timer: null,
         };
     },
+    
     methods: {
         doSearch() {
             let createStartDate = "";
@@ -245,6 +246,7 @@ export default {
                 projectName: this.searchParams.projectName,
                 createStartDate,
                 createEndDate,
+                resetPageNum: this.pagination.currentPage || 1,
             };
             this.refreshList(pageMap);
 

src/views/workManagement/manualRunProjectList.vue

@@ -413,6 +413,7 @@ export default {
                 createEndDate,
                 finishDateStart,
                 finishDateEnd,
+                resetPageNum: this.pagination.currentPage || 1,
             };
             this.refreshList(pageMap);