Merge branch 'dev' of https://inno.sh-sict.com/gitlab/qq5616657/agcs2.0-web into dev

.env.development

 NODE_ENV = 'development'
 VUE_APP_BASE_API = 'mockServer'
 VUE_APP_BASE_API = 'http://192.168.31.140:11999/'
+VUE_APP_UPLOAD_API = 'https://ds.cixincloud.com/geca-api/disease-data/file/info/'
 
 VUE_CLI_BABEL_TRANSPILE_MODULES = true
+·
\ No newline at end of file

.env.production

 NODE_ENV = 'production'
 VUE_APP_BASE_API = '/geca-api/'
+VUE_APP_UPLOAD_API = '/geca-api/disease-data/file/info/'
 

packages/config/date.vue

@@ -127,6 +127,9 @@ export default {
       // })
       // this.data.rules = rules
       let i = this.data.rules.findIndex((e) => e.trigger)
+      if (i == -1) {
+        i = 1
+      }
       this.data.rules[i] = { validator: checkAge, trigger: "change" }
       console.log(this.data.rules)
     },

src/components/FormComponents/index.vue

@@ -283,7 +283,7 @@ export default {
     },
 
     // 表单赋值
-    initforms(formEdit) {
+    initforms(formEdit, flag) {
       this.$nextTick(() => {
         const form = {}
         this.forms.forEach((item) => {
@@ -309,6 +309,9 @@ export default {
         if (this.$refs.form && this.$refs.form.clearValidate) {
           this.$refs.form.clearValidate()
         }
+        if (flag) {
+          this.$emit("handleSearch", this.form)
+        }
       })
     },
 

src/components/Upload/index.vue

@@ -99,6 +99,7 @@ export default {
           ? "/api"
           : process.env.VUE_APP_BASE_API,
       fileList: [],
+      uploadPrefix: process.env.VUE_APP_UPLOAD_API,
     }
   },
   computed: {
@@ -119,7 +120,7 @@ export default {
       return this.value.map((_) => {
         return (
           _.url ||
-          `/geca-api/disease-data/file/info/${_.bucket_name}/${_.prefix}-${_.uuid_name}`
+          this.uploadPrefix + `${_.bucket_name}/${_.prefix}-${_.uuid_name}`
         )
       })
     },
@@ -132,7 +133,8 @@ export default {
         this.fileList = newValue.map((_) => {
           return {
             name: _.file_name,
-            url: `/geca-api/disease-data/file/info/${_.bucket_name}/${_.prefix}-${_.uuid_name}`,
+            url:
+              this.uploadPrefix + `${_.bucket_name}/${_.prefix}-${_.uuid_name}`,
           }
         })
       },
@@ -204,7 +206,8 @@ export default {
       let responseUrl
       if (file.response) {
         const _ = file.response.data
-        responseUrl = `/geca-api/disease-data/file/info/${_.bucket_name}/${_.prefix}-${_.uuid_name}`
+        responseUrl =
+          this.uploadPrefix + `${_.bucket_name}/${_.prefix}-${_.uuid_name}`
       }
       try {
         if (name.match(/\.(png|jpg|jpeg)/)) {

src/components/UploadForOperation/index.vue

@@ -124,6 +124,7 @@ export default {
       type: String,
       default: "primary",
     },
+
     value: {
       type: Array,
       default: () => [],
@@ -133,6 +134,7 @@ export default {
     return {
       imgUrl: "",
       title: "",
+      uploadPrefix: process.env.VUE_APP_UPLOAD_API,
       httpPrefix:
         process.env.NODE_ENV === "development"
           ? "/api"
@@ -154,10 +156,7 @@ export default {
       console.log(this.value)
       if (!this.value.length || this.accept != "image/*") return []
       return this.value.map((_) => {
-        return (
-          _.url ||
-          `https://ds.cixincloud.com/geca-api/disease-data/file/info/${_.bucketName}/${_.uuidName}`
-        )
+        return _.url || this.uploadPrefix + `${_.bucketName}/${_.uuidName}`
       })
     },
   },
@@ -168,7 +167,7 @@ export default {
         this.fileList = newValue.map((_) => {
           return {
             name: _.fileName,
-            url: `https://ds.cixincloud.com/geca-api/disease-data/file/info/${_.bucketName}/${_.uuidName}`,
+            url: this.uploadPrefix + `${_.bucketName}/${_.uuidName}`,
           }
         })
       },
@@ -235,7 +234,7 @@ export default {
       let responseUrl
       if (file.response) {
         const _ = file.response.data
-        responseUrl = `https://ds.cixincloud.com/geca-api/disease-data/file/info/${_.bucketName}/${_.uuidName}`
+        responseUrl = this.uploadPrefix + `${_.bucketName}/${_.uuidName}`
       }
       try {
         if (name.match(/\.(png|jpg|jpeg)/)) {

src/layouts/index.vue

@@ -368,6 +368,8 @@ export default {
     goSearch(title) {
       if (title == "筛查") {
         this.$router.push("/screening/index?checkStatus=2")
+      } else if (title == "随访") {
+        this.$router.push("/followupquery?checkStatus=2")
       }
       this.autoFlag = false
     },
@@ -694,6 +696,9 @@ export default {
       display: flex;
       flex-direction: column;
       align-items: center;
+      &:first-child {
+        margin-right: 20px;
+      }
       .title {
         font-size: 16px;
         margin: 16px 0;

src/views/Home/HealthPopularization/index.vue

@@ -19,7 +19,7 @@
           <div class="leftImg">
             <img
               :src="
-                'https://ds.cixincloud.com/geca-api/disease-data/file/info/' +
+                uploadPrefix +
                 item.imgPath[0].bucketName +
                 '/' +
                 item.imgPath[0].uuidName
@@ -99,6 +99,7 @@ export default {
       showDetail: false,
       // 分页数据
       total: 0,
+      uploadPrefix: process.env.VUE_APP_UPLOAD_API,
       tableData: [],
     }
   },
@@ -150,7 +151,7 @@ export default {
     viewDetail(i) {
       this.showDetail = true
       this.pdfSrc =
-        "https://ds.cixincloud.com/geca-api/disease-data/file/info/" +
+        this.uploadPrefix +
         this.tableData[i].filePath[0].bucketName +
         "/" +
         this.tableData[i].filePath[0].uuidName

src/views/Home/PdfDialog/index.vue

@@ -3,6 +3,7 @@
     <el-dialog
       custom-class="pdfDialog"
       :title="''"
+      :width="dWidth + 'px'"
       :visible.sync="showPdf"
       :close-on-click-modal="true"
       :close-on-press-escape="false"
@@ -14,7 +15,7 @@
         <div class="title">{{ curPdf.articleTitle }}</div>
         <div class="refuteList">
           <!-- <pdf :src="pdfSrc"></pdf> -->
-          <pdf-view ref="pdfView" :pdfUrl="pdfSrc"></pdf-view>
+          <pdf-view ref="pdfView" :pdfUrl="pdfSrc" @scale="setScale"></pdf-view>
         </div>
       </div>
     </el-dialog>
@@ -33,8 +34,16 @@ export default {
   data() {
     return {
       showPdf: false,
+      width: 750,
+      dWidth: 750,
     }
   },
+  methods: {
+    setScale(val) {
+      console.log(val)
+      this.dWidth = this.width * (val / 100)
+    },
+  },
   watch: {
     showPdf(v) {
       if (v) {
@@ -66,8 +75,7 @@ export default {
 </style>
 <style lang="scss">
 .pdfDialog {
-  width: 750px;
-  max-height: 858px;
+  max-height: 958px;
   .el-dialog__header {
     // display: none;
     padding: 0px !important;

src/views/Home/PdfView/index.vue

@@ -104,8 +104,12 @@ export default {
 
     //放大
     scaleD() {
+      if (this.scale == 120) {
+        return
+      }
       this.scale += 5
       this.$refs.pdf.$el.style.width = parseInt(this.scale) + "%"
+      this.$emit("scale", this.scale)
     },
 
     //缩小
@@ -115,8 +119,9 @@ export default {
         return
       }
       this.scale += -5
-      console.log(parseInt(this.scale) + "%")
+      // console.log(parseInt(this.scale) + "%")
       this.$refs.pdf.$el.style.width = parseInt(this.scale) + "%"
+      this.$emit("scale", this.scale)
     },
     // 切换上一页
     prePage() {
@@ -190,7 +195,7 @@ export default {
   .show {
     overflow: auto;
     margin: auto;
-    max-width: 790px;
+    // max-width: 790px;
     max-height: 660px;
   }
   .pdf_footer {

src/views/Home/ScientificResearch/index.vue

@@ -82,6 +82,7 @@ export default {
       tableData: [],
       curPdf: { articleTitle: "测试pdf" },
       pdfSrc: "",
+      uploadPrefix: process.env.VUE_APP_UPLOAD_API,
     }
   },
   mounted() {
@@ -122,7 +123,7 @@ export default {
       this.$refs.pdfDialog.showPdf = true
       this.curPdf = item
       this.pdfSrc =
-        "https://ds.cixincloud.com/geca-api/disease-data/file/info/" +
+        this.uploadPrefix +
         item.filePath[0].bucketName +
         "/" +
         item.filePath[0].uuidName

src/views/Home/index.vue

@@ -100,7 +100,9 @@
                     }"
                   >
                     <div>{{ index + 1 }}</div>
-                    <div>{{ item.unionName }}</div>
+                    <div class="tooLong">
+                      {{ item.unionName }}
+                    </div>
                     <div>{{ item.nums }}</div>
                   </li>
                 </ul>
@@ -158,7 +160,7 @@
       </div> -->
 
       <!--  科学研究 -->
-      <div class="scientificresearch">
+      <!-- <div class="scientificresearch">
         <div class="title_box">
           <div class="title">科学研究</div>
           <div class="empty"></div>
@@ -177,7 +179,7 @@
             {{ item }}
           </li>
         </ul>
-      </div>
+      </div> -->
       <!-- 粘性定位 -->
       <div v-show="showFixed" class="fixed_box">
         <ul class="f_list">
@@ -320,11 +322,13 @@ export default {
       ],
       researchList: ["筛查技术方案", "筛查指南", "学术成果", "项目进展与成果"],
       showFixed: false,
+      uploadPrefix: process.env.VUE_APP_UPLOAD_API,
     }
   },
   created() {
     this.getArticleList("1")
     this.getArticleList("6")
+    console.log(this.uploadPrefix)
   },
   mounted() {
     this.getRankTotal()
@@ -371,7 +375,7 @@ export default {
       this.$refs.pdfDialog.showPdf = true
       this.curPdf = item
       this.pdfSrc =
-        "https://ds.cixincloud.com/geca-api/disease-data/file/info/" +
+        this.uploadPrefix +
         item.filePath[0].bucketName +
         "/" +
         item.filePath[0].uuidName
@@ -430,6 +434,9 @@ export default {
 </script>
 <style lang="scss" scoped>
 #con {
+  .tooLong {
+    white-space: nowrap;
+  }
   .flex {
     height: 100%;
     display: flex;
@@ -599,7 +606,7 @@ export default {
             flex-direction: column;
             flex-wrap: wrap;
             li {
-              width: 40%;
+              width: 46%;
               margin-bottom: 15px;
               display: flex;
               justify-content: space-between;

src/views/followupquery/index.vue

@@ -310,7 +310,13 @@ export default {
     },
     checkStatus(val) {
       if (val) {
-        this.handleSearch()
+        this.$refs.form.initforms(
+          {
+            checkStatus: val,
+          },
+          true
+        )
+        // this.handleSearch()
       }
     },
   },
@@ -417,7 +423,7 @@ export default {
         ...this.$refs.form.form,
         ...form,
       }
-      params = Object.assign(this.cacheForm, params)
+      // params = Object.assign(this.cacheForm, params)
       for (let key in params) {
         if (params[key] !== "" && params[key] !== null) {
           if (key.includes("Time") && params[key]) {

src/views/screening/index.vue

@@ -374,6 +374,7 @@ export default {
         this.initForm = {
           checkStatus: this.$route.query.checkStatus + "",
         }
+        this.cacheForm = {}
         //   console.log(this.searchForm)
         this.handleSearch(this.initForm)
       }