Merge branch 'master' of http://42.193.1.25:9521/r/zgyw-ui

ZhangXianQiang

2024-04-10 ec91fe6cafe0934e75fe4c164de770c2981cf012

Merge branch 'master' of http://42.193.1.25:9521/r/zgyw-ui

 src/router/index.js

@@ -90,12 +90,7 @@
    component: Layout,
    hidden: true,
    children: [
      {
        path: 'detail',
        name: 'check-result-city',
        component: () => import('@/views/system/result/city/detail'),
        meta: { title: '市局考核结果详情', activeMenu: '/system/check-result/city' }
      }

    ]
  },
  {
@@ -103,12 +98,7 @@
    component: Layout,
    hidden: true,
    children: [
      {
        path: 'detail',
        name: 'check-result-province',
        component: () => import('@/views/system/result/province/detail'),
        meta: { title: '省厅考核结果详情', activeMenu: '/system/check-result/province' }
      }

    ]
  },
  {

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

File was deleted

 src/views/system/result/city/index.vue

File was deleted

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

New file
@@ -0,0 +1,286 @@
<template>
  <div style="display: flex;flex-direction: row; padding: 15px">
    <div id="left">
      <div>
        <div>
          <div style="display: flex;flex-direction: row;">
            <div class="now-item">
              <div class="box now">
                <div class="title">
                  视频
                </div>
                <div>
                  98
                </div>
              </div>
            </div>
            <div class="now-item">
              <div class="box now">
                <div class="title">
                  人脸
                </div>
                <div>
                  98
                </div>
              </div>
            </div>
            <div class="now-item">
              <div class="box now">
                <div class="title">
                  监控
                </div>
                <div>
                  98
                </div>
              </div>
            </div>
            <div style="justify-content: center;align-items: center;display: flex;width: 80px">
              <i class="el-icon-caret-left">本月</i>
            </div>

          </div>
        </div>
      </div>

      <div style="margin-top: 20px">
        <div style="display: flex;flex-direction: row;">
          <div class="now-item">
            <div class="box">
              <div class="title">
                视频
              </div>
              <div>
                98
              </div>
            </div>
          </div>
          <div class="now-item">
            <div class="box">
              <div class="title">
                人脸
              </div>
              <div>
                98
              </div>
            </div>
          </div>
          <div class="now-item">
            <div class="box">
              <div class="title">
                监控
              </div>
              <div>
                98
              </div>
            </div>
          </div>
          <div style="justify-content: center;align-items: center;display: flex;width: 80px">
            <i class="el-icon-caret-left">24.<span style="font-size: large">3</span></i>
          </div>
        </div>
      </div>
      <div style="margin-top: 20px">
        <div style="display: flex;flex-direction: row;">
          <div class="now-item">
            <div class="box">
              <div class="title">
                视频
              </div>
              <div>
                98
              </div>
            </div>
          </div>
          <div class="now-item">
            <div class="box">
              <div class="title">
                人脸
              </div>
              <div>
                98
              </div>
            </div>
          </div>
          <div class="now-item">
            <div class="box">
              <div class="title">
                监控
              </div>
              <div>
                98
              </div>
            </div>
          </div>
          <div style="justify-content: center;align-items: center;display: flex;width: 80px">
            <i class="el-icon-caret-left">24.<span style="font-size: large">2</span></i>
          </div>
        </div>
      </div>
      <div style="margin-top: 20px">
        <div style="display: flex;flex-direction: row;">
          <div class="now-item">
            <div class="box">
              <div class="title">
                视频
              </div>
              <div>
                98
              </div>
            </div>
          </div>
          <div class="now-item">
            <div class="box">
              <div class="title">
                人脸
              </div>
              <div>
                98
              </div>
            </div>
          </div>
          <div class="now-item">
            <div class="box">
              <div class="title">
                监控
              </div>
              <div>
                98
              </div>
            </div>
          </div>
          <div style="justify-content: center;align-items: center;display: flex;width: 80px">
            <i class="el-icon-caret-left">24.<span style="font-size: large">1</span></i>
          </div>
        </div>
      </div>
      <div style="margin-top: 20px">
        <div style="display: flex;flex-direction: row;">
          <div class="now-item">
            <div class="box">
              <div class="title">
                视频
              </div>
              <div>
                98
              </div>
            </div>
          </div>
          <div class="now-item">
            <div class="box">
              <div class="title">
                人脸
              </div>
              <div>
                98
              </div>
            </div>
          </div>
          <div class="now-item">
            <div class="box">
              <div class="title">
                监控
              </div>
              <div>
                98
              </div>
            </div>
          </div>
          <div style="justify-content: center;align-items: center;display: flex;width: 80px">
            <i class="el-icon-caret-left">23.<span style="font-size: large">12</span></i>
          </div>
        </div>
      </div>
    </div>
    <div id="right">
      <div style="margin-top: 120px; display: flex;flex-direction: column; justify-content: center; align-items: center">
        <div style="width: 210px; margin-bottom: 15px">
          <el-switch
            v-model="searchForm.type"
            active-text="市局"
            inactive-text="省厅">
          </el-switch>
        </div>
        <div style="width: 210px; margin-bottom: 15px">
          <el-date-picker
            clearable
            v-model="searchForm.startTime"
            type="month"
            placeholder="开始时间">
          </el-date-picker>
        </div>
        <div style="width: 210px; margin-bottom: 15px">
          <el-date-picker
            clearable
            v-model="searchForm.endTime"
            type="month"
            placeholder="结束时间">
          </el-date-picker>
        </div>

      </div>
    </div>
  </div>
</template>

<script>
export default {
  name: 'index',
  data() {
    return {
      searchForm: {

      }
    }
  }
}
</script>

<style scoped>
.now-item {
  flex: 1;
  display: flex;
  justify-content: center;
  align-items: center;
}
.now {
  background-color: #42b983;
  height: 80px !important;
}
.box {
  display: flex;
  flex-direction: column;
  align-items: center;
  justify-content: center;
  box-shadow: 0 2px 6px hsla(0, 0%, 7%, .1);
  border-radius: 10px;
  width: 240px;
  height: 50px;
}
.box:hover{
  cursor: pointer;
}
.month {
  margin-top: 20px;
  display: flex;
  flex-direction: column;
  justify-content: center;
  align-items: center;
}
.title {
  font-size: larger;
}
.item {
  flex: 1;
}
#left {
  flex: 5;
}
#right {
  flex: 1.5;
  height: 100%;
  overflow: hidden;
  display: flex;
  justify-content: center;
  align-items: center;
}
</style>

 src/views/system/result/index.vue

New file
@@ -0,0 +1,263 @@
<template>
  <div id="warp">
    <el-row>
      <el-col :span="6">
        <div class="city-warp">
          <div class="city">
            <div class="title">
              自流井
            </div>
            <div class="score-warp">
              <div class="score-item">
                <div>视频：</div>
                <div class="score">99.5</div>
              </div>
              <div class="score-item">
                <div>人脸：</div>
                <div class="score">87</div>
              </div>
              <div class="score-item">
                <div>监控：</div>
                <div class="score">94</div>
              </div>
            </div>
            <div class="bottom-publish">
              <el-button size="medium" type="success">发布</el-button>
              <el-button size="medium" @click="jumpDetail" type="info">详情</el-button>
            </div>
          </div>
        </div>
      </el-col>
      <el-col :span="6">
        <div class="city-warp">
          <div class="city">
            <div class="title">
              富顺
            </div>
            <div class="score-warp">
              <div class="score-item">
                <div>视频：</div>
                <div class="score">99.5</div>
              </div>
              <div class="score-item">
                <div>人脸：</div>
                <div class="score">87</div>
              </div>
              <div class="score-item">
                <div>监控：</div>
                <div class="score">94</div>
              </div>
            </div>
            <div class="bottom-publish">
              <el-button size="medium" type="success">发布</el-button>
              <el-button size="medium" @click="jumpDetail" type="info">详情</el-button>
            </div>
          </div>
        </div>
      </el-col>
      <el-col :span="6">
        <div class="city-warp">
          <div class="city">
            <div class="title">
              荣县
            </div>
            <div class="score-warp">
              <div class="score-item">
                <div>视频：</div>
                <div class="score">99.5</div>
              </div>
              <div class="score-item">
                <div>人脸：</div>
                <div class="score">87</div>
              </div>
              <div class="score-item">
                <div>监控：</div>
                <div class="score">94</div>
              </div>
            </div>
            <div class="bottom-publish">
              <el-button size="medium" type="success">发布</el-button>
              <el-button size="medium" @click="jumpDetail" type="info">详情</el-button>
            </div>
          </div>
        </div>
      </el-col>
      <el-col :span="6">
        <div class="city-warp">
          <div class="city">
            <div class="title">
              沿滩区
            </div>
            <div class="score-warp">
              <div class="score-item">
                <div>视频：</div>
                <div class="score">99.5</div>
              </div>
              <div class="score-item">
                <div>人脸：</div>
                <div class="score">87</div>
              </div>
              <div class="score-item">
                <div>监控：</div>
                <div class="score">94</div>
              </div>
            </div>
            <div class="bottom-publish">
              <el-button size="medium" type="success">发布</el-button>
              <el-button size="medium" @click="jumpDetail" type="info">详情</el-button>
            </div>
          </div>
        </div>
      </el-col>


    </el-row>

    <el-row style="margin-top: 30px">
      <el-col :span="6">
        <div class="city-warp">
          <div class="city">
            <div class="title">
              高新区
            </div>
            <div class="score-warp">
              <div class="score-item">
                <div>视频：</div>
                <div class="score">99.5</div>
              </div>
              <div class="score-item">
                <div>人脸：</div>
                <div class="score">87</div>
              </div>
              <div class="score-item">
                <div>监控：</div>
                <div class="score">94</div>
              </div>
            </div>
            <div class="bottom-publish">
              <el-button size="medium" type="success">发布</el-button>
              <el-button size="medium" @click="jumpDetail" type="info">详情</el-button>
            </div>
          </div>
        </div>
      </el-col>
      <el-col :span="6">
        <div class="city-warp">
          <div class="city">
            <div class="title">
              大安区
            </div>
            <div class="score-warp">
              <div class="score-item">
                <div>视频：</div>
                <div class="score">99.5</div>
              </div>
              <div class="score-item">
                <div>人脸：</div>
                <div class="score">87</div>
              </div>
              <div class="score-item">
                <div>监控：</div>
                <div class="score">94</div>
              </div>
            </div>
            <div class="bottom-publish">
              <el-button size="medium" type="success">发布</el-button>
              <el-button size="medium" @click="jumpDetail" type="info">详情</el-button>
            </div>
          </div>
        </div>
      </el-col>
      <el-col :span="6">
        <div class="city-warp">
          <div class="city">
            <div class="title">
              贡井区
            </div>
            <div class="score-warp">
              <div class="score-item">
                <div>视频：</div>
                <div class="score">99.5</div>
              </div>
              <div class="score-item">
                <div>人脸：</div>
                <div class="score">87</div>
              </div>
              <div class="score-item">
                <div>监控：</div>
                <div class="score">94</div>
              </div>
            </div>
            <div class="bottom-publish">
              <el-button size="medium" type="success">发布</el-button>
              <el-button size="medium" @click="jumpDetail" type="info">详情</el-button>
            </div>
          </div>
        </div>
      </el-col>
    </el-row>
  </div>

</template>

<script>
export default {
  name: 'index',
  data() {
    return {

    }
  },
  methods: {
    jumpDetail() {
      this.$router.push("/examine/detail")
    }
  }
}
</script>

<style scoped>
.score-warp {
  display: flex;
  flex-direction: column;
  justify-content: center;
  align-items: center;
  color: #797777
}
.score-item {
  display: flex;
  flex-direction: row;
}
.score {
  width: 60px;
  text-align: right;
}
#warp {
  padding: 20px;
}
.city-warp {
  display: flex;
  flex-direction: column;
  align-items: center;
  justify-content: center;
  height: 210px;
}
.city {
  width: 240px;
  height: 100%;
  box-shadow: 0 2px 6px hsla(0, 0%, 7%, .1);
  border-radius: 10px;
  position: relative;
  text-align: center;
  padding: 10px 0px;
}
.bottom-publish {
  width: 100%;
  position: absolute;
  bottom: 10px;
}
.title {
  font-size: larger;
  margin-bottom: 25px;
}
</style>

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

File was deleted

 src/views/system/result/province/index.vue

File was deleted

 src/views/system/rule/province/index.vue

File was deleted

 src/views/system/template/index.vue

@@ -1,7 +1,7 @@
<template>
  <div class="app-container">
    <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
      <el-form-item label="状态" prop="status">
      <!-- <el-form-item label="状态" prop="status">
        <el-input
          v-model="queryParams.status"
          placeholder="请输入状态"
@@ -27,7 +27,17 @@
          start-placeholder="开始日期"
          end-placeholder="结束日期"
        ></el-date-picker>
      </el-form-item>
      </el-form-item> -->
      <el-form-item label="考核类型" prop="examineCategory">
          <el-select v-model="queryParams.status" placeholder="考核类型" clearable @keyup.enter.native="handleQuery">
            <el-option
              v-for="dict in dict.type.platform_examine_category"
              :key="dict.value"
              :label="dict.label"
              :value="parseInt(dict.value)"
            />
          </el-select>
        </el-form-item>
      <el-form-item>
        <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
        <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
@@ -44,7 +54,7 @@
          @click="handleAdd"
        >新增</el-button>
      </el-col>
      <el-col :span="1.5">
      <!-- <el-col :span="1.5">
        <el-button
          type="success"
          plain
@@ -63,7 +73,7 @@
          :disabled="multiple"
          @click="handleDelete"
        >删除</el-button>
      </el-col>
      </el-col> -->
      <el-col :span="1.5">
        <el-button
          type="warning"
@@ -76,34 +86,19 @@
      <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
    </el-row>

    <el-table v-loading="loading" :data="checkTemplateList" @selection-change="handleSelectionChange">
      <el-table-column type="selection" width="55" align="center" />
      <el-table-column label="模板名称" align="center" prop="templateName" width="220px"/>
      <el-table-column label="考核类型" align="center" prop="examineCategory" >
        <template slot-scope="scope">
          <dict-tag :options="dict.type.platform_examine_category" :value="scope.row.examineCategory"/>
        </template>
      </el-table-column>
      <el-table-column label="考核对象" align="center" prop="deptId" width="400px" />
      <el-table-column label="调整系数" align="center" prop="adjustCoefficient" />
      <el-table-column label="调整系数计算方式" align="center" prop="adjustWay"/>
      <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-edit"
            @click="handleUpdate(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>
    <el-card class="box-card" v-for="item in checkTemplateList" :key="item">
      <div class="text item">模板名称：{{ item.templateName }}</div>
      <div class="text item">考核类型：{{ item.examineCategory == 0 ? '省厅考核' : '区域考核' }}</div>
      <div class="text item">考核对象：{{ item.deptId }}</div>
      <div class="text item">发布状态：{{ item.status == 0 ? '启用' : '停用'  }}</div>
      <div class="bottom clearfix">
        <el-button type="text" class="button" @click="">审核</el-button>
        <el-button type="text" class="button" @click="">发布</el-button>
        <el-button type="text" class="button" @click="">复制</el-button>
        <el-button type="text" class="button" @click="handleUpdate(item)">修改</el-button>
        <el-button type="text" class="button" @click="handleDelete(item)">删除</el-button>
      </div>
    </el-card>

    <pagination
      v-show="total>0"
@@ -435,4 +430,18 @@
  display: flex;
  flex-direction: row;
}
.text {
    font-size: 14px;
  }

  .item {
    margin-bottom: 18px;
    overflow: hidden;
    text-overflow: ellipsis;
    white-space: nowrap;
  }

  .box-card {
    width: 20%;
  }
</style>