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

web_admin/src/views/report/view copy.vue

@@ -9,7 +9,7 @@
 
 <script>
 import { exportPdf } from "@/api/report.js";
-import pdf from "./pdf.vue";
+import pdf from "./components/pdf.vue";
 export default {
   components: {
     pdf,

web_admin/vue.config.js

@@ -39,7 +39,8 @@ module.exports = {
         // target: `http://localhost:8080`,
         // 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/",
+        target: "http://192.168.1.136:19330",
         changeOrigin: true,
         pathRewrite: {
           ["^" + process.env.VUE_APP_BASE_API]: "",

web_client/src/views/Patient/chooseSetMeal/index.vue

@@ -102,11 +102,10 @@
                               class="checkbox-group2-item"
                             >
                               <el-checkbox :label="item2.scaleCode" border>
-                                <h2
+                                <h3
-                                  @click.stop="
+                                  @click="handleCheckAll1(item1, item2, false)"
-                                    handleCheckAll1(item1, item2, false)
+                                ></h3>
-                                  "
+                                <h2>
-                                >
                                   {{ item2.scaleName }}（{{
                                     item2.questionNum || 0
                                   }}）
@@ -427,7 +426,7 @@ export default {
                 if (row1.scaleList) {
                   // console.log(row1.scaleList);
                   let scaleCodeList = row1.scaleList.map(
-                    (item) => item.scaleCode
+                    (item) => item.scaleCode,
                   );
                   this.checkboxGroup2 = [
                     ...this.checkboxGroup2,
@@ -525,6 +524,8 @@ export default {
         evaluationId: this.createId,
         scaleList,
       };
+      console.log("param", param);
+
       let res = await bindScale(param);
       const { code, msg, data } = res;
       if (code === 200) {
@@ -947,7 +948,7 @@ export default {
   right: 0;
   margin: 0 auto;
   bottom: 20px;
-  z-index: 9999;
+  z-index: 66;
 }
 .divul {
   display: flex;
@@ -1047,6 +1048,7 @@ export default {
   border: 2px solid #5cc0be;
   margin: 5px;
   height: 58px;
+  position: relative;
 }
 .checkbox-group2 h2 {
   font-size: 22px;
@@ -1060,7 +1062,7 @@ export default {
   left: 0px;
   right: 0px;
   height: 58px;
-  z-index: 8888;
+  z-index: 9999;
 }
 .div-scale-box {
   // border-top: 1px solid #e1e9f1;

web_client/src/views/evaluation/index.vue

@@ -26,7 +26,7 @@
               </div>
               <div class="div-li" style="text-align: left">
                 <span>就诊号</span>
-                <a-input v-model="people.outpatientNo" type="number" />
+                <a-input v-model="people.outpatientNo" />
                 <span class="required" style="color: red">*</span>
               </div>
               <div class="div-li" style="text-align: left">