修改手动报表，部分界面统一

industry-admin/src/components/CommonTable/index.vue

@@ -1,5 +1,5 @@
 <template>
-    <el-table ref="table" :data="tableData" :stripe="true" style="width: 100%"
+    <el-table ref="table" :data="tableData" :stripe="true" style="width: 100%" border
         @selection-change="handleSelectionChange" row-key="id"
         :tree-props="{ children: 'children', hasChildren: 'hasChildren' }">
         <el-table-column align="center" v-if="isShowCheckbox" type="selection" width="55" fixed></el-table-column>

industry-admin/src/components/UmyTable/index.vue

@@ -1,5 +1,5 @@
 <template>
-    <u-table ref="table" row-key="label" use-virtual :height="tableHight" :big-data-checkbox="true" :data="tableData"
+    <u-table ref="table" row-key="label" use-virtual :big-data-checkbox="true" :data="tableData"
         border style="width: 100%" @selection-change="handleSelectionChange" showBodyOverflow="title"
         showHeaderOverflow="title" :tree-props="{ children: 'children', hasChildren: 'hasChildren' }">
         <u-table-column align="left" v-if="isShowCheckbox" type="selection" width="55" fixed></u-table-column>

industry-admin/src/layout/components/Sidebar/Logo.vue

@@ -2,11 +2,11 @@
   <div class="sidebar-logo-container" :class="{'collapse':collapse}">
     <transition name="sidebarLogoFade">
       <div v-if="collapse" key="collapse" class="sidebar-logo-link">
-        <!-- <img v-if="logo" :src="logo" class="sidebar-logo"> -->
-        <h1 class="sidebar-title">{{ title }} </h1>
+        <img v-if="logo" :src="logo" class="sidebar-logo">
+<!--        <h1 class="sidebar-title">{{ title }} </h1>-->
       </div>
       <div v-else key="expand" class="sidebar-logo-link">
-        <!-- <img v-if="logo" :src="logo" class="sidebar-logo"> -->
+        <img v-if="logo" :src="logo" class="sidebar-logo">
         <h1 class="sidebar-title">{{ title }} </h1>
       </div>
     </transition>
@@ -26,7 +26,8 @@ export default {
   },
   data() {
     return {
-      title: '工业实时数据可视化管理系统',
+      //title: '工业实时数据可视化管理系统',
+      title: '工业实时数据报表软件',
       logo: logoImg
     }
   },

industry-admin/src/settings.js

@@ -1,5 +1,6 @@
 module.exports = {
-  title: '工业实时数据可视化管理系统',
+  // title: '工业实时数据可视化管理系统',
+  title: '工业实时数据报表软件',
 
   /**
    * @type {boolean} true | false

industry-admin/src/views/alarm/alarmHistory/index.vue

@@ -34,7 +34,7 @@
             </el-form-item>
         </el-form>
         <!-- 报警日志 -->
-        <UmyTable ref="alarmLogTable" :tableHeaderTitle="tableHeaderTitle" :tableHight="tableHight"
+        <UmyTable ref="alarmLogTable" :tableHeaderTitle="tableHeaderTitle"
             :tableData="tableData" :isShowCheckbox="isShowCheckbox" :tableOperate="tableOperate">
         </UmyTable>
         <!-- 分页信息 -->

industry-admin/src/views/login/index.vue

@@ -10,7 +10,8 @@
         label-position="left"
       >
         <div class="title-container">
-          <h3 class="title">工业实时数据可视化管理系统</h3>
+<!--          <h3 class="title">工业实时数据可视化管理系统</h3>-->
+          <h3 class="title">工业实时数据报表软件</h3>
         </div>
         <el-form-item prop="userName">
           <span class="svg-container">
@@ -182,6 +183,10 @@
       </el-row>
       </el-form>
     </div>
+    <!--  底部  -->
+    <div class="el-login-footer">
+      <span>Copyright © {{ copyrightDate }} 重庆川仪控制系统有限公司版权所有</span>
+    </div>
   </div>
 </template>
 
@@ -529,5 +534,17 @@ $dark_gray: #889aa4;
   .login-code-img {
     height: 38px;
   }
+  .el-login-footer {
+    height: 40px;
+    line-height: 40px;
+    position: fixed;
+    bottom: 0;
+    width: 100%;
+    text-align: center;
+    color: #4a4a4a;
+    font-family: Arial;
+    font-size: 12px;
+    letter-spacing: 1px;
+  }
 }
 </style>

industry-admin/src/views/report/reportTable/reportDetail.vue

@@ -72,15 +72,8 @@ export default
         }
     },
     created() {
-      //this.pollingReportData()
     },
   methods: {
-      /** 轮询更新报表数据 */
-      pollingReportData() {
-        setInterval(() => {
-          this.sendToken()
-        }, that.reportInterval * 1000);
-      },
         sendToken() {
             const _this = this
             _this.sendMsg({

industry-admin/src/views/report/runConfig/index.vue

@@ -93,7 +93,7 @@ export default {
                         return html
                     },
                     methodName: "reportNameClick",
-                    align: "left"
+                    align: "left",
                 },
                 {
                     propName: "reportTableType",
@@ -111,7 +111,7 @@ export default {
                         };
                     },
                     align: "left",
-                    width:"120"
+                    width:"200"
                 },
                 {
                     propName: "runState",
@@ -125,7 +125,7 @@ export default {
                         }
                     },
                     align: "left",
-                    width: '100'
+                    width: '200'
                 },
                 {
                     propName: "createTime",

industry-admin/src/views/source/dataQuery/index.vue

@@ -352,6 +352,8 @@ export default {
             }
             this.chartForm.idList = arr
             this.chartForm.itemListTitile = b
+
+            this.chooseScheme = null;
         },
         /** 频率更改事件 */
         changeFrequency() {

industry-admin/src/views/system/auth/index.vue

@@ -23,7 +23,7 @@
       <el-col :span="24">
 
         <!-- 表格数据信息 -->
-        <el-table v-loading="loading" :data="authList" stripe header-row-class-name="headBackground">
+        <el-table v-loading="loading" :data="authList" stripe border header-row-class-name="headBackground">
           <el-table-column width="50" align="center" label="序号">
             <template slot-scope="scope">
               {{ (queryParams.page - 1) * queryParams.limit + scope.$index + 1 }}

industry-admin/src/views/system/dept/index.vue

@@ -57,7 +57,7 @@
 
           <!-- 表格数据信息 -->
           <el-table
-
+            border
             ref="table"
             :data="mulData"
             row-key="id"

industry-admin/src/views/system/dict/dict-detail.vue

@@ -36,6 +36,7 @@
           ref="table"
           :data="mulData"
           row-key="id"
+          border
           header-row-class-name="headBackground"
           @select="select"
           @select-all="selectAll"

industry-admin/src/views/system/dict/index.vue

@@ -40,6 +40,7 @@
             :data="dictList"
             row-key="id"
             stripe
+            border
             header-row-class-name="headBackground"
             @selection-change="handleSelectionChange"
           >

industry-admin/src/views/system/log/index.vue

@@ -55,7 +55,7 @@
           </el-col>
         </el-row>
         <!-- 表格数据信息 -->
-        <el-table v-loading="loading" :data="logList" stripe header-row-class-name="headBackground">
+        <el-table v-loading="loading" :data="logList" stripe border header-row-class-name="headBackground">
           <el-table-column width="100" align="center" label="序号">
             <template slot-scope="scope">
               {{ (queryParams.page - 1) * queryParams.limit + scope.$index + 1 }}

industry-admin/src/views/system/menu/index.vue

@@ -36,6 +36,7 @@
             :data="menuList"
             row-key="id"
             stripe
+            border
             header-row-class-name="headBackground"
           >
             <el-table-column key="menuName" label="名称" header-align="left" prop="menuName" show-overflow-tooltip />

industry-admin/src/views/system/monitor/index.vue

@@ -103,6 +103,7 @@
           v-loading="loading"
           :data="monitorList"
           stripe
+          border
           header-row-class-name="headBackground"
           @selection-change="handleSelectionChange"
         >

industry-admin/src/views/system/role/index.vue

@@ -55,6 +55,7 @@
             v-loading="loading"
             :data="roleList"
             stripe
+            border
             header-row-class-name="headBackground"
             @selection-change="handleSelectionChange"
           >

industry-admin/src/views/system/user/delet-user.vue

@@ -23,6 +23,7 @@
         v-loading="loading"
         :data="tableData"
         stripe
+        border
         header-row-class-name="headBackground"
         @selection-change="handleSelectionChange"
       >

industry-admin/src/views/system/user/index.vue

@@ -122,6 +122,7 @@
           v-loading="loading"
           :data="userList"
           stripe
+          border
           header-row-class-name="headBackground"
           @selection-change="handleSelectionChange"
         >