zhuliu 1 vuosi sitten
vanhempi
commit
c00bd10ba9

+ 2 - 2
src/config/index.js

@@ -3,6 +3,6 @@ export default {
     updateTime:'2023-08-04 08:00:00',
     specialDays:['05-12','09-18','12-13'],
     host: window.location.host,
-    staticURL: process.env.NODE_ENV !== 'production' ? '139.224.24.90' : '192.168.1.24',
-    WebSocketPath: process.env.NODE_ENV !== 'production' ? '139.224.24.90:8879' : '192.168.1.24:8877',
+    staticURL: process.env.NODE_ENV == 'production' ? '139.224.24.90' : '192.168.1.24',
+    WebSocketPath: process.env.NODE_ENV == 'production' ? '139.224.24.90:8879' : '192.168.1.24:8877',
 }

+ 2 - 2
src/views/project/patentDetails/components/patentMessage/history/InvalidHistory.vue

@@ -29,7 +29,7 @@
                         <span>{{scope.row.invalidTime}}</span>
                     </template>
                 </el-table-column>
-                <el-table-column label="决时间" prop="judgementTime" align="center">
+                <el-table-column label="决时间" prop="judgementTime" align="center">
                     <template slot-scope="scope">
                         <span>{{scope.row.judgementTime}}</span>
                     </template>
@@ -101,7 +101,7 @@ export default {
                 },
                 {
                     field:'judgementTime',
-                    label:'决时间',
+                    label:'决时间',
                     components:'el-date-picker',
                     type:'date'
                 },

+ 15 - 2
src/views/report/InvalidResponse/components/dialog/addEvidenceReason.vue

@@ -431,8 +431,21 @@ export default {
     },
     //获取特征历史的值
     getFeature(val){
-        this.features = val
-        this.getSpanArr(this.features)
+        console.log(val)
+        if(val && val.length>0){
+            var arr = []
+            val.forEach(item=>{
+                item.ifFeatureHistory = true
+                arr.push(item)
+            })
+            console.log(arr)
+            this.features = arr
+            this.getSpanArr(this.features)
+        }
+        // this.features = val.forEach(item=>{
+        //     item.ifFeatureHistory = true
+        // })
+        // this.getSpanArr(this.features)
     },
     //选择历史无效记录
     chooseHistory(row){