[viewer]解决合并冲突

Jin Lei

2023-11-11 076cd08a4abcae33957e4de5b15babfcb6fed8ce

 src/components/menu/tools/analysis.vue

@@ -63,7 +63,7 @@
        </el-tooltip>
      </div>

      <div class="analysisTool" @click="hcqfx">
      <!-- <div class="analysisTool" @click="hcqfx">
        <el-tooltip
          class="item"
          effect="dark"
@@ -75,7 +75,7 @@
            <img src="@/assets/img/left/kjfx/hcqfx.png" />
          </el-button>
        </el-tooltip>
      </div>
      </div> -->
      <div class="analysisTool" @click="pqfx('x')">
        <el-tooltip
          class="item"
@@ -140,17 +140,17 @@
  /* border-radius: 30px; */
  box-shadow: 0px 0px 10px rgba(101, 180, 253, 0.8) inset;
  background-color: rgba(5, 39, 126, 0.7);
  border-image-source: radial-gradient(
  /* border-image-source: radial-gradient(
    52% 120%,
    transparent 0px,
    transparent 100%,
    cyan 100%
  );
  ); */
  border-image-slice: 1;
  border-width: 1px;
  border-style: solid;
  border-image-outset: 0;
  width: 450px;
  width: 350px;
}
.analysisList {
  background: transparent;