Merge remote-tracking branch 'origin/master'

fuliqi

2024-09-04 fbedd467c8ea2d4ae7c31d4eab1090bf17617b0d

Merge remote-tracking branch 'origin/master'

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

@@ -6,7 +6,6 @@
      size="small"
      :inline="true"
      v-show="showSearch"
      label-width="100px"
    >
      <el-form-item label="考核对象" prop="unitId">
        <el-select
@@ -100,7 +99,7 @@
      ></right-toolbar> -->
    </el-row>

    <el-row v-loading="loading">
    <el-row v-if="checkResultList && checkResultList.length > 0" v-loading="loading">
      <el-col
        :xl="8"
        :lg="8"
@@ -151,6 +150,7 @@
        </el-card>
      </el-col>
    </el-row>
    <el-empty v-else description="暂无数据"></el-empty>

    <pagination
      v-show="total > 0"

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

@@ -37,7 +37,7 @@
        >
      </el-col>
    </el-row>
    <el-row v-loading="loading" :gutter="20">
    <el-row v-if="contractList && contractList.length > 0" v-loading="loading" :gutter="20">
      <el-col
        :span="8"
        v-for="(item, index) in contractList"
@@ -68,6 +68,7 @@
        </el-card>
      </el-col>
    </el-row>
    <el-empty v-else description="暂无数据"></el-empty>

    <!-- 合同详情 -->
    <el-dialog
@@ -79,13 +80,13 @@
      <el-form label-position="left" inline class="table-expand">
        <el-collapse v-model="activeNames">
          <el-collapse-item
            v-for="name, index in ruleName"
            v-for="(name, index) in ruleName"
            :key="index"
            :title="name"
          >
            <div
              class="inline-input-container"
              v-for="item, index in ruleData"
              v-for="(item, index) in ruleData"
              :key="index"
            >
              <el-tooltip :content="

 src/views/system/contract/report/index.vue

@@ -13,7 +13,7 @@
      </el-col>
      <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
    </el-row> -->

    <div v-if="checkResultList && checkResultList.length > 0">
    <el-card class="box-card" v-for="item in checkResultList" :key="item.id">
      <div slot="header" class="clearfix">
        <span>{{ item.unitName }}</span>
@@ -30,6 +30,8 @@
      <el-button size="small" round style="float: right;margin-bottom: 18px;" @click="handlePublish(item)" v-if="item.status === 'not_publish'" :disabled="!item.canPublish" v-hasPermi="['system:calculate:report:status']">确认发布</el-button>
      <el-button size="small" round style="float: right;margin-bottom: 18px;" @click="handlePublish(item)" v-if="item.status === 'published'" v-hasPermi="['system:calculate:report:status']">取消发布</el-button>
    </el-card>
    </div>
    <el-empty v-else description="暂无数据"></el-empty>

    <pagination
      v-show="total>0"

 src/views/system/data-manage/data-detail/list.js

@@ -4323,7 +4323,18 @@
        {
          icon: 'el-icon-truck',
          dataList: [

            {
              label: 'IP异常数'
            },
            {
              label: 'MAC地址异常数'
            },
            {
              label: '经度异常数'
            },
            {
              label: '纬度异常数'
            },
          ]
        }
      ],