优化

src/views/modelLibrary/vehicleConfigurationList.vue

@@ -49,17 +49,17 @@
                 <el-button v-show="activeName === '2'" class="addBtn" icon="el-icon-circle-plus-outline" @click="addOne"
                     type="primary">新增</el-button>
                 <!-- <el-button
-                            v-bind:class="{ addBtn: true, disabled: activeName === '1' }"
-                            icon="el-icon-circle-plus-outline"
-                            @click="addOne"
-                            type="primary"
-                            :disabled="activeName === '1'"
-                            >新增</el-button
-                        > -->
+                    v-bind:class="{ addBtn: true, disabled: activeName === '1' }"
+                    icon="el-icon-circle-plus-outline"
+                    @click="addOne"
+                    type="primary"
+                    :disabled="activeName === '1'"
+                    >新增</el-button
+                > -->
             </div>
 
             <tableList ref="table" class="myTable" style="margin: 0 30px" :columns="columns" :getDataWay="getDataWay"
-                :pagination="pagination" index>
+                :pagination="pagination" index :row-class-name="errRow">
                 <el-table-column label="传感器配置" slot="sensorCount" align="center">
                     <template v-slot="scope">
                         <i class="sensorIcon sensorIconA" v-show="scope.row.sensorCount.camera" title="摄像头"></i><span
@@ -74,6 +74,12 @@
                             class="sensorCount" v-show="scope.row.sensorCount.gps">{{ scope.row.sensorCount.gps }}</span>
                     </template>
                 </el-table-column>
+                <el-table-column label="使用状态" slot="isUnavailable" align="center">
+                    <template v-slot="scope">
+                        <span v-if="scope.row.isUnavailable === '0'">未禁用</span>
+                        <span v-else>已禁用</span>
+                    </template>
+                </el-table-column>
                 <el-table-column label="操作" slot="cgInfos" align="center">
                     <template v-slot="scope">
                         <i v-if="
@@ -139,6 +145,11 @@ export default {
                     prop: "sensorCount",
                     template: true,
                 },
+                {
+                    label: "使用状态",
+                    prop: "isUnavailable",
+                    template: true,
+                },
                 {
                     label: "操作",
                     prop: "cgInfos",
@@ -270,8 +281,12 @@ export default {
                 });
             });
         },
+        errRow({ row, rowIndex }) {
+            if (row.isUnavailable === "1") {
+                return "errColor";
+            }
+        },
     },
-    created() { },
 };
 </script>
 
@@ -314,5 +329,10 @@ export default {
         line-height: 18px;
         text-align: center;
     }
+
+    /deep/ .el-table .errColor td {
+        color: red;
+    }
 }
+
 </style>

src/views/sceneLibrary/components/generalizationDetail.vue

@@ -1575,6 +1575,7 @@ export default {
                     let listMb = res.info.listMb;
                     res.info.listMb = [];
                     Object.assign(this.form, res.info);
+                    this.$emit("getGeneralizationSceneId", res.info.sceneId);
 
                     if (
                         res.info.scenarioRoadType === "2" ||

src/views/sceneLibrary/generalizationScenarioList.vue

@@ -110,7 +110,7 @@
         <el-dialog
             v-if="generalizationVisible"
             :visible.sync="generalizationVisible"
-            title="泛化模板"
+            :title="generalizationDiaTitle"
             width="90%"
             class="generalizationDia"
             :close-on-click-modal="false"
@@ -214,6 +214,7 @@ export default {
             },
             generalizationVisible: false, // 泛化dialog
             generalizationId: "", // 泛化详情id
+            generalizationDiaTitle: "",
         };
     },
 
@@ -249,6 +250,7 @@ export default {
         },
         viewRow(row) {
             this.generalizationId = row.id;
+            this.generalizationDiaTitle = "泛化场景 " + row.sceneId;
             this.generalizationVisible = true;
         },
         getFileNameList() {

src/views/sceneLibrary/scenePacketList.vue

@@ -245,6 +245,7 @@
                     :genUrlType="genUrlType"
                     @generalizationBegin="generalizationBegin"
                     @generalizationDone="generalizationDone"
+                    @getGeneralizationSceneId="getGeneralizationSceneId"
                 ></generalization-detail>
             </div>
             <span slot="footer">
@@ -842,7 +843,8 @@ export default {
             }
 
             this.generalizationId = arr[0].id;
-            this.generalizationSceneId = arr[0].sceneId;
+            // this.generalizationSceneId = arr[0].sceneId;
+            this.generalizationSceneId = "";
             this.genUrlType = 1;
             this.stepActive = 2;
         },
@@ -858,6 +860,9 @@ export default {
             this.formA.rulesId = "";
             this.generalizationVisible = false;
         },
+        getGeneralizationSceneId(sceneId) {
+            this.generalizationSceneId = sceneId;
+        },
         // 开始泛化
         generalizationBegin() {
             this.generalizationCancel();