更新-报表

src/views/vent/reportManager/comment/DeviceModal.vue

@@ -14,13 +14,13 @@
         </a-form-item>
         <a-form-item label="报表类型:">
           <JDictSelectTag v-if="kindType == 'ventSReport'" v-model:value="formState.reportType" placeholder="请选择报表类型..."
-            dictCode="ventSReport" />
+            dictCode="ventSReport" @change="changeReportType" />
           <JDictSelectTag v-if="kindType == 'fireSReport'" v-model:value="formState.reportType" placeholder="请选择报表类型..."
-            dictCode="fireSReport" />
+            dictCode="fireSReport" @change="changeReportType" />
           <JDictSelectTag v-if="kindType == 'dustSReport'" v-model:value="formState.reportType" placeholder="请选择报表类型..."
-            dictCode="dustSReport" />
+            dictCode="dustSReport" @change="changeReportType" />
           <JDictSelectTag v-if="kindType == 'gasSReport'" v-model:value="formState.reportType" placeholder="请选择报表类型..."
-            dictCode="gasSReport" />
+            dictCode="gasSReport" @change="changeReportType"/>
         </a-form-item>
         <a-form-item label="模式类型:">
           <a-radio-group v-model:value="formState.modelType" name="radioGroup">
@@ -52,12 +52,12 @@
   </BasicModal>
 </template>
 <script lang="ts" setup>
-import { computed, unref, inject, reactive, ref, watch, defineProps } from 'vue';
+import { computed, unref, inject, reactive, ref, watch, defineProps,onMounted } from 'vue';
 import NormalHisTable from '../comment/NormalHisTable.vue';
 import JDictSelectTag from '/@/components/Form/src/jeecg/components/JDictSelectTag.vue';
 import { BasicModal, useModalInner } from '/@/components/Modal';
 import { useUserStore } from '/@/store/modules/user';
-import { hisList, hisdownload } from '../reportManager.api';
+import {reportList, hisList, hisdownload } from '../reportManager.api';
 import { columnsHis } from '../reportManager.data';
 
 let props = defineProps({
@@ -81,12 +81,6 @@ let props = defineProps({
     type: String,
     default: '',
   },
-  optionLists: {
-    type: Array,
-    default: () => {
-      return []
-    }
-  }
 });
 const remoteUrl = import.meta.env.DEV ? 'http://182.92.126.35' : 'http://' + window.location.hostname;
 const userStore = useUserStore(); //获取用户信息
@@ -101,7 +95,7 @@ let formState = reactive({
   modelType:'',
 });
 let kindType = ref('ventSReport')
-let optionList = ref<any[]>([])
+let optionList = reactive<any[]>([])
 let radioList=reactive<any[]>([
   {label:"手动",value:1},
   {label:"自动",value:0},
@@ -188,8 +182,16 @@ const [registerModal, { setModalProps, closeModal }] = useModalInner(async (data
 
 //业务种类下拉选项切换
 function changeKind(val) {
+  formState.busKind=val
   kindType.value = `${val}Report`
+  getModuleList()
+}
+//报表类型下拉选项切换
+function changeReportType(val){
+  formState.reportType=val
+  getModuleList()
 }
+
 //点击图标关闭弹框
 const closeModalFn = () => {
   formState.modelType=''
@@ -203,11 +205,19 @@ const closeModalFn = () => {
 let save = () => {
   emit('saveOrUpdate', formState);
 };
+// 获取模板列表数据
+async function getModuleList(){
+  let res=await reportList({pageNo:1,pageSize:100,busKind: formState.busKind,reportType:formState.reportType,modelType:2,})
+  console.log(res,'报表模板数据-------')
+  if(res.records.length!=0){
+    optionList.length=0
+    res.records.forEach(el=>{
+      optionList.push({label:el.fileName,value:el.id})
+    })
+   
+  }
+}
 
-watch(() => props.optionLists, (newV, oldV) => {
-  console.log(newV, '99999999----------')
-  optionList.value = newV
-}, { immediate: true, deep: true })
 </script>
 <style scoped lang="less">
 ::v-deep .suffix {

src/views/vent/reportManager/comment/NormalTable.vue

@@ -19,7 +19,7 @@
       </template>
     </BasicTable>
     <DeviceModal :editID="editID" :reportId="reportId" :reportLogHis="reportLogHis" :fileType="fileType"
-      @register="registerModal" :addOredit="addOredit" :optionLists="optionLists" @saveOrUpdate="saveOrUpdate" />
+      @register="registerModal" :addOredit="addOredit"  @saveOrUpdate="saveOrUpdate" />
     <!-- 报表或模板上传弹窗 -->
     <tempUpload :visibleUp="visibleUp" @resetUpload="resetUpload"></tempUpload>
 
@@ -37,12 +37,7 @@ import { getTableHeaderColumns } from '/@/hooks/web/useWebColumns';
 import { useListPage } from '/@/hooks/system/useListPage';
 
 const props = defineProps({
-  moduleList:{
-    type:Array,
-    default:()=>{
-      return []
-    }
-  },
+ 
   searchParam: {
     type: Object,
     default: () => {
@@ -97,7 +92,6 @@ const record = reactive({});
 const columnList = getTableHeaderColumns('');
 let visibleUp = ref(0)
 let resetTable = ref(0)
-let optionLists = ref<any[]>([])
 //列表查询参数
 let searchParams = reactive({
   busKind: '',
@@ -239,10 +233,6 @@ watch(() => props.searchParam, (newS, oldS) => {
   searchParams.reportType = newS.reportType
 }, { immediate: true, deep: true })
 
-watch(()=>props.moduleList,(newV,oldV)=>{
-  optionLists.value=newV
-},{immediate:true,deep:true})
-
 defineExpose({
   doRequest, onExportXls, onImportXls, reload, getForm
 });

src/views/vent/reportManager/index.vue

@@ -15,7 +15,7 @@
         </fileSystem>
       </div>
       <div class="right-box">
-        <NormalTable :key="dataNow" :moduleList="moduleList" :searchParam="searchParam" :columns="columns" :deleteById="deleteById"
+        <NormalTable :key="dataNow" :searchParam="searchParam" :columns="columns" :deleteById="deleteById"
           :downLoad="downLoad" :list="reportList" designScope="device-tabel" title="报表管理" :showTab="false"
           @saveAdd="saveAdd" />
       </div>
@@ -73,9 +73,6 @@ let selected = reactive<any>({
   isFolder: false,
 });
 
-//报表模板数据
-let moduleList=reactive<any[]>([])
-
 //获取左侧菜单树
 async function getTreeList() {
   const res = await getQuery()
@@ -127,20 +124,9 @@ function treeClick(node) {
     searchParam.modelType = node.ppid
     searchParam.reportType = node.id
   }
-  getModuleList()
 }
 
-//获取报表模板数据
-async function getModuleList(){
-  let res=await reportList({column: 'createTime', ...searchParam})
-  console.log(res,'报表模板---------')
-  if(res.records.length!=0){
-    moduleList.length=0
-    res.records.forEach(el=>{
-      moduleList.push({label:el.fileName,value:el.id})
-    })
-  }
-}
+
 
 async function saveAdd(params) {
   let res = await save({ ...params });