修改基础布局

chuanyi-admin/src/views/dashboard/onlineUsers.vue

@@ -16,7 +16,7 @@
             type="text"
             icon="el-icon-delete"
             @click="handelClick(scope.row)"
-          >清空用户登录信息</el-button>
+          >强制下线</el-button>
         </template>
       </el-table-column>
     </el-table>

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

@@ -1,89 +1,91 @@
 <template>
   <div class="login-container">
-    <el-form
-      ref="loginForm"
-      :model="loginForm"
-      :rules="loginRules"
-      class="login-form"
-      autocomplete="on"
-      label-position="left"
-    >
-      <div class="title-container">
-        <h3 class="title">Easy Industrial Report管理系统</h3>
-      </div>
-      <el-form-item prop="userName">
+    <div class="login-div">
+      <el-form
+        ref="loginForm"
+        :model="loginForm"
+        :rules="loginRules"
+        class="login-form"
+        autocomplete="on"
+        label-position="left"
+      >
+        <div class="title-container">
+          <h3 class="title">Easy Industrial Report 后台管理系统</h3>
+        </div>
+        <el-form-item prop="userName">
         <span class="svg-container">
           <svg-icon icon-class="user" />
         </span>
-        <el-input
-          ref="userName"
-          v-model="loginForm.userName"
-          placeholder="用户名"
-          name="userName"
-          type="text"
-          tabindex="1"
-          auto-complete="off"
-        />
-      </el-form-item>
-      <el-tooltip
-        v-model="capsTooltip"
-        content="已开启大写字母"
-        placement="bottom-start"
-        manual
-      >
-        <el-form-item prop="password">
-          <span class="svg-container">
-            <svg-icon icon-class="password" />
-          </span>
           <el-input
-            :key="passwordType"
-            ref="password"
-            v-model="loginForm.password"
-            :type="passwordType"
-            placeholder="密码"
-            name="password"
-            tabindex="2"
+            ref="userName"
+            v-model="loginForm.userName"
+            placeholder="用户名"
+            name="userName"
+            type="text"
+            tabindex="1"
             auto-complete="off"
-            @keyup.native="checkCapslock"
-            @blur="capsTooltip = false"
-            @keyup.enter.native="handleLogin"
           />
-          <span class="show-pwd" @click="showPwd">
+        </el-form-item>
+        <el-tooltip
+          v-model="capsTooltip"
+          content="已开启大写字母"
+          placement="bottom-start"
+          manual
+        >
+          <el-form-item prop="password">
+          <span class="svg-container">
+            <svg-icon icon-class="password" />
+          </span>
+            <el-input
+              :key="passwordType"
+              ref="password"
+              v-model="loginForm.password"
+              :type="passwordType"
+              placeholder="密码"
+              name="password"
+              tabindex="2"
+              auto-complete="off"
+              @keyup.native="checkCapslock"
+              @blur="capsTooltip = false"
+              @keyup.enter.native="handleLogin"
+            />
+            <span class="show-pwd" @click="showPwd">
             <svg-icon
               :icon-class="passwordType === 'password' ? 'eye' : 'eye-open'"
             />
           </span>
-        </el-form-item>
-      </el-tooltip>
-      <!-- <el-form-item v-if="captchaEnabled" prop="code" class="code-div">
-        <div class="el-form-item" style="width: 63%; float: left">
-          <span class="svg-container">
-            <svg-icon icon-class="validCode" />
-          </span>
-          <el-input
-            ref="code"
-            v-model="loginForm.code"
-            placeholder="验证码"
-            name="code"
-            type="text"
-            tabindex="3"
-            auto-complete="off"
-            @keydown.enter.native="handleLogin"
-          />
-        </div>
-        <div class="login-code">
-          <img :src="url" class="login-code-img" @click="getCode">
-        </div>
-      </el-form-item> -->
-      <el-button
-        :loading="loading"
-        type="primary"
-        style="width: 100%; margin-bottom: 30px"
-        @click.native.prevent="handleLogin"
-      >
-        登录
-      </el-button>
-    </el-form>
+          </el-form-item>
+        </el-tooltip>
+        <!-- <el-form-item v-if="captchaEnabled" prop="code" class="code-div">
+          <div class="el-form-item" style="width: 63%; float: left">
+            <span class="svg-container">
+              <svg-icon icon-class="validCode" />
+            </span>
+            <el-input
+              ref="code"
+              v-model="loginForm.code"
+              placeholder="验证码"
+              name="code"
+              type="text"
+              tabindex="3"
+              auto-complete="off"
+              @keydown.enter.native="handleLogin"
+            />
+          </div>
+          <div class="login-code">
+            <img :src="url" class="login-code-img" @click="getCode">
+          </div>
+        </el-form-item> -->
+        <el-button
+          :loading="loading"
+          type="primary"
+          style="width: 100%; margin-bottom: 30px"
+          @click.native.prevent="handleLogin"
+        >
+          登录
+        </el-button>
+      </el-form>
+    </div>
   </div>
 </template>
 
@@ -230,7 +232,7 @@ export default {
 </script>
 
 <style lang="scss">
-$imgBg: url("~@/assets/images/loginbg.png");
+$imgBg: url("~@/assets/images/cqcybg.png");
 $dark_gray: #889aa4;
 
 .login-container {
@@ -254,15 +256,19 @@ $dark_gray: #889aa4;
 }
 
 .login-container {
-  display: flex;
-  justify-content: center;
-  align-items: center;
   height: 100%;
-  background-color: #2c3e50;
-  //background-image: $imgBg;
-  //background-size: cover;
+  background-image: $imgBg;
+  background-size: cover;
   overflow: hidden;
 
+  .login-div {
+    display: flex;
+    justify-content: flex-end;
+    align-items: center;
+    height: 100%;
+    margin-right: 10%;
+  }
+
   .login-form {
     border-radius: 6px;
     background: #ffffff;
@@ -295,7 +301,8 @@ $dark_gray: #889aa4;
   .title {
     margin: 0px auto 30px auto;
     text-align: center;
-    color: #707070;
+    font-weight: 600;
+    color: black;
   }
 
   .show-pwd {

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

@@ -163,6 +163,7 @@
           <el-table-column
             label="操作"
             align="center"
+            width="250"
             class-name="small-padding fixed-width"
           >
             <template v-if="scope.row.userId !== 1" slot-scope="scope">
@@ -175,16 +176,16 @@
               <el-button
                 size="mini"
                 type="text"
+                icon="el-icon-key"
+                @click="handleResetPwd(scope.row)"
+              >重置密码</el-button>
+              <el-button
+                size="mini"
+                type="text"
                 icon="el-icon-delete"
                 :disabled="!multiple"
                 @click="handleDelete(scope.row)"
               >删除</el-button>
-              <el-button
-                size="mini"
-                type="text"
-                icon="el-icon-key"
-                @click="handleResetPwd(scope.row)"
-              >重置密码</el-button>
             </template>
           </el-table-column>
         </el-table>

chuanyi_client2/src/components/HeaderMain/index.vue

@@ -39,7 +39,7 @@
       <div>
         <el-tree class="cy-group-tree"
                  ref="groupTree"
-                 :indent="10"
+                 :indent="0"
                  node-key="id"
                  :load="loadGroupNode"
                  :props="groupProps"
@@ -51,9 +51,9 @@
                 <svg-icon v-if="data.itemName" icon-class="file-bg"/>
                 <svg-icon v-else-if="data.id == -1" icon-class="groups"/>
                 <template v-else>
-                  <svg-icon v-if="data.runState == 1" icon-class="green"/>
-                  <svg-icon v-else-if="data.runState == 0" icon-class="grey"/>
-                  <svg-icon v-else icon-class="red"/>
+                  <svg-icon v-if="data.runState == 1" style="width: 30px; height: 30px;" icon-class="green"/>
+                  <svg-icon v-else-if="data.runState == 0" style="width: 30px; height: 30px;" icon-class="grey"/>
+                  <svg-icon v-else style="width: 30px; height: 30px;" icon-class="red"/>
                 </template>
                 <span :title='data.groupName || data.itemName'
                       style="margin-left: 2px;">{{ data.groupName || data.itemName }}</span>
@@ -170,7 +170,7 @@
                 </el-select>
               </el-form-item>
               <!-- 周期读取 -->
-              <el-form-item v-if="groupRateForm.readMode == 0" label='' prop="modeValue">
+              <el-form-item v-if="groupRateForm.readMode == 0" label='读取频率' prop="modeValue">
                 <el-input-number v-model="groupRateForm.modeValueH" @change="withModeValueTime(1)" :min="0" :max="9999" :controls="false" style="width: 100px;"></el-input-number>
                 <span style="margin: 0 5px;">时</span>
                 <el-input-number v-model="groupRateForm.modeValueM" @change="withModeValueTime(2)" :min="0" :max="59" :controls="false" style="width: 100px;"></el-input-number>
@@ -199,34 +199,37 @@
                           style="width: 120px;float: right;"></el-input>
                 <span style="float: left;color: #8a8888;font-size: 12px;line-height: 12px;">{{reportEventConfigForm.itemName}}</span>
               </el-form-item>
-              <el-form-item label='日期设置' prop="daySetting" style="margin-top: 20px;">
-                <el-checkbox-group v-model="groupRateForm.daySetting">
-                  <el-checkbox name="daySetting" label="MON">周一</el-checkbox>
-                  <el-checkbox name="daySetting" label="TUE">周二</el-checkbox>
-                  <el-checkbox name="daySetting" label="WED">周三</el-checkbox>
-                  <el-checkbox name="daySetting" label="THU">周四</el-checkbox>
-                  <el-checkbox name="daySetting" label="FRI">周五</el-checkbox>
-                  <el-checkbox name="daySetting" label="SAT">周六</el-checkbox>
-                  <el-checkbox name="daySetting" label="SUN">周日</el-checkbox>
-                </el-checkbox-group>
-              </el-form-item>
-              <el-form-item label='记录周期' prop="valuePeriod">
-                <el-time-picker
-                    style="width: 100%;"
-                    is-range
-                    :clearable="false"
-                    :editable="false"
-                    v-model="groupRateForm.valuePeriod"
-                    :picker-options="{
+              <el-divider content-position="left">周期设置</el-divider>
+              <div class="cy-line">
+                <el-form-item label='日期设置' prop="daySetting" style="margin-top: 20px;">
+                  <el-checkbox-group v-model="groupRateForm.daySetting">
+                    <el-checkbox name="daySetting" label="MON">周一</el-checkbox>
+                    <el-checkbox name="daySetting" label="TUE">周二</el-checkbox>
+                    <el-checkbox name="daySetting" label="WED">周三</el-checkbox>
+                    <el-checkbox name="daySetting" label="THU">周四</el-checkbox>
+                    <el-checkbox name="daySetting" label="FRI">周五</el-checkbox>
+                    <el-checkbox name="daySetting" label="SAT">周六</el-checkbox>
+                    <el-checkbox name="daySetting" label="SUN">周日</el-checkbox>
+                  </el-checkbox-group>
+                </el-form-item>
+                <el-form-item label='时间域' prop="valuePeriod">
+                  <el-time-picker
+                      style="width: 100%;"
+                      is-range
+                      :clearable="false"
+                      :editable="false"
+                      v-model="groupRateForm.valuePeriod"
+                      :picker-options="{
                       format: 'HH:mm:ss'
                     }"
-                    value-format="HH:mm:ss"
-                    range-separator="至"
-                    start-placeholder="开始时间"
-                    end-placeholder="结束时间"
-                    placeholder="选择时间范围">
-                </el-time-picker>
-              </el-form-item>
+                      value-format="HH:mm:ss"
+                      range-separator="至"
+                      start-placeholder="开始时间"
+                      end-placeholder="结束时间"
+                      placeholder="选择时间范围">
+                  </el-time-picker>
+                </el-form-item>
+              </div>
             </el-form>
           </div>
         </el-tab-pane>
@@ -609,7 +612,7 @@ export default {
         modeValueH: 0,
         modeValueM: 0,
         modeValueS: 0,
-        daySetting: [],
+        daySetting: ["MON", "TUE", "WED", "THU", "FRI", "SAT", "SUN"],
         valuePeriod: ['00:00:00', '23:59:59']
       },
       updateGroupData: null,
@@ -1014,7 +1017,7 @@ export default {
         modeValueH: 0,
         modeValueM: 0,
         modeValueS: 0,
-        daySetting: [],
+        daySetting: ["MON", "TUE", "WED", "THU", "FRI", "SAT", "SUN"],
         valuePeriod: ['00:00:00', '23:59:59']
       }
       this.updateGroupData = null
@@ -1491,7 +1494,7 @@ export default {
       let _mv = parseFloat(this.groupRateForm.modeValue)
       // 周期读取
       if (this.groupRateForm.readMode == 0 && (isNaN(_mv) || _mv == 0)) {
-        showAlertMsgWin(this, null, '策略设置中周期读取值不能为0！')
+        showAlertMsgWin(this, null, '策略设置中读取频率不能为0！')
         return false
       }
       // 值改变读取

chuanyi_client2/src/components/HeaderPersonal/index.vue

@@ -2,7 +2,10 @@
   <div class="cy-person">
     <el-dropdown>
       <div class="menu-userinfo">
-        <el-avatar shape="square" size="small" @error="errorHandler">
+        <el-avatar v-if="roleCodeList.indexOf(__self.clientRole) > -1" shape="square" size="small" @error="errorHandler" style="background: #FFFFFF;">
+          <img :src="avatarManager"/>
+        </el-avatar>
+        <el-avatar v-else shape="square" size="small" @error="errorHandler">
           <img :src="avatarDefault"/>
         </el-avatar>
         <span>{{ name }}</span>
@@ -145,6 +148,7 @@
 
 <script>
 import avatarDefault from '@/assets/images/default.png'
+import avatarManager from '@/assets/images/manager_user.png'
 import {mapGetters} from 'vuex'
 import {updatePwd} from '@/api/user'
 import {getPubKey} from '@/utils/auth'
@@ -171,6 +175,7 @@ export default {
     return {
       roleCodeList: [],
       avatarDefault: avatarDefault,
+      avatarManager: avatarManager,
       dialogPwdVisible: false,
       dialogAboutVisible: false,
       dialogNoticeVisible: false,

chuanyi_client2/src/components/LeftMenu/index.vue

@@ -1,27 +1,37 @@
 <template>
   <el-row>
-    <el-col class="cy-conn cy-logo" @click.native="goHome">
+    <el-col :class="currMenuIndex == 0 ? 'cy-conn' : 'cy-conn'"
+            @click.native="changeNavTypeAction(0)">
       <el-image :src="require('@/assets/images/home1.png')" fit="contain" class="c-logo"></el-image>
       <span style="margin-top: -5px;">首页</span>
 <!--      <el-image :src="require('@/assets/images/cytxt.png')" fit="contain" class="c-logo-txt"></el-image>-->
     </el-col>
-    <el-col v-if="roleCodeList.indexOf(__self.clientRole) > -1" class="cy-conn" @click.native="createDatasourceEvent">
+    <el-col v-if="roleCodeList.indexOf(__self.clientRole) > -1"
+            :class="currMenuIndex == -1 ? 'cy-conn cy-conn-select' : 'cy-conn'"
+            @click.native="changeNavTypeAction(-1)">
       <el-image :src="require('@/assets/images/datasource.png')" fit="contain"></el-image>
       <span>数据源配置</span>
     </el-col>
-    <el-col v-if="roleCodeList.indexOf(__self.clientRole) > -1" class="cy-conn" @click.native="changeNavTypeAction(3)">
+    <el-col v-if="roleCodeList.indexOf(__self.clientRole) > -1"
+            :class="currMenuIndex == 3 ? 'cy-conn cy-conn-select' : 'cy-conn'"
+            @click.native="changeNavTypeAction(3)">
       <el-image :src="require('@/assets/images/model.png')" fit="contain"></el-image>
       <span>数据模型</span>
     </el-col>
-    <el-col v-if="roleCodeList.indexOf(__self.clientRole) > -1" class="cy-conn" @click.native="changeNavTypeAction(1)">
+    <el-col v-if="roleCodeList.indexOf(__self.clientRole) > -1"
+            :class="currMenuIndex == 1 ? 'cy-conn cy-conn-select' : 'cy-conn'"
+            @click.native="changeNavTypeAction(1)">
       <el-image :src="require('@/assets/images/run.png')" fit="contain"></el-image>
       <span>运行配置</span>
     </el-col>
-    <el-col v-if="roleCodeList.indexOf(__self.clientRole) > -1" class="cy-conn" @click.native="changeNavTypeAction(4)">
+    <el-col v-if="roleCodeList.indexOf(__self.clientRole) > -1"
+            :class="currMenuIndex == 4 ? 'cy-conn cy-conn-select' : 'cy-conn'"
+            @click.native="changeNavTypeAction(4)">
       <el-image :src="require('@/assets/images/users.png')" fit="contain"></el-image>
       <span style="width: 100%; text-align: center;">用户组</span>
     </el-col>
-    <el-col class="cy-conn" @click.native="changeNavTypeAction(2)">
+    <el-col :class="currMenuIndex == 2 ? 'cy-conn cy-conn-select' : 'cy-conn'"
+            @click.native="changeNavTypeAction(2)">
       <el-image :src="require('@/assets/images/report.png')" fit="contain"></el-image>
       <span>我的报表</span>
     </el-col>
@@ -29,7 +39,7 @@
     <!-- 数据源配置弹出层 -->
     <el-dialog
         :title="datasourceDialogTitle"
-        width="80%"
+        width="60%"
         top="10vh"
         center
         v-dialog-drag-and-zoom
@@ -200,6 +210,7 @@ export default {
       connDialogVisible: false,
       labelPosition: 'top',
       chooseDatasourceType: '',
+      currMenuIndex: null,
       // 选择的服务类型
       chooseServerType: null,
       // 选择的连接服务
@@ -335,6 +346,15 @@ export default {
     },
     /** 左侧菜单点击事件 */
     changeNavTypeAction(type) {
+      this.currMenuIndex = type
+      if (type == 0) {
+        this.goHome()
+        return
+      }
+      if (type == -1) {
+        this.createDatasourceEvent()
+        return
+      }
       checkReportChangeStatusAction(this, () => {
         this.changeNavType(type)
       })
@@ -688,6 +708,7 @@ export default {
           this.connDialogVisible = false
           break
         case 'datasource':
+          this.currMenuIndex = null
           this.initConfigForm()
           this.clearDatasourceBg()
           this.$refs['datasourceForm'].resetFields()
@@ -712,6 +733,7 @@ export default {
     },
     /** 弹出层关闭事件 */
     handleClose(done) {
+      this.currMenuIndex = null
       this.initConfigForm()
       this.clearDatasourceBg()
       this.chooseConnServer = null
@@ -731,8 +753,13 @@ export default {
   align-items: center;
   font-size: 12px;
   color: #FFFFFF;
-  margin-bottom: 15px;
   cursor: pointer;
+  flex-direction: column;
+  padding: 10px 0;
+}
+
+.cy-conn-select {
+  background: #606266;
 }
 
 .cy-conn img {

chuanyi_client2/src/views/index.vue

@@ -131,7 +131,7 @@ export default {
 
 .el-aside {
   width: 80px !important;
-  padding: 10px 5px;
+  padding: 0;
   background-color: #2c3e50;
   margin-bottom: 0;
 }

chuanyi_client2/src/views/login.vue

@@ -1,83 +1,86 @@
 <template>
   <div class="login">
-    <el-form ref="loginForm" :model="loginForm" :rules="loginRules" class="login-form">
-      <i class="el-icon-setting"
-         @click="editHostEvent"
-         style="float: right; margin-top: -17px; margin-right: -10px; cursor: pointer; display: none;"></i>
-      <h3 class="title">{{ applicationName }}</h3>
-      <el-form-item prop="username">
-        <el-input
-            v-model="loginForm.username"
-            type="text"
-            auto-complete="off"
-            placeholder="帐号"
-        >
-          <svg-icon slot="prefix" icon-class="user" class="el-input__icon input-icon"/>
-        </el-input>
-      </el-form-item>
-      <el-form-item prop="password">
-        <el-input
-            v-model="loginForm.password"
-            type="password"
-            auto-complete="off"
-            placeholder="密码"
-            @keyup.enter.native="handleLogin"
-        >
-          <svg-icon slot="prefix" icon-class="password" class="el-input__icon input-icon"/>
-        </el-input>
-      </el-form-item>
-      <el-form-item prop="code" v-if="captchaEnabled">
-        <el-input
-            v-model="loginForm.code"
-            auto-complete="off"
-            placeholder="验证码"
-            style="width: 63%"
-            @keyup.enter.native="handleLogin"
-        >
-          <svg-icon slot="prefix" icon-class="validCode" class="el-input__icon input-icon"/>
-        </el-input>
-        <div class="login-code">
-          <img :src="codeUrl" @click="getCode" class="login-code-img"/>
-        </div>
-      </el-form-item>
-      <el-form-item prop="ip">
-        <el-input
-            v-model="loginForm.ip"
-            type="text"
-            auto-complete="off"
-            placeholder="IP地址"
-        >
-          <svg-icon slot="prefix" icon-class="ip" class="el-input__icon input-icon"/>
-        </el-input>
-      </el-form-item>
-      <el-form-item prop="port">
-        <el-input
-            v-model="loginForm.port"
-            type="text"
-            auto-complete="off"
-            placeholder="端口号"
-        >
-          <svg-icon slot="prefix" icon-class="port" class="el-input__icon input-icon"/>
-        </el-input>
-      </el-form-item>
-      <el-checkbox v-model="loginForm.rememberMe" v-if="rememberMeView" style="margin:0px 0px 25px 0px;">记住帐号
-      </el-checkbox>
-      <el-form-item style="width:100%;">
-        <el-button
-            :loading="loading"
-            size="medium"
-            type="primary"
-            style="width:100%;"
-            @click.native.prevent="handleLogin"
-        >
-          <span v-if="!loading">登 录</span>
-          <span v-else>登录中</span>
-        </el-button>
-        <div style="float: right;" v-if="register">
-          <router-link class="link-type" :to="'/register'">立即注册</router-link>
-        </div>
-      </el-form-item>
-    </el-form>
+    <div class="login-bg">
+      <el-form ref="loginForm" :model="loginForm" :rules="loginRules" class="login-form">
+        <i class="el-icon-setting"
+           @click="editHostEvent"
+           style="float: right; margin-top: -17px; margin-right: -10px; cursor: pointer; display: none;"></i>
+        <h3 class="title">{{ applicationName }}</h3>
+        <div class="title-bg"></div>
+        <el-form-item prop="username">
+          <el-input
+              v-model="loginForm.username"
+              type="text"
+              auto-complete="off"
+              placeholder="帐号"
+          >
+            <svg-icon slot="prefix" icon-class="user" class="el-input__icon input-icon"/>
+          </el-input>
+        </el-form-item>
+        <el-form-item prop="password">
+          <el-input
+              v-model="loginForm.password"
+              type="password"
+              auto-complete="off"
+              placeholder="密码"
+              @keyup.enter.native="handleLogin"
+          >
+            <svg-icon slot="prefix" icon-class="password" class="el-input__icon input-icon"/>
+          </el-input>
+        </el-form-item>
+        <el-form-item prop="code" v-if="captchaEnabled">
+          <el-input
+              v-model="loginForm.code"
+              auto-complete="off"
+              placeholder="验证码"
+              style="width: 63%"
+              @keyup.enter.native="handleLogin"
+          >
+            <svg-icon slot="prefix" icon-class="validCode" class="el-input__icon input-icon"/>
+          </el-input>
+          <div class="login-code">
+            <img :src="codeUrl" @click="getCode" class="login-code-img"/>
+          </div>
+        </el-form-item>
+        <el-form-item prop="ip">
+          <el-input
+              v-model="loginForm.ip"
+              type="text"
+              auto-complete="off"
+              placeholder="IP地址"
+          >
+            <svg-icon slot="prefix" icon-class="ip" class="el-input__icon input-icon"/>
+          </el-input>
+        </el-form-item>
+        <el-form-item prop="port">
+          <el-input
+              v-model="loginForm.port"
+              type="text"
+              auto-complete="off"
+              placeholder="端口号"
+          >
+            <svg-icon slot="prefix" icon-class="port" class="el-input__icon input-icon"/>
+          </el-input>
+        </el-form-item>
+        <el-checkbox v-model="loginForm.rememberMe" v-if="rememberMeView" style="margin:0px 0px 25px 0px;">记住帐号
+        </el-checkbox>
+        <el-form-item style="width:100%;">
+          <el-button
+              :loading="loading"
+              size="medium"
+              type="primary"
+              style="width:100%;"
+              @click.native.prevent="handleLogin"
+          >
+            <span v-if="!loading">登 录</span>
+            <span v-else>登录中</span>
+          </el-button>
+          <div style="float: right;" v-if="register">
+            <router-link class="link-type" :to="'/register'">立即注册</router-link>
+          </div>
+        </el-form-item>
+      </el-form>
+    </div>
     <!--  底部  -->
     <div class="el-login-footer">
       <span>Copyright © {{ copyrightDate }} 重庆川仪控制系统有限公司版权所有</span>
@@ -287,25 +290,38 @@ export default {
 
 <style rel="stylesheet/scss" lang="scss">
 .login {
-  display: flex;
-  justify-content: center;
-  align-items: center;
   height: 100%;
-  background-color: #2c3e50;
-  //background-image: url("../assets/images/loginbg.png");
+  background-image: url("../assets/images/cqcybg.png");
   background-size: cover;
 }
 
 .title {
-  margin: 0px auto 30px auto;
+  margin: 0px auto 5px auto;
   text-align: center;
-  color: #707070;
+  font-weight: 600;
+  color: black;
+}
+
+.title-bg {
+  height: 4px;
+  width: 35px;
+  background: #1890ff;
+  margin: auto auto 25px;
+}
+
+.login-bg {
+  display: flex;
+  justify-content: flex-end;
+  height: 100%;
+  align-items: center;
+  margin-right: 10%;
 }
 
 .login-form {
   border-radius: 6px;
   background: #ffffff;
   width: 400px;
+  height: 425px;
   padding: 25px 25px 5px 25px;
 
   .el-input {
@@ -347,7 +363,7 @@ export default {
   bottom: 0;
   width: 100%;
   text-align: center;
-  color: #fff;
+  color: #4a4a4a;
   font-family: Arial;
   font-size: 12px;
   letter-spacing: 1px;

chuanyi_client2/src/views/run_config/index.vue

@@ -1273,6 +1273,7 @@ export default {
         params.endBelongTime = getNowFormatDate('yyyy-MM-dd') + ' 18:00:00'
       }
       this.getChartData(params, (res) => {
+        console.log(res)
         let result = (res instanceof Array) ? res : []
         // 系列
         let series = info.option.series
@@ -1287,7 +1288,13 @@ export default {
                 'value': result[j].value
               })
             } else {
-              temp.data = result[i].dataList ? result[i].dataList : []
+              let _t = []
+              let t = result[i].dataList ? result[i].dataList : []
+              t.forEach((temp) => {
+                _t.push(parseFloat(temp))
+              })
+              console.log(_t)
+              temp.data = _t
             }
           }
         }