最大仿真时间的限制、局部loading等优化

src/views/modelLibrary/components/modelList.vue

@@ -188,6 +188,7 @@ export default {
             border-top: 1px solid @grayLine;
 
             li {
+                padding-right: 10px;
                 margin-top: 10px;
                 word-break: break-all;
                 align-items: center;

src/views/page/breadCrumb.vue

@@ -28,7 +28,6 @@
             <div>{{ $store.state.username }}</div>
             <div class="el-icon-switch-button exit" @click="exit"></div>
         </div>
-        <!-- <div class="avatarBox"><img :src="imgSrc" width="100%" height="100%" /></div> -->
     </div>
 </template>
 
@@ -46,7 +45,6 @@ export default {
                 "systemManagement",
                 "workManagement",
             ],
-            // imgSrc: require("@/assets/common/image/photoF.png"),
         };
     },
     methods: {

src/views/workManagement/autoRunProjectDetail.vue

@@ -201,7 +201,7 @@ let validateNum = (rule, value, callback) => {
 };
 let validateNumA = (rule, value, callback) => {
     !/^(\d+)$/.test(value) && callback(new Error(rule.message));
-    if (+value < 5 || +value > 60) callback(new Error(rule.message));
+    if (+value < 5 || +value > 600) callback(new Error(rule.message));
     callback();
 };
 let validateNumB = (rule, value, callback) => {
@@ -263,7 +263,7 @@ export default {
                     { required: true, message: "请输入", trigger: "blur" },
                     {
                         validator: validateNumA,
-                        message: "请输入不小于5且不大于60的正整数",
+                        message: "请输入不小于5且不大于600的正整数",
                         trigger: ["blur"],
                     },
                 ],

src/views/workManagement/components/threeProjectInfo.vue

@@ -12,10 +12,10 @@ import { MTLLoader } from "three/examples/jsm/loaders/MTLLoader.js";
 import { GLTFLoader } from "three/examples/jsm/loaders/GLTFLoader.js";
 import { ConvexGeometry } from "three/examples/jsm/geometries/ConvexGeometry.js";
 import { DRACOLoader } from "three/examples/jsm/loaders/DRACOLoader";
-import {
-    showFullScreenLoading,
-    tryHideFullScreenLoading,
-} from "../../../axios/filter";
+// import {
+//     showFullScreenLoading,
+//     tryHideFullScreenLoading,
+// } from "../../../axios/filter";
 import { mapState } from "vuex";
 
 export default {
@@ -440,7 +440,7 @@ export default {
                 this.car = null;
             }
 
-            showFullScreenLoading();
+            // showFullScreenLoading();
 
             var that = this;
             var loader = new GLTFLoader(); //创建一个FBX加载器
@@ -454,7 +454,8 @@ export default {
             loader.load(
                 model,
                 function (obj) {
-                    tryHideFullScreenLoading();
+                    // tryHideFullScreenLoading();
+                    that.$emit('loadingDone', 'carDone');
 
                     obj.scene.rotation.set(
                         (-90 * Math.PI) / 180,
@@ -479,7 +480,8 @@ export default {
                     // console.log((xhr.loaded / xhr.total) * 100 + "% loaded");
                 },
                 (error) => {
-                    tryHideFullScreenLoading();
+                    // tryHideFullScreenLoading();
+                    that.$emit('loadingDone', 'carDone');
                     console.error(error);
                 }
             );
@@ -617,18 +619,18 @@ export default {
                 objUrl = `${that.publicPath}sensor/gps/lidar.obj`;
             }
 
-            if (type === "ogt") {
-                showFullScreenLoading();
-            }
+            // if (type === "ogt") {
+            //     showFullScreenLoading();
+            // }
 
             Loader.load(
                 mtlUrl,
                 function (materials) {
                     loader.setMaterials(materials);
                     loader.load(objUrl, function (obj) {
-                        if (type === "ogt") {
-                            tryHideFullScreenLoading();
-                        }
+                        // if (type === "ogt") {
+                        //     tryHideFullScreenLoading();
+                        // }
 
                         that.cacheList.push(obj);
                         for (let i = 0; i < obj.children.length; i++) {
@@ -655,9 +657,9 @@ export default {
                     // console.log((xhr.loaded / xhr.total) * 100 + "% loaded");
                 },
                 (error) => {
-                    if (type === "ogt") {
-                        tryHideFullScreenLoading();
-                    }
+                    // if (type === "ogt") {
+                    //     tryHideFullScreenLoading();
+                    // }
                     console.error(error);
                 }
             );

src/views/workManagement/manualRunProjectDetail.vue

@@ -177,7 +177,7 @@ let validateNum = (rule, value, callback) => {
 };
 let validateNumA = (rule, value, callback) => {
     !/^(\d+)$/.test(value) && callback(new Error(rule.message));
-    if (+value < 5 || +value > 60) callback(new Error(rule.message));
+    if (+value < 5 || +value > 600) callback(new Error(rule.message));
     callback();
 };
 let validateNumB = (rule, value, callback) => {
@@ -243,7 +243,7 @@ export default {
                     { required: true, message: "请输入", trigger: "blur" },
                     {
                         validator: validateNumA,
-                        message: "请输入不小于5且不大于60的正整数",
+                        message: "请输入不小于5且不大于600的正整数",
                         trigger: ["blur"],
                     },
                 ],

src/views/workManagement/projectInfo.vue

@@ -126,7 +126,8 @@
                         <div class="canvasBox">
                             <!-- <canvas-sensor v-if="modelImgSrc" :modelImgSrc="modelImgSrc" :configList="configList"></canvas-sensor> -->
 
-                            <three-show ref="threeShow" :carModel="carModel" :allSensor="allSensor"></three-show>
+                            <three-show v-loading="loading" @loadingDone="loadingDone" ref="threeShow" :carModel="carModel"
+                                :allSensor="allSensor"></three-show>
 
                             <div v-show="configBox" class="conditions">
                                 <el-form ref="formA" :model="formA" :rules="rulesA" label-width="99px" disabled>
@@ -368,6 +369,7 @@ export default {
                 sensorPort: "", // 端口
             },
             rulesA: {},
+            loading: true,
         };
     },
 
@@ -498,6 +500,9 @@ export default {
                 }
             });
         },
+        loadingDone(done) {
+            if (done === 'carDone') this.loading = false;
+        },
     },
 
     // watch: {
@@ -515,7 +520,7 @@ export default {
 
     mounted() {
         this.getAllSensor();
-        
+
         if (this.$route.query.id) {
             this.id = this.$route.query.id;
             this.projectType = this.$route.query.projectType || "1";