合并master

.env.development

@@ -1,5 +1,5 @@
 # 接口地址http://8.136.199.33:8610/v1   http://8.136.199.33:7778/adminapi
-VITE_APP_API_URL="http://8.136.199.33:7778/adminapi"
+VITE_APP_API_URL="http://8.136.199.33:8610/v1"
 # 路由根地址
 VITE_APP_BASE_URL="/"
 # 打包输入文件名

src/api/user.js

@@ -97,7 +97,14 @@ export const _apiLogin = {
      */
     checkUserIsLdap:params=>{
         return post('/user_login/ldap/user_check',params)
-    }
+    },
+    /**
+     * 获取备案信息
+     * @returns 
+    */
+    getICPLicense:(params)=>{
+        return get('/user_login/icp_license',params)
+    },
 }
 
 

src/hooks/chart/render.js

@@ -657,6 +657,8 @@ function setSplineOpt(e){
             temYRightArr.push(item)
         }
 
+        const textZh = item.ConvertUnit||item.Unit
+        const textEn = item.ConvertEnUnit||item.UnitEn||item.ConvertUnit||item.Unit
         let yItem={
             ...basicYAxis,
             IsAxis:item.IsAxis,
@@ -672,9 +674,9 @@ function setSplineOpt(e){
             },
             tickWidth: sameSideIndex !== index ? 0 : 1,
             title: {
-                text:  sameSideIndex !== index ? '' : `${item.Unit}`,
-                textZh:item.Unit,//中文单位
-                textEn:item.Unit?item.UnitEn:'',//英文单位，但如果无中文单位则不显示
+                text:  sameSideIndex !== index ? '' : `${textZh}`,
+                textZh:textZh,//中文单位
+                textEn:textZh?textEn:'',//英文单位，但如果无中文单位则不显示
                 align: 'high',
                 rotation: 0,
                 y: -15,
@@ -813,7 +815,8 @@ function setSeasonOpt(e){
             }
             series.push(seriesItem)
         })
-
+    const textZh = data.ConvertUnit||data.Unit
+    const textEn = data.ConvertEnUnit||data.UnitEn||data.ConvertUnit||data.Unit
     yAxis=[{
         IsAxis:data.IsAxis,
         labels: {
@@ -824,10 +827,10 @@ function setSeasonOpt(e){
             }
         },
         title: {
-            text:  `${data.Unit}`,
-            textZh:data.Unit, // 中文
+            text:  `${textZh}`,
+            textZh:textZh, // 中文
             // 中文不存在，无论英文有无都显示空
-            textEn:data.Unit?data.UnitEn?data.UnitEn:'英文单位':'', // 英文
+            textEn:textZh?textEn||'英文单位':'', // 英文
             align: 'high',
             rotation: 0,
             y: -5,
@@ -1032,6 +1035,8 @@ function setStackOrCombinChart(e){
             temYRightArr.push(item)
         }
 
+        const textZh = item.ConvertUnit||item.Unit
+        const textEn = item.ConvertEnUnit||item.UnitEn||item.ConvertUnit||item.Unit
         let yItem={
             ...basicYAxis,
             IsAxis:item.IsAxis,
@@ -1047,10 +1052,10 @@ function setStackOrCombinChart(e){
             },
             title: {
                 // text:  sameSideIndex !== index ? '' : `${item.Unit}`,
-                text: item.Unit,
-                textZh:item.Unit, // 中文
+                text: textZh,
+                textZh:textZh, // 中文
                 // 中文不存在，无论英文有无都显示空
-                textEn:item.Unit?item.UnitEn?item.UnitEn:'英文单位':'', // 英文
+                textEn:textZh?textEn||'英文单位':'', // 英文
                 align: 'high',
                 rotation: 0,
                 y: -15,
@@ -1141,7 +1146,7 @@ function setStackOrCombinChart(e){
 
 /* 散点图 第一个指标值为x轴 第二个指标为y轴*/
 function setScatterOptions(data){
-    axisLimitState.leftIndex=0
+    axisLimitState.leftIndex=1
     axisLimitState.rightIndex=-1
     axisLimitState.rightTwoIndex=-1
 
@@ -1151,13 +1156,13 @@ function setScatterOptions(data){
      /* 主题样式*/
     const chartTheme = ChartInfo.ChartThemeStyle ? JSON.parse(ChartInfo.ChartThemeStyle) : null;
 
-
+    //上下限设置的是y轴，也就是第二个指标的值，改回来
     axisLimitState.hasLeftAxis=true
-    axisLimitState.leftMin=Number(dataList[0].MinData)
-    axisLimitState.leftMax=Number(dataList[0].MaxData)
+    axisLimitState.leftMin=Number(dataList[1].MinData)
+    axisLimitState.leftMax=Number(dataList[1].MaxData)
 
-    axisLimitData.leftMin=Number(dataList[0].MinData)
-    axisLimitData.leftMax=Number(dataList[0].MaxData)
+    axisLimitData.leftMin=Number(dataList[1].MinData)
+    axisLimitData.leftMax=Number(dataList[1].MaxData)
 
     // 取2个指标中日期相同的数据
     const real_data = [];
@@ -1212,12 +1217,15 @@ function setScatterOptions(data){
     }
 
     const { IsOrder,ChartColor } = dataList[0];
+
+    const textYZh = dataList[1].ConvertUnit||dataList[1].Unit
+    const textYEn = dataList[1].ConvertEnUnit||dataList[1].UnitEn||dataList[1].ConvertUnit||dataList[1].Unit
     //y轴
     let yAxis = {
         title: {
-            text:  `${dataList[1].Unit}`,
-            textZh:dataList[1].Unit,
-            textEn:dataList[1].Unit?dataList[1].UnitEn:'',
+            text:  `${textYZh}`,
+            textZh:textYZh,
+            textEn:textYZh?textYEn:'',
             align: 'high',
             rotation: 0,
             y: -15,
@@ -1239,8 +1247,8 @@ function setScatterOptions(data){
         },
         opposite: false,
         reversed: IsOrder,
-        min: Number(dataList[0].MinData),
-        max: Number(dataList[0].MaxData),
+        min: Number(dataList[1].MinData),
+        max: Number(dataList[1].MaxData),
         tickWidth: 1,
         tickLength: 5,
         lineWidth: 1,
@@ -1275,7 +1283,8 @@ function setScatterOptions(data){
     real_data.forEach(_ => {
         series.data.push([_.x,_.y])
     })
-    
+    const textXZh = dataList[0].ConvertUnit||dataList[0].Unit
+    const textXEn = dataList[0].ConvertEnUnit||dataList[0].UnitEn||dataList[0].ConvertUnit||dataList[0].Unit
     return {
         title: {
             text:''
@@ -1285,9 +1294,9 @@ function setScatterOptions(data){
         xAxis: {
             ...scatterXAxis,
             title: {
-                text:  `${dataList[0].Unit}`,
-                textZh:dataList[0].Unit,
-                textEn:dataList[0].Unit?dataList[0].UnitEn:'',
+                text:  `${textXZh}`,
+                textZh:textXZh,
+                textEn:textXZh?textXEn:'',
                 align: 'high',
                 rotation: 0,
                 x: 0,

src/views/Login.vue

@@ -136,77 +136,98 @@ function userLogin(params,values){
         router.replace('/')
     })
 }
+
+let recordInformation=ref([])
+
+function getRecordInfo(){
+    _apiLogin.getICPLicense().then(res=>{
+        if(res.Ret == 200){
+            // 两个空格以上截一段
+            recordInformation.value = res.Data.ConfVal.split(/\s{2,}/)
+        }
+    })
+
+}
+
+getRecordInfo();//获取备案信息
 </script>
 
 <template>
-    <div class="login-page">
-        <van-form class="form-box" ref="loginForm" v-if="activeModel!=='forgetPassModel'">
-            <div class="logo-wrap">
-                <img class="logo" src="@/assets/imgs/logo_icon.png" alt="">
-                <div class="title">Bind on account,</div>
-                <div class="sub-title">sign in to continue</div>
-            </div>
-            <div class="ordinaryModel" v-show="activeModel==='ordinaryModel'">
-                <ordinary-model :activeModel="activeModel" @change-model="changeModel('forgetPassModel')"/>
-            </div>
-            <div class="mobileModel" v-show="activeModel==='mobileModel'">
-                <mobile-model ref="mobileModel"
-                    :activeModel="activeModel"/>
-            </div>
-            <div class="emailModel" v-show="activeModel==='emailModel'">
-                <email-model ref="emailModel"
-                    :activeModel="activeModel"/>
-            </div>
-            <div class="btn-box">
-                <van-button 
-                    round 
-                    block 
-                    type="primary" 
-                    @click="onSubmit2"
-                >登录</van-button>
-            </div>
-            <!-- 选择其他登陆方法 -->
-            <div class="model-icon-box">
-                <div class="model-item" 
-                    @click="changeModel('ordinaryModel')"
-                    v-show="activeModel!=='ordinaryModel'">
-                    <div class="model-item-icon">
-                        <img src="@/assets/imgs/login/account-icon.png"/>
-                    </div>
+    <div>
+        <div class="login-page">
+            <van-form class="form-box" ref="loginForm" v-if="activeModel!=='forgetPassModel'">
+                <div class="logo-wrap">
+                    <img class="logo" src="@/assets/imgs/logo_icon.png" alt="">
+                    <div class="title">Bind on account,</div>
+                    <div class="sub-title">sign in to continue</div>
                 </div>
-                <div class="model-item" 
-                    @click="changeModel('mobileModel')"
-                    v-show="activeModel!=='mobileModel'">
-                    <div class="model-item-icon">
-                        <img src="@/assets/imgs/login/phone-icon.png"/>
-                    </div>
-                    
+                <div class="ordinaryModel" v-show="activeModel==='ordinaryModel'">
+                    <ordinary-model :activeModel="activeModel" @change-model="changeModel('forgetPassModel')"/>
+                </div>
+                <div class="mobileModel" v-show="activeModel==='mobileModel'">
+                    <mobile-model ref="mobileModel"
+                        :activeModel="activeModel"/>
+                </div>
+                <div class="emailModel" v-show="activeModel==='emailModel'">
+                    <email-model ref="emailModel"
+                        :activeModel="activeModel"/>
                 </div>
-                <div class="model-item" 
-                    @click="changeModel('emailModel')"
-                    v-show="activeModel!=='emailModel'">
-                    <div class="model-item-icon">
-                        <img src="@/assets/imgs/login/email-icon.png"/>
+                <div class="btn-box">
+                    <van-button 
+                        round 
+                        block 
+                        type="primary" 
+                        @click="onSubmit2"
+                    >登录</van-button>
+                </div>
+                <!-- 选择其他登陆方法 -->
+                <div class="model-icon-box">
+                    <div class="model-item" 
+                        @click="changeModel('ordinaryModel')"
+                        v-show="activeModel!=='ordinaryModel'">
+                        <div class="model-item-icon">
+                            <img src="@/assets/imgs/login/account-icon.png"/>
+                        </div>
+                    </div>
+                    <div class="model-item" 
+                        @click="changeModel('mobileModel')"
+                        v-show="activeModel!=='mobileModel'">
+                        <div class="model-item-icon">
+                            <img src="@/assets/imgs/login/phone-icon.png"/>
+                        </div>
+                        
+                    </div>
+                    <div class="model-item" 
+                        @click="changeModel('emailModel')"
+                        v-show="activeModel!=='emailModel'">
+                        <div class="model-item-icon">
+                            <img src="@/assets/imgs/login/email-icon.png"/>
+                        </div>
                     </div>
                 </div>
+            </van-form>
+            <div class="form-box" v-else>
+                <forget-pass-model ref="forgetPassModel"
+                    :autoAccount="autoAccount"
+                    @change-model="changeModel('ordinaryModel')"/>
             </div>
-        </van-form>
-        <div class="form-box" v-else>
-            <forget-pass-model ref="forgetPassModel"
-                :autoAccount="autoAccount"
-                @change-model="changeModel('ordinaryModel')"/>
+            <img class="pad-img" src="https://hzstatic.hzinsights.com/static/ETA_mobile/login_img.png" alt="">
+        </div>
+
+        <!-- <div class="mobile-bot-text">Long time&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;More profit</div> -->
+        <div class="record-info">
+            <span v-for="(item,index) in recordInformation" :key="index">{{ item }}</span>
         </div>
-        <img class="pad-img" src="https://hzstatic.hzinsights.com/static/ETA_mobile/login_img.png" alt="">
-        <div class="mobile-bot-text">Long time&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;More profit</div>
     </div>
 </template>
 
 <style lang="scss" scoped>
 .login-page{
-    padding: 0 80px;
+    padding: 220px 80px 0;
+    min-height: calc(100vh - 52PX);
 }
 .logo-wrap{
-    margin-top: 220px;
+    // margin-top: 220px;
     margin-bottom: 180px;
     .logo{
         width: 225px;
@@ -241,14 +262,27 @@ function userLogin(params,values){
         }
     }
 }
-.mobile-bot-text{
-    margin-top: 200px;
-    text-align: center;
-    color: #999;
-}
+// .mobile-bot-text{
+//     margin-top: 200px;
+//     text-align: center;
+//     color: #999;
+// }
 .pad-img{
     display: none;
 }
+.record-info{
+    display: flex;
+    flex-wrap: wrap;
+    justify-content: center;
+    margin: 16PX 0;
+    font-size: 13PX;
+    color: #C0C4CC;
+    text-align: center;
+    width: 100%;
+    span{
+        margin: 0 6PX;
+    }
+}
 
 @media screen and (min-width:$media-width) {
     .login-page{
@@ -256,7 +290,7 @@ function userLogin(params,values){
         padding: 30px;
         display: flex;
         justify-content: space-between;
-        align-items: center;
+        // align-items: center;
         .form-box{
             flex-shrink: 0;
             width: 47%;
@@ -290,9 +324,9 @@ function userLogin(params,values){
         }
     }
 
-    .mobile-bot-text{
-        display: none;
-    }
+    // .mobile-bot-text{
+    //     display: none;
+    // }
     .model-icon-box{
         margin-top: 50px;
         display: flex;
@@ -311,5 +345,8 @@ function userLogin(params,values){
             }
         }
     }
+    .record-info{
+        font-size: 15PX;
+    }
 }
 </style>

src/views/myETA/components/EDBInfo.vue

@@ -154,7 +154,7 @@ function handleCopyEDBData(){
             <div class="opt-box">
                 <div class="lable">指标操作</div>
                 <div class="con">
-                    <template v-if="sameOptionType.includes(chartInfo.ChartType) && chartInfo.ChartType!==5 && chartInfo.Source===1">
+                    <!--<template v-if="sameOptionType.includes(chartInfo.ChartType) && chartInfo.ChartType!==5 && chartInfo.Source===1">
                     <div class="item-box" v-if="showYOptionsHandle">
                         <div 
                             :class="['radio-box',temData.IsOrder?'active':'']"
@@ -238,7 +238,7 @@ function handleCopyEDBData(){
                             <van-stepper input-width="40px" v-model.number="temData.ChartWidth" />
                         </div>
                     </div>
-                    </template>
+                    </template>-->
                     <div class="item-box" v-if="checkAuthBtn(myETABtn.myChart_checkData)||checkAuthBtn(myETABtn.myChart_copyData)">
                         <van-button color="#F2F3FF" size="small" style="color:#0052D9;margin-right:10px" @click="handleCopyEDBData" v-permission="myETABtn.myChart_copyData">复制数据</van-button>
                         <van-button color="#0052D9" size="small" v-permission="myETABtn.myChart_checkData">查看数据</van-button>