From d4865d6df0b911c8e17c56b4658d8c507ac9255f Mon Sep 17 00:00:00 2001
From: lvleigang <957075182@qq.com>
Date: Wed, 31 Jul 2024 16:04:49 +0800
Subject: [PATCH 1/3] 1

---
 babel.config.js                         | 27 +++++++++++++------------
 src/views/applicationList/configData.js |  4 ++++
 vue.config.js                           |  4 +++-
 3 files changed, 21 insertions(+), 14 deletions(-)

diff --git a/babel.config.js b/babel.config.js
index d33f9ea..3c6620c 100644
--- a/babel.config.js
+++ b/babel.config.js
@@ -1,13 +1,14 @@
-module.exports = {
-  presets: [
-    // https://github.com/vuejs/vue-cli/tree/master/packages/@vue/babel-preset-app
-    '@vue/cli-plugin-babel/preset'
-  ],
-  'env': {
-    'development': {
-      // babel-plugin-dynamic-import-node plugin only does one thing by converting all import() to require().
-      // This plugin can significantly increase the speed of hot updates, when you have a large number of pages.
-      'plugins': ['dynamic-import-node']
-    }
-  }
-}
\ No newline at end of file
+module.exports = {
+  presets: [
+    // https://github.com/vuejs/vue-cli/tree/master/packages/@vue/babel-preset-app
+    '@vue/cli-plugin-babel/preset'
+  ],
+  'env': {
+    'development': {
+      // babel-plugin-dynamic-import-node plugin only does one thing by converting all import() to require().
+      // This plugin can significantly increase the speed of hot updates, when you have a large number of pages.
+      'plugins': ['dynamic-import-node']
+    }
+  },
+  "compact": false
+}
diff --git a/src/views/applicationList/configData.js b/src/views/applicationList/configData.js
index 821abef..d689494 100644
--- a/src/views/applicationList/configData.js
+++ b/src/views/applicationList/configData.js
@@ -96,6 +96,10 @@ const addForm = [
             id: "3",
             label: "用友BIP",
           },
+          {
+            id: "4",
+            label: "宁波银行",
+          },
         ],
         fontSize: 16,
       },
diff --git a/vue.config.js b/vue.config.js
index f9ff94d..83877a8 100644
--- a/vue.config.js
+++ b/vue.config.js
@@ -40,9 +40,11 @@ module.exports = {
       // detail: https://cli.vuejs.org/config/#devserver-proxy
       [process.env.VUE_APP_BASE_API]: {
         // target: `http://hzya.ufyct.com:9067/`,
-        target: `http://ufidahz.com.cn:9067/`,
+        // target: `http://ufidahz.com.cn:9067/`,
         // target: `http://127.0.0.1:9081/`,
         // target: `http://192.168.2.78:9999`,
+        target: `http://192.168.2.85:9999`,
+        // target: `http://192.168.2.78:8080`,
         // target: `http://192.168.2.83:9999`,
         changeOrigin: true,
         pathRewrite: {

From eecac2b7320293bc9ed36f42ee59188418e19b4c Mon Sep 17 00:00:00 2001
From: hyt <958868763@qq.com>
Date: Thu, 1 Aug 2024 09:57:39 +0800
Subject: [PATCH 2/3] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E5=91=A8=E4=B8=89?=
 =?UTF-8?q?=E6=B5=8B=E8=AF=95=E6=8F=90=E5=87=BA=E7=9A=84=E4=BD=8F=E6=95=B0?=
 =?UTF-8?q?=E6=8D=AEbug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/applicationList/scriptAdmin/configData.js | 13 +++++++++++++
 vue.config.js                                       |  3 ++-
 2 files changed, 15 insertions(+), 1 deletion(-)

diff --git a/src/views/applicationList/scriptAdmin/configData.js b/src/views/applicationList/scriptAdmin/configData.js
index 7e30890..01427f8 100644
--- a/src/views/applicationList/scriptAdmin/configData.js
+++ b/src/views/applicationList/scriptAdmin/configData.js
@@ -64,6 +64,19 @@ const formRow = [
       }
     ]
   },
+  {
+    elCol: [
+      {
+        type: 'textrea',
+        title: '返回脚本',
+        id: 'backScriptData',
+        row: 24,
+        disabled: false,
+        required: true,
+        fontSize: 16
+      }
+    ]
+  },
   {
     elCol: [
       {
diff --git a/vue.config.js b/vue.config.js
index bf0c75f..21233aa 100644
--- a/vue.config.js
+++ b/vue.config.js
@@ -43,9 +43,10 @@ module.exports = {
         // target: `http://ufidahz.com.cn:9067/`,
         // target: `http://127.0.0.1:9081/`,
         // target: `http://192.168.2.78:9999`,
-        target: `http://192.168.2.85:9999`,
+        // target: `http://192.168.2.85:9999`,
         // target: `http://192.168.2.78:8080`,
         target: `http://192.168.2.78:9999`,
+        // target: `http://192.168.2.185:9999`,
         // target: `http://192.168.2.83:9999`,
         changeOrigin: true,
         pathRewrite: {

From 747e27f11b9f05753e7b34779db67c6d6c242534 Mon Sep 17 00:00:00 2001
From: username <email@example.com>
Date: Thu, 8 Aug 2024 12:00:29 +0800
Subject: [PATCH 3/3] =?UTF-8?q?=E6=97=A5=E5=BF=97=E6=8C=89=E5=88=9B?=
 =?UTF-8?q?=E5=BB=BA=E6=97=B6=E9=97=B4=E6=8E=92=E5=BA=8F=E3=80=81=E6=BA=90?=
 =?UTF-8?q?=E6=95=B0=E6=8D=AE=E6=A8=A1=E7=B3=8A=E6=9F=A5=E8=AF=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../masterDataOptions/logsDeatil/index.vue    | 147 +++++++++++++++++-
 1 file changed, 144 insertions(+), 3 deletions(-)

diff --git a/src/views/masterDataOptions/logsDeatil/index.vue b/src/views/masterDataOptions/logsDeatil/index.vue
index 215300d..8a46b01 100644
--- a/src/views/masterDataOptions/logsDeatil/index.vue
+++ b/src/views/masterDataOptions/logsDeatil/index.vue
@@ -4,6 +4,43 @@
       <div class="chunk" :class="{acivted:activeName==='1'}" @click="tabsHandleClick('1')">下发日志</div>
       <div class="chunk" :class="{acivted:activeName==='2'}" @click="tabsHandleClick('2')">写入日志</div>
     </div>
+    <div class="search-container">
+      <el-input
+        v-model="inputValue"
+        placeholder="源数据"
+
+        @input="handleInput"
+        class="search-text"
+        type="text"
+      ></el-input>
+      <el-select
+        v-model="selectedValue"
+        class="search-text"
+        @change="handleSelectChange"
+        placeholder="请选择状态">
+        <el-option
+          v-for="item in options"
+          :key="item.value"
+          :label="item.label"
+          :value="item.value">
+        </el-option>
+      </el-select>
+      <el-button
+        icon="el-icon-search"
+        type="primary"
+        class="searchIcon"
+        @click="handleSearch"
+      ></el-button>
+      <el-button
+        icon="el-icon-refresh"
+        type="primary"
+        class="searchIcon"
+        @click="clearInput"
+      ></el-button>
+
+
+    </div>
+
     <div class="table" v-loading="tableLoading">
       <baseTable :tableData="tableData" :tabLoading="tabLoading"
                  :tableColumn="tableColumn" :border="false" tableHeight="73vh"
@@ -18,21 +55,74 @@
         </template>
       </baseTable>
     </div>
+
+
     <footer>
       <basePage :pageModel="pageModel" @update:pageModel="currentChangeHandle"></basePage>
     </footer>
   </div>
 </template>
+
+<!--<template>-->
+<!--  <div>-->
+
+<!--    <base-layout-->
+
+<!--    >-->
+<!--      <div slot="main" slot-scope="{ tableHeight }">-->
+<!--          <div class="logsDeatil">-->
+<!--            <div class="tabs">-->
+<!--              <div class="chunk" :class="{acivted:activeName==='1'}" @click="tabsHandleClick('1')">下发日志</div>-->
+<!--              <div class="chunk" :class="{acivted:activeName==='2'}" @click="tabsHandleClick('2')">写入日志</div>-->
+<!--            </div>-->
+
+<!--            <div class="table" v-loading="tableLoading">-->
+<!--              <baseTable :tableData="tableData" :tabLoading="tabLoading"-->
+<!--                         :tableColumn="tableColumn" :border="false" tableHeight="73vh"-->
+<!--              >-->
+<!--                &lt;!&ndash;        状态&ndash;&gt;-->
+<!--                <template #dataType="{row}">-->
+<!--                  {{ row.dataType == 1 ? '成功' : '失败' }}-->
+<!--                </template>-->
+<!--                &lt;!&ndash;        操作类型&ndash;&gt;-->
+<!--                <template #optionType="{row}">-->
+<!--                  {{ row.optionType }}-->
+<!--                </template>-->
+<!--              </baseTable>-->
+<!--            </div>-->
+
+
+<!--            <footer>-->
+<!--              <basePage :pageModel="pageModel" @update:pageModel="currentChangeHandle"></basePage>-->
+<!--            </footer>-->
+<!--          </div>-->
+<!--      </div>-->
+<!--    </base-layout>-->
+<!--  </div>-->
+<!--</template>-->
+
+
+
+
+
 <script>
 import BaseTable from '@/views/intergrationTask/compoments/baseTable.vue'
 import basePage from '@/views/intergrationTask/compoments/basePage.vue'
 import { authApi } from '@/api/apis/auth'
+import baseLayout from "@/components/base/baseLayout/index.vue";
 
 export default {
   name: 'index',
-  components: { basePage, BaseTable },
+  components: {baseLayout,basePage, BaseTable },
   data() {
     return {
+      inputValue:'',
+      selectedValue:'',
+      options:[
+        {value:'1',label:'成功'},
+        {value:'2',label:'失败'},
+        {value:'',label:'不筛选'},
+      ],
       activeName: '1',
       tableData: [],
       tableColumn: [
@@ -63,6 +153,13 @@ export default {
           id: 'optionType'
         }
       ],
+      requirementList: [
+        {
+          placeholder: "源数据",
+          prop: "sourceData",
+          tag: "elInput",
+        }
+      ],
       tabLoading: false,
       tableColumnTypeOne: [
         {
@@ -87,6 +184,10 @@ export default {
           id: 'remark',
           tooltip: true
         },
+        {
+          title: '创建时间',
+          id: 'create_time'
+        },
         {
           title: '操作类型',
           id: 'optionType'
@@ -150,6 +251,17 @@ export default {
       this.pageModel.pageIndex = 1
       this.initMainTableData()
     },
+    handleSelectChange(){
+
+      this.initMainTableData()
+    },
+    clearInput() {
+      this.inputValue = ''; // 将inputValue重置为空字符串
+    },
+    handleSearch() {
+      this.initMainTableData()
+    },
+
     // 页码
     currentChangeHandle(pageModel) {
       this.pageModel = pageModel
@@ -162,7 +274,9 @@ export default {
         const res = await authApi('mdmModuleService', '', 'queryMdmOptionLogPage', '', {
           pageNum: this.pageModel.pageIndex,
           pageSize: this.pageModel.limit,
-          mdmCode: this.$route.query.mdmCode
+          mdmCode: this.$route.query.mdmCode,
+          sourceData: this.inputValue,
+          dataType:this.selectedValue,
         })
         this.tableColumn = this.tableColumnTypeTwo
         this.tableData = res.attribute.list
@@ -171,7 +285,9 @@ export default {
         const res = await authApi('mdmModuleService', '', 'queryMdmDistributeLogPage', '', {
           pageNum: this.pageModel.pageIndex,
           pageSize: this.pageModel.limit,
-          mdmCode: this.$route.query.mdmCode
+          mdmCode: this.$route.query.mdmCode,
+          sourceData: this.inputValue,
+          dataType:this.selectedValue,
         })
         this.tableColumn = this.tableColumnTypeOne
         this.tableData = res.attribute.list
@@ -188,6 +304,31 @@ export default {
 
 
 <style scoped lang="scss">
+.search-container {
+  display: flex;           /* 使用Flexbox布局 */
+  align-items: center;     /* 垂直居中对齐 */
+  justify-content: flex-start; /* 水平起始对齐 */
+  margin-bottom: 15px;
+  margin-top: 15px;
+}
+
+.searchIcon {
+  font-size: 18px;
+  /* padding: 0 12px; */
+  height: 32px;
+  /* line-height: 32px; */
+  margin-left: 8px;
+  display: flex;
+  justify-content: center;
+  align-items: center;
+}
+
+.search-text {
+  //flex-grow: 1; /* 让输入框占据剩余空间 */
+  margin-right: 10px; /* 与按钮保持一定间距 */
+  width: 15%;
+}
+
 .logsDeatil {
   margin-left: 5px;
   background-color: #fff;