Просмотр исходного кода

过程监测选择记录规则api修改

lucw 8 месяцев назад
Родитель
Сommit
c48323ae1e

+ 12 - 0
src/api/recordRules/index.js

@@ -26,3 +26,15 @@ export async function recordrulesPage(body) {
   }
   return Promise.reject(new Error(res.data.message));
 }
+
+// 规则记录分页查询 过程监测 /main/recordrules/notProduceTaskConfigRecordRulesPage
+export async function recordrulesNotProduceTaskConfigRecordRulesPage(body) {
+  const res = await request.post(
+    `/main/recordrules/notProduceTaskConfigRecordRulesPage`,
+    body
+  );
+  if (res.data.code == 0) {
+    return res.data.data;
+  }
+  return Promise.reject(new Error(res.data.message));
+}

+ 14 - 2
src/components/selectReleaseRules/select-release-rules.vue

@@ -29,7 +29,10 @@
 
 <script>
   import search from './search.vue';
-  import { recordrulesPage } from '@/api/recordRules/index';
+  import {
+    recordrulesPage,
+    recordrulesNotProduceTaskConfigRecordRulesPage
+  } from '@/api/recordRules/index';
   import tabMixins from '@/mixins/tableColumnsMixin';
   import dictMixins from '@/mixins/dictMixins';
 
@@ -41,6 +44,11 @@
       multiple: {
         type: Boolean,
         default: false
+      },
+      // NotProduceTaskConfig bool 是否排除已配置的记录规则 过程监测传true
+      notProduceTaskConfig: {
+        type: Boolean,
+        default: false
       }
     },
     computed: {
@@ -196,7 +204,11 @@
       },
       /* 表格数据源 */
       datasource({ page, limit, where }) {
-        return recordrulesPage({
+        const API = this.notProduceTaskConfig
+          ? recordrulesNotProduceTaskConfigRecordRulesPage
+          : recordrulesPage;
+
+        return API({
           pageNum: page,
           size: limit,
           // 已发布

+ 1 - 0
src/views/batchRecord/components/editModal.vue

@@ -412,6 +412,7 @@
     <selectReleaseRules
       ref="selectReleaseRulesRef"
       @chooseRules="chooseReleaseRules"
+      :notProduceTaskConfig="reportWorkType == 2"
     ></selectReleaseRules>
 
     <programRulesDialog