del herui time

gitPush.sh

+#!/bin/bash
+hasGit=`which git` # 判断是否存在git
+msg=${1:-'auto commit'} # 获取终端输入的第一个参数，若为空则为auto commit
+if [ ! $hasGit ];then
+  echo 'Please download git first!';
+  exit 1;
+else
+  git remote update
+  git fetch --all
+  result=`git symbolic-ref --short -q HEAD` # 获取分支名
+  current_id=`git log -n 1 origin/release --pretty=format:"%H"`
+  git reset --soft $current_id
+  git add .
+  git commit -m "$msg"
+  echo "curBranch $result"
+  git push origin  -f $result # 提交代码到github(修改了远程项目名)
+fi
\ No newline at end of file

package.json

@@ -16,7 +16,8 @@
     "img-md5": "pica-cli-service img-md5",
     "page": "vue-cli-service page",
     "skeleton": "pica-cli-service skeleton",
-    "tinypng": "pica-cli-service tinypng"
+    "tinypng": "pica-cli-service tinypng",
+    "push": "bash gitPush.sh"
   },
   "dependencies": {
     "@fullcalendar/core": "^5.10.0",
@@ -50,8 +51,8 @@
     "@babel/plugin-proposal-object-rest-spread": "^7.11.0",
     "@pica-cli/pica-cli-framework": "^1.0.10",
     "@pica-cli/vue-cli-plugin-pica-cli-plugin": "1.1.5",
-    "@pica-core/multiple-versions-plugin": "^1.0.4",
-    "@pica-core/reset-pathfile-plugin": "^1.0.4",
+    "@pica-core/multiple-versions-plugin": "^1.0.16",
+    "@pica-core/reset-pathfile-plugin": "^1.0.16",
     "@pica-core/web-buried-point": "^1.0.15",
     "@vue/cli-plugin-babel": "~4.5.0",
     "@vue/cli-plugin-eslint": "~4.5.0",
@@ -111,10 +112,6 @@
       "eslint --fix",
       "git add"
     ],
-    "src/**/*.{vue,html,css,scss,sass}": [
-      "stylelint --fix",
-      "git add"
-    ],
     "src/**/*.{js,vue,html,css,scss,sass}": [
       "prettier-eslint --write",
       "git add"

src/views/IM/diagnosis-admin/diagnosis-editor.vue

@@ -555,7 +555,7 @@
           {{
             formData.receptionServiceFeeStr
               ? `￥ ${formData.receptionServiceFeeStr}`
-              : ""
+              : ''
           }}
         </el-form-item>
         <el-form-item
@@ -577,7 +577,7 @@
           {{
             formData.assistantServiceFeeStr
               ? `￥ ${formData.assistantServiceFeeStr}`
-              : ""
+              : ''
           }}
         </el-form-item>
         <el-form-item
@@ -655,9 +655,36 @@
           <upload-img
             ref="imgComponent"
             :is-disable="editorType == 2"
-            :img-list="formData.illnessImageUrls"
+            :img-list="
+              formData.illnessImageUrls.filter((i) => {
+                i && !i.url.includes('.pdf');
+              })
+            "
           />
         </el-form-item>
+        <el-form-item label="检测报告">
+          <div
+            v-for="item in formData.illnessPdfUrls"
+            :key="item.name"
+            class="pdf-wrap"
+            @click="openPdf(item)"
+          >
+            <div class="left">
+              <img src="../../../assets/image/pdf@2x.png">
+            </div>
+            <div class="right">
+              <div>
+                <p class="bold">
+                  {{ item.name }}
+                </p>
+                <p>{{ (item.size / 1024).toFixed(2) }}k</p>
+              </div>
+              <div>
+                查看详情 <i class="el-icon-arrow-right el-icon--right" />
+              </div>
+            </div>
+          </div>
+        </el-form-item>
         <el-form-item
           label="诊断建议"
           prop="diagnoseAdvice"
@@ -685,13 +712,13 @@
             >
               {{
                 diagnoseLogId +
-                  "_" +
+                  '_' +
                   item.name +
-                  "_" +
+                  '_' +
                   formData.doctorName +
-                  "_" +
+                  '_' +
                   formData.doctorDepartment +
-                  ".mp4"
+                  '.mp4'
               }}
             </el-link>
           </el-form-item>
@@ -921,7 +948,7 @@
         align="center"
       >
         <el-button @click="cancle">
-          {{ editorType == 1 ? "取消" : "返回" }}
+          {{ editorType == 1 ? '取消' : '返回' }}
         </el-button>
         <el-button
           v-if="editorType == 1"
@@ -950,7 +977,12 @@
     FOLLW_LIST,
   } from '@/utils/constants';
   import { getBirth } from '@/utils/index';
-  import { getAdminDiagnose, getDoctorList, getDiagnoseLog, diagnoseUpdate } from '@/api/diagnosis';
+  import {
+    getAdminDiagnose,
+    getDoctorList,
+    getDiagnoseLog,
+    diagnoseUpdate,
+  } from '@/api/diagnosis';
 
   const PAY_TYPE = {
     1: '自动付款',
@@ -1199,6 +1231,12 @@
       getAssistantPayType() {
         return PAY_TYPE[this.formData.assistantPayType];
       },
+      illnessImageUrls() {
+        const m = this.formData.illnessImageUrls.filter((i) => {
+          console.log('---', i);
+        });
+        return m;
+      },
     },
     created() {
       this.editorType = this.$route.query.editorType;
@@ -1227,6 +1265,10 @@
                   this.formData.illnessImageUrls
                 );
               }
+              console.log(
+                'this.formData.illnessImageUrls',
+                this.formData.illnessImageUrls
+              );
               if (!this.formData.illnessAudioUrls) {
                 this.formData.illnessAudioUrls = [];
               } else {
@@ -1257,7 +1299,7 @@
       getDoctorList() {
         this.loading = true;
         getDoctorList({
-          diagnoseType:this.formData.diagnoseType
+          diagnoseType: this.formData.diagnoseType,
         })
           .then((res) => {
             this.loading = false;
@@ -1274,7 +1316,7 @@
       },
       queryOperationLogs() {
         getDiagnoseLog({
-          id:this.diagnoseLogId
+          id: this.diagnoseLogId,
         })
           .then((res) => {
             if (res.code == '000000') {
@@ -1388,7 +1430,6 @@
               this.btnDisable = false;
               this.loading = false;
             });
-
         });
       },
       // 格式话音频/视频数组
@@ -1399,7 +1440,9 @@
         });
         return newArr;
       },
-
+      openPdf(item) {
+        window.open(item.url);
+      },
     },
   };
 </script>
@@ -1441,5 +1484,39 @@
     padding: 40px 0 60px;
     margin: 0 auto;
   }
+  .pdf-wrap {
+    display: flex;
+    align-items: center;
+    width: 693px;
+    height: 68px;
+    background: #f5f6f8;
+    border-radius: 12px;
+    padding: 16px;
+    margin-top: 10px;
+    .left {
+      width: 38px;
+      height: 38px;
+      img {
+        width: 100%;
+        height: 100%;
+      }
+    }
+    .right {
+      height: 38px;
+      width: 100%;
+      justify-content: space-between;
+      margin-left: 10px;
+      display: flex;
+      align-items: center;
+      color: #aaaaaa;
+      font-size: 14px;
+      .bold {
+        color: #1a1a1a;
+      }
+      p {
+        line-height: 1.5;
+      }
+    }
+  }
 }
 </style>

vue.config.js

@@ -71,7 +71,7 @@ module.exports = {
     port: 8080,
     proxy: {
       '/proxy': {
-        target: 'https://dev-sc.yunqueyi.com/',
+        target: 'https://test1-sc.yunqueyi.com/',
         ws: false,
         changeOrigin: true,
         secure: true,