Merge remote-tracking branch 'origin/master'

frontend/src/views/plan/planList/components/planPopup.vue

@@ -64,12 +64,12 @@
               <el-radio :value="0">否</el-radio>
             </el-radio-group>
           </el-form-item>
-          <el-form-item label="关联报告模版" :label-width="100" prop='associateReport'>
+          <!-- <el-form-item label="关联报告模版" :label-width="100" prop='associateReport'>
             <el-radio-group v-model="formContent.associateReport">
               <el-radio :value="1">是</el-radio>
               <el-radio :value="0">否</el-radio>
             </el-radio-group>
-          </el-form-item>
+          </el-form-item> -->
           <el-form-item label="模版名称" prop="reportTemplateName" :label-width="100" v-if="formContent.associateReport === 1">
             <el-select v-model="formContent.reportTemplateName" placeholder="请选择报告模版" autocomplete="off"  >
               <el-option
@@ -119,6 +119,12 @@
   import { type ErrorSystem } from '@/api/device/interface/error';
   import { type Device } from '@/api/device/interface/device';
   import {getPqReportAllName,getPqReportAllVersion} from '@/api/device/report/index.ts'
+  import {useAppSceneStore} from "@/stores/modules/mode";
+import { fromPairs } from 'lodash';
+import { el } from 'element-plus/es/locale';
+
+
+  const AppSceneStore = useAppSceneStore()
   const dictStore = useDictStore()
   // 定义弹出组件元信息
   const dialogFormRef = ref()
@@ -444,6 +450,13 @@ const open = async (sign: string,
       }
 
       value.value = boundPqDevList.value.map((i: { id: { toString: () => any } }) => i.id.toString());
+      
+      if(AppSceneStore.currentScene == "1"){//楼下场景不用报告模版
+        formContent.associateReport = 0
+      }else{
+        formContent.associateReport = 1
+      }
+
        // 所有数据加载完成后显示对话框
        dialogVisible.value = true;
 }