fix:pageSize change

package.json

@@ -91,6 +91,7 @@
     "connect": "3.6.6",
     "eslint": "7.15.0",
     "eslint-plugin-vue": "7.2.0",
+    "html-webpack-plugin": "^5.6.0",
     "lint-staged": "10.5.3",
     "runjs": "4.4.2",
     "sass": "1.32.13",

src/views/integrationApi/apiAdmin.vue

@@ -792,5 +792,6 @@ export default {
   // /deep/ .ace_editor {
   //   height: 90vh !important;
   // }
+
 }
 </style>

src/views/integrationOptionV2/index.vue

@@ -146,25 +146,21 @@
           <el-button type="primary" @click="sendRowHandle()">下发
           </el-button>
         </div>
-      </div>
+      </div>`
-      <!--      <baseTable-->
+    </baseDialog>
-      <!--        :tableData="sendTableData"-->
+    <baseDialog width="30%" v-model="dataDistDialog" :footerShow="false" title="查看数据字典">
-      <!--        :tableColumn="sendTableColumn"-->
+        <vue-json-editor
-      <!--      >-->
+          class="editor"
-      <!--        <template v-slot:status="{row}">-->
+          v-model="authInfo"
-      <!--          {{ sendDist[row.status] }}-->
+          :showBtns="false"
-      <!--        </template>-->
+          :mode="'code'"
-      <!--        <template v-slot:fun="{row}">-->
+        />
-      <!--          <el-button v-if="row.status === '1'||row.status === '2'" type="danger" @click="sendRowHandle(row)">删除-->
+
-      <!--          </el-button>-->
-      <!--          <el-button v-if="row.status === '3'||row.status === '4'" type="primary" @click="sendRowHandle(row)">下发-->
-      <!--          </el-button>-->
-      <!--        </template>-->
-      <!--      </baseTable>-->
     </baseDialog>
   </div>
 </template>
 <script>
+import vueJsonEditor from "vue-json-editor";
 import { deepClone } from '@/utils/index.js'
 import { getUserModuleApi } from '@/api/integrationOption/integrationOption.js'
 import BaseNewForm from './compoments/baseNewForm'
@@ -300,7 +296,9 @@ export default {
           name: '删除'
         }
       ],
-      rowId: ''
+      rowId: '',
+      dataDistDialog:false,
+      authInfo:{},
     }
   },
   methods: {
@@ -486,8 +484,24 @@ export default {
           })
       } else if (item.type === 'send') {
         this.sendHandle(row.id)
+      } else if (item.type === 'viewData') {
+        this.getDataDist(row.id)
       }
     },
+    //查看数据字典方法
+    async getDataDist(id) {
+      const res = await getUserModuleApi({
+        tl: 'mdmService',
+        as: '',
+        dj: 'queryMdmShowDetailsDictionary'
+      }, {
+        mdmCode: this.$route.meta.mdmCode,
+        id: id
+      })
+      console.log(res, 'res')
+      this.dataDistDialog = true
+      this.authInfo = res.attribute
+    },
     // 分页器更新数据
     currentChangeHandle(pageModel) {
       this.pageModel = pageModel
@@ -939,12 +953,13 @@ export default {
     BasePage,
     BaseTable,
     BaseNewForm,
-    baseDialog
+    baseDialog,
+    vueJsonEditor
   }
   ,
   computed: {
     funWidth() {
-      return this.mainFunData.length * 70
+      return this.mainFunData.length * 90
     }
 
   }
@@ -1008,4 +1023,17 @@ export default {
   border-radius: 8px;
 }
 </style>
+<style lang="less" scoped>
+
+//.code-json-editor {
+/* jsoneditor右上角默认有一个链接,加css去掉 */
+/deep/ .jsoneditor-poweredBy {
+  display: none !important;
+}
+/deep/ .ace-jsoneditor {
+  height: 350px !important;
+}
+
+//}
+</style>
 

src/views/intergrationTask/taskLogdetailData/index.vue

@@ -120,7 +120,7 @@ export default {
       tableData: [], //表格数据
       pageModel: {
         pageNum: 1,
-        pageSize: 10
+        pageSize: 100
       },
       queryModel: {
         plugin_id: '',

src/views/masterDataOptions/displayInfo/index.vue

@@ -266,10 +266,16 @@ export default {
           buttonName: '查看',
           buttonValue: 'view',
           buttonType: '6'
-        }, {
+        },
+        {
           buttonName: '下发',
           buttonValue: 'send',
           buttonType: '7'
+        },
+        {
+          buttonName: '查看数据字典',
+          buttonValue: 'viewData',
+          buttonType: '8'
         }
       ],//所有按钮
       dist: {

src/views/masterDataOptions/displayInfo/settingChunk.vue

@@ -93,6 +93,11 @@ export default {
           buttonName: '下发',
           buttonValue: 'send',
           buttonType: '7'
+        },
+        {
+          buttonName: '查看数据字典',
+          buttonValue: 'viewData',
+          buttonType: '8'
         }
       ],//所有按钮
       //key字段【'待选字段'，‘选中字段’，viewType】

vue.config.js

@@ -45,10 +45,10 @@ module.exports = {
         // 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.78:9999`,
+        target: `http://192.168.2.78:10086`,
         // target: `http://192.168.2.185:9999`,
         // target: `http://192.168.2.83:9999`,
-        target:'http://127.0.0.1:9999/',
+        // target:'http://127.0.0.1:9999/',
         changeOrigin: true,
         pathRewrite: {
           ["^" + process.env.VUE_APP_BASE_API]: "",