Merge branch 'product' into noveltySearch2

src/config/index.js

@@ -4,7 +4,7 @@ export default {
     updateTime:'2023-08-04 08:00:00',
     specialDays:['05-12','09-18','12-13'],
     host: window.location.host,
-    url:process.env.NODE_ENV === 'production' ? 'https://xsip.cn' : 'http://192.168.2.24:8803',//文件地址
-    staticURL: process.env.NODE_ENV === 'production' ? 'https://xsip.cn/onlinePreview' : 'http://192.168.2.24:8012',//在线预览
-    WebSocketPath: process.env.NODE_ENV === 'production' ? 'wss://xsip.cn' : 'ws://192.168.2.24:8877',//websocket
+    url:process.env.NODE_ENV === 'production' ? 'https://xsip.cn' : 'http://192.168.2.24:8803',
+    staticURL: process.env.NODE_ENV === 'production' ? 'https://xsip.cn/onlinePreview' : 'http://192.168.2.24:8879/onlinePreview',
+    WebSocketPath: process.env.NODE_ENV === 'production' ? 'wss://xsip.cn' : 'ws://192.168.2.24:8879',
 }

src/views/noveltySearch/components/details/components/basicMessage/components/basicMessage/basicMessageDetails.vue

@@ -97,7 +97,7 @@
                 <el-form-item label="报告结果：">
                     <div class="box1" v-html="$commonJS.getColumnData(reportMessage, { type: 'Array', value: 'cronNames' })"></div>
                 </el-form-item>
-                <el-form-item label="结果论述：">
+                <el-form-item label="结论论述：">
                     <div class="box1" v-html="$commonJS.getColumnData(reportMessage, { type: 'String', value: 'cronDescription' })"></div>
                 </el-form-item>
             </div>

src/views/report/components/details/components/basicMessage.vue

@@ -99,7 +99,7 @@
       <el-form-item label="是否完成：">
         <div class="box1" v-html="$commonJS.getColumnData(form, { type: 'String', value: 'status' })==3?'是':'否'"></div>
       </el-form-item>
-      <template v-if="form.status == 3">
+      <template>
         <div>
           <el-form-item label="报告结果：">
             <div class="box1" v-html="$commonJS.getColumnData(form, { type: 'Array', value: 'cronNames' })"></div>

src/views/report/components/details/components/basicMessage_official.vue

@@ -198,12 +198,12 @@
                         <el-form-item label="是否完成：">
                             <div class="box1" v-html="$commonJS.getColumnData(reportMessage, { type: 'String', value: 'status' })==3?'是':'否'"></div>
                         </el-form-item>
-                        <template v-if="reportMessage.status == 3">
+                        <template>
                             <div>
                                 <el-form-item label="报告结果：">
                                     <div class="box1" v-html="$commonJS.getColumnData(reportMessage, { type: 'Array', value: 'cronNames' })"></div>
                                 </el-form-item>
-                                <el-form-item label="结果论述：">
+                                <el-form-item label="结论论述：">
                                     <div class="box1" v-html="$commonJS.getColumnData(reportMessage, { type: 'String', value: 'cronDescription' })"></div>
                                 </el-form-item>
                             </div>

src/views/report/components/dialog/addAndEditReport.vue

@@ -126,8 +126,8 @@
                   item.label }}</el-checkbox>
               </el-checkbox-group>
             </el-form-item>
-            <el-form-item label="结果论述" prop="cronDescription">
-              <el-input v-model="form.cronDescription" type="textarea" placeholder="请输入结果论述"></el-input>
+            <el-form-item label="结论论述" prop="cronDescription">
+              <el-input v-model="form.cronDescription" type="textarea" placeholder="请输入结论论述"></el-input>
             </el-form-item>
             <el-form-item label="后续跟进事项" prop="followUps" v-if="!form.id && form.status == 3">
               <span v-if="form.followUps"><span v-for="item in form.followUps" :key="item.name"