修改CURD，增加表格增加修改和查看

src/window1/tabGridView/CellTextItem.vue

@@ -224,6 +224,10 @@ export default {
       type: String,
       default: null,
     },
+    index:{
+      type: Number,
+      default: null,
+    },
   },
   emits: ['executeCallout', 'deleteRecord', 'refreshDatas', 'editRecord', 'readRecord'],
 
@@ -522,10 +526,10 @@ export default {
     },
     // 改变表格行元素的编辑状态
     editRecord: function () {
-      this.$emit('editRecord');
+      this.$emit('editRecord', this.modelData, this.index);
     },
     readRecord: function () {
-      this.$emit('readRecord');
+      this.$emit('readRecord', true, this.modelData, this.index);
     },
 
 

src/window1/tabGridView/GridBody.vue

@@ -73,7 +73,8 @@
               :grid-field-item="gridFieldItem" :model-data="modelData" :class-name="className"
               :simple-filter-params="simpleFilterParams" :complex-filter-params="complexFilterParams"
               :model-datas="modelDatas" :js-url="jsUrl"
-              @execute-callout="executeCallout(gridFieldItem)" @delete-record="deleteRecord" @refresh-datas="refreshDatas"
+              :index="index" @execute-callout="executeCallout(gridFieldItem)" @delete-record="deleteRecord"
+              @refresh-datas="refreshDatas"
               @edit-record="editRecord"
               @read-record="readRecord"
             />
@@ -379,12 +380,12 @@ export default {
     },
 
     // 改变表格行元素的编辑状态
-    editRecord: function () {
-      this.$emit('editRecord');
+    editRecord: function (modelData, index) {
+      this.$emit('editRecord', modelData, index);
     },
 
-    readRecord: function () {
-      this.$emit('readRecord');
+    readRecord: function (isRead, modelData, index) {
+      this.$emit('readRecord', isRead, modelData, index);
     },
 
     clickModelData: function () {

src/window1/tabGridView/TabGridEdit.vue

@@ -1091,58 +1091,58 @@ export default {
         );
       } else {
         // 如果存在子页签，则进入到新建的界面
-        if (_self.window.tabs != undefined && _self.window.tabs.length > 1) {
-          var currPage = _self.pagination.current_page;
-          var currIndex = (currPage - 1) * Common.pageSize + index + 1;
-          var totalCount = _self.pagination.total;
+        // if (_self.window.tabs != undefined && _self.window.tabs.length > 1) {
+        var currPage = _self.pagination.current_page;
+        var currIndex = (currPage - 1) * Common.pageSize + index + 1;
+        var totalCount = _self.pagination.total;
 
 
-          _self.dynamicComponentParam = {
-            viewType: 'edit',
-            curdWindowNo: _self.windowNo,
-            tabIndex: _self.tabIndex,
-            modelDataId: modelData.id,
-            currentPage: currPage,
-            currentIndex: currIndex,
-            totalRecords: totalCount,
-            isRestoreData: _self.isRestoreData,
-            uuid: _self.uuid,
-          };
-          _self.dynamicComponent = 'CurdWindowModal';
-          _self.dynamicComponentOpen = true;
+        _self.dynamicComponentParam = {
+          viewType: 'edit',
+          curdWindowNo: _self.windowNo,
+          tabIndex: _self.tabIndex,
+          modelDataId: modelData.id,
+          currentPage: currPage,
+          currentIndex: currIndex,
+          totalRecords: totalCount,
+          isRestoreData: _self.isRestoreData,
+          uuid: _self.uuid,
+        };
+        _self.dynamicComponent = 'CurdWindowModal';
+        _self.dynamicComponentOpen = true;
 
 
-          // this.$router.push(
-          //   'window-edit/edit/' +
-          //   this.windowNo +
-          //   '/' +
-          //   this.tabIndex +
-          //   '/' +
-          //   modelData.id +
-          //   '?currPage=' +
-          //   currPage +
-          //   '&currIndex=' +
-          //   currIndex +
-          //   '&totalCount=' +
-          //   totalCount +
-          //   '&uuid=' +
-          //   this.uuid +
-          //   '&isRestoreData=' +
-          //   _self.isRestoreData,
-          // );
-        } else {
-          if (!modelData.editMode) {
-            modelData.editMode = true;
-          } else {
-            this.saveTabData(modelData, index, true);
-          }
-          modelData.changed = true;
-          _self.dataChanged = true;
-          let index1 = this.modelDatas.indexOf(modelData);
-          if (index1 != -1) {
-            this.modelDatas[index1] = modelData;
-          }
-        }
+        // this.$router.push(
+        //   'window-edit/edit/' +
+        //   this.windowNo +
+        //   '/' +
+        //   this.tabIndex +
+        //   '/' +
+        //   modelData.id +
+        //   '?currPage=' +
+        //   currPage +
+        //   '&currIndex=' +
+        //   currIndex +
+        //   '&totalCount=' +
+        //   totalCount +
+        //   '&uuid=' +
+        //   this.uuid +
+        //   '&isRestoreData=' +
+        //   _self.isRestoreData,
+        // );
+        // } else {
+        //   if (!modelData.editMode) {
+        //     modelData.editMode = true;
+        //   } else {
+        //     this.saveTabData(modelData, index, true);
+        //   }
+        //   modelData.changed = true;
+        //   _self.dataChanged = true;
+        //   let index1 = this.modelDatas.indexOf(modelData);
+        //   if (index1 != -1) {
+        //     this.modelDatas[index1] = modelData;
+        //   }
+        // }
       }
     },
 
@@ -1202,13 +1202,13 @@ export default {
     readRecord: function (isRead, modelData, index) {
       this.nowModelIndex = index + 1;
       var _self = this;
-      const readModelData = !_self.checkDatas ? modelData : _self.checkDatas.modelData;
+      const readModelData = modelData;
       if (readModelData.editMode == true) {
         return;
       }
       if (isRead) {
         var currPage = _self.pagination.current_page;
-        var currIndex = (currPage - 1) * Common.pageSize + _self.checkDatas.index + 1;
+        var currIndex = (currPage - 1) * Common.pageSize + index + 1;
         var totalCount = _self.pagination.total;
 
         var customerWindowUrl = _self.tab.customerWindowUrl;
@@ -1236,13 +1236,15 @@ export default {
           if (readModelData.data['category']) {
             categoryValue = readModelData.data['category'];
             displayValue = categoryValue['displayValue'];
+            categoryNo = displayValue[displayValue.length - 1];
           } else if (readModelData.data['assetCategory']) {
             categoryValue = readModelData.data['assetCategory'];
             displayValue = categoryValue['displayValue'];
+            categoryNo = displayValue[displayValue.length - 1];
           } else {
             categoryNo = this.windowNo;
           }
-          categoryNo = displayValue[displayValue.length - 1];
+          
 
           _self.dynamicComponentParam = {
             viewType: 'view',

webpack.dev.js

@@ -62,78 +62,78 @@ module.exports = WebpackMerge.merge(baseConfig, {
     
     proxy: {
       '/api': {
-        target: 'http://192.168.1.113:10022/',
+        target: 'http://192.168.1.8:10025/',
         ws: false,
         changeOrigin: true,
         secure:true,
       },
       '/static': {
-        target: 'http://192.168.1.113:10022/',
+        target: 'http://192.168.1.8:10025/',
         ws: false,
         changeOrigin: true,
         secure:true,
       },
       '/content': {
-        target: 'http://192.168.1.113:10022/',
+        target: 'http://192.168.1.8:10025/',
         ws: false,
         changeOrigin: true,
         secure:true,
       },
       '/dashboard': {
-        target: 'http://192.168.1.113:10022/',
+        target: 'http://192.168.1.8:10025/',
         ws: false,
         changeOrigin: true,
         secure:true,
       },
       '/assets': {
-        target: 'http://192.168.1.113:10022/',
+        target: 'http://192.168.1.8:10025/',
         ws: false,
         changeOrigin: true,
         secure:true,
       },
       '/mock': {
-        target: 'http://192.168.1.113:10022/',
+        target: 'http://192.168.1.8:10025/',
         ws: false,
         changeOrigin: true,
         secure:true,
       },
       '/authApi': {
-        target: 'http://192.168.1.113:10022/',
+        target: 'http://192.168.1.8:10025/',
         ws: false,
         changeOrigin: true,
         secure:true,
       },
       '/Dictionary': {
-        target: 'http://192.168.1.113:10022/',
+        target: 'http://192.168.1.8:10025/',
         ws: false,
         changeOrigin: true,
         secure:true,
       },
       '/Files': {
-        target: 'http://192.168.1.113:10022/',
+        target: 'http://192.168.1.8:10025/',
         ws: false,
         changeOrigin: true,
         secure:true,
       },
       '/WebSocket': {
-        target: 'http://192.168.1.113:10022/',
+        target: 'http://192.168.1.8:10025/',
         ws: true,
         changeOrigin: true,
       },
       '/TrainVideo': {
-        target: 'http://192.168.1.113:10022/',
+        target: 'http://192.168.1.8:10025/',
         ws: true,
         changeOrigin: true,
       },
       '/module': {
-        target: 'http://192.168.1.113:10022/',
+        target: 'http://192.168.1.8:10025/',
         ws: true,
         changeOrigin: true,
         secure:true,
       },
     },
     client: {
-      overlay: false //解决ResizeObserver loop completed with undelivered notifications
+      overlay: false, //解决ResizeObserver loop completed with undelivered notifications
     },
   },