Merge branch 'dev' of http://110.41.163.243:9980/kd-aiot/kd-aiot-frontend into dev

src/views/equipmentManage/index.vue

@@ -21,7 +21,6 @@
             :columns="columns"
             :datasource="datasource"
             height="calc(100vh - 350px)"
-            :need-page="false"
             :initLoad="false"
             :current.sync="current"
             highlight-current-row
@@ -61,9 +60,10 @@
           {
             columnKey: 'index',
             type: 'index',
-            width: 45,
+            width: 55,
             align: 'center',
-            reserveSelection: true
+            reserveSelection: true,
+            label: '序号'
           },
           {
             prop: 'code',
@@ -118,7 +118,7 @@
       },
       /* 刷新表格 */
       reload (where) {
-        this.$refs.table.reload({ where: where});
+        this.$refs.table.reload({ where: where });
       },
       handleNodeClick (data) {
         this.categoryLevelId = data.id;

src/views/material/product/index.vue

@@ -21,7 +21,6 @@
             :columns="columns"
             :datasource="datasource"
             height="calc(100vh - 350px)"
-            :need-page="false"
             class="dict-table"
           >
             <!-- 表头工具栏 -->
@@ -57,9 +56,11 @@
           {
             columnKey: 'index',
             type: 'index',
-            width: 45,
+            width: 55,
             align: 'center',
-            reserveSelection: true
+            reserveSelection: true,
+            label: '序号',
+            showOverflowTooltip: true
           },
           {
             prop: 'code',
@@ -103,7 +104,7 @@
           ...where,
           pageNum: page,
           size: limit,
-          isProduct:true,
+          isProduct: true,
           categoryLevelId: this.categoryLevelId
         });
       },

src/views/material/productLinkMaterial/components/link-material-dialog.vue

@@ -259,7 +259,7 @@
           },
           {
             label: `${this.catogaryName}分类`,
-            prop: 'categoryLevelGroupName'
+            prop: 'categoryLevelPath'
           },
           {
             label: `${this.catogaryName}编码`,
@@ -283,7 +283,7 @@
           },
           {
             label: `${this.catogaryName}分类`,
-            prop: 'categoryLevelGroupName',
+            prop: 'categoryLevelPath',
             width: 110
           },
           {

src/views/material/productLinkMaterial/index.vue

@@ -21,7 +21,6 @@
             :columns="columns"
             :datasource="datasource"
             height="calc(100vh - 350px)"
-            :need-page="false"
             :initLoad="false"
             :current.sync="current"
             highlight-current-row
@@ -106,7 +105,8 @@
           ...where,
           pageNum: page,
           size: limit,
-          categoryLevelId: this.categoryLevelId
+          categoryLevelId: this.categoryLevelId,
+          isProduct: true
         });
       },
       success () {
@@ -121,7 +121,7 @@
       },
       /* 刷新表格 */
       reload (where) {
-        this.$refs.table.reload({where:where});
+        this.$refs.table.reload({ where: where });
       },
       handleNodeClick (data) {
         this.categoryLevelId = data.id;

vue.config.js

@@ -33,11 +33,8 @@ module.exports = {
       '/api': {
         // target: 'http://192.168.3.51:18086', // 测试
         target: 'http://192.168.3.35:8080', // kang杨威
-        // target: 'http://192.168.3.25:8080', // 黄峥嵘
-        // target: 'http://192.168.3.41:8080', // 何江鹏
         // target: 'http://192.168.3.33:8080', // 谢一平
-        // target: 'http://192.168.3.64:8080', // 粟勋
-        // target: 'http://192.168.3.34:8080', // 刘毅
+        // target: 'http://192.168.3.38:8080', // 陈潇
         changeOrigin: true, // 只有这个值为true的情况下 才表示开启跨域
         pathRewrite: {
           '^/api': ''