Merge branch 'master-dev' of http://116.204.114.73:3000/ccsens_zhengzhichuan/cga_v2 into master-dev

web_admin/src/views/pacp.vue

@@ -264,7 +264,7 @@
         <el-form-item label="需要防治" prop="needPlan">
           <el-radio-group v-model="form.needPlan">
             <el-radio label="1">需要</el-radio>
-            <el-radio label="2">不需要</el-radio>
+            <el-radio label="0">不需要</el-radio>
           </el-radio-group>
         </el-form-item>
         <el-form-item label="防治计划" prop="plan">

web_admin/src/views/report/view.vue

@@ -1,6 +1,10 @@
 <template>
   <div class="app-container">
-    <div class="patient-info">
+    <!-- 透明度 -->
+    <div
+      class="patient-info"
+      :style="{ opacity: patientInfo.patientName ? 1 : 0 }"
+    >
       <span> {{ patientInfo.patientName || "未知" }}</span>
       <span class="fg">/</span>
       <span>

web_admin/vue.config.js

@@ -37,10 +37,10 @@ module.exports = {
       // detail: https://cli.vuejs.org/config/#devserver-proxy
       [process.env.VUE_APP_BASE_API]: {
         // target: `http://localhost:8080`,
-        // target: `http://192.168.1.116:19330`,
+        target: "http://192.168.1.136:19330",
         // target: "https://nnzjpt.ylinno.com/ruisiCgaAdmin/",
         // target: "https://www.ylinno.com/cga/v2/api/admin/",
-        target: "http://113.45.159.249:59001/cga/v2/api/admin/",
+        // target: "http://113.45.159.249:59001/cga/v2/api/admin/",
         changeOrigin: true,
         pathRewrite: {
           ["^" + process.env.VUE_APP_BASE_API]: "",

web_client/vue.config.js

@@ -38,7 +38,7 @@ module.exports = {
         // target: "https://www.ylinno.com/cga/v2/api/client/",
         // target: "http://113.45.159.249:59001/cga/v2/api/client/",
         // target: "http://127.0.0.1:19331",
-        target: "http://127.0.0.1:19331",
+        target: "http://192.168.1.136:19331",
         changeOrigin: true,
         pathRewrite: {
           ["^" + settings.proxyUrl]: "",