Merge remote-tracking branch 'origin/master'

xiangpei

2024-07-19 4e4e3042f9240816d49332f19ca85a68cb89c2e4

Merge remote-tracking branch 'origin/master'

 src/layout/components/Navbar.vue

@@ -39,13 +39,13 @@

    </div>
    <div class="button-container">
      <el-button type="primary" @click="toScreen">可视化大屏</el-button>
      <el-button type="primary" @click="toScreen" size="small">可视化大屏</el-button>
    </div>
    <div class="button-container">
      <el-button type="primary" @click="toSystemB">跳转B系统</el-button>
      <el-button type="primary" @click="toSystemB" size="small">跳转B系统</el-button>
    </div>
    <div class="button-container">
      <el-button type="primary" @click="toSystemA">跳转A系统</el-button>
      <el-button type="primary" @click="toSystemA" size="small">跳转A系统</el-button>
    </div>
  </div>
</template>

 src/views/screen/components/select-item/index.vue

@@ -1,20 +1,20 @@
<template>
  <div class="select-container">
    <div class="tabs-box">
      <el-tabs v-model="activeName" @tab-click="handleClick">
      <el-button v-for="item in testData1" class="transparent-button">{{ item.name }} </el-button>
      <!-- <el-tabs v-model="activeName" @tab-click="handleClick">
        <el-tab-pane
          v-for="item in testData1"
          :label="item.name"
          :name="item.value"
        ></el-tab-pane>
      </el-tabs>
      </el-tabs> -->
      <!-- <div>
        <el-button>

        </el-button>
      </div> -->
    </div>

    <!-- <div class="type-select">
      <div class="select-label">数据源</div>
      <el-select
@@ -127,7 +127,7 @@
<style lang="scss" scoped>
.select-container {
  position: absolute;
  top: 0px;
  top: 10px;
  left: 20px;
  display: flex;
  align-items: center;
@@ -189,4 +189,10 @@
::v-deep .date-select .el-date-editor .el-range-separator {
  color: #4481dd !important;
}
.transparent-button {
  background-color: transparent;
  border-color: #23f0ed;
  color: #0d6adb; /* 这里设置按钮文字颜色 */
  
}
</style>

 src/views/system/check/result/detail/detail.vue

@@ -399,7 +399,7 @@
    /** 修改按钮操作 */
    handleRuleUpdate(row) {
      this.reset("ruleForm");
      this.ruleForm = row;
      this.ruleForm = JSON.parse(JSON.stringify(row));
      this.ruleOpen = true;
      this.title = "修改考核规则";
    },

 src/views/system/contract/contract-result/index.vue

@@ -221,7 +221,7 @@
          width="180px"
        >
        </el-table-column>
        <el-table-column prop="num" label="指标"> </el-table-column>
        <el-table-column prop="num" label="量值"> </el-table-column>
        <el-table-column prop="score" label="扣分"> </el-table-column>
      </el-table>
    </el-dialog>