提交一下

src/views/main_views/newProductionLineEditor/routers/lineEditor/lineEditor.js

@@ -6,7 +6,7 @@ async function getLineEditor() {
   var value = await loadComponent('lineEditor', window.global.urls.loadUrl + '/src/views/main_views/newProductionLineEditor/routers/lineEditor/lineEditor.vue')
   return {
     data: function () {
-      return renderData.renderData
+      return editorData.renderData
     },
     components: { 'chart': chart, 'condition': condition, 'calculater': calculater },
     template: value.template,
@@ -91,7 +91,7 @@ async function getLineEditor() {
           })
         })
       })
-      renderer(ipcRenderer, this)
+      customIpcRenderer(ipcRenderer, this)
     },
     methods: {
       //打开条件编辑
@@ -543,7 +543,7 @@ async function getLineEditor() {
       //       "Current": 0,
       //       "Psize": 10,
       //       "Name": string,
-      //       "AccountId": store.get('accountId')
+      //       "AccountId": info.accountId
       //     }).then((res) => {
       //       if (res.data.Status == 1) {
       //         this.labelList = res.data.Data.Records
@@ -2188,7 +2188,7 @@ async function getLineEditor() {
       getIndexsModules() {
         return new Promise((resolve, reject) => {
           http.netPost('Module/Basic/GetAllIndexEncodeModuleList', {
-            "AccountId": store.get('accountId')
+            "AccountId": info.accountId
           })
             .then((res) => {
               this.handleIndexData(res.data.Data)
@@ -3348,7 +3348,7 @@ async function getLineEditor() {
             "Psize": 100,
             "Code": "B",
             'Name': '',
-            "AccountId": store.get('accountId')
+            "AccountId": info.accountId
           })
             .then((res) => {
               if (res.data.Status == 1) {
@@ -3572,7 +3572,7 @@ async function getLineEditor() {
       //         "Psize": this.psize,
       //         "Name": this.inputModelName,
       //         "CategoryId": null,
-      //         "AccountId": store.get('accountId'),
+      //         "AccountId": info.accountId,
       //         "Indexs": this.inputedIndex == '' ? null : [this.inputedIndex],
       //         "BeforeCreateDate": this.selectedDate == null ? '' : this.selectedDate + ' 23:59:59',
       //       })
@@ -4795,7 +4795,7 @@ async function getLineEditor() {
       },
       checkPermission(list) {
         var result = false
-        var id = store.get('accountId')
+        var id = info.accountId
         for (const item of list) {
           if (item.AccountId == id) {
             result = true
@@ -4882,7 +4882,7 @@ async function getLineEditor() {
         return new Promise((resolve, reject) => {
           http.netPost('ProductLine/ProductLine/GetSingleProductLine', {
             "Id": id,
-            "AccountId": store.get('accountId')
+            "AccountId": info.accountId
           })
             .then((res) => {
               this.getUsedIndexModules(res.data.Data.Contents, res.data.Data.Titles)
@@ -5549,7 +5549,7 @@ async function getLineEditor() {
           http.netPost('ProductLine/ProductLineVersion/EditSave', {
             "ProductLineVersionId": this.productionLineId,
             "Contents": contents,
-            "AccountId": store.get('accountId'),
+            "AccountId": info.accountId,
             "Titles": Titles,
           })
             .then((res) => {
@@ -5599,7 +5599,7 @@ async function getLineEditor() {
             "Contents": contents,
             "Titles": Titles,
             "isAutoPushArticle": this.productionAutoPush ? 1 : 0,
-            "AccountId": store.get('accountId'),
+            "AccountId": info.accountId,
           })
             .then((res) => {
               if (res.data.Status == 1) {
@@ -5685,7 +5685,7 @@ async function getLineEditor() {
             "StockCodes": companyList,
             "Ids": [this.currentProductionId],
             "T": this.runningYear + this.runningDate,
-            "AccountId": store.get('accountId')
+            "AccountId": info.accountId
           })
             .then(res => {
               if (res.data.Status == 1) {
@@ -5713,7 +5713,7 @@ async function getLineEditor() {
         return new Promise((resolve, reject) => {
           http.netPost('Task/Basic/GetTaskList', {
             "id": id,
-            "AccountId": this.onlySeeMe ? store.get('accountId') : 0,
+            "AccountId": this.onlySeeMe ? info.accountId : 0,
             "current": 0,
             "psize": 1,
           })
@@ -5731,7 +5731,7 @@ async function getLineEditor() {
             'Psize': 100,
             "TaskId": id,
             "name": '',
-            "AccountId": store.get('accountId')
+            "AccountId": info.accountId
           })
             .then((res) => {
               if (res.data.Status == 1) {
@@ -5753,7 +5753,7 @@ async function getLineEditor() {
           http.netPost('ProductLine/ProductLine/EditProductLineName', {
             "Id": this.currentProductionId,
             "Name": this.editingProductionName,
-            "AccountId": store.get('accountId'),
+            "AccountId": info.accountId,
           })
             .then((res) => {
               if (res.data.Status == 1) {
@@ -6067,7 +6067,7 @@ async function getLineEditor() {
             },
             "filterConditionContent": conditionFuns.setSaveCondition(this.conditionParamsList['start']),
             "Active": 1,
-            "AccountId": store.get('accountId')
+            "AccountId": info.accountId
           })
             .then((res) => {
               if (res.data.Status == 1) {
@@ -6329,7 +6329,7 @@ async function getLineEditor() {
         return new Promise((resolve, reject) => {
           http.netPost('Data/Encode/QueryEncodeListWithMultiple', {
             "Encodes": codes,
-            "AccountId": store.get('accountId')
+            "AccountId": info.accountId
           })
             .then((res) => {
               if (res.data.Status == 1) {

src/views/main_views/newProductionLineEditor/routers/lineEditor/lineEditor.vue

@@ -710,7 +710,7 @@
               && !selectedTimeParams.id"
             class="no-module-tip"
           >
-            <img src="../../static/image/no-edit.png" alt />
+            <img src="../../../static/images/no-edit.png" alt />
             <p>未选中结构</p>
           </div>
 

src/views/main_views/router/router.html

@@ -582,11 +582,12 @@
             .then((res) => {
               if (res.data.Status == 1) {
                 var id = res.data.Data.Id
-                ipcRenderer.send('openPage', {
-                  id: 'productionLineEdit' + id,
-                  name: '未命名单券图文财报产线编辑器',
-                  src: './newProductionLineEditor/index.html?id=' + id + '&type=' + name,
-                })
+                // ipcRenderer.send('openPage', {
+                //   id: 'productionLineEdit' + id,
+                //   name: '未命名单券图文财报产线编辑器',
+                //   src: './newProductionLineEditor/index.html?id=' + id + '&type=' + name,
+                // })
+                this.openPage('productionLineEdit' + id, '未命名单券图文财报产线编辑器', '../../main_views/newProductionLineEditor/newProductionLineEditor.html?id=' + id + '&type=' + name, 1)
               }
             })
         })