Merge branch 'all-v4-chauncey' into 'all-v4'

fix:删除状态字段 修改布局管理文案

See merge request skyeye/skyeye_frontend/skyeye-admin!269

src/types/business-scene/type.ts

@@ -5,7 +5,7 @@ export interface TemplateListInfo {
 interface BasicSceneType {
   name: string;
   remark: string;
-  isDisabled: number; //0-启用 1-禁用
+  isDisabled?: number; //0-启用 1-禁用
 }
 export interface SceneListInfo extends BasicSceneType {
   createdAt?: string;

src/views/page-config/component/BasicLayoutEntry.vue

@@ -7,8 +7,8 @@
         </section>
         <section class="card__right">
           <span class="span__card--title"> PC端{{ titleDefault }} </span>
-          <span class="span__card--describe"> {{ describeDefault }}PC端平台{{ props.layoutType === LayoutConfigType.scene
-            ? '生效' : '首页' }} </span>
+          <span class="span__card--describe"> {{ describeDefault }}PC端{{ props.layoutType === LayoutConfigType.scene
+            ? '生效' : '车间页面' }} </span>
         </section>
       </div>
       <div class="card--default" @click="toLayout('Phone')">
@@ -17,8 +17,8 @@
         </section>
         <section class="card__right">
           <span class="span__card--title"> 手机端{{ titleDefault }} </span>
-          <span class="span__card--describe"> {{ describeDefault }}手机端平台{{ props.layoutType === LayoutConfigType.scene
-            ? '生效' : '首页' }} </span>
+          <span class="span__card--describe"> {{ describeDefault }}手机端{{ props.layoutType === LayoutConfigType.scene
+            ? '生效' : '车间页面' }} </span>
         </section>
       </div>
     </main>
@@ -43,7 +43,7 @@ const generateContentDefault = (layoutType: LayoutConfigType.scene | LayoutConfi
       break;
     case LayoutConfigType.camera:
       titleDefault.value = '相机布局';
-      describeDefault.value = '配置车间在业务场景\n中的布局，展示在\n'
+      describeDefault.value = '配置相机在车间中的布局，展示在'
       break;
   }
 }
@@ -117,7 +117,7 @@ onMounted(() => {
     .span__card--describe {
       padding-right: 24px;
       font-weight: 400;
-      font-size: 24px;
+      font-size: 18px;
       line-height: 33px;
       color: #909399;
       white-space: pre-line;

src/views/system-config/business-scene/PageBusinessScene.vue

@@ -62,20 +62,20 @@ const columns: BasicColumn[] = [
             );
         },
     },
-    {
-        label: '状态',
-        prop: 'isDisabled',
-        width: 140,
-        align: 'center',
-        render(record) {
-            const status = record.row.isDisabled;
-            return h(
-                ElTag,
-                { type: status === 0 ? 'success' : 'danger' },
-                status === 0 ? '启用' : '停用',
-            );
-        },
-    },
+    // {
+    //     label: '状态',
+    //     prop: 'isDisabled',
+    //     width: 140,
+    //     align: 'center',
+    //     render(record) {
+    //         const status = record.row.isDisabled;
+    //         return h(
+    //             ElTag,
+    //             { type: status === 0 ? 'success' : 'danger' },
+    //             status === 0 ? '启用' : '停用',
+    //         );
+    //     },
+    // },
     {
         label: '备注',
         prop: 'remark',

src/views/system-config/business-scene/components/InfoDrawer.vue

@@ -16,9 +16,9 @@
                         <el-input v-model="ruleForm.remark" maxlength="100" placeholder="请输入备注" type="textarea"
                             :autosize="{ minRows: 3, maxRows: 6 }" />
                     </el-form-item>
-                    <el-form-item label="状态" prop="isDisabled">
+                    <!-- <el-form-item label="状态" prop="isDisabled">
                         <el-switch v-model="ruleForm.isDisabled" :active-value=0 :inactive-value=1 />
-                    </el-form-item>
+                    </el-form-item> -->
                 </el-form>
             </section>
             <footer class="drawer__btn">
@@ -80,7 +80,7 @@ const submitForm = () => {
             name: ruleForm.name,
             viewTemplateIdList: ruleForm.viewTemplateList.map(item => item.id),
             remark: ruleForm.remark,
-            isDisabled: ruleForm.isDisabled
+            // isDisabled: ruleForm.isDisabled
         }
         if (props.title !== '添加业务场景') {
             const editParams: EditSceneDataParam = {