影像打包

src/api/trials/visit.js

@@ -298,10 +298,11 @@ export function getPatientSubejctVisitList(param) {
 }
 
 // 下载影像
-export function getSubjectImageZipInfo(id, id2) {
+export function requestPackageAndAnonymizImage(params) {
   return request({
-    url: `/Patient/getSubjectImageZipInfo/${id}/${id2}`,
+    url: `/Patient/requestPackageAndAnonymizImage`,
-    method: 'get',
+    method: 'post',
+    params
   })
 }
 

src/utils/uploadZip.js

@@ -3,20 +3,41 @@ import axios from "axios";
 import { saveAs } from "file-saver";
 import Vue from 'vue';
 import {
-    getSubjectImageZipInfo,
+    requestPackageAndAnonymizImage,
 } from "@/api/trials/visit.js";
-let flag = false;
+let flag = {};
 export const downloadImage = async (id, id2) => {
-    if (flag) return
+    if (flag[id2]) return
-    flag = true
+    flag[id2] = true
     try {
-        let res = await getSubjectImageZipInfo(id, id2);
+        let params = {
+            TrialId: id,
+            SubjectVisitId: id2
+        }
+        let res = await requestPackageAndAnonymizImage(params);
         if (res.IsSuccess) {
-            let item = res.Result;
+            if (!res.Result) {
-            await setfolder(item);
+                Vue.prototype.$message.warning(Vue.prototype.$t("trials:upload:message:not"))
+                return 1;
+            }
+            let a = document.createElement("a");
+            let href = Vue.prototype.OSSclientConfig.basePath + res.Result;
+            let fileName =
+                res.Result.split("/")[res.Result.split("/").length - 1];
+            a.download = fileName;
+            a.href = href;
+            a.click();
+            URL.revokeObjectURL(href);
+            this.$nextTick(() => {
+                a = null;
+                href = null;
+            });
+            return 2;
+        } else {
+            return false;
         }
     } catch (err) {
-        flag = false;
+        flag[id2] = false;
         console.log(err);
     }
 };
@@ -78,11 +99,11 @@ const setfolder = async (item) => {
                 })
                 .then((res) => {
                     saveAs(res, zipName + ".zip"); // 使用FileSaver.saveAs保存文件，文件名可自定义
-                    flag = false;
+                    flag[id2] = false;
                     zipObj = null;
                 });
         })
-        .catch((reason) => { flag = false; });
+        .catch((reason) => { flag[id2] = false; });
 };
 const handleBatchDown = async (item, zip) => {
     return new Promise((resolve) => {

src/views/forgetpassword/index.vue

@@ -12,13 +12,6 @@
         class="demo-ruleForm"
         size="small"
       >
-        <!-- 用户类型 -->
-        <el-form-item
-          v-if="form.UserId"
-          :label="$t('passwordReset:form:userType')"
-        >
-          <el-input v-model="form.UserType" disabled />
-        </el-form-item>
         <!-- 邮箱 -->
         <el-form-item
           :label="$t('passwordReset:form:email')"
@@ -105,6 +98,9 @@
               {{ $t("passwordReset:button:verify") }}
             </el-button>
           </el-col>
+          <span v-if="isVerify" style="float: left">{{
+            $t("passwordReset:tip:verifySuccess")
+          }}</span>
         </el-form-item>
         <!-- 用户名 -->
         <el-form-item :label="$t('passwordReset:form:userName')" prop="UserId">
@@ -128,6 +124,13 @@
             </el-option>
           </el-select>
         </el-form-item>
+        <!-- 用户类型 -->
+        <el-form-item
+          v-if="form.UserId"
+          :label="$t('passwordReset:form:userType')"
+        >
+          <el-input v-model="form.UserType" disabled />
+        </el-form-item>
         <!-- 新密码 -->
         <el-form-item
           class="my_new_pwd"
@@ -138,7 +141,7 @@
           <el-input v-model="form.NewPwd" show-password autocomplete="off" />
           <span style="position: absolute; right: -30px">
             <el-tooltip
-              :content="$t('passwordReset:form:passwordCentent')"
+              :content="$t('passwordReset:form:passwordtip')"
               placement="top"
             >
               <i class="el-icon-question" />
@@ -341,6 +344,8 @@ export default {
         .catch(() => {
           this.formLoading = false;
           this.isVerify = false;
+          this.users = [];
+          this.form.UserId = null;
         });
     },
     handleEmailChange() {

src/views/trials/trials-myinfo/account.vue

@@ -200,6 +200,16 @@ export default {
     },
     async setNewUserName() {
       try {
+        let confirm = await this.$confirm(
+          this.$t("trials:trials-myInfo:confirmMessage:updateUserName"),
+          {
+            type: "warning",
+            distinguishCancelAndClose: true,
+            confirmButtonText: this.$t("common:button:confirm"),
+            cancelButtonText: this.$t("common:button:cancel"),
+          }
+        );
+        if (confirm !== "confirm") return;
         let res = await setNewUserName(this.userForm.UserName);
         if (res.IsSuccess) {
           this.userForm.UserName = "";
@@ -208,18 +218,6 @@ export default {
           );
           this.$emit("getUserInfo");
           removeToken();
-          let confirm = await this.$confirm(
-            this.$t("trials:trials-myInfo:confirmMessage:updateUserName"),
-            {
-              type: "warning",
-              showClose: false,
-              showCancelButton: false,
-              distinguishCancelAndClose: true,
-              confirmButtonText: this.$t("common:button:confirm"),
-              cancelButtonText: this.$t("common:button:cancel"),
-            }
-          );
-          if (confirm !== "confirm") return;
           this.logout();
         }
       } catch (err) {

src/views/trials/trials-myinfo/password.vue

@@ -114,6 +114,16 @@ export default {
           this.$alert(this.$t("passwordReset:formRule:passwordsDiffer"));
           return;
         }
+        let confirm = await this.$confirm(
+          this.$t("trials:trials-myInfo:confirmMessage:updatePassWord"),
+          {
+            type: "warning",
+            distinguishCancelAndClose: true,
+            confirmButtonText: this.$t("common:button:confirm"),
+            cancelButtonText: this.$t("common:button:cancel"),
+          }
+        );
+        if (confirm !== "confirm") return;
         const param = {
           UserId: this.userId,
           NewPassWord: md5(this.password.NewPassWord),
@@ -126,18 +136,6 @@ export default {
             this.$t("trials:trials-myinfo:message:modifyPWSuccessfully")
           );
           removeToken();
-          let confirm = await this.$confirm(
-            this.$t("trials:trials-myInfo:confirmMessage:updatePassWord"),
-            {
-              type: "warning",
-              showClose: false,
-              showCancelButton: false,
-              distinguishCancelAndClose: true,
-              confirmButtonText: this.$t("common:button:confirm"),
-              cancelButtonText: this.$t("common:button:cancel"),
-            }
-          );
-          if (confirm !== "confirm") return;
           this.logout();
         }
       } catch (err) {

src/views/trials/trials-panel/hirVisit/components/current-study.vue

@@ -38,6 +38,14 @@
           min-width="80"
           show-overflow-tooltip
         />
+        <!--检查描述-->
+        <el-table-column
+          align="center"
+          prop="Description"
+          :label="$t('trials:inspection:table:studyDescription')"
+          show-overflow-tooltip
+          min-width="100"
+        ></el-table-column>
         <!--检查类型-->
         <el-table-column
           align="center"

src/views/trials/trials-panel/hirVisit/components/studyInfo.vue

@@ -50,17 +50,14 @@
         prop="Modalities"
         :label="$t('trials:audit:table:modality1')"
       />
-      <!-- 检查部位 -->
+      <!--检查描述-->
       <el-table-column
-        prop="BodyPartForEdit"
+        align="center"
-        :label="$t('trials:uploadedDicoms:table:bodyPart')"
+        prop="Description"
-        min-width="100"
+        :label="$t('trials:inspection:table:studyDescription')"
         show-overflow-tooltip
-      >
+        min-width="100"
-        <template slot-scope="scope">
+      ></el-table-column>
-          {{ getBodyPart(scope.row.BodyPartForEdit) }}
-        </template>
-      </el-table-column>
       <!-- 序列数量 -->
       <el-table-column
         prop="SeriesCount"

src/views/trials/trials-panel/hirVisit/index.vue

@@ -212,6 +212,27 @@
             >
           </template>
         </el-table-column>
+        <!-- 打包状态 -->
+        <el-table-column
+          prop="PackState"
+          :label="$t('trials:hirVisit:table:PackState')"
+          show-overflow-tooltip
+          sortable="custom"
+        >
+          <template slot-scope="scope">
+            <el-tag
+              v-if="scope.row.SubmitState > 1"
+              :type="
+                Number(scope.row.PackState) === 0
+                  ? 'danger'
+                  : Number(scope.row.PackState) === 1
+                  ? 'warning'
+                  : 'success'
+              "
+              >{{ $fd("PackState", Number(scope.row.PackState)) }}</el-tag
+            >
+          </template>
+        </el-table-column>
         <!-- 提交时间 -->
         <el-table-column
           prop="SubmitTime"
@@ -481,7 +502,13 @@ export default {
     },
     // 下载影像
     async downloadImage(item) {
-      downloadImage(item.SubjectId, item.SubjectVisitId);
+      let res = await downloadImage(
+        this.$route.query.trialId,
+        item.SubjectVisitId
+      );
+      if (res) {
+        item.PackState = res;
+      }
     },
   },
 };

src/views/trials/trials-panel/reading/reading-tracking/index.vue

@@ -228,6 +228,26 @@
           show-overflow-tooltip
           sortable="custom"
         />
+        <!-- 打包状态 -->
+        <el-table-column
+          prop="PackState"
+          :label="$t('trials:hirVisit:table:PackState')"
+          show-overflow-tooltip
+          sortable="custom"
+        >
+          <template slot-scope="scope">
+            <el-tag
+              :type="
+                Number(scope.row.PackState) === 0
+                  ? 'danger'
+                  : Number(scope.row.PackState) === 1
+                  ? 'warning'
+                  : 'success'
+              "
+              >{{ $fd("PackState", Number(scope.row.PackState)) }}</el-tag
+            >
+          </template>
+        </el-table-column>
         <!-- 建议完成时间 -->
         <!-- <el-table-column
           prop="StudyCode"
@@ -460,7 +480,13 @@ export default {
     },
     // 下载影像
     async downloadImage(item) {
-      downloadImage(item.SubjectId, item.SourceSubjectVisitId);
+      let res = await downloadImage(
+        this.$route.query.trialId,
+        item.SourceSubjectVisitId
+      );
+      if (res) {
+        item.PackState = res;
+      }
     },
     // 阅片结果
     readResult(row) {