Commit a88ca93f authored by “yiyousong”'s avatar “yiyousong”

pref:修改语法

parent 877df31b
...@@ -12,6 +12,7 @@ ...@@ -12,6 +12,7 @@
}, },
"dependencies": { "dependencies": {
"@babel/parser": "^7.7.4", "@babel/parser": "^7.7.4",
"@babel/polyfill": "^7.12.1",
"axios": "^0.27.2", "axios": "^0.27.2",
"beautifier": "^0.1.7", "beautifier": "^0.1.7",
"clipboard": "^2.0.4", "clipboard": "^2.0.4",
......
...@@ -5,13 +5,11 @@ import request from "@/utils/request"; ...@@ -5,13 +5,11 @@ import request from "@/utils/request";
export const getHomeInfo = (data) => { export const getHomeInfo = (data) => {
let baseUrl = local.getLocal("serverUrl"); let baseUrl = local.getLocal("serverUrl");
let siteId = local.getLocal("siteId"); let siteId = local.getLocal("siteId");
let devicenum = local.getLocal("devicenum");
return request({ return request({
url: `${baseUrl}sampleform/home/info`, url: `${baseUrl}sampleform/home/info`,
method: "post", method: "post",
data: { data: {
siteId, siteId,
devicenum,
...data, ...data,
}, },
}); });
......
...@@ -31,7 +31,7 @@ export default { ...@@ -31,7 +31,7 @@ export default {
.header { .header {
width: 100%; width: 100%;
height: 100px; height: 100px;
padding: 0px 40px; padding: 0px 60px;
background: url("../assets/img/title.jpg") no-repeat center; background: url("../assets/img/title.jpg") no-repeat center;
background-size: 100% 100%; background-size: 100% 100%;
box-shadow: 0px 2px 6px 6px #ccc; box-shadow: 0px 2px 6px 6px #ccc;
......
...@@ -14,15 +14,17 @@ ...@@ -14,15 +14,17 @@
<div class="right flex"> <div class="right flex">
<p class="flex aic mr25"> <p class="flex aic mr25">
<span class="tips-name"> 今日节约能量: </span> <span class="tips-name"> 今日节约能量: </span>
<span class="count count1">{{ <span class="count count1" v-if="homeInfo.dayThrift">{{
homeInfo.dayThrift ?? 0 | filterCount homeInfo.dayThrift | filterCount
}}</span> }}</span>
<span class="count count1" v-else> 0 </span>
</p> </p>
<p class="flex aic"> <p class="flex aic">
<span class="tips-name"> 累计节约能量: </span> <span class="tips-name"> 累计节约能量: </span>
<span class="count count2">{{ <span class="count count2" v-if="homeInfo.totalThrift">{{
homeInfo.totalThrift ?? 0 | filterCount homeInfo.totalThrift | filterCount
}}</span> }}</span>
<span class="count count2" v-else> 0 </span>
</p> </p>
</div> </div>
</div> </div>
...@@ -63,12 +65,12 @@ ...@@ -63,12 +65,12 @@
> >
<span <span
:data-value="v" :data-value="v"
v-if="v?.length <= 6" v-if="v.length && v.length <= 6"
class="hot-search-item" class="hot-search-item"
>{{ v }}</span >{{ v }}</span
> >
<span :data-value="v" v-else class="hot-search-item">{{ <span :data-value="v" v-else class="hot-search-item">{{
v?.slice(0, 6) + "..." v.slice(0, 6) + "..."
}}</span> }}</span>
<span class="line"></span> <span class="line"></span>
</div> </div>
...@@ -161,7 +163,7 @@ ...@@ -161,7 +163,7 @@
<span class="data-name">入驻表单量:</span> <span class="data-name">入驻表单量:</span>
<div class="count-box"> <div class="count-box">
<span class="data-count" v-format="'#,##0'">{{ <span class="data-count" v-format="'#,##0'">{{
homeInfo.datumCont ?? 0 homeInfo.datumCont ? homeInfo.datumCont : 0
}}</span> }}</span>
<span></span> <span></span>
</div> </div>
...@@ -171,7 +173,7 @@ ...@@ -171,7 +173,7 @@
<span class="data-name">入驻事项量:</span> <span class="data-name">入驻事项量:</span>
<div class="count-box"> <div class="count-box">
<span class="data-count" v-format="'#,##0'">{{ <span class="data-count" v-format="'#,##0'">{{
homeInfo.matterCont ?? 0 homeInfo.matterCont ? homeInfo.matterCont : 0
}}</span> }}</span>
<span></span> <span></span>
</div> </div>
......
...@@ -3,12 +3,12 @@ ...@@ -3,12 +3,12 @@
*/ */
import axios from "axios"; import axios from "axios";
import { Message } from "element-ui"; import { Message } from "element-ui";
import local from "@/utils/local"; // import local from "@/utils/local";
// 请求超时时间 // 请求超时时间
axios.defaults.timeout = 15 * 1000; // axios.defaults.timeout = 15 * 1000;
// 设置统一服务器地址 // 设置统一服务器地址
axios.defaults.baseURL = local.getLocal("serverUrl"); // axios.defaults.baseURL = local.getLocal("serverUrl");
// 请求拦截 // 请求拦截
axios.interceptors.request.use( axios.interceptors.request.use(
(config) => { (config) => {
......
...@@ -832,6 +832,14 @@ ...@@ -832,6 +832,14 @@
"@babel/helper-create-regexp-features-plugin" "^7.18.6" "@babel/helper-create-regexp-features-plugin" "^7.18.6"
"@babel/helper-plugin-utils" "^7.18.6" "@babel/helper-plugin-utils" "^7.18.6"
"@babel/polyfill@^7.12.1":
version "7.12.1"
resolved "https://registry.npmmirror.com/@babel/polyfill/-/polyfill-7.12.1.tgz#1f2d6371d1261bbd961f3c5d5909150e12d0bd96"
integrity sha512-X0pi0V6gxLi6lFZpGmeNa4zxtwEmCs42isWLNjZZDE0Y8yVfgu0T2OAHlzBbdYlqbW/YXVvoBHpATEM+goCj8g==
dependencies:
core-js "^2.6.5"
regenerator-runtime "^0.13.4"
"@babel/preset-env@^7.12.16": "@babel/preset-env@^7.12.16":
version "7.19.1" version "7.19.1"
resolved "https://registry.yarnpkg.com/@babel/preset-env/-/preset-env-7.19.1.tgz#9f04c916f9c0205a48ebe5cc1be7768eb1983f67" resolved "https://registry.yarnpkg.com/@babel/preset-env/-/preset-env-7.19.1.tgz#9f04c916f9c0205a48ebe5cc1be7768eb1983f67"
...@@ -3036,7 +3044,7 @@ core-js-compat@^3.25.1, core-js-compat@^3.8.3: ...@@ -3036,7 +3044,7 @@ core-js-compat@^3.25.1, core-js-compat@^3.8.3:
dependencies: dependencies:
browserslist "^4.21.4" browserslist "^4.21.4"
core-js@^2.4.0: core-js@^2.4.0, core-js@^2.6.5:
version "2.6.12" version "2.6.12"
resolved "https://registry.npmmirror.com/core-js/-/core-js-2.6.12.tgz#d9333dfa7b065e347cc5682219d6f690859cc2ec" resolved "https://registry.npmmirror.com/core-js/-/core-js-2.6.12.tgz#d9333dfa7b065e347cc5682219d6f690859cc2ec"
integrity sha512-Kb2wC0fvsWfQrgk8HU5lW6U/Lcs8+9aaYcy4ZFc6DDlo4nZ7n70dEgE5rtR0oG6ufKDUnrwfWL1mXR5ljDatrQ== integrity sha512-Kb2wC0fvsWfQrgk8HU5lW6U/Lcs8+9aaYcy4ZFc6DDlo4nZ7n70dEgE5rtR0oG6ufKDUnrwfWL1mXR5ljDatrQ==
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment