zc

src/api/creditViolation/index.js

@@ -1,74 +1,7 @@
 import request from '@/utils/request'
 
-// 查询信用合格分设置列表
-export function listMarkconfig(query) {
-  return request({
-    url: '/exam/markconfig/list',
-    method: 'get',
-    params: query
-  })
-}
 
-// 新增信用合格分
-export function addpassmark(data) {
-  return request({
-    url: '/exam/markconfig/addpassmark',
-    method: 'post',
-    data: data
-  })
-}
 
-// 修改信用合格分
-export function editpassmark(data) {
-  return request({
-    url: '/exam/markconfig/editpassmark',
-    method: 'post',
-    data: data
-  })
-}
-
-// 查询负面清单列表列表
-export function listNegativeListRecords(query) {
-  return request({
-    url: '/laboratory/negativeListRecords/list',
-    method: 'get',
-    params: query
-  })
-}
-
-// 查询负面清单列表详细
-export function getNegativeListRecords(id) {
-  return request({
-    url: '/laboratory/negativeListRecords/' + id,
-    method: 'get'
-  })
-}
-
-// 删除负面清单列表
-export function delNegativeListRecords(id) {
-  return request({
-    url: '/laboratory/negativeListRecords/' + id,
-    method: 'delete'
-  })
-}
-
-// 新增负面清单列表
-export function addNegativeListRecords(data) {
-  return request({
-    url: '/laboratory/negativeListRecords',
-    method: 'post',
-    data: data
-  })
-}
-
-// 修改负面清单列表
-export function updateNegativeListRecords(data) {
-  return request({
-    url: '/laboratory/negativeListRecords',
-    method: 'put',
-    data: data
-  })
-}
 
 //移除黑名单
 export function delBlacklist(data) {
@@ -106,34 +39,7 @@ export function getSemesterList(query) {
   })
 }
 
-// 查询负面清单历史记录列表
-export function listNegativeListHistory(query) {
-  return request({
-    url: '/laboratory/negativeListHistory/list',
-    method: 'get',
-    params: query
-  })
-}
-
-
 
-// 查询奖励分设置列表
-export function listRewardconfig(query) {
-  return request({
-    url: '/exam/rewardconfig/list',
-    method: 'get',
-    params: query
-  })
-}
-
-// 修改奖励分设置
-export function updateRewardconfig(data) {
-  return request({
-    url: '/exam/rewardconfig',
-    method: 'put',
-    data: data
-  })
-}
 
 // 查询个人黑名单历史记录
 export function myBlackDetail(query) {
@@ -189,14 +95,6 @@ export function getMyPointsLogInfo(query) {
   })
 }
 
-// 查询违规记录列表
-export function examViolationList(data) {
-  return request({
-    url: '/exam/violation/list',
-    method: 'post',
-    data: data
-  })
-}
 
 // 查询违规记录详细
 export function getViolation(id) {
@@ -249,14 +147,6 @@ export function violationSiteType(query) {
   })
 }
 
-//添加违规记录
-export function examViolationAdd(data) {
-  return request({
-    url: '/exam/violation/add',
-    method: 'post',
-    data: data
-  })
-}
 
 //根据输入值查询除法方式
 export function getIntegralMatchingRules(query) {
@@ -320,6 +210,40 @@ export function violationSite(data) {
     data: data
   })
 }
+/************* 违规记录 *************/
+// 违规记录-列表
+export function examViolationList(data) {
+  return request({
+    url: '/exam/violation/list',
+    method: 'post',
+    data: data
+  })
+}
+//添加违规记录
+export function examViolationAdd(data) {
+  return request({
+    url: '/exam/violation/add',
+    method: 'post',
+    data: data
+  })
+}
+//违规记录-历史记录
+export function examViolationHistoryList(data) {
+  return request({
+    url: '/exam/violation/historyList',
+    method: 'post',
+    data: data
+  })
+}
+//违规记录-违规类型下拉列表
+export function examViolationSiteGetListByType(query) {
+  return request({
+    url: '/exam/violationSite/getListByType',
+    method: 'get',
+    params: query
+  })
+}
+
 /************* 积分列表 *************/
 
 // 查询用户积分记录列表
@@ -449,3 +373,20 @@ export function examViolationMyList(data) {
     data: data
   })
 }
+/************* 积分明细 *************/
+// 积分明细-信用分/奖励分
+export function examPointsRecordGetMyPointsLogInfo(data) {
+  return request({
+    url: '/exam/points/record/getMyPointsLogInfo',
+    method: 'post',
+    data: data
+  })
+}
+// 积分明细-信用分/奖励分-列表
+export function examPointsRecordGetMyPointsLoglist(data) {
+  return request({
+    url: '/exam/points/record/getMyPointsLoglist',
+    method: 'post',
+    data: data
+  })
+}

src/api/emergencyManagement/index.js

@@ -262,3 +262,12 @@ export function laboratoryEventLogEventLogStatistics(data) {
     data: data
   })
 }
+/************ 应急处置 ************/
+//根据权限所属实验室反查楼栋楼层  type:2.楼栋 3.楼层
+export function laboratoryBigViewGetBuildByBigView(query) {
+  return request({
+    url: '/laboratory/bigView/getBuildByBigView',
+    method: 'get',
+    params: query
+  })
+}

src/views/creditViolation/credit/pointsRecord/creditScoreList.vue

@@ -1,60 +1,65 @@
 <!--信用分明细-->
 <template>
-    <div class="creditScoreList">
-      <div class="title-box">
-          <p>信用分明细</p>
-          <p class="right-button page-out-common-style-button" @click="backPage"><i class="el-icon-arrow-left"></i>返回</p>
-        </div>
-      <div class="rewardPointsListPage">
-        <el-form :model="queryParams" ref="queryForm" :inline="true" v-show="showSearch" label-width="68px">
-          <el-form-item label="变更时间" prop="dateRange" style="margin-left:10px;">
-            <el-date-picker
-              :clearable="false"
-              v-model="dateRange"
-              size="small"
-              style="width: 240px"
-              value-format="yyyy-MM-dd"
-              type="daterange"
-              range-separator="-"
-              start-placeholder="开始日期"
-              end-placeholder="结束日期"
-            ></el-date-picker>
-          </el-form-item>
-          <el-form-item label="状态" prop="bonusType" label-width="50px">
-            <el-select v-model="queryParams.bonusType" clearable placeholder="请选择变动状态">
-              <el-option
-                v-for="dict in bonusTypeOptions"
-                :key="dict.id"
-                :label="dict.name"
-                :value="dict.id"
-              ></el-option>
-            </el-select>
-          </el-form-item>
-          <el-form-item>
+    <div class="page-container creditScoreList">
+      <div class="page-top-title-box">
+        <p class="page-top-title-name-p">信用分明细</p>
+        <p class="page-top-title-out-p" @click="backPage">返回</p>
+      </div>
+      <div class="page-container">
+        <div class="page-form-title-box" style="border:none;">
+          <el-form :model="queryParams" ref="queryForm" :inline="true" v-show="showSearch" label-width="68px">
+            <el-form-item label="变更时间" prop="dateRange" style="margin-left:10px;">
+              <el-date-picker
+                :clearable="false"
+                v-model="dateRange"
+                size="small"
+                style="width: 240px"
+                value-format="yyyy-MM-dd"
+                type="daterange"
+                range-separator="-"
+                start-placeholder="开始日期"
+                end-placeholder="结束日期"
+              ></el-date-picker>
+            </el-form-item>
+            <el-form-item label="状态" prop="bonusType" label-width="50px">
+              <el-select v-model="queryParams.bonusType" clearable placeholder="请选择变动状态">
+                <el-option
+                  v-for="dict in bonusTypeOptions"
+                  :key="dict.id"
+                  :label="dict.name"
+                  :value="dict.id"
+                ></el-option>
+              </el-select>
+            </el-form-item>
             <p class="page-inquire-common-style-button" style="margin:0 20px;" @click="handleQuery">查询</p>
             <p class="page-reset-common-style-button" @click="resetQuery">重置</p>
-          </el-form-item>
-        </el-form>
-        <el-table v-loading="loading" class="table-box" border :data="recordList" style="margin-top:20px;">
-          <el-table-column label="信用分变动信息" align="left" prop="messageContent" />
-          <el-table-column label="添加人" align="left" prop="createBy"  width="260"/>
-          <el-table-column label="变更时间" align="left" prop="createTime"  width="260"/>
-          <el-table-column label="变动" align="left" prop="points" width="260">
-            <template slot-scope="scope">
-              <p :class="scope.row.points>0?'color_14AE10':(scope.row.points<0?'color_FF4E00':'')">{{scope.row.points}}</p>
-            </template>
-          </el-table-column>
-          <el-table-column label="信用分余额" align="left" prop="surplusPoints"  width="260"/>
-        </el-table>
-        <pagination
-          style="margin-top:20px;"
-          v-show="total>0"
-          :total="total"
-          layout="total, prev, pager, next, sizes, jumper"
-          :page.sync="queryParams.page"
-          :limit.sync="queryParams.pageSize"
-          @pagination="getList"
-        />
+          </el-form>
+        </div>
+        <div class="page-content-box" style="padding-top:0;">
+          <el-table v-loading="loading" class="table-box" border :data="recordList">
+            <el-table-column label="信用分变动信息" align="left" prop="messageContent" show-overflow-tooltip/>
+            <el-table-column label="添加人" align="left" prop="createByName"  width="260" show-overflow-tooltip/>
+            <el-table-column label="变更时间" align="left" prop="createTime"  width="260" show-overflow-tooltip>
+              <template slot-scope="scope">
+                <span>{{ parseTime(scope.row.createTime,"{y}-{m}-{d} {h}:{i}") }}</span>
+              </template>
+            </el-table-column>
+            <el-table-column label="变动" align="left" prop="points" width="260" show-overflow-tooltip>
+              <template slot-scope="scope">
+                <p :class="scope.row.points>0?'color_14AE10':(scope.row.points<0?'color_FF4E00':'')">{{scope.row.points}}</p>
+              </template>
+            </el-table-column>
+            <el-table-column label="信用分余额" align="left" prop="surplusPoints"  width="260" show-overflow-tooltip/>
+          </el-table>
+          <pagination
+            v-show="total>0"
+            :total="total"
+            layout="total, prev, pager, next, sizes, jumper"
+            :page.sync="queryParams.page"
+            :limit.sync="queryParams.pageSize"
+            @pagination="getList"
+          />
+        </div>
       </div>
     </div>
 </template>
@@ -111,12 +116,12 @@
           this.loading = true;
           if(this.dateRange&&this.dateRange.length>0)
           {
-            this.queryParams.beginTime=this.dateRange[0]+'T00:00:00';
+            this.queryParams.startTime=this.dateRange[0]+'T00:00:00';
             this.queryParams.endTime=this.dateRange[1]+'T23:59:59';
           }
           else
           {
-            this.queryParams.beginTime=null;
+            this.queryParams.startTime=null;
             this.queryParams.endTime=null
           }
 
@@ -151,33 +156,6 @@
 
 <style scoped lang="scss">
   .creditScoreList {
-    flex:1;
-    display: flex!important;
-    flex-direction: column;
-    overflow: hidden;
-    *{
-      margin:0;
-    }
-    .title-box{
-      display: flex;
-      border-bottom: 1px solid #E0E0E0;
-      p:nth-child(1){
-        flex:1;
-        line-height:80px;
-        color:#0045AF;
-        font-size:18px;
-        margin-left:20px;
-      }
-      p:nth-child(2){
-        margin:20px;
-      }
-    }
-    .rewardPointsListPage{
-      flex:1;
-      display: flex!important;
-      flex-direction: column;
-      overflow: hidden;
-      padding:20px;
-    }
+
   }
 </style>

src/views/creditViolation/credit/pointsRecord/index.vue

@@ -286,17 +286,6 @@
 </script>
 <style scoped lang="scss">
   .points-record {
-    display: flex!important;
-    flex-direction: column;
-    box-shadow: 0 0 8px 2px rgba(0, 0, 0, 0.1);
-    overflow: hidden;
-    .page-one-box{
-      flex:1;
-      display: flex!important;
-      flex-direction: column;
-      overflow: hidden;
-      padding:20px!important;
-    }
     .el-row{
       margin-bottom:20px;
     }

src/views/creditViolation/credit/pointsRecord/rewardPointsList.vue

@@ -1,70 +1,75 @@
 <!--奖励分明细-->
 <template>
-  <div class="rewardPointsList">
-    <div class="title-box">
-      <p>奖励分明细</p>
-      <p class="right-button page-out-common-style-button" @click="backPage"><i class="el-icon-arrow-left"></i>返回</p>
+  <div class="page-container rewardPointsList">
+    <div class="page-top-title-box">
+      <p class="page-top-title-name-p">奖励分明细</p>
+      <p class="page-top-title-out-p" @click="backPage">返回</p>
     </div>
-    <div class="rewardPointsListPage">
-      <el-form :model="queryParams" ref="queryForm" :inline="true" v-show="showSearch" label-width="68px">
-        <el-form-item label="变更时间" prop="dateRange" style="margin-left:10px;">
-          <el-date-picker
-            :clearable="false"
-            v-model="dateRange"
-            size="small"
-            style="width: 240px"
-            value-format="yyyy-MM-dd"
-            type="daterange"
-            range-separator="-"
-            start-placeholder="开始日期"
-            end-placeholder="结束日期"
-          ></el-date-picker>
-        </el-form-item>
-        <el-form-item label="状态" prop="bonusType" label-width="50px">
-          <el-select v-model="queryParams.bonusType" clearable placeholder="请选择变动状态">
-            <el-option
-              v-for="dict in bonusTypeOptions"
-              :key="dict.id"
-              :label="dict.name"
-              :value="dict.id"
-            ></el-option>
-          </el-select>
-        </el-form-item>
-        <el-form-item>
+    <div class="page-container">
+      <div class="page-form-title-box" style="border:none;">
+        <el-form :model="queryParams" ref="queryForm" :inline="true" v-show="showSearch" label-width="68px">
+          <el-form-item label="变更时间" prop="dateRange" style="margin-left:10px;">
+            <el-date-picker
+              :clearable="false"
+              v-model="dateRange"
+              size="small"
+              style="width: 240px"
+              value-format="yyyy-MM-dd"
+              type="daterange"
+              range-separator="-"
+              start-placeholder="开始日期"
+              end-placeholder="结束日期"
+            ></el-date-picker>
+          </el-form-item>
+          <el-form-item label="状态" prop="bonusType" label-width="50px">
+            <el-select v-model="queryParams.bonusType" clearable placeholder="请选择变动状态">
+              <el-option
+                v-for="dict in bonusTypeOptions"
+                :key="dict.id"
+                :label="dict.name"
+                :value="dict.id"
+              ></el-option>
+            </el-select>
+          </el-form-item>
           <p class="page-inquire-common-style-button" style="margin:0 20px;" @click="handleQuery">查询</p>
           <p class="page-reset-common-style-button" @click="resetQuery">重置</p>
-        </el-form-item>
-        <div style="float: right">
-          <p class="queryParams-data-box">
-            获得总奖励分：{{propsData.allBonusPoints>0?propsData.allBonusPoints:0}}
-          </p>
-          <p class="queryParams-data-box">
-            已兑换奖励分：{{propsData.consumeBonusPoints>0?propsData.consumeBonusPoints:0}}
-          </p>
-          <p class="queryParams-data-box">
-            剩余奖励分：{{propsData.bonusPoints>0?propsData.bonusPoints:0}}
-          </p>
-        </div>
-      </el-form>
-      <el-table v-loading="loading" border class="table-box" :data="recordList" style="margin-top:20px;">
-        <el-table-column label="奖励分变动信息" align="left" prop="messageContent" />
-        <el-table-column label="变更时间" align="left" prop="createTime" />
-        <el-table-column label="变动" align="left" prop="points">
-          <template slot-scope="scope">
-            <p :class="scope.row.points>0?'color_14AE10':(scope.row.points<0?'color_FF4E00':'')">{{scope.row.points}}</p>
-          </template>
-        </el-table-column>
-        <el-table-column label="奖励分余额" align="left"  prop="surplusPoints" />
-      </el-table>
-      <pagination
-        style="margin-top:20px;"
-        v-show="total>0"
-        :total="total"
-        layout="total, prev, pager, next, sizes, jumper"
-        :page.sync="queryParams.page"
-        :limit.sync="queryParams.pageSize"
-        @pagination="getList"
-      />
+          <div style="float: right">
+            <p class="queryParams-data-box">
+              获得总奖励分：{{propsData.allBonusPoints>0?propsData.allBonusPoints:0}}
+            </p>
+            <p class="queryParams-data-box">
+              已兑换奖励分：{{propsData.consumeBonusPoints>0?propsData.consumeBonusPoints:0}}
+            </p>
+            <p class="queryParams-data-box">
+              剩余奖励分：{{propsData.bonusPoints>0?propsData.bonusPoints:0}}
+            </p>
+          </div>
+        </el-form>
+      </div>
+      <div class="page-content-box" style="padding-top:0;">
+        <el-table v-loading="loading" border class="table-box" :data="recordList">
+          <el-table-column label="奖励分变动信息" align="left" prop="messageContent" show-overflow-tooltip/>
+          <el-table-column label="变更时间" align="left" prop="createTime" show-overflow-tooltip>
+            <template slot-scope="scope">
+              <span>{{ parseTime(scope.row.createTime,"{y}-{m}-{d} {h}:{i}") }}</span>
+            </template>
+          </el-table-column>
+          <el-table-column label="变动" align="left" prop="points" show-overflow-tooltip>
+            <template slot-scope="scope">
+              <p :class="scope.row.points>0?'color_14AE10':(scope.row.points<0?'color_FF4E00':'')">{{scope.row.points}}</p>
+            </template>
+          </el-table-column>
+          <el-table-column label="奖励分余额" align="left"  prop="surplusPoints" show-overflow-tooltip/>
+        </el-table>
+        <pagination
+          v-show="total>0"
+          :total="total"
+          layout="total, prev, pager, next, sizes, jumper"
+          :page.sync="queryParams.page"
+          :limit.sync="queryParams.pageSize"
+          @pagination="getList"
+        />
+      </div>
     </div>
   </div>
 </template>
@@ -118,12 +123,12 @@
         this.loading = true;
         if(this.dateRange&&this.dateRange.length>0)
         {
-          this.queryParams.beginTime=this.dateRange[0]+'T00:00:00';
+          this.queryParams.startTime=this.dateRange[0]+'T00:00:00';
           this.queryParams.endTime=this.dateRange[1]+'T23:59:59';
         }
         else
         {
-          this.queryParams.beginTime=null;
+          this.queryParams.startTime=null;
           this.queryParams.endTime=null
         }
 
@@ -158,33 +163,10 @@
 
 <style scoped lang="scss">
   .rewardPointsList {
-    flex:1;
-    display: flex!important;
-    flex-direction: column;
-    overflow: hidden;
-    *{
-      margin:0;
-    }
-    .title-box{
-      display: flex;
-      border-bottom: 1px solid #E0E0E0;
-      p:nth-child(1){
-        flex:1;
-        line-height:80px;
-        color:#0045AF;
-        font-size:18px;
-        margin-left:20px;
-      }
-      p:nth-child(2){
-        margin:20px;
-      }
-    }
-    .rewardPointsListPage{
+    .content-box{
       flex:1;
-      display: flex!important;
-      flex-direction: column;
+      display: flex;
       overflow: hidden;
-      padding:20px;
     }
     .queryParams-data-box{
       margin:0 0 0 20px;

src/views/creditViolation/credit/rewardconfig/index.vue

@@ -1,7 +1,11 @@
 <!--奖励分设置-->
 <template>
   <div class="app-container rewardconfig">
-    <p class="title-p">奖励分设置</p>
+    <div class="page-top-title-box">
+      <p class="page-top-title-name-p">奖励分设置</p>
+      <p class="page-top-title-out-p" v-hasPermi="['exam:rewardconfig:edit']" @click="getList">重置</p>
+      <p class="page-top-title-submit-p" v-hasPermi="['exam:rewardconfig:edit']" @click="submitForm">提交</p>
+    </div>
     <el-form class="form-content scrollbar-box" ref="form" :model="form" label-width="100px" :rules="rules">
       <el-form-item label="一个月无违规记录奖励分值：" prop="monthNoviolationScore" label-width="240px" style="margin-top:22px;">
         <el-input
@@ -66,13 +70,6 @@
         </el-input>
       </el-form-item>
     </el-form>
-    <div class="form-bottom-button-box"
-         v-hasPermi="['exam:rewardconfig:edit']">
-      <p class="null-p-button"></p>
-      <el-button @click="getList">重 置</el-button>
-      <el-button type="primary" @click="submitForm">保 存</el-button>
-      <p class="null-p-button"></p>
-    </div>
   </div>
 </template>
 
@@ -146,17 +143,6 @@ export default {
 
 <style scoped lang="scss">
   .rewardconfig{
-    display: flex!important;
-    flex-direction: column;
-    box-shadow: 0 0 8px 2px rgba(0, 0, 0, 0.1);
-    padding:0 20px 0 20px!important;
-    .title-p{
-      margin:0;
-      line-height:80px;
-      font-size:18px;
-      color:#0045AF;
-      border-bottom:2px solid #E0E0E0;
-    }
     .form-content{
       overflow-y: scroll;
       flex:1;

src/views/creditViolation/credit/violation/index.vue

@@ -42,22 +42,20 @@
               >新增违规记录</p>
             </el-col>
           </el-form-item>
-          <el-form-item>
-            <p class="page-inquire-common-style-button" @click="handleQuery">查询</p>
-            <p class="page-reset-common-style-button" @click="resetQuery">重置</p>
-          </el-form-item>
+          <p class="page-inquire-common-style-button" @click="handleQuery">查询</p>
+          <p class="page-reset-common-style-button" @click="resetQuery">重置</p>
         </el-form>
       </div>
       <div class="page-content-box">
         <el-table class="table-box" v-loading="loading" border :data="violationList" @sort-change="handleSelectionChange" v-if="pageType==1">
-          <el-table-column label="姓名" align="left" prop="joinUserName" />
-          <el-table-column label="学号" align="left" prop="stuNo" />
-          <el-table-column label="学院" align="left" prop="deptName" />
-          <el-table-column label="违规次数" align="left" sortable="custom" prop="violationNum" />
-          <el-table-column label="负面清单次数" align="left" sortable="custom" prop="negativeListNum" />
-          <el-table-column label="黑名单次数" align="left" sortable="custom" prop="blackListNum" />
-          <el-table-column label="信用分" align="left" prop="creditScore" />
-          <el-table-column label="当前状态" align="left" prop="status">
+          <el-table-column label="姓名" align="left" prop="joinUserName" show-overflow-tooltip/>
+          <el-table-column label="学号" align="left" prop="stuNo" show-overflow-tooltip/>
+          <el-table-column label="学院" align="left" prop="deptName" show-overflow-tooltip/>
+          <el-table-column label="违规次数" align="left" sortable="custom" prop="violationNum" show-overflow-tooltip/>
+          <el-table-column label="负面清单次数" align="left" sortable="custom" prop="negativeListNum" show-overflow-tooltip/>
+          <el-table-column label="黑名单次数" align="left" sortable="custom" prop="blackListNum" show-overflow-tooltip/>
+          <el-table-column label="信用分" align="left" prop="creditScore" show-overflow-tooltip/>
+          <el-table-column label="当前状态" align="left" prop="status" show-overflow-tooltip>
             <template slot-scope="scope">
               {{scope.row.status == 1?'正常':(scope.row.status == 2?'负面清单':(scope.row.status == 3?'黑名单':''))}}
             </template>
@@ -83,23 +81,6 @@
                   </el-dropdown-menu>
                 </el-dropdown>
                 <p class="table-button-null"></p>
-                <!--<p class="table-button-warning-120"-->
-                <!--v-if="scope.row.isBlackList == 1"-->
-                <!--style="margin-right:10px;"-->
-                <!--@click="blacklistClick(scope.row)"-->
-                <!--v-hasPermi="['laboratory:blacklist:remove']"-->
-                <!--&gt;移除黑名单</p>-->
-                <!--<p class="table-button-warning-120"-->
-                <!--v-if="scope.row.isBlackList != 1"-->
-                <!--style="margin-right:10px;"-->
-                <!--@click="blacklistClick(scope.row)"-->
-                <!--v-hasPermi="['laboratory:blacklist:add']"-->
-                <!--&gt;加入黑名单</p>-->
-                <!--<p v-if="scope.row.isNegative == 1"-->
-                <!--class="table-button-success-120"-->
-                <!--@click="checklistClick(scope.row)"-->
-                <!--v-hasPermi="['laboratory:negativeListRecords:remove']"-->
-                <!--&gt;移除负面清单</p>-->
               </div>
             </template>
           </el-table-column>
@@ -142,7 +123,7 @@
         <el-form-item label="学院：" style="width:600px;">
           <el-input v-model="form.deptName" :disabled="true" placeholder="请选择学院" />
         </el-form-item>
-        <el-form-item label="实验室" prop="laboratoryId">
+        <el-form-item label="实验室" prop="subjectId">
           <el-select v-model="form.subjectId" style="width:480px;" placeholder="请选择实验室"
                      @change="subjectChange">
             <el-option
@@ -157,9 +138,9 @@
           <el-select v-model="form.reasonId" style="width:480px;" placeholder="请选择违规项" @change="reasonChange">
             <el-option
               v-for="item in violationSiteTypeList"
-              :key="item.itemId"
-              :label="item.label"
-              :value="item.itemId">
+              :key="item.id"
+              :label="item.violationName"
+              :value="item.id">
             </el-option>
           </el-select>
         </el-form-item>
@@ -384,11 +365,12 @@
 </template>
 
 <script>
-  import { delNegivelist,delBlacklist,blackAdd,examViolationList,
+  import { delNegivelist,delBlacklist,blackAdd,
     getViolation, delViolation, addViolation, updateViolation,joinBlackList,
-    violationSiteType ,examViolationAdd,getIntegralMatchingRules,addBlacklist } from "@/api/creditViolation/index";
-  import {selectListUser, getDeptDropList, systemUserList} from "@/api/commonality/permission";
-  import { listDepartments,getDicts,laboratorySubRelInfoList} from "@/api/commonality/noPermission";
+    getIntegralMatchingRules,addBlacklist } from "@/api/creditViolation/index";
+  import {selectListUser, getDeptDropList, systemUserSelectUser } from "@/api/commonality/permission";
+  import { listDepartments,getDicts,laboratorySubRelInfoList } from "@/api/commonality/noPermission";
+  import { examViolationList,examViolationSiteGetListByType,examViolationAdd } from "@/api/creditViolation/index";
   import violationInfo from "./violationInfo.vue";
 export default {
   name: "Violation",
@@ -431,7 +413,6 @@ export default {
         deptId: null,
         deptName: null,
         userId: null,
-        beginTime: null,
         endTime: null,
         violationReasons: null
       },
@@ -515,7 +496,7 @@ export default {
         subjectId:[
           {required: true, message: '请选择实验室', trigger: 'blur'}
         ],
-        reason:[
+        reasonId:[
           {required: true, message: '请选择违规项', trigger: 'blur'}
         ],
         violationReasons:[
@@ -556,10 +537,6 @@ export default {
           { required: true, message: "只能输入数字", validator: this.isNum, trigger: "blur" },
         ],
       },
-      //违规类型
-      violationTypeOptions: [],
-      //处罚类型
-      penaltyTypeOptions: [],
       //人员
       optionsUser: [],
       //详情数据
@@ -573,8 +550,6 @@ export default {
       openTwo:false,
       //黑名单弹窗数据
       formTwo:{},
-      //处罚方式列表
-      optionsTwo:[],
       //学院
       deptOptions:[],
       //状态
@@ -598,16 +573,8 @@ export default {
   },
   created() {
     this.getList();
-    this.getDicts("lab_violation_rules").then(response => {
-      this.violationTypeOptions = response.data;
-    })
-    this.getDicts("penaltyType").then(response => {
-      this.penaltyTypeOptions = response.data;
-      this.optionsTwo = response.data;
-    })
     this.getDeptList();
-    // this.getSubjectDictByViolation();
-    this.violationSiteType();
+    this.examViolationSiteGetListByType();
   },
   methods: {
     //勾选方法
@@ -683,7 +650,7 @@ export default {
           this.pageType = type;
           this.getList();
         }else if(type == 2){
-          this.propsData.userId = row.joinUserId;
+          this.propsData.joinUserId = row.joinUserId;
           this.pageType = type;
         }
       }
@@ -982,10 +949,9 @@ export default {
         let obj = {
           userName : query,
           userType: 2,
-          pageSize: -1,
         };
-        systemUserList(obj).then(response => {
-          this.optionsUser = response.data.records;
+        systemUserSelectUser(obj).then(response => {
+          this.optionsUser = response.data;
           this.loading = false;
         });
       } else {
@@ -1021,16 +987,16 @@ export default {
     reasonChange(e){
       let self=this;
       for(let i=0;i<self.violationSiteTypeList.length;i++){
-        if(e == self.violationSiteTypeList[i].itemId){
-          self.form.violationContent = self.violationSiteTypeList[i].label
+        if(e == self.violationSiteTypeList[i].id){
+          self.form.violationContent = self.violationSiteTypeList[i].violationName
         }
       }
     },
-    //查询实验室列表
-    violationSiteType(){
-      this.getDicts("lab_violation_rules").then(response => {
+    //获取违规类型列表
+    examViolationSiteGetListByType(){
+      examViolationSiteGetListByType({}).then(response => {
         this.violationSiteTypeList = response.data;
-        this.violationSiteTypeList.push({"itemId":"-1","label":"其他"});
+        this.violationSiteTypeList.push({"id":"-1","violationName":"其他"});
       });
     },
   }

src/views/creditViolation/credit/violation/violationInfo.vue

@@ -1,96 +1,95 @@
 <!--负面清单历史记录-->
 <template>
-  <div class="violationInfo">
-    <div class="title-box">
-      <p>历史记录</p>
-      <p class="reset-button-one" @click="backPage"><i class="el-icon-arrow-left"></i>返回</p>
+  <div class="page-container violationInfo">
+    <div class="page-top-title-box">
+      <p class="page-top-title-name-p">历史记录</p>
+      <p class="page-top-title-out-p" @click="backPage">返回</p>
     </div>
-    <div class="rewardPointsListPage">
-      <el-form :model="queryParams" ref="queryForm" :inline="true" v-show="showSearch" label-width="68px">
-        <el-form-item label="状态" prop="overStatus" label-width="50px">
-          <el-select v-model="queryParams.overStatus" clearable placeholder="请选择状态">
-            <el-option
-              v-for="dict in bonusTypeOptions"
-              :key="dict.id"
-              :label="dict.name"
-              :value="dict.id"
-            ></el-option>
-          </el-select>
-        </el-form-item>
-        <!--<el-form-item label="学期" prop="semesterId" label-width="50px">-->
-          <!--<el-select v-model="queryParams.semesterId" clearable placeholder="请选择学期">-->
-            <!--<el-option-->
-              <!--v-for="dict in semesterList"-->
-              <!--:key="dict.id"-->
-              <!--:label="dict.semesterName"-->
-              <!--:value="dict.id"-->
-            <!--&gt;</el-option>-->
-          <!--</el-select>-->
-        <!--</el-form-item>-->
-        <el-form-item label="时间段" prop="dateRange" label-width="65px">
-          <el-date-picker
-            :clearable="false"
-            v-model="dateRange"
-            size="small"
-            style="width: 240px"
-            value-format="yyyy-MM-dd"
-            type="daterange"
-            range-separator="-"
-            start-placeholder="开始日期"
-            end-placeholder="结束日期"
-          ></el-date-picker>
-        </el-form-item>
-        <el-form-item>
-          <p class="inquire-button-one" style="margin:0 20px;" @click="handleQuery">查询</p>
-          <p class="reset-button-one" @click="resetQuery">重置</p>
-        </el-form-item>
-      </el-form>
-      <el-table v-loading="loading" border :data="recordList" style="margin-top:20px;">
-        <el-table-column label="姓名" align="left" prop="userName" width="120"/>
-        <el-table-column label="违规原因" align="left" prop="reason"/>
-        <el-table-column label="实验室" align="left" prop="laboratoryName"  width="200"/>
-        <el-table-column label="添加人" align="left"  prop="createBy"  width="120"/>
-        <el-table-column label="添加时间" align="left"  prop="createTime"  width="180"/>
-        <el-table-column label="扣分值" align="left"  prop="deductionVal" width="100">
-          <template slot-scope="scope">
-            <span style="color:#FF3131;">-{{scope.row.deductionVal}}</span>
-          </template>
-        </el-table-column>
-        <el-table-column label="处理方式" align="left"  prop="treatmentMethod" width="100"/>
-        <el-table-column label="处理状态" align="left" width="240">
-          <template slot-scope="scope">
-            <div class="scope-big-box" v-if="scope.row.learnStatus == 0 || scope.row.learnStatus == 1 || scope.row.learnStatus == 2">
-              <p>学习</p>
-              <p :class="scope.row.learnStatus == 0 ?'scopeColorA':(scope.row.learnStatus == 1 ?'scopeColorB':(scope.row.learnStatus == 2 ?'scopeColorC':''))">{{scope.row.learnStatus == 0 ?'未完成':(scope.row.learnStatus == 1 ?'已完成':(scope.row.learnStatus == 2 ?'已恢复':''))}}</p>
-            </div>
-            <div class="scope-big-box" v-if="scope.row.practiceStatus == 0 || scope.row.practiceStatus == 1 || scope.row.practiceStatus == 2">
-              <p>做题</p>
-              <p :class="scope.row.practiceStatus == 0 ?'scopeColorA':(scope.row.practiceStatus == 1 ?'scopeColorB':(scope.row.practiceStatus == 2 ?'scopeColorC':''))">{{scope.row.practiceStatus == 0 ?'未完成':(scope.row.practiceStatus == 1 ?'已完成':(scope.row.practiceStatus == 2 ?'已恢复':''))}}</p>
-            </div>
-            <div class="scope-big-box" v-if="scope.row.testStatus == 0 || scope.row.testStatus == 1 || scope.row.testStatus == 2">
-              <p>考试</p>
-              <p :class="scope.row.testStatus == 0 ?'scopeColorA':(scope.row.testStatus == 1 ?'scopeColorB':(scope.row.testStatus == 2 ?'scopeColorC':''))">{{scope.row.testStatus == 0 ?'未完成':(scope.row.testStatus == 1 ?'已完成':(scope.row.testStatus == 2 ?'已恢复':''))}}</p>
-            </div>
-          </template>
-        </el-table-column>
-        <el-table-column label="处理截止日期" align="left"  prop="handleDay" width="180" />
-        <el-table-column label="信用分" align="left"  prop="creditScore" width="100"/>
-      </el-table>
-      <pagination :page-sizes="[20, 30, 40, 50]"
-        style="margin-top:20px;"
-        v-show="total>0"
-        :total="total"
-        layout="total, prev, pager, next, sizes, jumper"
-        :page.sync="queryParams.page"
-        :limit.sync="queryParams.pageSize"
-        @pagination="getList"
-      />
+    <div class="page-container">
+      <div class="page-form-title-box" style="border:none;">
+        <el-form :model="queryParams" ref="queryForm" :inline="true" v-show="showSearch" label-width="68px">
+          <el-form-item label="" prop="overStatus">
+            <el-select v-model="queryParams.overStatus" clearable placeholder="请选择状态">
+              <el-option
+                v-for="dict in bonusTypeOptions"
+                :key="dict.id"
+                :label="dict.name"
+                :value="dict.id"
+              ></el-option>
+            </el-select>
+          </el-form-item>
+          <el-form-item label="" prop="dateRange">
+            <el-date-picker
+              :clearable="false"
+              v-model="dateRange"
+              size="small"
+              style="width: 240px"
+              value-format="yyyy-MM-dd"
+              type="daterange"
+              range-separator="-"
+              start-placeholder="开始日期"
+              end-placeholder="结束日期"
+            ></el-date-picker>
+          </el-form-item>
+          <p class="page-inquire-common-style-button" style="margin:0 20px;" @click="handleQuery">查询</p>
+          <p class="page-reset-common-style-button" @click="resetQuery">重置</p>
+        </el-form>
+      </div>
+      <div class="page-content-box" style="padding-top:0;">
+        <el-table class="table-box" v-loading="loading" border :data="recordList">
+          <el-table-column label="姓名" align="left" prop="joinUserName" width="120" show-overflow-tooltip/>
+          <el-table-column label="违规原因" align="left" prop="reason" show-overflow-tooltip/>
+          <el-table-column label="实验室" align="left" prop="subjectName"  width="200" show-overflow-tooltip/>
+          <el-table-column label="添加人" align="left"  prop="createBy"  width="120" show-overflow-tooltip/>
+          <el-table-column label="添加时间" align="left"  prop="createTime"  width="180" show-overflow-tooltip>
+            <template slot-scope="scope">
+              <span>{{ parseTime(scope.row.createTime,"{y}-{m}-{d} {h}:{i}") }}</span>
+            </template>
+          </el-table-column>
+          <el-table-column label="扣分值" align="left"  prop="deductionVal" width="100" show-overflow-tooltip>
+            <template slot-scope="scope">
+              <span style="color:#FF3131;">-{{scope.row.deductionVal}}</span>
+            </template>
+          </el-table-column>
+          <el-table-column label="处理方式" align="left"  prop="treatmentMethod" width="100" show-overflow-tooltip/>
+          <el-table-column label="处理状态" align="left" width="240" show-overflow-tooltip>
+            <template slot-scope="scope">
+              <div class="scope-big-box" v-if="scope.row.learnStatus == 0 || scope.row.learnStatus == 1 || scope.row.learnStatus == 2">
+                <p>学习</p>
+                <p :class="scope.row.learnStatus == 0 ?'scopeColorA':(scope.row.learnStatus == 1 ?'scopeColorB':(scope.row.learnStatus == 2 ?'scopeColorC':''))">{{scope.row.learnStatus == 0 ?'未完成':(scope.row.learnStatus == 1 ?'已完成':(scope.row.learnStatus == 2 ?'已恢复':''))}}</p>
+              </div>
+              <div class="scope-big-box" v-if="scope.row.practiceStatus == 0 || scope.row.practiceStatus == 1 || scope.row.practiceStatus == 2">
+                <p>做题</p>
+                <p :class="scope.row.practiceStatus == 0 ?'scopeColorA':(scope.row.practiceStatus == 1 ?'scopeColorB':(scope.row.practiceStatus == 2 ?'scopeColorC':''))">{{scope.row.practiceStatus == 0 ?'未完成':(scope.row.practiceStatus == 1 ?'已完成':(scope.row.practiceStatus == 2 ?'已恢复':''))}}</p>
+              </div>
+              <div class="scope-big-box" v-if="scope.row.testStatus == 0 || scope.row.testStatus == 1 || scope.row.testStatus == 2">
+                <p>考试</p>
+                <p :class="scope.row.testStatus == 0 ?'scopeColorA':(scope.row.testStatus == 1 ?'scopeColorB':(scope.row.testStatus == 2 ?'scopeColorC':''))">{{scope.row.testStatus == 0 ?'未完成':(scope.row.testStatus == 1 ?'已完成':(scope.row.testStatus == 2 ?'已恢复':''))}}</p>
+              </div>
+            </template>
+          </el-table-column>
+          <el-table-column label="处理截止日期" align="left"  prop="handleDay" width="180" show-overflow-tooltip>
+            <template slot-scope="scope">
+              <span>{{ parseTime(scope.row.handleDay,"{y}-{m}-{d} {h}:{i}") }}</span>
+            </template>
+          </el-table-column>
+          <el-table-column label="信用分" align="left"  prop="creditScore" width="100" show-overflow-tooltip/>
+        </el-table>
+        <pagination :page-sizes="[20, 30, 40, 50]"
+                    v-show="total>0"
+                    :total="total"
+                    layout="total, prev, pager, next, sizes, jumper"
+                    :page.sync="queryParams.page"
+                    :limit.sync="queryParams.pageSize"
+                    @pagination="getList"
+        />
+      </div>
     </div>
   </div>
 </template>
 
 <script>
-  import { violationHistoryRecord,getSemesterList } from "@/api/creditViolation/index";
+  import { examViolationHistoryList,getSemesterList } from "@/api/creditViolation/index";
   export default {
     props:{
       propsData:{},
@@ -107,13 +106,6 @@
           page: 1,
           pageSize:20,
           overStatus: null,
-          semesterId: null,
-          points: null,
-          joinUserId: null,
-          mode: null,
-          deptName: null,
-          deptId: null,
-          userId: null,
         },
         //状态条件
         bonusTypeOptions:[
@@ -121,8 +113,6 @@
           {id:0,name:"未完成"},
           {id:2,name:"已恢复"},
         ],
-        //学期
-        semesterList:[],
         //列表数据
         recordList:[],
         total:0,
@@ -132,51 +122,43 @@
     },
     created(){
       this.getList();
-      this.getSemesterList();
     },
     methods:{
       //返回上级页面
       backPage(){
         this.$parent.goPage(1);
       },
-      getSemesterList(){
-        getSemesterList(this.queryParams).then( res => {
-          this.semesterList = res.data;
-        });
-      },
       /** 查询数据 */
       getList() {
         this.loading = true;
-        if(this.dateRange&&this.dateRange.length>0)
-        {
-          this.queryParams.statTime=this.dateRange[0]
-          this.queryParams.endTime=this.dateRange[1]
+        let obj = JSON.parse(JSON.stringify(this.queryParams))
+        if(this.dateRange&&this.dateRange.length>0) {
+          obj.statTime=this.dateRange[0]
+          obj.endTime=this.dateRange[1]
+        } else {
+          obj.statTime=null;
+          obj.endTime=null
         }
-        else
-        {
-          this.queryParams.statTime=null;
-          this.queryParams.endTime=null
-        }
-        this.queryParams.joinUserId = this.propsData.userId;
-        violationHistoryRecord(this.queryParams).then( response => {
-          this.recordList =  response.rows;
-          this.total =  response.total;
+        obj.joinUserId = this.propsData.joinUserId;
+        examViolationHistoryList(obj).then( response => {
+          this.$set(this,'recordList',response.data.records);
+          this.$set(this,'total',response.data.total);
           this.loading = false;
         });
       },
       /** 搜索按钮操作 */
       handleQuery() {
-        this.queryParams.page = 1;
+        this.$set(this.queryParams,'page',1);
         this.getList();
       },
       /** 重置按钮操作 */
       resetQuery() {
-        this.dateRange = [];
-        this.queryParams.overStatus = null;
-        this.queryParams.semesterId = null;
-        this.queryParams.statTime = null;
-        this.queryParams.endTime = null;
-        this.resetForm("queryParams");
+        this.$set(this,'dateRange',[]);
+        this.$set(this,'queryParams',{
+          page: 1,
+          pageSize:20,
+          overStatus: null,
+        });
         this.handleQuery();
       },
     },
@@ -185,33 +167,6 @@
 
 <style scoped lang="scss">
   .violationInfo {
-    flex:1;
-    display: flex!important;
-    flex-direction: column;
-    *{
-      margin:0;
-    }
-    .title-box{
-      display: flex;
-      border-bottom: 1px solid #E0E0E0;
-      p:nth-child(1){
-        flex:1;
-        line-height:80px;
-        color:#0045AF;
-        font-size:18px;
-        margin-left:20px;
-      }
-      p:nth-child(2){
-        margin:20px;
-      }
-    }
-    .rewardPointsListPage{
-      flex:1;
-      display: flex!important;
-      flex-direction: column;
-      overflow: hidden;
-      padding:20px;
-    }
     .scope-big-box{
       display: flex;
       p{

src/views/creditViolation/credit/violationSite/index.vue

@@ -1,7 +1,11 @@
 <!--违规设置-->
 <template>
   <div class="app-container violation-site">
-    <p class="title-p">违规设置</p>
+    <div class="page-top-title-box">
+      <p class="page-top-title-name-p">违规设置</p>
+      <p class="page-top-title-out-p" v-hasPermi="['laboratory:site:add']" @click="getList">重置</p>
+      <p class="page-top-title-submit-p" v-hasPermi="['laboratory:site:add']" @click="submitForm">提交</p>
+    </div>
     <el-form class="form-content scrollbar-box" ref="form" :model="form" label-width="100px" :rules="rules">
       <el-form-item label="负面清单次数设置：" prop="violationNumber" label-width="240px">
         <el-input
@@ -44,12 +48,6 @@
         </el-form-item>
       </div>
     </el-form>
-    <div class="form-bottom-button-box" v-hasPermi="['laboratory:site:add']">
-      <p class="null-p-button"></p>
-      <el-button @click="getList">重 置</el-button>
-      <el-button type="primary" @click="submitForm">保 存</el-button>
-      <p class="null-p-button"></p>
-    </div>
   </div>
 </template>
 
@@ -158,17 +156,6 @@ export default {
 
 <style scoped lang="scss">
   .violation-site {
-    display: flex!important;
-    flex-direction: column;
-    box-shadow: 0 0 8px 2px rgba(0, 0, 0, 0.1);
-    .title-p{
-      margin:0;
-      line-height:80px;
-      font-size:18px;
-      color:#0045AF;
-      border-bottom:2px solid #E0E0E0;
-      padding:0 20px;
-    }
     .form-content{
       overflow-y: scroll;
       padding:20px 20px 0;

src/views/creditViolation/myViolation/violation_my/index.vue

@@ -44,22 +44,22 @@
     </div>
     <div class="page-content-box">
       <el-table class="table-box" v-loading="loading" border :data="violationList">
-        <el-table-column label="违规类型" align="left" prop="reason"  width="100">
+        <el-table-column label="违规类型" align="left" prop="reason"  width="100" show-overflow-tooltip>
           <template slot-scope="scope">
             {{scope.row.violationType == 1 ?'负面清单':(scope.row.violationType == 2 ?'黑名单':'')}}
           </template>
         </el-table-column>
-        <el-table-column label="违规原因" align="left" prop="reason"  width="300"/>
+        <el-table-column label="违规原因" align="left" prop="reason"  width="300" show-overflow-tooltip/>
         <el-table-column label="实验室" align="left" prop="subjectName" show-overflow-tooltip width="200"/>
-        <el-table-column label="添加人" align="left" prop="createByName" width="140"/>
-        <el-table-column label="创建时间" align="left" prop="createTime" width="200">
+        <el-table-column label="添加人" align="left" prop="createByName" width="140" show-overflow-tooltip/>
+        <el-table-column label="创建时间" align="left" prop="createTime" width="200" show-overflow-tooltip>
           <template slot-scope="scope">
             {{parseTime(scope.row.createTime,"{y}-{m}-{d} {h}:{i}")}}
           </template>
         </el-table-column>
-        <el-table-column label="扣分值" align="left"  prop="deductionVal" width="100"/>
-        <el-table-column label="处理方式" align="left"  prop="treatmentMethod" width="200"/>
-        <el-table-column label="处理状态" align="left" width="140">
+        <el-table-column label="扣分值" align="left"  prop="deductionVal" width="100" show-overflow-tooltip/>
+        <el-table-column label="处理方式" align="left"  prop="treatmentMethod" width="200" show-overflow-tooltip/>
+        <el-table-column label="处理状态" align="left" width="140" show-overflow-tooltip>
           <template slot-scope="scope">
             <div class="scope-big-box" v-if="scope.row.learnStatus == 0 || scope.row.learnStatus == 1 || scope.row.learnStatus == 2">
               <p>学习</p>
@@ -75,12 +75,12 @@
             </div>
           </template>
         </el-table-column>
-        <el-table-column label="处理截止日期" align="left"  prop="handleDayTime" width="140">
+        <el-table-column label="处理截止日期" align="left"  prop="handleDayTime" width="140" show-overflow-tooltip>
           <template slot-scope="scope">
             {{parseTime(scope.row.handleDayTime,"{y}-{m}-{d}")}}
           </template>
         </el-table-column>
-        <el-table-column label="信用分" align="left"  prop="creditScore" width="100"/>
+        <el-table-column label="信用分" align="left"  prop="creditScore" width="100" show-overflow-tooltip/>
       </el-table>
       <pagination :page-sizes="[20, 30, 40, 50]"
                   v-show="total>0"
@@ -127,7 +127,6 @@ export default {
         deptId: null,
         deptName: null,
         userId: null,
-        beginTime: null,
         endTime: null
       },
       // 表单参数

src/views/creditViolation/record_my/index.vue

@@ -77,71 +77,82 @@
           <p>违规扣分，黑名单将无法进入实验室。</p>
         </div>
       </div>
-      <el-form :model="queryParams" ref="queryForm" :inline="true" v-show="showSearch" label-width="68px">
-        <el-form-item label="时间段" prop="dateRange" label-width="65px">
-          <el-date-picker
-            :clearable="false"
-            v-model="dateRange"
-            size="small"
-            style="width: 240px"
-            value-format="yyyy-MM-dd"
-            type="daterange"
-            range-separator="-"
-            start-placeholder="开始日期"
-            end-placeholder="结束日期">
-          </el-date-picker>
-        </el-form-item>
-        <el-form-item label="状态" prop="bonusType" label-width="50px">
-          <el-select v-model="queryParams.bonusType" clearable placeholder="请选择状态">
-            <el-option
-              v-for="dict in bonusTypeOptions"
-              :key="dict.id"
-              :label="dict.name"
-              :value="dict.id"
-            ></el-option>
-          </el-select>
-        </el-form-item>
-        <el-form-item>
-          <p class="inquire-button-one" @click="handleQuery">查询</p>
-          <p class="reset-button-one" @click="resetQuery">重置</p>
-        </el-form-item>
-      </el-form>
-      <el-table v-loading="loading" border :data="recordList" v-if="queryParams.pointsType == 2">
-        <!--<el-table-column label="姓名" align="left" prop="userName" />-->
-        <el-table-column label="奖励分变动信息" align="left" prop="messageContent"/>
-        <el-table-column label="时间" align="left" prop="createTime" />
-        <el-table-column label="积分变动" align="left" prop="points">
-          <template slot-scope="scope">
-            <span :class="scope.row.points>0?'table-colorA':(scope.row.points<0?'table-colorB':'')">{{scope.row.points>0?'+'+scope.row.points:scope.row.points}}</span>
-          </template>
-        </el-table-column>
-        <el-table-column label="奖励分余额" align="left"  prop="surplusPoints"/>
-      </el-table>
-      <el-table v-loading="loading" border :data="recordList" v-if="queryParams.pointsType == 1">
-        <!--<el-table-column label="姓名" align="left" prop="userName" />-->
-        <el-table-column label="信用分变动信息" align="left" prop="messageContent"/>
-        <el-table-column label="时间" align="left" prop="createTime" />
-        <el-table-column label="积分变动" align="left" prop="points">
-          <template slot-scope="scope">
-            <span :class="scope.row.points>0?'table-colorA':(scope.row.points<0?'table-colorB':'')">{{scope.row.points>0?'+'+scope.row.points:scope.row.points}}</span>
-          </template>
-        </el-table-column>
-        <el-table-column label="信用分余额" align="left"  prop="surplusPoints"/>
-      </el-table>
-      <pagination
-        v-show="total>0"
-        :total="total"
-        layout="total, prev, pager, next, sizes, jumper"
-        :page.sync="queryParams.page"
-        :limit.sync="queryParams.pageSize"
-        @pagination="getList"
-      />
+      <div class="page-form-title-box" style="padding:0 20px 0 0;height:60px;">
+        <el-form :model="queryParams" ref="queryForm" :inline="true" v-show="showSearch" label-width="68px">
+          <el-form-item label="时间段" prop="dateRange" label-width="65px">
+            <el-date-picker
+              :clearable="false"
+              v-model="dateRange"
+              size="small"
+              style="width: 240px"
+              value-format="yyyy-MM-dd"
+              type="daterange"
+              range-separator="-"
+              start-placeholder="开始日期"
+              end-placeholder="结束日期">
+            </el-date-picker>
+          </el-form-item>
+          <el-form-item label="状态" prop="bonusType" label-width="50px">
+            <el-select v-model="queryParams.bonusType" clearable placeholder="请选择状态">
+              <el-option
+                v-for="dict in bonusTypeOptions"
+                :key="dict.id"
+                :label="dict.name"
+                :value="dict.id"
+              ></el-option>
+            </el-select>
+          </el-form-item>
+          <p class="page-inquire-common-style-button" @click="handleQuery">查询</p>
+          <p class="page-reset-common-style-button" @click="resetQuery">重置</p>
+        </el-form>
+      </div>
+      <div class="page-content-box" style="padding:20px 0 0;">
+        <el-table class="table-box" v-loading="loading" border :data="recordList" v-if="queryParams.pointsType == 2">
+          <!--<el-table-column label="姓名" align="left" prop="userName" />-->
+          <el-table-column label="奖励分变动信息" align="left" prop="messageContent" show-overflow-tooltip/>
+          <el-table-column label="时间" align="left" prop="createTime" show-overflow-tooltip>
+            <template slot-scope="scope">
+              <span>{{ parseTime(scope.row.createTime,"{y}-{m}-{d} {h}:{i}") }}</span>
+            </template>
+          </el-table-column>
+          <el-table-column label="积分变动" align="left" prop="points" show-overflow-tooltip>
+            <template slot-scope="scope">
+              <span :class="scope.row.points>0?'table-colorA':(scope.row.points<0?'table-colorB':'')">{{scope.row.points>0?'+'+scope.row.points:scope.row.points}}</span>
+            </template>
+          </el-table-column>
+          <el-table-column label="奖励分余额" align="left"  prop="surplusPoints" show-overflow-tooltip/>
+        </el-table>
+        <el-table class="table-box" v-loading="loading" border :data="recordList" v-if="queryParams.pointsType == 1">
+          <!--<el-table-column label="姓名" align="left" prop="userName" />-->
+          <el-table-column label="信用分变动信息" align="left" prop="messageContent" show-overflow-tooltip/>
+          <el-table-column label="时间" align="left" prop="createTime" show-overflow-tooltip>
+            <template slot-scope="scope">
+              <span>{{ parseTime(scope.row.createTime,"{y}-{m}-{d} {h}:{i}") }}</span>
+            </template>
+          </el-table-column>
+          <el-table-column label="积分变动" align="left" prop="points" show-overflow-tooltip>
+            <template slot-scope="scope">
+              <span :class="scope.row.points>0?'table-colorA':(scope.row.points<0?'table-colorB':'')">{{scope.row.points>0?'+'+scope.row.points:scope.row.points}}</span>
+            </template>
+          </el-table-column>
+          <el-table-column label="信用分余额" align="left"  prop="surplusPoints" show-overflow-tooltip/>
+        </el-table>
+        <pagination
+          v-show="total>0"
+          :total="total"
+          layout="total, prev, pager, next, sizes, jumper"
+          :page.sync="queryParams.page"
+          :limit.sync="queryParams.pageSize"
+          @pagination="getList"
+        />
+      </div>
     </div>
   </div>
 </template>
 
 <script>
-import { examPointsRecordList, getRecord, delRecord,myListRecord, addRecord, updateRecord, getMyPointsLoglist ,getMyPointsLogInfo } from "@/api/creditViolation/index";
+// import { examPointsRecordList, getRecord, delRecord,myListRecord, addRecord, updateRecord, getMyPointsLoglist ,examPointsRecordGetMyPointsLogInfo } from "@/api/creditViolation/index";
+import { examPointsRecordGetMyPointsLogInfo,examPointsRecordGetMyPointsLoglist } from "@/api/creditViolation/index";
 
 export default {
   name: "Record",
@@ -149,22 +160,12 @@ export default {
     return {
       // 遮罩层
       loading: true,
-      // 选中数组
-      ids: [],
-      // 非单个禁用
-      single: true,
-      // 非多个禁用
-      multiple: true,
       // 显示搜索条件
       showSearch: true,
       // 总条数
       total: 0,
       // 用户积分记录表格数据
       recordList: [],
-      // 弹出层标题
-      title: "",
-      // 是否显示弹出层
-      open: false,
       // 查询参数
       queryParams: {
         pointsType:2,
@@ -172,11 +173,6 @@ export default {
         pageSize:20,
         bonusType:null
       },
-      // 表单参数
-      form: {},
-      // 表单校验
-      rules: {
-      },
       // 日期范围
       dateRange: [],
       //状态
@@ -190,14 +186,12 @@ export default {
   },
   created() {
     this.getList();
-    this.getMyPointsLogInfo();
-    this.getDicts("points_mode").then(response => {
-      this.pointsMode = response.data;
-    });
+    this.examPointsRecordGetMyPointsLogInfo();
   },
   methods: {
-    getMyPointsLogInfo(){
-      getMyPointsLogInfo({pointsType:this.queryParams.pointsType}).then( response => {
+    //信用分/奖励分-查询
+    examPointsRecordGetMyPointsLogInfo(){
+      examPointsRecordGetMyPointsLogInfo({pointsType:this.queryParams.pointsType}).then( response => {
         this.userData =  response.data;
       });
     },
@@ -208,59 +202,26 @@ export default {
         this.queryParams.page = 1;
         this.resetForm("queryForm");
         this.dateRange=[];
-        this.getMyPointsLogInfo();
+        this.examPointsRecordGetMyPointsLogInfo();
         this.getList();
       }
     },
     /** 查询用户积分记录列表 */
     getList() {
       this.loading = true;
-      if(this.dateRange&&this.dateRange.length>0)
-      {
-        this.queryParams.beginTime=this.dateRange[0]
-        this.queryParams.endTime=this.dateRange[1]
+      let obj = JSON.parse(JSON.stringify(this.queryParams))
+      if(this.dateRange&&this.dateRange.length>0) {
+        obj.startTime=this.dateRange[0]+'T00:00:00'
+        obj.endTime=this.dateRange[1]+'T23:59:59'
+      } else {
+        obj.startTime=null;
+        obj.endTime=null
       }
-      else
-      {
-        this.queryParams.beginTime=null;
-        this.queryParams.endTime=null
-      }
-      getMyPointsLoglist(this.queryParams).then( response => {
-        this.recordList =  response.rows;
-        this.total =  response.total;
+      examPointsRecordGetMyPointsLoglist(obj).then( response => {
+        this.$set(this,'recordList',response.data.records);
+        this.$set(this,'total',response.data.total);
         this.loading = false;
       });
-    },
-     // 行为字典翻译
-    modeFormat(row, column) {
-      return this.selectDictLabel(this.pointsMode, row.mode);
-    },
-    pointsFormat(row,a)
-    {
-      return row.recordType.code===1?`+ ${row.points}`:`- ${row.points}`
-    },
-    // 取消按钮
-    cancel() {
-      this.open = false;
-      this.reset();
-    },
-    // 表单重置
-    reset() {
-      this.form = {
-        id: null,
-        points: null,
-        joinUserId: null,
-        mode: null,
-        deptName: null,
-        deptId: null,
-        createTime: null,
-        userId: null,
-        createBy: null,
-        updateTime: null,
-        updateBy: null,
-        remark: null
-      };
-      this.resetForm("form");
     },
     /** 搜索按钮操作 */
     handleQuery() {
@@ -273,62 +234,6 @@ export default {
       this.dateRange=[];
       this.handleQuery();
     },
-    /** 新增按钮操作 */
-    handleAdd() {
-      this.reset();
-      this.open = true;
-      this.title = "添加用户积分记录";
-    },
-    /** 修改按钮操作 */
-    handleUpdate(row) {
-      this.reset();
-      const id = row.id || this.ids
-      getRecord(id).then( response => {
-        this.form =  response.data;
-        this.open = true;
-        this.title = "修改用户积分记录";
-      });
-    },
-    /** 提交按钮 */
-    submitForm() {
-      this.$refs["form"].validate(valid => {
-        if (valid) {
-          if (this.form.id != null) {
-            updateRecord(this.form).then( response => {
-              this.msgSuccess("修改成功");
-              this.open = false;
-              this.getList();
-            });
-          } else {
-            addRecord(this.form).then( response => {
-              this.msgSuccess("新增成功");
-              this.open = false;
-              this.getList();
-            });
-          }
-        }
-      });
-    },
-    /** 删除按钮操作 */
-    handleDelete(row) {
-      const ids = row.id || this.ids;
-      this.$confirm('确认删除用户积分记录吗?', "警告", {
-          confirmButtonText: "确定",
-          cancelButtonText: "取消",
-          type: "warning"
-        }).then(function() {
-          return delRecord(ids);
-        }).then(() => {
-          this.getList();
-          this.msgSuccess("删除成功");
-        }).catch(() => {});
-    },
-    /** 导出按钮操作 */
-    handleExport() {
-      this.download('exam/record/export', {
-        ...this.queryParams
-      }, `exam_record.xlsx`)
-    }
   }
 };
 </script>

src/views/emergencyManagement/evacuation/emergencyEvacuation/newEvacuationBigDataHome.vue

@@ -105,6 +105,10 @@
   import { GLTFLoader } from 'three/examples/jsm/loaders/GLTFLoader.js'
   import { mergeBufferGeometries } from 'three/examples/jsm/utils/BufferGeometryUtils'
   import { SceneUtils } from 'three/examples/jsm/utils/SceneUtils.js'
+
+  //                                        V3
+  import { laboratoryBigViewGetBuildByBigView } from "@/api/emergencyManagement/index";
+
   export default {
     name: 'newEvacuationBigDataHome',
     computed:{
@@ -203,7 +207,7 @@
     mounted(){
       // this.offAllMQTT('on');
       //获取楼栋数据
-      this.getBuilding();
+      this.laboratoryBigViewGetBuildByBigView();
     },
     methods: {
       //数据处理
@@ -662,8 +666,8 @@
         }
       },
       //获取楼栋数据
-      getBuilding(){
-        getBuildOrFloorList({type:2,parentId:''}).then(response => {
+      laboratoryBigViewGetBuildByBigView(){
+        laboratoryBigViewGetBuildByBigView({type:2}).then(response => {
           if(response.data[0]){
             this.$set(this,'buildingOptions',response.data);
             this.$set(this,'buildingId',response.data[0].id);
@@ -706,7 +710,7 @@
       },
       //获取楼层数据
       getFloor(){
-        getBuildOrFloorDetailList({parentId : this.buildingId}).then(response => {
+        laboratoryBigViewGetBuildByBigView({id:this.buildingId,type:3}).then(response => {
           let list = [];
           let monitorList = [];
           for(let i=0;i<response.data.length;i++){