添加聚合查询类型，聚合查询，查询库，MQ队列名

src/views/pri/priLoopSet/components/add/index.vue

@@ -12,6 +12,7 @@ let UrlList = reactive(null)
 onMounted(async () => {
   UrlList = await getGroupUrl(["prizeSet"]);
   listIdQuery();
+  databaseIdQuery();
 
 })
 // 组件传参对象
@@ -41,6 +42,7 @@ let UpdateForm = ref({
   levelDiffFlag: "", //级差
   afterPrizeFlag: "", //发奖后是否继续
   conditionMode: "", //条件模式
+  databaseId: null, //查询数据库
 
 
 });
@@ -95,6 +97,7 @@ const submit = async (formEl) => {
           levelDiffFlag: "", //级差
           afterPrizeFlag: "", //发奖后是否继续
           conditionMode: "", //条件模式
+          databaseId: null, //查询数据库
 
         };
         // 关闭新增弹窗;
@@ -125,6 +128,16 @@ const listIdQuery = async () => {
 };
 
 
+//获取查询库数据
+const databaseIdOptionList = ref([]);
+const databaseIdQuery = async () => {
+  const { status, data }: any = await http.Request({ method: UrlList.prizeSet.prigetPriDatabaseSetDic.method, url: UrlList.prizeSet.prigetPriDatabaseSetDic.url, params: {} });
+  if (status === 1) {
+    databaseIdOptionList.value = data.records;
+  }
+};
+
+
 
 // 表单校验规则
 const rules = reactive({
@@ -161,6 +174,7 @@ const closeVisible = () => {
     levelDiffFlag: "", //级差
     afterPrizeFlag: "", //发奖后是否继续
     conditionMode: "", //条件模式
+    databaseId: null, //查询数据库
 
   };
   closeFn();
@@ -188,6 +202,13 @@ const isFullscreen = ref(false)
           clearable,
         )
           el-option(:label="item.label", :value="item.id" v-for="(item,index) in loopModelOptionList")
+      el-form-item(label="数据库", prop="databaseId")
+        el-select(
+          v-model="UpdateForm.databaseId",
+          placeholder="请选择数据库",
+          clearable,
+        )
+          el-option(:label="item.title", :value="item.id" v-for="(item,index) in databaseIdOptionList")
       el-form-item(label='父ID字段' prop="parentField")
         el-input(v-model='UpdateForm.parentField' autocomplete='off'
           placeholder="请输入父ID字段")

src/views/pri/priLoopSet/components/updatePriLoopSet/index.vue

@@ -11,6 +11,7 @@ let UrlList = reactive(null)
 // 获取当前板块接口列表
 onMounted(async () => {
   UrlList = await getGroupUrl(["prizeSet"]);
+  databaseIdQuery();
 
 })
 const props = defineProps<{
@@ -38,6 +39,7 @@ const UpdateForm: any = ref({
   levelDiffFlag: "", //级差
   afterPrizeFlag: "", //发奖后是否继续
   conditionMode: "", //条件模式
+  databaseId: null, //查询数据库
 
 });
 // 执行模式选项数据
@@ -87,6 +89,7 @@ const submit = async (formEl) => {
           levelDiffFlag: "", //级差
           afterPrizeFlag: "", //发奖后是否继续
           conditionMode: "", //条件模式
+          databaseId: null, //查询数据库
 
         };
         // 关闭修改弹窗;
@@ -109,6 +112,15 @@ const submit = async (formEl) => {
 };
 
 
+//获取查询库数据
+const databaseIdOptionList = ref([]);
+const databaseIdQuery = async () => {
+  const { status, data }: any = await http.Request({ method: UrlList.prizeSet.prigetPriDatabaseSetDic.method, url: UrlList.prizeSet.prigetPriDatabaseSetDic.url, params: {} });
+  if (status === 1) {
+    databaseIdOptionList.value = data.records;
+  }
+};
+
 
 
 // 表单校验规则
@@ -154,6 +166,7 @@ const closeUpdatePriLoopSetVisible = () => {
     levelDiffFlag: "", //级差
     afterPrizeFlag: "", //发奖后是否继续
     conditionMode: "", //条件模式
+    databaseId: null, //查询数据库
 
   };
   closeFn();
@@ -177,6 +190,13 @@ const isFullscreen = ref(false)
           clearable,
         )
           el-option(:label="item.label", :value="item.id" v-for="(item,index) in loopModelOptionList")
+      el-form-item(label="数据库", prop="databaseId")
+        el-select(
+          v-model="UpdateForm.databaseId",
+          placeholder="请选择数据库",
+          clearable,
+        )
+          el-option(:label="item.title", :value="item.id" v-for="(item,index) in databaseIdOptionList")
       el-form-item(label='父ID字段' prop="parentField")
         el-input(v-model='UpdateForm.parentField' autocomplete='off'
           placeholder="请输入父ID字段")

src/views/pri/priPrizeInSet/components/add/index.vue

@@ -34,6 +34,7 @@ const props = defineProps<{
 let UpdateForm = ref({
   prizeListIds: "", //指定奖励配置
   note: "", //备注
+  mqQueueName: "", //MQ队列名
 
   projectId: props.projectId
 });
@@ -67,8 +68,10 @@ const submit = async (formEl) => {
           type: "success"
         });
         UpdateForm.value = {
-      prizeListIds: "", //指定奖励配置
-      note: "", //备注
+          prizeListIds: "", //指定奖励配置
+          note: "", //备注
+          mqQueueName: "", //MQ队列名
+          projectId: props.projectId
 
         };
         // 关闭新增弹窗;
@@ -107,6 +110,8 @@ const closeVisible = () => {
   UpdateForm.value = {
     prizeListIds: "", //指定奖励配置
     note: "", //备注
+    mqQueueName: "", //MQ队列名
+    projectId: props.projectId
 
   };
   closeFn();
@@ -123,6 +128,9 @@ const isFullscreen = ref(false)
       el-form-item(label='指定奖励配置' prop="prizeListIds")
         el-input(v-model='UpdateForm.prizeListIds' autocomplete='off'
           placeholder="请输入指定奖励配置")
+      el-form-item(label='MQ队列名' prop="mqQueueName")
+        el-input(v-model='UpdateForm.mqQueueName' autocomplete='off'
+          placeholder="请输入MQ队列名")
       el-form-item(label='备注' prop="note")
         el-input(v-model='UpdateForm.note' autocomplete='off'
           placeholder="请输入备注")

src/views/pri/priPrizeInSet/components/updatePriPrizeInSet/index.vue

@@ -33,6 +33,7 @@ const UpdateForm: any = ref({
   id: null, //ID
   prizeListIds: "", //指定奖励配置
   note: "", //备注
+  mqQueueName: "", //MQ队列名
 
 });
 
@@ -63,9 +64,10 @@ const submit = async (formEl) => {
           type: "success"
         });
         UpdateForm.value = {
-      id: null, //ID
-      prizeListIds: "", //指定奖励配置
-      note: "", //备注
+          id: null, //ID
+          prizeListIds: "", //指定奖励配置
+          note: "", //备注
+          mqQueueName: "", //MQ队列名
 
         };
         // 关闭修改弹窗;
@@ -101,7 +103,7 @@ const rules = reactive({
 const closeFn: any = inject('closeEditUpdatePriPrizeInSetVisible');
 const openVisible = async () => {
   //通过ID获取表格数据
-  const { status, data }: any = await http.Request({ method: UrlList.prizeSet.prigetPriPrizeInSetQuery.method, url: UrlList.prizeSet.prigetPriPrizeInSetQuery.url, params: { id: props.formData.id }});
+  const { status, data }: any = await http.Request({ method: UrlList.prizeSet.prigetPriPrizeInSetQuery.method, url: UrlList.prizeSet.prigetPriPrizeInSetQuery.url, params: { id: props.formData.id } });
   if (status === 1) {
     UpdateForm.value = data;
 
@@ -113,6 +115,7 @@ const closeUpdatePriPrizeInSetVisible = () => {
     id: null, //ID
     prizeListIds: "", //指定奖励配置
     note: "", //备注
+    mqQueueName: "", //MQ队列名
 
   };
   closeFn();
@@ -132,6 +135,9 @@ const isFullscreen = ref(false)
       el-form-item(label='指定奖励配置' prop="prizeListIds")
         el-input(v-model='UpdateForm.prizeListIds' autocomplete='off'
           placeholder="请输入指定奖励配置")
+      el-form-item(label='MQ队列名' prop="mqQueueName")
+        el-input(v-model='UpdateForm.mqQueueName' autocomplete='off'
+          placeholder="请输入MQ队列名")
       el-form-item(label='备注' prop="note")
         el-input(v-model='UpdateForm.note' autocomplete='off'
           placeholder="请输入备注")

src/views/pri/priQueryField/components/add/index.vue

@@ -40,6 +40,7 @@ let UpdateForm = ref({
   fieldQueryValue: "", //匹配值
   fieldQueryValueType: "", //匹配值类型
   queryTableId: props.queryTableId, //匹配表
+  groupByFlag: "", //聚合查询
 
 
 });
@@ -106,6 +107,7 @@ const submit = async (formEl) => {
           fieldQueryValue: "", //匹配值
           fieldQueryValueType: "", //匹配值类型
           queryTableId: props.queryTableId, //匹配表
+          groupByFlag: "", //聚合查询
 
         };
         // 关闭新增弹窗;
@@ -153,6 +155,7 @@ const closeVisible = () => {
     fieldQueryValue: "", //匹配值
     fieldQueryValueType: "", //匹配值类型
     queryTableId: props.queryTableId, //匹配表
+    groupByFlag: "", //聚合查询
 
   };
   closeFn();
@@ -203,6 +206,8 @@ const isFullscreen = ref(false)
           clearable,
         )
           el-option(:label="item.tableEnName + item.summary", :value="item.id" v-for="(item,index) in queryTableIdOptionList")
+      el-form-item(label='聚合查询' prop="groupByFlag")
+        el-switch(v-model="UpdateForm.groupByFlag")
 
     .flex.justify-end
       el-button(

src/views/pri/priQueryField/components/updatePriQueryField/index.vue

@@ -37,6 +37,7 @@ const UpdateForm: any = ref({
   fieldQueryModel: "", //匹配方式
   fieldQueryValue: "", //匹配值
   fieldQueryValueType: "", //匹配值类型
+  groupByFlag: "", //聚合查询
 
 });
 // 匹配条件选项数据
@@ -98,6 +99,7 @@ const submit = async (formEl) => {
           fieldQueryModel: "", //匹配方式
           fieldQueryValue: "", //匹配值
           fieldQueryValueType: "", //匹配值类型
+          groupByFlag: "", //聚合查询
 
         };
         // 关闭修改弹窗;
@@ -146,6 +148,7 @@ const closeUpdatePriQueryFieldVisible = () => {
     fieldQueryModel: "", //匹配方式
     fieldQueryValue: "", //匹配值
     fieldQueryValueType: "", //匹配值类型
+    groupByFlag: "", //聚合查询
 
   };
   closeFn();
@@ -192,6 +195,8 @@ const isFullscreen = ref(false)
           clearable,
         )
           el-option(:label="item.label", :value="item.id" v-for="(item,index) in fieldQueryValueTypeOptionList")
+      el-form-item(label='聚合查询' prop="groupByFlag")
+        el-switch(v-model="UpdateForm.groupByFlag")
 
     .flex.justify-end
       el-button(