Merge branch 'master' into dev-threejs

ZhangXianQiang

2024-04-29 44d9a94ceafae734add7d09628fd2ac132f0ee83

 src/views/system/calculate/order/index.vue

@@ -10,18 +10,6 @@
          @keyup.enter.native="handleQuery"
        />
      </el-form-item>
      <el-form-item label="考核频率" prop="frequency">
        <el-select v-model="queryParams.frequency" clearable @clear="handleQuery" placeholder="考核频率">
          <el-option
            label="月度考核"
            value="1">
          </el-option>
          <el-option
            label="季度考核"
            value="2">
          </el-option>
        </el-select>
      </el-form-item>
      <el-form-item label="考核时间">
        <el-date-picker
          v-model="daterangeCheckTime"
@@ -74,15 +62,13 @@
      <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
    </el-row>

    <el-card class="box-card" v-for="(item) in checkResultList">
    <el-card class="box-card" v-for="item in checkResultList" :key="item.id">
      <div slot="header" class="clearfix">
        <span>{{ checkUnitName }}</span>
        <span>{{ item.contractName }}</span>
        <el-button style="float: right; padding: 3px 6px" type="text" @click="handleDetail(item)">详情</el-button>
        <el-button style="float: right; padding: 3px 0" type="text" @click="handleDetail(item)">打分</el-button>
      </div>
      <div class="text item">考核<span class="time">{{ examineName }}</span></div>
      <div class="text item">考核频率<span class="time">{{ "季度考核" }}</span></div>
      <div class="text item">考核分数<span class="time">{{ item.checkScore }}</span></div>
      <div class="text item">考核<span class="time">{{ item.unitName }}</span></div>
      <div class="text item">考核分数<span class="time">{{ item.score }}</span></div>
      <div class="text item">考核时间
        <span class="time">{{ item.checkTime }}</span>
        <el-button size="small" round style="float: right;" @click="handlePublish(item)" v-show="item.publish != 1"  v-hasPermi="['result:contract:publish']">确认发布</el-button>
@@ -90,37 +76,6 @@
      </div>
    </el-card>

    <!-- <el-table v-loading="loading" :data="checkResultList" @selection-change="handleSelectionChange">
      <el-table-column type="selection" width="55" align="center" />
      <el-table-column label="考核对象" align="center" prop="checkUnitName" />
      <el-table-column label="考核" align="center" prop="examineName" />
      <el-table-column label="考核范围":formatter="examineRangeFormatter" align="center" prop="examineRange" />
      <el-table-column label="考核频率" :formatter="frequencyFormatter" align="center" prop="frequency" />
      <el-table-column label="考核分数" falign="center" prop="checkScore" />
      <el-table-column label="考核时间" align="center" prop="checkTime" />
      <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
        <template slot-scope="scope">
          <el-button
            size="mini"
            type="text"
            icon="el-icon-view"
            @click="handleDetail(scope.row)"
          >详情</el-button>
         <el-button
           type="text"
           size="mini"
           icon="el-icon-edit"
           @click="handleSetManualScore(scope.row)"
         >人工打分</el-button>
          <el-button
            size="mini"
            type="text"
            icon="el-icon-delete"
            @click="handleDelete(scope.row)"
          >删除</el-button>
        </template>
      </el-table-column>
    </el-table>

    <pagination
      v-show="total>0"
@@ -128,7 +83,7 @@
      :page.sync="queryParams.pageNum"
      :limit.sync="queryParams.pageSize"
      @pagination="getList"
    /> -->
    />

    <el-dialog :title="manualScoreTitle" :visible.sync="manualScoreOpen" width="500px" append-to-body>
      <el-input v-model="manualScoreForm.manualScore" type="number" placeholder="请为该单位打分"/>
@@ -140,36 +95,26 @@

    <el-dialog :title="detailTitle" :visible.sync="detailOpen" width="700px" append-to-body>
      <el-descriptions class="margin-top" :column="3" border>
<!--        <template slot="extra">-->
<!--          <el-button type="primary" size="small">操作</el-button>-->
<!--        </template>-->
        <el-descriptions-item>
          <template slot="label">
            <i class="el-icon-user"></i>
            考核对象
          </template>
          {{checkUnitName}}
          {{detail.unitName}}
        </el-descriptions-item>
        <el-descriptions-item>
          <template slot="label">
            <i class="el-icon-s-management"></i>
            考核名称
            合同名称
          </template>
          {{examineName}}
        </el-descriptions-item>
        <el-descriptions-item>
          <template slot="label">
            <i class="el-icon-timer"></i>
            考核频率
          </template>
          <el-tag size="small">{{detail.frequency === 1 ? '月度考核' : '季度考核'}}</el-tag>
          {{detail.contractName}}
        </el-descriptions-item>
        <el-descriptions-item>
          <template slot="label">
            <i class="el-icon-medal"></i>
            综合分数
          </template>
          <el-tag type="danger" size="small">{{detail.checkScore}}</el-tag>
          <el-tag type="danger" size="small">{{detail.score}}</el-tag>
        </el-descriptions-item>
      </el-descriptions>
        <el-table
@@ -217,8 +162,6 @@
      detail:{

      },
      checkUnitName: '成都x运维',
      examineName: '成都x运维考核',
      tableData: [{
        name: '视频平均在线率',
        content: '97%',
@@ -461,6 +404,6 @@
    clear: both
  }
  .box-card {
    width: 480px;
    width: 350px;
  }
</style>