cornerstone版本升级

package.json

@@ -15,18 +15,16 @@
   },
   "dependencies": {
     "@aws-sdk/client-s3": "^3.701.0",
-    "@cornerstonejs/adapters": "^2.19.7",
     "@cornerstonejs/calculate-suv": "^1.1.0",
-    "@cornerstonejs/core": "^2.19.7",
+    "@cornerstonejs/core": "^4.19.2",
-    "@cornerstonejs/dicom-image-loader": "^2.19.7",
+    "@cornerstonejs/dicom-image-loader": "^4.19.2",
-    "@cornerstonejs/tools": "^2.19.7",
+    "@cornerstonejs/tools": "^4.19.2",
     "@fingerprintjs/fingerprintjs": "^4.6.2",
     "@icr/polyseg-wasm": "^0.4.0",
     "@microsoft/signalr": "^8.0.7",
     "@riophae/vue-treeselect": "^0.4.0",
     "@vue-office/docx": "^1.6.2",
     "@vue-office/excel": "^1.7.11",
-    "@vue/composition-api": "^1.7.2",
     "ali-oss": "^6.17.1",
     "axios": "^0.18.1",
     "core-js": "^3.8.3",
@@ -60,11 +58,10 @@
     "screenfull": "^6.0.2",
     "sortablejs": "^1.15.5",
     "streamsaver": "^2.0.6",
-    "svg-sprite-loader": "^4.1.3",
     "svgo": "^1.2.2",
     "v-viewer": "^1.7.4",
     "vcrontab": "^0.3.5",
-    "vue": "^2.6.14",
+    "vue": "2.7.16",
     "vue-clipboard2": "^0.3.3",
     "vue-contextmenujs": "^1.4.11",
     "vue-count-to": "^1.0.13",
@@ -98,9 +95,10 @@
     "path-browserify": "^1.0.1",
     "process": "^0.11.10",
     "sass": "^1.63.2",
-    "sass-loader": "^10.4.1",
+    "sass-loader": "^16.0.7",
+    "svg-sprite-loader": "^6.0.11",
     "terser-webpack-plugin": "^5.3.10",
-    "vue-template-compiler": "^2.6.14",
+    "vue-template-compiler": "2.7.16",
     "webpack": "^5.96.1",
     "webpack-bundle-analyzer": "^4.10.2"
   },

src/components/TrialsTab/index.vue

@@ -74,10 +74,11 @@ export default {
       zzSessionStorage.setItem('lastWorkbench', `${v.path}${query ? '?' : ''}${query}`)
       var firstGoIn = this.trialsRouter.children.find(v => { return v.name === 'TrialsPanel' }).children[0]
       if (this.trialsTab === '/trials/trials-panel') {
-        this.$router.replace({ path: `${firstGoIn.path}${query ? '?' : ''}${query}` })
+        var targetPath = firstGoIn.path
         if (firstGoIn.children && firstGoIn.children.length > 0) {
-          this.$router.replace({ path: `${firstGoIn.children[0].path}${query ? '?' : ''}${query}` })
+          targetPath = firstGoIn.children[0].path
         }
+        this.$router.replace({ path: `${targetPath}${query ? '?' : ''}${query}` })
       }
       // document.cookie = 'TrialId=' + this.$route.query.trialId + ';path=/'
     },
@@ -112,10 +113,11 @@ export default {
     this.getTrialList()
     var firstGoIn = this.trialsRouter.children.find(v => { return v.name === 'TrialsPanel' }).children[0]
     if (this.trialsTab === '/trials/trials-panel') {
-      this.$router.replace({ path: `${firstGoIn.path}${query ? '?' : ''}${query}` })
+      var targetPath = firstGoIn.path
       if (firstGoIn.children && firstGoIn.children.length > 0) {
-        this.$router.replace({ path: `${firstGoIn.children[0].path}${query ? '?' : ''}${query}` })
+        targetPath = firstGoIn.children[0].path
       }
+      this.$router.replace({ path: `${targetPath}${query ? '?' : ''}${query}` })
     }
   },
   methods: {
@@ -201,15 +203,19 @@ export default {
         if (~url.indexOf('?')) {
           query = url.split('?')[1]
         }
+        var trialsPanelList = this.trialsRouter.children.find(item => { return item.name === 'TrialsPanel' }).children
+        var currentRoute = trialsPanelList.find(c => { return c.path === v.name })
+
+        if (currentRoute && currentRoute.tabHiddn) {
           this.$router.push({ path: `${v.name}${query ? '?' : ''}${query}` })
-        var trialsPanelList = this.trialsRouter.children.find(v => { return v.name === 'TrialsPanel' }).children
-        var isHasChild = trialsPanelList.find(c => { return c.path === v.name }) && trialsPanelList.find(c => { return c.path === v.name }).children
-        if (trialsPanelList.find(c => { return c.path === v.name }) && trialsPanelList.find(c => { return c.path === v.name }).tabHiddn) {
           return
         }
+        var isHasChild = currentRoute && currentRoute.children
         if (isHasChild && isHasChild.length > 0) {
           this.trialsTabChild = isHasChild[0].path
           this.$router.push({ path: `${this.trialsTabChild}${query ? '?' : ''}${query}` })
+        } else {
+          this.$router.push({ path: `${v.name}${query ? '?' : ''}${query}` })
         }
       } catch (e) {
         console.log(e)

src/layout/index.vue

@@ -56,8 +56,10 @@ export default {
 </script>
 
 <style lang="scss" scoped>
-@import "~@/styles/mixin.scss";
+@use "@/styles/mixin.scss" as *;
-@import "~@/styles/variables.module.scss";
+@use "@/styles/variables.module.scss" as *;
+// @import "~@/styles/mixin.scss";
+// @import "~@/styles/variables.module.scss";
 
 .app-wrapper {
   @include clearfix;

src/styles/index.scss

@@ -1,15 +1,16 @@
-@import "./variables.module.scss";
+@use "./variables.module.scss";
-@import "./mixin.scss";
+@use "./mixin.scss";
-@import "./transition.scss";
+@use "./transition.scss";
-@import "./element-ui.scss";
+@use "./element-ui.scss";
-@import "./sidebar.scss";
+@use "./sidebar.scss";
 
 body {
   height: 100%;
   -moz-osx-font-smoothing: grayscale;
   -webkit-font-smoothing: antialiased;
   text-rendering: optimizeLegibility;
-  font-family: "Helvetica Neue", Helvetica, "PingFang SC", "Hiragino Sans GB", "Microsoft YaHei", "微软雅黑", Arial, sans-serif;
+  font-family: "Helvetica Neue", Helvetica, "PingFang SC", "Hiragino Sans GB",
+    "Microsoft YaHei", "微软雅黑", Arial, sans-serif;
   // font-family:"Helvetica Neue", Helvetica, Arial, sans-serif;
   // font-family: -apple-system, BlinkMacSystemFont, "Segoe UI", "PingFang SC",
   //   "Hiragino Sans GB", "Microsoft YaHei", "Helvetica Neue", Helvetica, Arial,
@@ -205,133 +206,139 @@ body .el-table th.gutter {
 .el-descriptions {
   box-sizing: border-box;
   font-size: 14px;
-  color: #303133
+  color: #303133;
 }
 
 .el-descriptions__header {
   display: flex;
   justify-content: space-between;
   align-items: center;
-  margin-bottom: 20px
+  margin-bottom: 20px;
 }
 
 .el-descriptions__title {
   font-size: 16px;
-  font-weight: 700
+  font-weight: 700;
 }
 
 .el-descriptions__body {
   color: #606266;
-  background-color: #fff
+  background-color: #fff;
 }
 
 .el-descriptions__body .el-descriptions__table {
   border-collapse: collapse;
   width: 100%;
-  table-layout: fixed
+  table-layout: fixed;
 }
 
 .el-descriptions__body .el-descriptions__table .el-descriptions-item__cell {
   box-sizing: border-box;
   text-align: left;
   font-weight: 400;
-  line-height: 1.5
+  line-height: 1.5;
 }
 
-.el-descriptions__body .el-descriptions__table .el-descriptions-item__cell.is-left {
+.el-descriptions__body
-  text-align: left
+  .el-descriptions__table
+  .el-descriptions-item__cell.is-left {
+  text-align: left;
 }
 
-.el-descriptions__body .el-descriptions__table .el-descriptions-item__cell.is-center {
+.el-descriptions__body
-  text-align: center
+  .el-descriptions__table
+  .el-descriptions-item__cell.is-center {
+  text-align: center;
 }
 
-.el-descriptions__body .el-descriptions__table .el-descriptions-item__cell.is-right {
+.el-descriptions__body
-  text-align: right
+  .el-descriptions__table
+  .el-descriptions-item__cell.is-right {
+  text-align: right;
 }
 
 .el-descriptions .is-bordered {
-  table-layout: auto
+  table-layout: auto;
 }
 
 .el-descriptions .is-bordered .el-descriptions-item__cell {
   border: 1px solid #ebeef5;
-  padding: 12px 10px
+  padding: 12px 10px;
 }
 
 .el-descriptions :not(.is-bordered) .el-descriptions-item__cell {
-  padding-bottom: 12px
+  padding-bottom: 12px;
 }
 
 .el-descriptions--medium.is-bordered .el-descriptions-item__cell {
-  padding: 10px
+  padding: 10px;
 }
 
 .el-descriptions--medium:not(.is-bordered) .el-descriptions-item__cell {
-  padding-bottom: 10px
+  padding-bottom: 10px;
 }
 
 .el-descriptions--small {
-  font-size: 12px
+  font-size: 12px;
 }
 
 .el-descriptions--small.is-bordered .el-descriptions-item__cell {
-  padding: 8px 10px
+  padding: 8px 10px;
 }
 
 .el-descriptions--small:not(.is-bordered) .el-descriptions-item__cell {
-  padding-bottom: 8px
+  padding-bottom: 8px;
 }
 
 .el-descriptions--mini {
-  font-size: 12px
+  font-size: 12px;
 }
 
 .el-descriptions--mini.is-bordered .el-descriptions-item__cell {
-  padding: 6px 10px
+  padding: 6px 10px;
 }
 
 .el-descriptions--mini:not(.is-bordered) .el-descriptions-item__cell {
-  padding-bottom: 6px
+  padding-bottom: 6px;
 }
 
 .el-descriptions-item {
-  vertical-align: top
+  vertical-align: top;
 }
 
 .el-descriptions-item__container {
-  display: flex
+  display: flex;
 }
 
 .el-descriptions-item__container .el-descriptions-item__content,
 .el-descriptions-item__container .el-descriptions-item__label {
   display: inline-flex;
-  align-items: baseline
+  align-items: baseline;
 }
 
 .el-descriptions-item__container .el-descriptions-item__content {
-  flex: 1
+  flex: 1;
 }
 
 .el-descriptions-item__label.has-colon:after {
   content: ":";
   position: relative;
-  top: -.5px
+  top: -0.5px;
 }
 
 .el-descriptions-item__label.is-bordered-label {
   font-weight: 700;
   color: #909399;
-  background: #fafafa
+  background: #fafafa;
 }
 
 .el-descriptions-item__label:not(.is-bordered-label) {
-  margin-right: 10px
+  margin-right: 10px;
 }
 
 .el-descriptions-item__content {
   word-break: break-word;
-  overflow-wrap: break-word
+  overflow-wrap: break-word;
 }
 
 .feedBack-box {
@@ -350,7 +357,7 @@ body .el-table th.gutter {
   top: 0;
   width: 100%;
   height: 100%;
-  opacity: .5;
+  opacity: 0.5;
   background: #000;
   z-index: 3999;
 }

src/views/dicom-show/dicom-study.vue

@@ -965,8 +965,8 @@ export default {
 }
 </script>
 
-<style lang="scss" scoped>
+<style lang="scss">
-.imageBox {
+.viewerContainer .imageBox {
   position: relative;
 
   i {

src/views/dicom-show/dicom-visit.vue

@@ -158,8 +158,7 @@
                 <div class="viewerSidethumbinner">
 
                   <el-collapse v-model="relationActiveName" @change="handelRelationActiveChange">
-                    <template v-for="item in relationStudyListByVisitName">
+                    <div v-for="item in relationStudyListByVisitName" :key="`${item.VisitName}`">
-                      <div :key="`${item.VisitName}`">
                       <div v-show="item.VisitName" class="text-desc" style="background-color: #1f1f1f;">
                         {{ item.VisitName }}
                       </div>
@@ -258,8 +257,6 @@
                       </template>
 
                     </div>
-                    </template>
-
                   </el-collapse>
 
                 </div>
@@ -1012,7 +1009,7 @@ export default {
 </script>
 
 <style lang="scss">
-.imageBox {
+.viewerContainer .imageBox {
   position: relative;
 
   i {

src/views/trials/trials-layout/index.vue

@@ -28,8 +28,10 @@ export default {
 </script>
 
 <style lang="scss" scoped>
-@import "~@/styles/mixin.scss";
+// @import "~@/styles/mixin.scss";
-@import "~@/styles/variables.module.scss";
+// @import "~@/styles/variables.module.scss";
+@use "@/styles/mixin.scss" as *;
+@use "@/styles/variables.module.scss" as *;
 
 .trials-wrapper {
   @include clearfix;

src/views/trials/trials-panel/reading/dicoms3D/components/ReadPage.vue

@@ -3942,61 +3942,6 @@ export default {
     }
   }
 
-  ::v-deep .manuals-dialog-container {
-    margin-top: 50px !important;
-    width: 75%;
-    height: 80%;
-
-    .el-dialog__body {
-      padding: 10px;
-      height: calc(100% - 50px) !important;
-    }
-
-    .el-dialog__header {
-      position: relative;
-    }
-  }
-
-  ::v-deep .manuals-full-dialog-container {
-    .el-dialog__body {
-      padding: 10px;
-      height: calc(100% - 50px) !important;
-    }
-
-    .el-dialog__header {
-      position: relative;
-    }
-  }
-
-  ::v-deep .cd-dialog-container {
-    background: #fff !important;
-    margin-top: 50px !important;
-    width: 75%;
-    height: 80%;
-
-    .el-dialog__body {
-      padding: 20px 20px 0 20px;
-      height: calc(100% - 70px);
-    }
-
-    .el-dialog__header {
-      position: relative;
-    }
-  }
-
-  ::v-deep .cd-full-dialog-container {
-    background: #fff !important;
-
-    .el-dialog__body {
-      padding: 10px;
-      height: calc(100% - 50px) !important;
-    }
-
-    .el-dialog__header {
-      position: relative;
-    }
-  }
-
   ::v-deep .el-dropdown-menu {
     .el-dropdown-menu__item {
       padding: 0 5px;
@@ -4039,3 +3984,60 @@ export default {
   }
 }
 </style>
+
+<style lang="scss">
+.manuals-dialog-container {
+  margin-top: 50px !important;
+  width: 75%;
+  height: 80%;
+
+  .el-dialog__body {
+    padding: 10px;
+    height: calc(100% - 50px) !important;
+  }
+
+  .el-dialog__header {
+    position: relative;
+  }
+}
+
+.manuals-full-dialog-container {
+  .el-dialog__body {
+    padding: 10px;
+    height: calc(100% - 50px) !important;
+  }
+
+  .el-dialog__header {
+    position: relative;
+  }
+}
+
+.cd-dialog-container {
+  background: #fff !important;
+  margin-top: 50px !important;
+  width: 75%;
+  height: 80%;
+
+  .el-dialog__body {
+    padding: 20px 20px 0 20px;
+    height: calc(100% - 70px);
+  }
+
+  .el-dialog__header {
+    position: relative;
+  }
+}
+
+.cd-full-dialog-container {
+  background: #fff !important;
+
+  .el-dialog__body {
+    padding: 10px;
+    height: calc(100% - 50px) !important;
+  }
+
+  .el-dialog__header {
+    position: relative;
+  }
+}
+</style>