From 24593f1b5cbf617b4eb1c3aaadbdd73c91d9f03a Mon Sep 17 00:00:00 2001
From: Jo <479214531@qq.com>
Date: Wed, 10 Nov 2021 03:44:13 +0800
Subject: [PATCH] =?UTF-8?q?bug=E4=BF=AE=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 public/index.html                |   2 +-
 src/assets/img/index/index20.png | Bin 0 -> 2288 bytes
 src/layouts/header/index.vue     |   3 +-
 src/pages/data/list/index.vue    |  24 ++++++++++------
 src/pages/index/list/index.vue   |  18 ++++++++----
 src/pages/user/list/index.vue    |  46 ++++++++++++++++---------------
 src/setting.js                   |   4 +--
 7 files changed, 58 insertions(+), 39 deletions(-)
 create mode 100644 src/assets/img/index/index20.png
diff --git a/public/index.html b/public/index.html
index 0b8236a..9a64886 100644
--- a/public/index.html
+++ b/public/index.html
@@ -5,7 +5,7 @@
     <meta http-equiv="X-UA-Compatible" content="IE=edge">
     <meta name="viewport" content="width=device-width,initial-scale=1,minimum-scale=1,maximum-scale=1,user-scalable=no">
     <link rel="stylesheet" href="//at.alicdn.com/t/font_830376_qzecyukz0s.css">
-    <title>或然数据平台</title>
+    <title>数据前瞻</title>
   </head>
   <body>
     <noscript>
diff --git a/src/assets/img/index/index20.png b/src/assets/img/index/index20.png
new file mode 100644
index 0000000000000000000000000000000000000000..b481e8c51cbd6f70167bffb212479335c9bded12
GIT binary patch
literal 2288
zcmV<M2oLv(P)<h;3K|Lk000e1NJLTq001%o001%w1^@s69zTe&00001b5ch_0Itp)
z=>Px-s!2paRA@u(S!sw>Wf*?Gxy#ICHPZ|cIapbyh>$H(R3I%B^rIC7TR{sVN^9DP
z@Q0aMPzDwCqaQUw1zBcBP$agILPVPtY8z&`JNw*y?tSC=mUF&y?!D7oM@hsBhdIl4
zzVChB=Xsa!jKWd!Q%4C79KAq#vofy&BvG+kHQB%JnwPvc#`8o9f^x_;PZQ=f@oonL
z5(zs#0hG&TEO^iUczt{tYn4)?^%PXa$nIe&3XnQ@$#H!ZP_3#~5c|~FsUIuzhJeq^
z&wq_`BulEZtxfffAIOLlMJ56yG!7zA8c7tKHdNo1z+wa41Lpu)M2!QP03)Fn163G<
z1JBzF0t}dl`d9-eK#vxV{U3lh7JOR_BlLIx)-qL}2{+zI?yv*#l;ac>G1z&Se??2J
zItCmkL43sGikFFoW8@&DRa+)rP%8x$#Dhx&p8Px{@!a69Pij>iN~!+w2YUlRqKo>H
zie;vNHlGboYIRuh=RYh!sxqo_hSSjcAmZ_$BgY1}kzAO$;wkvB0C9_iHNp?(SQ_=%
z;FBO$tVTvF3ZMNZ*!U-~a}c<1uEKd;e%3SdwYM}XtugC}^>#!GF89~)W(-6;s6X1G
z@c0LUzXw8&*W4+%{A?>h@BPMsj1ePDgr=B9t8jHCj-}dIwdVWJZV)`PzDlI{@NU5+
zQyq{nv{j4hXrE}X8?#&yGtES#F8DfkkGwV`D00^BRbK-StqnmmDPZn2!8wzGyDtSM
zw|M~E>7fGRDw$b6WX7C^AYI!L)C9lvPzpQx1sAVW$lLbs^bTOvZ3aYGEIlBu(oYmf
zL{33L3!B17e^eul`r@HY_pAn1e`oHtw*njP6HM)_mQq}<m<SNRb9I2s0%K>UNKo6M
zoU1<z%zR3rWPACQHwqS9<kc1rb;JSWyip)~{H&$hYfnl6`JS{Q&!Zp%K-Q|az6BP&
z<Jb^vT>_*NUbh@i3ZcRv1=Z2s?p5}OWfGoKnRq4)UfDBJDGF4|wBUZwxeEuPMnL-e
zh#E4xxd-@Ut9fwC9Kp-;JWFGHkcblmA&_pF4`2m=sSxx+p$CHHRryad0;Hl$IK{^H
z3jt%XjZq8)FaPQX<~$3OE9T+b3j|lqh{?)kJZ3Q_5%EhC8CiyFA?T^XtYF>aIcBc~
zVs3eDw`(V2Qu2Mub;FHRl(Ab@0UvKMASSm7zJC-*aLerWRvvg|x7QknE%HM})p7b0
z_zb}8D3AJTsG5<C6qF!sVAw{`+X#i4H14Xm5%L#X`6;mClW?i0uM;f12&h;i`G>Ys
z%4CBF&m9mx-!rN@XD!8Uz}Oc1RRh_Zk%EY%<5@$$SVJ<A2|cOtex?XKwhnmf+i<q?
zrwG>FW#$^K02TWYgT|Agq&>8}>}HW;mTyqgUiuQh*8owQ5dwi`q+UE&CPHeAJUrxl
z^Mjv&B_9I22EzxZog{egE}-K$pfG9<mx^h4DgiVn&5>#{bCR`k1-N6iy5x&(*whe^
zLP^r=w<&z}hv1jpz}{h{C!+ypbON(Z6`b3pa88%t<m1DD?awNFyajl5qhRx{sA^|-
z33_e?+FF223CI==V+2EE$pitkrhwzpCM^>jW2968u76$K_WM4(F+L#kB(d~P$-nS9
zk~C^OzZ05)*0g}_cwdm!!#8Q*y>kVRTxpCNDF8!xU@&j~=8Djtz>*4RP63nB`WqHn
zl16F-SsVp!cul>$KZAS!8%Vcwpn^3JTs9s6;~8`148gK%fElM4ujY$Df6i3+-Yn3U
zHOw$pXf%x{BPX<2Aj-&!@814~>dTbSF*cBHX+>G5Hrp_eX13D`mroa**=eZXHv;^+
z57@j@;fI}qp?o!K?X7}qW&#T@1}>OlmZhPL1xl$m102Wz`$x?A2!WJMJfxEbz@(Hp
zr?fO9W#FN8VWU|;Yb}=N0d%_oS4;<<yHPNuJ=DL;T0y9b=pEgTeqbnP0=26h8Z^D@
zL!?&=Wg{zsphF0R=LA<`C(N&jO(r&)6F`!!3xQOOBbKixpt^D&QdlHsL18OpN@M5G
zfxLJV%R}rNl=sn$r#$E_eK3vMd*<_JSO<8)=L~Ab#C`%9HXtZ14Ww*8I@%gSKsx>M
z6Em}x0IzHeo6Xvc+%GRcu-HD_{`ZrZ+>#Vsbo5-ohcugzJ>#j}Qdw#0%N5ajcE2VX
z!$PN+@kBE+L`EzVj1wL?n}S_&wB;kHA<khv-zd#Y{TNv+Ujw+%N@vl56|yo?J-s5w
z`k*Ja0Z1=1>(Cfx7A~YeUs=y4yrRajE=Cye136$g552*n19-Sk4vu`yy#4UcqB=GZ
zB6vV%qJpcD!kY({$<6?XZQ5M1bCTkOG=Le0a-sIKB?E@3R0%*v2*mY$luxb%4CV|o
zk$0>to%ijg(}1wg-u_`cKs>&Bvz3C_ekLATZXp`wKroHcxM2&%Ev$Pcg5p0##AGJQ
zi-5@@9pPAXvE~?X4%6#d6}<D~!2l7YqkEAsJ{WjfCIw(1Z!!>rmYGWju3p(@JC6}p
z4|H2%<AP&3AICcf1oE}Aa^T+mk<uM2YsI36jKn)k*Wo(P6-vM`i(3}hV>8e|*3<;D
z6=X1PZW`=jfq!+w=mT))e8)R?z}9ST5J+E6@*>h)3p>3-gYqS#ams4<kYPmwDVXBL
zF**zRUbQlbq-&Qvys_E|_P(E7*8bd}wEA<BuZT1U>DOjpN3jM{v_LYzE(?V0kfmbD
z1LA_!85Uz82xi}Ko4taJWrO|wMu80EWD}HY<898dle0=v5<2_jMc0IHc3}EHgE*1d
zi!s6guI1GTJ63Xm=WDQ_73Q)TfKA(#iKp7X>Wx+1q4geg%LV{fH2mJ7ec>38(4P;=
zdl1Y$v<_}?HdW)}LxWQsF~i5V4LoAZt#8ONAV(TW#~3-%82J}Iwb**IynSQ<0000<
KMNUMnLSTYFLn5gF

literal 0
HcmV?d00001

diff --git a/src/layouts/header/index.vue b/src/layouts/header/index.vue
index e09657e..4b0ad02 100644
--- a/src/layouts/header/index.vue
+++ b/src/layouts/header/index.vue
@@ -11,7 +11,8 @@
                 <el-dropdown class="user-wrap" @command="userCommand">
                     <div class="user">
                         <el-avatar :size="40" :src="avatar"></el-avatar>
-                        <span class="username">{{userName}}</span>
+                        <span class="username" v-if="isCustomer">超**大学</span>
+                        <span class="username" v-else>{{userName}}</span>
                     </div>
                     <el-dropdown-menu slot="dropdown">
                         <el-dropdown-item command="person" v-if="!isCustomer">个人资料</el-dropdown-item>
diff --git a/src/pages/data/list/index.vue b/src/pages/data/list/index.vue
index d40fe4b..c066f79 100644
--- a/src/pages/data/list/index.vue
+++ b/src/pages/data/list/index.vue
@@ -104,11 +104,7 @@
                       <el-table-column type="index" width="100" label="序号" align="center"></el-table-column>
                       <el-table-column prop="showName" label="数据表名称" align="center" :show-overflow-tooltip="true"></el-table-column>
                       <el-table-column prop="dataTotal" label="数据总量" width="90" align="center"></el-table-column>
-                      <el-table-column label="起止时间" width="220" align="center">
-                          <template slot-scope="scope">
-                              {{scope.row.startTime.slice(0, 10)}} ~ {{scope.row.endTime.slice(0, 10)}}
-                          </template>
-                      </el-table-column>
+                      <el-table-column prop="timeRange" label="起止时间" width="220" align="center"></el-table-column>
                       <el-table-column prop="dataSize" label="数据大小" width="90" align="center">
                           <template slot-scope="scope">
                               {{scope.row.dataSize}}M
@@ -160,7 +156,7 @@
 
         <el-drawer
           custom-class="preview-dia"
-          size="709"
+          size="950px"
           :with-header="false"
           :visible.sync="previewVisible">
           <div class="flex j-between">
@@ -318,7 +314,19 @@ export default {
     },
     getData() {
       this.$post(`${this.api.getIdQueryTable}?categoryId=${this.defaultType}&showName=${this.keyword}&pageNum=${this.page}&pageSize=${this.pageSize}&updateTime=`).then(res => {
-        this.listData = res.pageList.records
+        const list = res.pageList.records
+        list.map(e => {
+          const startTime = e.startTime ? e.startTime.slice(0, 10) : ''
+          const endTime = e.endTime ? e.endTime.slice(0, 10) : ''
+          if (startTime && endTime) {
+            e.timeRange = startTime + ' ~ ' + endTime
+          } else if (startTime) {
+            e.timeRange = startTime
+          } else if (endTime) {
+            e.timeRange = e.endTime
+          }
+        })
+        this.listData = list
         this.total = res.pageList.total
       }).catch(res => { })
     },
@@ -401,7 +409,7 @@ export default {
       }).then(res => {
         this.curRow = row
         this.downloadVisible = true
-        // 查询有数据的时间段,接口会返回开始时间和结束时间,但也有些数据是没有这两个时间的
+        // 限制数据可选择的开始结束时间
         if (row.startTime) {
           startTimeLimit = new Date(row.startTime).getTime()
         } else {
diff --git a/src/pages/index/list/index.vue b/src/pages/index/list/index.vue
index 81547c7..05d3e17 100644
--- a/src/pages/index/list/index.vue
+++ b/src/pages/index/list/index.vue
@@ -54,22 +54,22 @@
         <template v-else>
             <!-- 简介 -->
             <ul class="intro">
-                <li @click="toPart(1)">
+                <li :class="{active: active === 1}" @click="toPart(1)">
                     <img src="@/assets/img/index/index1.png" alt="">
                     <div class="text">
                         <h6>平台概览</h6>
                         <p class="desc">了解数据平台一句话简介</p>
                     </div>
                 </li>
-                <li @click="toPart(2)">
+                <li :class="{active: active === 2}" @click="toPart(2)">
                     <img src="@/assets/img/index/index2.png" alt="">
                     <div class="text">
                         <h6>平台特色与优势</h6>
                         <p class="desc">了解数据平台一句话简介</p>
                     </div>
                 </li>
-                <li @click="toPart(3)">
-                    <img src="@/assets/img/index/index1.png" alt="">
+                <li :class="{active: active === 3}" @click="toPart(3)">
+                    <img src="@/assets/img/index/index20.png" alt="">
                     <div class="text">
                         <h6>平台产品介绍</h6>
                         <p class="desc">了解数据平台一句话简介</p>
@@ -178,7 +178,8 @@ export default {
             page: 1,
             pageSize: 10,
             total: 0,
-            hotData: []
+            hotData: [],
+            active: ''
         }
     },
     computed: {
@@ -260,6 +261,8 @@ export default {
             }
         },
         toPart(i){
+            console.log(i)
+            this.active = i
             document.querySelector(`#part${i}`).scrollIntoView()
         }
     }
@@ -398,6 +401,11 @@ export default {
                 display: inline-flex;
                 align-items: center;
                 cursor: pointer;
+                &.active{
+                    h6, .desc{
+                        color: #006EFF;
+                    }
+                }
             }
             img{
                 width: 50px;
diff --git a/src/pages/user/list/index.vue b/src/pages/user/list/index.vue
index 9e6b057..6a62d01 100644
--- a/src/pages/user/list/index.vue
+++ b/src/pages/user/list/index.vue
@@ -3,7 +3,7 @@
         <div class="page">
             <h6 class="l-title">用户列表</h6>
             <div class="page-content">
-                <div class="tool" style="margin-bottom: 0;">
+                <div class="tool">
                     <ul class="filter">
                         <li>
                             <label>创建时间：</label>
@@ -16,8 +16,8 @@
                             <el-date-picker v-model="date" align="right" unlink-panels type="daterange" start-placeholder="开始日期" end-placeholder="结束日期" format="yyyy-MM-dd" value-format="yyyy-MM-dd" clearable size="small"></el-date-picker>
                         </li>
                         <li>
-                            <label style="width: auto;">角色：</label>
-                            <el-select v-model="role" placeholder="请选择角色" size="small" clearable @change="initData">
+                            <label>角色：</label>
+                            <el-select v-model="role" placeholder="请选择角色" size="small" clearable class="flex-1" @change="initData">
                                 <el-option label="不限" value=""></el-option>
                                 <el-option v-for="(item,index) in roleList" :key="index" :label="item.roleName" :value="item.id"></el-option>
                             </el-select>
@@ -28,18 +28,22 @@
                                 <el-option v-for="(item,index) in statusList" :key="index" :label="item.label" :value="item.id"></el-option>
                             </el-select>
                         </li>
-                        <li>
-                            <label>搜索：</label>
-                            <el-input style="width: 250px" placeholder="请输入员工账号/姓名/工号" v-model="keyword" suffix-icon="el-icon-search" clearable size="small"></el-input>
-                        </li>
                     </ul>
                     <div></div>
                 </div>
                 
-                <div class="tool" style="justify-content: flex-end;margin-bottom: 16px;">
-                    <el-button type="primary" size="small" round @click="add" v-auth="'/user/list:新增用户'">新增账号</el-button>
-                    <el-button type="primary" size="small" round @click="batchImport" v-auth>批量导入</el-button>
-                    <el-button type="primary" size="small" round @click="delAllSelection" v-auth>批量删除</el-button>
+                <div class="tool" style="margin-bottom: 16px;">
+                    <ul class="filter">
+                        <li style="margin-bottom: 0">
+                            <label>搜索：</label>
+                            <el-input style="width: 250px" placeholder="请输入员工账号/姓名/工号" v-model="keyword" suffix-icon="el-icon-search" clearable size="small"></el-input>
+                        </li>
+                    </ul>
+                    <div>
+                        <el-button type="primary" size="small" round @click="add" v-auth="'/user/list:新增用户'">新增账号</el-button>
+                        <el-button type="primary" size="small" round @click="batchImport" v-auth>批量导入</el-button>
+                        <el-button type="primary" size="small" round @click="delAllSelection" v-auth>批量删除</el-button>
+                    </div>
                 </div>
 
                 <el-table :data="listData" class="table" ref="table" stripe header-align="center" @selection-change="handleSelectionChange">
@@ -76,17 +80,17 @@
                 </div>
 
                 <el-dialog :title="isDetail ? '查看账号' : (form.userId ? '编辑账号' : '新增账号')" :visible.sync="userVisible" width="500px" @close="closeUser" class="dialog" :close-on-click-modal="false">
-                    <el-form ref="form" :model="form" :rules="rules" label-width="105px" label-suffix="：" :disabled="isDetail">
+                    <el-form ref="form" :model="form" :rules="rules" label-width="110px" label-suffix="：" :disabled="isDetail">
                         <el-form-item prop="account" label="账号">
-                            <el-input v-model="form.account" ref="account" placeholder="请输入职工账号" @change="accountChange"></el-input>
+                            <el-input v-model="form.account" ref="account" placeholder="请输入账号" @change="accountChange"></el-input>
                         </el-form-item>
                         <el-form-item prop="userName" label="用户姓名">
-                            <el-input v-model="form.userName" placeholder="请输入员工姓名"></el-input>
+                            <el-input v-model="form.userName" placeholder="请输入姓名"></el-input>
                         </el-form-item>
                         <el-form-item prop="roleIds" label="账号角色">
                             <el-checkbox-group v-model="form.roleIds">
                                 <template v-for="(item,index) in roleList">
-                                    <el-checkbox v-if="item.roleName != '超级管理员'" :key="index" :label="item.id" :disabled="item.id == 'user'">{{item.roleName}}</el-checkbox>
+                                    <el-checkbox v-if="item.roleName != '超级管理员'" :key="index" :label="item.id" :disabled="item.roleName === '用户'">{{item.roleName}}</el-checkbox>
                                 </template>
                             </el-checkbox-group>
                         </el-form-item>
@@ -100,7 +104,7 @@
                             <el-input v-model="form.email" placeholder="请输入邮箱"></el-input>
                         </el-form-item>
                         <el-form-item prop="workNumber" label="工号/学号">
-                            <el-input v-model="form.workNumber" placeholder="请输入职工工号" @change="workNumberChange"></el-input>
+                            <el-input v-model="form.workNumber" placeholder="请输入工号/学号" @change="workNumberChange"></el-input>
                         </el-form-item>
                     </el-form>
                     <span slot="footer" class="dialog-footer" v-if="!isDetail">
@@ -302,7 +306,9 @@ export default {
         // 获取全部角色
         getRole(){
             this.$get(`${this.api.listRole}?page=1&size=1000&name=&platformId=${Setting.platformId}`).then(res => {
-                this.roleList = res.rolePage.records
+                const list = res.rolePage.records
+                this.roleList = list
+                if (user) this.form.roleIds.push(user.id)
             }).catch(res => {})
         },
         resetPassword(row){
@@ -534,11 +540,7 @@ export default {
     .filter{
         flex-wrap: wrap;
         li{
-            width: 30%;
-            margin-bottom: 16px;
-            label{
-                width: 70px;
-            }
+            width: 22%;
         }
     }
     /deep/.dialog{
diff --git a/src/setting.js b/src/setting.js
index d616945..08fe481 100644
--- a/src/setting.js
+++ b/src/setting.js
@@ -17,13 +17,13 @@ const Setting = {
      * 基础配置
      * */
     // 网页标题的后缀
-    titleSuffix: '或然数据平台',
+    titleSuffix: '数据前瞻',
     // 路由模式，可选值为 history 或 hash
     routerMode: 'hash',
     // 页面切换时，是否显示模拟的进度条
     showProgressBar: true,
     // 接口请求地址
-    // apiBaseURL: env === 'development' ? 'http://192.168.31.125:9000' : 'http://39.108.250.202:9000',// 佳坤
+    // apiBaseURL: env === 'development' ? 'http://192.168.31.151:9000' : 'http://39.108.250.202:9000',// 佳坤
     apiBaseURL: env === 'development' ? 'http://192.168.31.151:9000' : 'http://39.108.250.202:9000',
     // 接口请求返回错误时，弹窗的持续时间，单位：秒
     modalDuration: 3,
