Merge branch 'master' of http://gitlab.91isoft.com:90/zhangbotao/intelligent_station_web

src/api/busClassesInfo.js

+import request from '@/utils/request'
+import Qs from 'qs'
+
+/**
+* 1. 列表查询
+* 2. 查询详细信息
+* 3. 新增
+* 4. 修改
+* 5. 逻辑删除
+* 6. 导出
+*
+*/
+
+// 1. 查询班级信息列表
+export function listBusClassesInfo(query) {
+  return request({
+    url: '/busclassesinfo/list',
+    method: 'get',
+    params: query
+  })
+}
+
+// 2. 查询班级信息详细信息
+export function getBusClassesInfo(businessId) {
+  return request({
+    url: '/busclassesinfo/detail/' + businessId,
+    method: 'get'
+  })
+}
+
+// 3. 新增班级信息
+export function addBusClassesInfo(data) {
+  data = Qs.stringify(data)
+  return request({
+    url: '/busclassesinfo/add',
+    method: 'post',
+    data: data
+  })
+}
+
+// 4. 修改班级信息
+export function updateBusClassesInfo(data) {
+  const businessId = data.businessId
+  data = Qs.stringify(data)
+  return request({
+    url: '/busclassesinfo/update/' + businessId,
+    method: 'put',
+    data
+  })
+}
+
+// 5. 逻辑删除班级信息
+export function delBusClassesInfo(businessId) {
+  return request({
+    url: '/busclassesinfo/deleteLogical/' + businessId,
+    method: 'delete'
+  })
+}
+
+// 6. 导出班级信息
+export function exportBusClassesInfo(query) {
+  return request({
+    url: '/busclassesinfo/export',
+    method: 'get',
+    params: query,
+    responseType: 'blob'
+  })
+}

src/api/resDatasetInfo.js

+import request from '@/utils/request'
+import Qs from 'qs'
+
+/**
+* 1. 列表查询
+* 2. 查询详细信息
+* 3. 新增
+* 4. 修改
+* 5. 逻辑删除
+* 6. 导出
+*
+*/
+
+// 1. 查询数据集信息列表
+export function listResDatasetInfo(query) {
+  return request({
+    url: '/resdatasetinfo/list',
+    method: 'get',
+    params: query
+  })
+}
+
+// 2. 查询数据集信息详细信息
+export function getResDatasetInfo(businessId) {
+  return request({
+    url: '/resdatasetinfo/detail/' + businessId,
+    method: 'get'
+  })
+}
+
+// 3. 新增数据集信息
+export function addResDatasetInfo(data) {
+  data = Qs.stringify(data)
+  return request({
+    url: '/resdatasetinfo/add',
+    method: 'post',
+    data: data
+  })
+}
+
+// 4. 修改数据集信息
+export function updateResDatasetInfo(data) {
+  const businessId = data.businessId
+  data = Qs.stringify(data)
+  return request({
+    url: '/resdatasetinfo/update/' + businessId,
+    method: 'put',
+    data
+  })
+}
+
+// 5. 逻辑删除数据集信息
+export function delResDatasetInfo(businessId) {
+  return request({
+    url: '/resdatasetinfo/deleteLogical/' + businessId,
+    method: 'delete'
+  })
+}
+
+// 6. 导出数据集信息
+export function exportResDatasetInfo(query) {
+  return request({
+    url: '/resdatasetinfo/export',
+    method: 'get',
+    params: query,
+    responseType: 'blob'
+  })
+}

src/styles/themeH/common.scss

@@ -64,7 +64,7 @@
     opacity: 0.85;
     border: none;
     background: #2288ff;
-    color: #696974;
+    //color: #696974;
     border-radius: 0.25rem;
   }
 }
@@ -87,7 +87,7 @@
     opacity: 0.85;
     border: none;
     background: #2288ff;
-    color: #696974;
+    //color: #696974;
     border-radius: 0.25rem;
   }
 }
@@ -110,7 +110,7 @@
     opacity: 0.85;
     border: none;
     background: #2288ff;
-    color: #696974;
+    // color: #696974;
     border-radius: 0.25rem;
   }
 }
@@ -133,7 +133,7 @@
     opacity: 0.85;
     border: none;
     background: #2288ff;
-    color: #696974;
+    //color: #696974;
     border-radius: 0.25rem;
   }
 }
@@ -155,8 +155,8 @@
   &:focus {
     opacity: 0.85;
     border: none;
-    background: #f1f1f5 !important;
-    color: #696974 !important;
+    background: #2288ff !important;
+    //color: #696974 !important;
     border-radius: 0.25rem !important;
   }
 }

src/views/monitor/errorLog/index.vue

@@ -37,7 +37,7 @@
         </el-form-item>
         <el-form-item>
           <el-button class="queryBtn" type="primary" size="small" icon="el-icon-search" @click="handleQuery">查询</el-button>
-          <el-button class="resetBtn" icon="el-icon-refresh" size="small" @click="resetQuery">重置</el-button>
+          <el-button class="resetBtn" type="primary" icon="el-icon-refresh" size="small" @click="resetQuery">重置</el-button>
         </el-form-item>
         <el-form-item style="float: right">
           <el-button

src/views/monitor/loginInfo/index.vue

@@ -26,7 +26,7 @@
         </el-form-item>
         <el-form-item>
           <el-button class="queryBtn" type="primary" size="small" icon="el-icon-search" @click="handleQuery">查询</el-button>
-          <el-button class="resetBtn" icon="el-icon-refresh" size="small" @click="resetQuery">重置</el-button>
+          <el-button class="resetBtn" type="primary" icon="el-icon-refresh" size="small" @click="resetQuery">重置</el-button>
         </el-form-item>
         <div style="float: right">
           <el-form-item>

src/views/monitor/operLog/index.vue

@@ -37,7 +37,7 @@
         </el-form-item>
         <el-form-item>
           <el-button class="queryBtn" type="primary" size="small" icon="el-icon-search" @click="handleQuery">查询</el-button>
-          <el-button class="resetBtn" icon="el-icon-refresh" size="small" @click="resetQuery">重置</el-button>
+          <el-button class="resetBtn" type="primary" icon="el-icon-refresh" size="small" @click="resetQuery">重置</el-button>
         </el-form-item>
         <el-form-item style="float: right">
           <el-button

src/views/resLabelInfo/index.vue

 <template>
   <div class="app-container">
+    <div v-if="themeType == '8'" class="tableTitle">标签管理列表</div>
+    <div class="search">
       <el-form ref="queryForm" style="padding: 0 0 0 10px" :model="queryParams" :inline="true">
-      <el-form-item label="名称" prop="labelName">
+        <el-form-item label="标签名称" prop="labelName">
           <el-input
             v-model="queryParams.labelName"
-          placeholder="请输入名称"
+            placeholder="请输入标签名称"
             clearable
             :maxlength="255"
             size="small"
             style="width: 150px"
           />
         </el-form-item>
-      <el-form-item label="分类（1模版，2镜像，3数据集）" prop="labelType">
-        <el-input
-          v-model="queryParams.labelType"
-          placeholder="请输入分类（1模版，2镜像，3数据集）"
-          clearable
-          :maxlength="1"
-          size="small"
-          style="width: 150px"
+        <el-form-item label="标签分类" prop="labelType">
+          <el-select v-model="queryParams.labelType" placeholder="请选择标签分类" clearable size="small">
+            <el-option
+              v-for="dict in sortOptions"
+              :key="dict.dictValue"
+              :label="dict.dictLabel"
+              :value="dict.dictValue"
             />
+          </el-select>
         </el-form-item>
         <el-form-item label="状态" prop="flag">
           <el-select v-model="queryParams.flag" placeholder="请选择状态" clearable size="small">
@@ -41,6 +43,7 @@
           >查询</el-button>
           <el-button
             :class="commonField.resetClass"
+            :type="commonField.typePrimary"
             :icon="commonField.resetIcon"
             :size="commonField.smallSize"
             @click="resetQuery"
@@ -57,7 +60,7 @@
             >新增</el-button>
             <el-button
               :class="commonField.exportClass"
-            :type="commonField.typeSuccess"
+              :type="commonField.typePrimary"
               :icon="commonField.exportIcon"
               :size="commonField.smallSize"
               @click="handleExport"
@@ -65,19 +68,19 @@
           </el-form-item>
         </div>
       </el-form>
-    <div class="placeholder" />
+    </div>
     <div style="padding:5px 10px">
-      <div class="mb12 font-small-bold">标签信息列表</div>
+      <div v-if="themeType !== '8'" class="tableTitle">标签管理列表</div>
       <el-table v-loading="loading" border :data="resLabelInfoList">
         <el-table-column type="index" label="序号" width="55" align="center" />
-        <el-table-column label="名称" prop="labelName" :show-overflow-tooltip="true">
+        <el-table-column label="标签名称" prop="labelName" :show-overflow-tooltip="true">
           <template slot-scope="scope">
             {{ scope.row.labelName || '-' }}
           </template>
         </el-table-column>
-        <el-table-column label="分类（1模版，2镜像，3数据集）" prop="labelType" :show-overflow-tooltip="true">
+        <el-table-column label="标签分类" prop="labelType" :show-overflow-tooltip="true">
           <template slot-scope="scope">
-            {{ scope.row.labelType || '-' }}
+            {{ scope.row.labelTypeName || '-' }}
           </template>
         </el-table-column>
         <el-table-column label="权重" prop="weight" :show-overflow-tooltip="true">
@@ -134,14 +137,18 @@
     <!-- 添加或修改标签信息配置对话框 -->
     <el-dialog :title="title" :visible.sync="open" width="500px" append-to-body>
       <el-form ref="form" :model="form" :rules="rules" size="small" label-width="90px">
-        <el-form-item label="名称" prop="labelName">
-          <el-input v-model.trim="form.labelName" show-word-limit :maxlength="255" placeholder="请输入名称" />
+        <el-form-item label="标签名称" prop="labelName">
+          <el-input v-model.trim="form.labelName" show-word-limit :maxlength="255" placeholder="请输入标签名称" />
         </el-form-item>
-        <el-form-item label="分类（1模版，2镜像，3数据集）" prop="labelType">
-          <el-input v-model.trim="form.labelType" show-word-limit :maxlength="1" placeholder="请输入分类（1模版，2镜像，3数据集）" />
+        <el-form-item label="标签分类">
+          <el-radio-group v-model="form.labelType">
+            <el-radio label="1">模板</el-radio>
+            <el-radio label="2">镜像</el-radio>
+            <el-radio label="3">数据集</el-radio>
+          </el-radio-group>
         </el-form-item>
         <el-form-item label="权重" prop="weight">
-          <el-input-number v-model.trim="form.weight" controls-position="right" :min="0" />
+          <el-input-number v-model="form.weight" style="width: 100%" controls-position="right" :min="0" />
         </el-form-item>
         <el-form-item label="状态">
           <el-radio-group v-model="form.flag">
@@ -169,9 +176,14 @@ import {
   addResLabelInfo,
   updateResLabelInfo,
   exportResLabelInfo } from '@/api/resLabelInfo'
+import {
+  selectDictType
+} from '@/api/system/dict/type'
+import { getDataCache, setDataCache } from '@/assets/js/filterData'
 import commonField from '@/utils/commonField'
 export default {
   name: 'ResLabelInfo',
+  dicts: ['res_label_type'],
   data() {
     return {
       // 遮罩层
@@ -195,6 +207,20 @@ export default {
           dictValue: '0'
         }
       ],
+      sortOptions: [
+        {
+          dictLabel: '模板',
+          dictValue: '1'
+        },
+        {
+          dictLabel: '镜像',
+          dictValue: '2'
+        },
+        {
+          dictLabel: '数据集',
+          dictValue: '3'
+        }
+      ],
       // 查询参数
       queryParams: {
         page: 1,
@@ -206,28 +232,53 @@ export default {
       },
       // 表单参数
       form: {},
+      dictList: [],
       // 表单校验
       rules: {
+        labelName: [
+          { required: true, message: '标签名称不能为空', trigger: 'blur' }
+        ],
+        labelType: [
+          { required: true, message: '标签分类不能为空', trigger: 'blur' }
+        ],
+        weight: [
+          { required: true, message: '权重不能为空', trigger: 'blur' }
+        ]
       }
     }
   },
   computed: {
+    themeType() {
+      return localStorage.getItem('theme')
+    },
     commonField() {
       return commonField
     }
   },
+  /** 路由离开前存储筛选条件*/
+  beforeRouteLeave(to, from, next) {
+    setDataCache(this.$route.path, this.queryParams)
+    next()
+  },
   created() {
+    this.queryParams = JSON.parse(getDataCache(this.$route.path))
     this.getList() // 列表查询
   },
   methods: {
     /** 查询标签信息列表 */
     getList() {
       this.loading = true
+      selectDictType('res_label_type').then(response => {
+        this.dictList = response.data
+      })
       listResLabelInfo(this.queryParams).then(
         response => {
           this.resLabelInfoList = response.rows
           this.total = response.total
           this.loading = false
+          this.resLabelInfoList.forEach(item => {
+            item.labelTypeName = this.dictList.find(item1 => item1.dictValue === item.labelType).dictLabel
+          })
         }
       )
     },

src/views/system/dept/index.vue

@@ -35,6 +35,7 @@
           <!--          //重置按钮-->
           <el-button
             :class="commonField.resetClass"
+            :type="commonField.typePrimary"
             :icon="commonField.resetIcon"
             :size="commonField.smallSize"
             @click="resetQuery"

src/views/system/dict/data.vue

@@ -35,7 +35,7 @@
         </el-form-item>
         <el-form-item>
           <el-button class="queryBtn" type="primary" icon="el-icon-search" size="small" @click="handleQuery">查询</el-button>
-          <el-button class="resetBtn" icon="el-icon-refresh" size="small" @click="resetQuery">重置</el-button>
+          <el-button class="resetBtn" type="primary" icon="el-icon-refresh" size="small" @click="resetQuery">重置</el-button>
         </el-form-item>
         <div style="padding-bottom: 15px" class="dictBtnRow">
         <coolbutton :class-name="commonField.addClass" :type="commonField.typePrimary" :name="commonField.addName" :icon="commonField.addIcon" :size="commonField.size" :haspermi="hasDataAddPerm" @btn-click="handleAdd" />
@@ -59,7 +59,6 @@
         </div>
       </el-form>
     </div>
-    <div class="placeholder" />
     <div style="padding:10px">
       <div v-if="themeType !== '8'" class="tableTitle">字典参数列表</div>
       <el-table v-loading="loading" :data="dataList" border @selection-change="handleSelectionChange">

src/views/system/dict/index.vue

@@ -65,6 +65,7 @@
           <!--          //重置按钮-->
           <el-button
             :class="commonField.resetClass"
+            :type="commonField.typePrimary"
             :icon="commonField.resetIcon"
             :size="commonField.smallSize"
             @click="resetQuery"

src/views/system/menu/index.vue

@@ -25,6 +25,7 @@
           <!--          //重置按钮-->
           <el-button
             :class="commonField.resetClass"
+            :type="commonField.typePrimary"
             :icon="commonField.resetIcon"
             :size="commonField.smallSize"
             @click="resetQuery"

src/views/system/role/index.vue

@@ -52,6 +52,7 @@
           <!--          //重置按钮-->
           <el-button
             :class="commonField.resetClass"
+            :type="commonField.typePrimary"
             :icon="commonField.resetIcon"
             :size="commonField.smallSize"
             @click="resetQuery"

src/views/system/user/index.vue

@@ -41,6 +41,7 @@
           <!--          //重置按钮-->
           <el-button
             :class="commonField.resetClass"
+            :type="commonField.typePrimary"
             :icon="commonField.resetIcon"
             :size="commonField.smallSize"
             @click="resetQuery"