ZaiZai hace 1 año
padre
commit
77754e7c16

+ 2 - 2
src/config/index.json

@@ -1,7 +1,7 @@
 {
     "version": "20230607160059",
-    "target1": "http://192.168.0.102:8090",
-    "target": "http://39.108.216.210:8090",
+    "target": "http://192.168.0.102:8090",
+    "target1": "http://39.108.216.210:8090",
     "smsPhone": "",
     "vite": {
         "port": 5174,

+ 1 - 0
src/views/tentative/detect/test-form.vue

@@ -257,6 +257,7 @@ onMounted(() => {
   listItemBaseData.value.contractId = contractId.value
   listItemBaseData.value.trialProjectName = title
   listItemBaseData.value.reportDate = dayDate
+  listItemBaseData.value.commissionId = commissionId.value
   // listItemBaseData.value.detectionCategory = Number(dataType)
   listItemBaseData.value.detectionCategory = info.detectionCategory || 1
   listItemBaseData.value.trialUserName = info.trialUserName || (userInfo.value['nick_name'])

+ 0 - 1
src/views/tentative/detect/test.vue

@@ -551,7 +551,6 @@ const tableRowEdit = (row, tabTypeKey) => {
             dataType: row.type,
             tabTypeKey: tabTypeKey,
             // prenodeDataInfo:JSON.stringify(nodeDataInfo.value)
-
         },
     })
 }

+ 3 - 3
src/views/tentative/material/modules/testSample/testUnder.vue

@@ -294,16 +294,16 @@ const sampleRemoveApi = async (ids) => {
 }
 
 //填写报告
-const fillReportClick = ({ testId }) => {
+const fillReportClick = ({ id, testId }) => {
     const { contractType } = contractInfo.value
     const { primaryKeyId } = treeInfo.value
     router.push({
         path: '/tentative/detect/test-form',
         query: {
+            id: testId,
             nodeId: primaryKeyId || '',
             dataType: contractType > 0 ? contractType + '' : '1',
-            commissionId: testId,
-            isaddType: true,
+            commissionId: id,
         },
     })
 }