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

src/api/resLabelInfo.js

+import request from '@/utils/request'
+import Qs from 'qs'
+
+/**
+* 1. 列表查询
+* 2. 查询详细信息
+* 3. 新增
+* 4. 修改
+* 5. 逻辑删除
+* 6. 导出
+*
+*/
+
+// 1. 查询标签信息列表
+export function listResLabelInfo(query) {
+  return request({
+    url: '/reslabelinfo/list',
+    method: 'get',
+    params: query
+  })
+}
+
+// 2. 查询标签信息详细信息
+export function getResLabelInfo(businessId) {
+  return request({
+    url: '/reslabelinfo/detail/' + businessId,
+    method: 'get'
+  })
+}
+
+// 3. 新增标签信息
+export function addResLabelInfo(data) {
+  data = Qs.stringify(data)
+  return request({
+    url: '/reslabelinfo/add',
+    method: 'post',
+    data: data
+  })
+}
+
+// 4. 修改标签信息
+export function updateResLabelInfo(data) {
+  const businessId = data.businessId
+  data = Qs.stringify(data)
+  return request({
+    url: '/reslabelinfo/update/' + businessId,
+    method: 'put',
+    data
+  })
+}
+
+// 5. 逻辑删除标签信息
+export function delResLabelInfo(businessId) {
+  return request({
+    url: '/reslabelinfo/deleteLogical/' + businessId,
+    method: 'delete'
+  })
+}
+
+// 6. 导出标签信息
+export function exportResLabelInfo(query) {
+  return request({
+    url: '/reslabelinfo/export',
+    method: 'get',
+    params: query,
+    responseType: 'blob'
+  })
+}

src/styles/themeH/common.scss

@@ -5,9 +5,7 @@
   font-family: Microsoft YaHei;
   font-weight: 700;
   text-align: LEFT;
-  position: absolute;
-  left: 0.25rem;
-  top: 0.45rem;
+  margin-bottom: 10px;
   // background-color: #000;
 }
 .container {

src/styles/themeH/dict.scss

 $color-theme: #f4ac10;
+.dictBtnRow{
+  text-align: end;
+  margin-right: 9px;
+}
 .dict-manage {
   font-size: 18px;
   padding: 0;

src/styles/themeH/sidebar.scss

@@ -236,7 +236,7 @@
 }
 
 #app .sidebar-container .el-submenu .el-menu-item.is-active {
-  background-color: #171725 !important;
+  background-color: #1D2B36 !important;
 }
 
 .router-link-active .el-menu-item.is-active {

src/styles/themeH/variables.scss

@@ -88,7 +88,7 @@ $menuBg: #1d2b36;
 $menuHover:#2288ff;
 
 $subMenuBg:#1A2229;
-$subMenuHover:#1A2229;
+$subMenuHover:#1D2B36;
 
 $sideBarWidth: 13.25rem;
 $sideHideWidth: 3rem;

src/views/monitor/errorLog/index.vue

 <template>
   <div class="errLog-manage">
+    <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" label-width="auto">
         <el-form-item label="系统模块" prop="title">
@@ -57,7 +58,7 @@
       </el-form>
     </div>
     <div style="padding:5px 10px">
-      <div class="tableTitle">异常日志列表</div>
+      <div v-if="themeType !== '8'" class="tableTitle">异常日志列表</div>
       <el-table v-loading="loading" border :data="list" @selection-change="handleSelectionChange">
         <el-table-column type="index" label="序号" width="55" align="center" />
         <el-table-column :show-overflow-tooltip="true" label="系统模块" align="center" prop="systemMode">
@@ -264,6 +265,9 @@ export default {
     }
   },
   computed: {
+    themeType() {
+      return localStorage.getItem('theme')
+    },
     commonField() {
       return commonField
     }

src/views/monitor/loginInfo/index.vue

 <template>
   <div class="loginInfo-manage">
+    <div v-if="themeType === '8'" class="tableTitle">登录日志列表</div>
     <div class="search">
       <el-form v-show="showSearch" ref="queryForm" style="padding: 0 0 0 10px" :model="queryParams" :inline="true" label-width="auto">
         <el-form-item label="用户名称" prop="userName">
@@ -48,7 +49,7 @@
       </el-form>
     </div>
     <div style="padding:5px 10px">
-      <div class="tableTitle">登录日志列表</div>
+      <div v-if="themeType !== '8'" class="tableTitle">登录日志列表</div>
       <el-table v-loading="loading" border :data="list" @selection-change="handleSelectionChange">
         <el-table-column type="index" width="55" label="序号" align="center" />
         <el-table-column label="用户名称" align="center" prop="username" />
@@ -213,6 +214,9 @@ export default {
     }
   },
   computed: {
+    themeType() {
+      return localStorage.getItem('theme')
+    },
     commonField() {
       return commonField
     }

src/views/monitor/operLog/index.vue

 <template>
   <div class="operlog-manage">
+    <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" label-width="auto">
         <el-form-item label="系统模块" prop="title">
@@ -57,7 +58,7 @@
       </el-form>
     </div>
     <div style="padding:5px 10px">
-      <div class="tableTitle">操作日志列表</div>
+      <div v-if="themeType !== '8'" class="tableTitle">操作日志列表</div>
       <el-table v-loading="loading" border :data="list" @selection-change="handleSelectionChange">
         <el-table-column type="index" width="55" align="center" />
         <!--        <el-table-column :show-overflow-tooltip="true" label="日志编号" width="100" align="center" prop="operId">-->
@@ -298,6 +299,9 @@ export default {
     }
   },
   computed: {
+    themeType() {
+      return localStorage.getItem('theme')
+    },
     commonField() {
       return commonField
     }

src/views/system/dept/index.vue

 <template>
   <div class="dept-manage">
+    <div v-if="themeType === '8'" class="tableTitle">部门管理列表</div>
     <div class="search">
       <el-form v-show="showSearch" ref="queryForm" style="padding: 0 0 0 10px" :model="queryParams" :inline="true">
         <el-form-item label="部门名称" prop="deptName">
@@ -53,7 +54,7 @@
       </el-form>
     </div>
     <div style="padding:5px 10px">
-      <div class="tableTitle">部门管理列表</div>
+      <div v-if="themeType !== '8'" class="tableTitle">部门管理列表</div>
       <el-table
         v-loading="Loading"
         :data="deptList"
@@ -236,6 +237,9 @@ export default {
     }
   },
   computed: {
+    themeType() {
+      return localStorage.getItem('theme')
+    },
     commonField() {
       return commonField
     }

src/views/system/dict/data.vue

 <template>
   <div class="dictData-manage">
+    <div v-if="themeType === '8'" class="tableTitle">字典参数列表</div>
     <div class="search">
       <el-form v-show="showSearch" ref="queryForm" style="padding: 0 0 0 10px" :model="queryParams" :inline="true">
         <el-form-item label="字典名称" prop="dictType">
@@ -36,8 +37,8 @@
           <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-form-item>
-        <div style="padding-bottom: 15px">
-          <coolbutton :class-name="commonField.addClass" :type="commonField.typePrimary" :name="commonField.addName" :icon="commonField.addIcon" :size="commonField.size" :haspermi="hasDataAddPerm" @btn-click="handleAdd" />
+        <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" />
           <el-button
             class="importBtn"
             type="warning"
@@ -60,7 +61,7 @@
     </div>
     <div class="placeholder" />
     <div style="padding:10px">
-      <div class="mb12 font-small-bold">字典参数列表</div>
+      <div v-if="themeType !== '8'" class="tableTitle">字典参数列表</div>
       <el-table v-loading="loading" :data="dataList" border @selection-change="handleSelectionChange">
         <el-table-column type="selection" width="55" align="center" />
         <el-table-column label="字典编码" align="center" prop="businessId" />
@@ -283,6 +284,9 @@ export default {
     }
   },
   computed: {
+    themeType() {
+      return localStorage.getItem('theme')
+    },
     commonField() {
       return commonField
     }

src/views/system/dict/index.vue

 <template>
   <div class="dict-manage">
+    <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" label-width="auto">
         <el-form-item label="字典名称" prop="dictName">
@@ -69,8 +70,8 @@
             @click="resetQuery"
           >{{ commonField.resetName }}</el-button>
         </el-form-item>
-        <div style="padding-bottom: 15px">
-          <!--          //新增按钮-->
+        <div style="padding-bottom: 15px" class="dictBtnRow">
+        <!--          //新增按钮-->
           <el-button
             v-hasPermi="hasDictAddPerm"
             :class="commonField.addClass"FR
@@ -93,7 +94,7 @@
       </el-form>
     </div>
     <div style="min-height: 445px;padding:5px 10px">
-      <div class="tableTitle">字典管理列表</div>
+      <div v-if="themeType !== '8'" class="tableTitle">字典管理列表</div>
       <el-table v-loading="loading" border :data="typeList" @selection-change="handleSelectionChange">
         <el-table-column type="index" label="序号" width="55" align="center" />
         <!--        <el-table-column label="字典编号" align="center" prop="businessId" />-->
@@ -299,6 +300,9 @@ export default {
     }
   },
   computed: {
+    themeType() {
+      return localStorage.getItem('theme')
+    },
     commonField() {
       return commonField
     }

src/views/system/menu/index.vue

 <template>
   <div class="menu-manage">
+    <div v-if="themeType === '8'" class="tableTitle">菜单管理列表</div>
     <div class="search">
       <el-form style="padding: 0 0 0 10px" :inline="true">
         <el-form-item label="菜单名称">
@@ -45,7 +46,7 @@
       </el-form>
     </div>
     <div style="padding:5px 10px">
-      <div class="tableTitle">菜单管理列表</div>
+      <div v-if="themeType !== '8'" class="tableTitle">菜单管理列表</div>
       <el-table
         v-loading="loading"
         :data="menuList"
@@ -345,6 +346,9 @@ export default {
     }
   },
   computed: {
+    themeType() {
+      return localStorage.getItem('theme')
+    },
     commonField() {
       return commonField
     }

src/views/system/role/index.vue

 <template>
   <div class="role-manage">
+    <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="roleName">
@@ -81,7 +82,7 @@
       </el-form>
     </div>
     <div style="padding:5px 10px">
-      <div class="tableTitle">角色管理列表</div>
+      <div v-if="themeType !== '8'" class="tableTitle">角色管理列表</div>
       <el-table v-loading="loading" border :data="roleList" @selection-change="handleSelectionChange">
         <el-table-column type="index" label="序号" width="90" />
         <el-table-column label="名称" prop="roleName" :show-overflow-tooltip="true">
@@ -399,6 +400,9 @@ export default {
     }
   },
   computed: {
+    themeType() {
+      return localStorage.getItem('theme')
+    },
     commonField() {
       return commonField
     }

src/views/system/user/index.vue

 <template>
   <div class="user-manage">
+    <div v-if="themeType === '8'" class="tableTitle">用户管理列表</div>
     <div class="search">
       <el-form v-show="showSearch" ref="queryForm" style="padding: 0 0 0 10px" class="formClass" :model="queryParams" :inline="true" label-width="auto">
         <el-form-item label="登录名" prop="username">
@@ -114,7 +115,7 @@
       </el-col>
       <!--用户数据-->
       <el-col :span="20" :xs="24">
-        <div class="tableTitleUser">用户管理列表</div>
+        <div v-if="themeType === '8'" class="tableTitle">用户管理列表</div>
         <el-table
           v-loading="loading"
           style="padding-right: 10px"
@@ -612,6 +613,9 @@ export default {
     }
   },
   computed: {
+    themeType() {
+      return localStorage.getItem('theme')
+    },
     commonField() {
       return commonField
     }

vue.config.js

@@ -91,7 +91,7 @@ module.exports = {
       // 直接修改 terserOptions 下的属性值，保留原有配置
       // 这里访问 terserOptions 的时候并没有 output，访问不到 output.comments 需要直接赋值
       args[0].terserOptions.output = {
-        comments: false,
+        comments: false
       }
       return args
     })