src/views/baseinfo/fysp/scene/CompSceneBaseInfo.vue
@@ -1,8 +1,5 @@ <!-- 场景基本信息编辑 --> <template> <<<<<<< HEAD <FYForm :form-info="_formInfo" :rules="rules" @submit="submit" @cancel="cancel"> ======= <FYForm :form-info="_formInfo" :rules="rules" @@ -10,7 +7,6 @@ @submit="submit" @cancel="cancel" > >>>>>>> 356f54467f525f437f41271fb62f6be66f2ab1e5 <template #form-item="{ formObj }"> <el-form-item label="场景名称" prop="name"> <el-input clearable show-word-limit v-model="formObj.name" placeholder="场景名称" />
