Browse Source

Merge branch 'master' of git.sagacloud.cn:web/ibms

zhangyu 5 years ago
parent
commit
8d022e14b3

+ 3 - 12
src/components/data_admin/selectTime.vue

@@ -118,13 +118,12 @@ export default {
       color: #409eff;
     }
     .picker_view {
-      display: flex;
       position: absolute;
-      width: 34rem;
+      width: 33rem;
       bottom: -4rem;
-      left: -18rem;
+      left: -16rem;
       height: 3rem;
-      // padding-top: 0.5rem;
+      padding-top: -0.5rem;
       box-sizing: border-box;
       z-index: 999;
       background-color: rgba(255, 255, 255, 1);
@@ -154,11 +153,3 @@ export default {
   }
 }
 </style>
-<style lang="less">
-.select_time{
-  .el-date-editor{
-    margin-top: 5px;
-  }
-}
-</style>
-

+ 1 - 1
src/components/ledger/handsontables/assets.vue

@@ -926,7 +926,7 @@ export default {
       let val = this.hot.colToProp(row.col);
       if (val == "caozuo") {
         window.open(`
-http://47.94.89.44:8058/asset?id=${infos.id}&pid=${this.projectId}`,"_blank")
+http://47.94.89.44:8058/asset?id=${infos.id}&pid=${this.projectId}&secret=${this.secret}`,"_blank")
         // this.iframeSrc =
         //   process.env.BASE_URL +
         //   ":8889/#/details?perjectId=" +

+ 1 - 1
src/components/ledger/handsontables/device.vue

@@ -1033,7 +1033,7 @@ export default {
       this.systemId = infos.id
       if (val == "caozuo") {
          window.open(`
-http://47.94.89.44:8058/spread?id=${infos.id}&pid=${this.projectId}`,"_blank")
+http://47.94.89.44:8058/spread?id=${infos.id}&pid=${this.projectId}&secret=${this.secret}`,"_blank")
         // this.iframeSrc =
         //   process.env.BASE_URL +
         //   ":8889/#/details?perjectId=" +

+ 1 - 1
src/components/ledger/handsontables/system.vue

@@ -826,7 +826,7 @@ export default {
       }
       if (val == "caozuo") {
          window.open(`
-http://47.94.89.44:8058/system?id=${infos.id}&pid=${this.projectId}`,"_blank")
+http://47.94.89.44:8058/system?id=${infos.id}&pid=${this.projectId}&secret=${this.secret}`,"_blank")
         // this.iframeSrc =
         //   process.env.BASE_URL +
         //   ":8889/#/details?perjectId=" +