From 986ead9c0ba1de832e5265a806d9c30f79f0688b Mon Sep 17 00:00:00 2001
From: ZZJ <10913410+zzj2100@user.noreply.gitee.com>
Date: 星期五, 15 七月 2022 20:27:37 +0800
Subject: [PATCH] 下载
---
src/views/index/components/commendContent.vue | 2
src/components/Price.vue | 6
src/views/index/components/rightForm.vue | 2
src/views/productDetail/components/PayCard.vue | 17
src/views/index/components/rightColumn.vue | 2
src/views/index/index.vue | 10
src/views/hashrate/CameraManage/CameraRules/components/LinkageCameraBox.vue | 3
src/views/index/components/rightRrid.vue | 2
src/components/Connect.vue | 2
src/views/index/components/rightTabs.vue | 2
src/main.ts | 4
src/views/personalCenter/components/OrderMng.vue | 41 ++
src/views/manageCenter/index.vue | 72 ++--
src/views/product/components/productCard.vue | 2
src/views/hashrate/AlgManage/index.vue | 2
src/components/Footer.vue | 7
src/components/Header.vue | 7
src/components/subComponents/CardItem.vue | 574 ++++++++++++++++++++++++++++------------
src/views/connectUs/index.vue | 5
src/views/hashrate/CameraManage/CameraRules/components/CameraBox.vue | 3
src/views/search/components/CardItem.vue | 20
21 files changed, 515 insertions(+), 270 deletions(-)
diff --git a/src/components/Connect.vue b/src/components/Connect.vue
index c5e8849..c31ec76 100644
--- a/src/components/Connect.vue
+++ b/src/components/Connect.vue
@@ -95,7 +95,7 @@
//妫�鏌ユ粴鍔ㄦ潯鏄惁鍦ㄩ《閮紝鎺у埗杩斿洖椤堕儴鎸夐挳鐨勯殣钘忓拰鏄剧ず
},
jump1() {
- window.open("http://smartai.com/contact");
+ window.open("http://smartai.com/consult");
},
},
};
diff --git a/src/components/Footer.vue b/src/components/Footer.vue
index 6132f0c..006050c 100644
--- a/src/components/Footer.vue
+++ b/src/components/Footer.vue
@@ -8,7 +8,7 @@
<span class="label">娉曞緥澹版槑</span>
<span class="label">闅愮鏀跨瓥</span>
<span class="label">寤夋涓炬姤</span>
- <span class="label" @click="$router.push('/connectUs')">鑱旂郴鎴戜滑</span>
+ <span class="label" @click="jump2">鑱旂郴鎴戜滑</span>
<span class="label">鍔犲叆鎴戜滑</span>
</div>
</div>
@@ -24,7 +24,10 @@
},
methods: {
jump() {
- window.open("http://www.smartai.com/");
+ window.open("http://www.smartai.com/contact");
+ },
+ jump2() {
+ window.open("http://www.smartai.com/consult");
},
},
};
diff --git a/src/components/Header.vue b/src/components/Header.vue
index 410116a..75b8a2c 100644
--- a/src/components/Header.vue
+++ b/src/components/Header.vue
@@ -7,7 +7,7 @@
<div class="right">
<div class="link"><router-link to="/">棣栭〉</router-link></div>
- <div class="link" @click="$router.push('/connectUs')">鑱旂郴鎴戜滑</div>
+ <div class="link" @click="jump2">鑱旂郴鎴戜滑</div>
<div class="link" @click="jump">鍏充簬鎴戜滑</div>
</div>
</div>
@@ -17,7 +17,10 @@
export default {
methods: {
jump() {
- window.open("http://www.smartai.com/");
+ window.open("http://www.smartai.com/contact");
+ },
+ jump2() {
+ window.open("http://www.smartai.com/consult");
},
},
};
diff --git a/src/components/Price.vue b/src/components/Price.vue
index 5078dc4..1a03a7e 100644
--- a/src/components/Price.vue
+++ b/src/components/Price.vue
@@ -1,10 +1,10 @@
<template>
- <div class="Price">
- 锟�<span class="newPrice">{{ priceN1 }}</span
+ <div class="Price" style="height: 30px">
+ <!-- 锟�<span class="newPrice">{{ priceN1 }}</span
>{{ priceN2 }}/骞�
<span class="iconSave" v-if="showIcon">鐪�</span>
- <span class="oldPrice">锟{ priceO1 }}{{ priceO2 }}/骞�</span>
+ <span class="oldPrice">锟{ priceO1 }}{{ priceO2 }}/骞�</span> -->
</div>
</template>
diff --git a/src/components/subComponents/CardItem.vue b/src/components/subComponents/CardItem.vue
index 063f9af..00ff1cb 100644
--- a/src/components/subComponents/CardItem.vue
+++ b/src/components/subComponents/CardItem.vue
@@ -2,13 +2,13 @@
<div class="box-card" ref="cardItem">
<!-- 宸︿晶鍥剧墖鍖哄煙 -->
<!-- 姣斿妯″紡 -->
- <div class="s-card-left-isCompare" v-if="showType === 'compare' ">
+ <div class="s-card-left-isCompare" v-if="showType === 'compare'">
<div class="card-img-box">
<div class="card-img-box-compear">
<div class="card-img-box-compear-left" ref="firstImg">
<img
:src="data.targetInfo[0].picSmUrl | httpImage"
- :id="'/compear/'+data.targetInfo[0].picSmUrl"
+ :id="'/compear/' + data.targetInfo[0].picSmUrl"
class="cursor-pointer"
@click="detailsClick($event)"
/>
@@ -20,7 +20,10 @@
indicator-position="none"
:arrow="data.baseInfo.length > 1 ? 'always' : 'never'"
>
- <el-carousel-item v-for="(item, index) in data.baseInfo" :key="index">
+ <el-carousel-item
+ v-for="(item, index) in data.baseInfo"
+ :key="index"
+ >
<img
:src="item.targetPicUrl | httpImage"
class="cursor-pointer"
@@ -33,7 +36,7 @@
class="s-card-left-isCompare-div compareScore111"
:style="{
bottom: '0',
- background: getUrl(data.baseInfo[initialIndex].bwType)
+ background: getUrl(data.baseInfo[initialIndex].bwType),
}"
>
<b>{{ data.baseInfo[initialIndex].compareScore | percentage }}</b>
@@ -52,13 +55,23 @@
:autoplay="false"
@change="changeCarousel"
>
- <el-carousel-item v-for="(item, index) in data.picMaxUrl" :key="index + 'img'">
- <img :src="item | httpImage" class="cursor-pointer" @click="detailsClick($event)" />
+ <el-carousel-item
+ v-for="(item, index) in data.picMaxUrl"
+ :key="index + 'img'"
+ >
+ <img
+ :src="item | httpImage"
+ class="cursor-pointer"
+ @click="detailsClick($event)"
+ />
</el-carousel-item>
</el-carousel>
<!-- 鏆傛椂璁や负鍙湁浜鸿劯鎶撴媿鐨勬姤璀�, 棣栭〉鏄剧ず灏忓浘, 鍏朵粬鏃堕棿鍧囨樉绀哄ぇ鍥� -->
<img
- v-else-if="data.targetInfo == null || data.targetInfo[0].targetType !== 'FaceDetect'"
+ v-else-if="
+ data.targetInfo == null ||
+ data.targetInfo[0].targetType !== 'FaceDetect'
+ "
:src="data.picMaxUrl[0] | httpImage"
class="cursor-pointer"
@click="detailsClick($event)"
@@ -71,7 +84,10 @@
/>
</div>
<div class="s-card-left-box" v-else>
- <img :src="data.baseInfo[0].targetPicUrl | httpImage" class="cursor-pointer" />
+ <img
+ :src="data.baseInfo[0].targetPicUrl | httpImage"
+ class="cursor-pointer"
+ />
</div>
</div>
@@ -85,34 +101,52 @@
@mouseleave="cardMouseleave($event)"
>
<p>
- <span class="fontStyle color222">{{ data.picDate | formatTime}}</span>
+ <span class="fontStyle color222">{{
+ data.picDate | formatTime
+ }}</span>
</p>
- <p style="margin-bottom: 8px;">
+ <p style="margin-bottom: 8px">
<span class="fontStyle color222">{{ data.cameraAddr }}</span>
</p>
<el-tooltip placement="right" popper-class="atooltip">
<div slot="content">
- <p v-for="(item,index) in data.alarmRules" :key="index+'rule'">
- <span>{{data.taskName}}</span>
- <span v-if="item.alarmLevel !== '鎾ら槻'"> {{item.alarmLevel}}</span>
+ <p v-for="(item, index) in data.alarmRules" :key="index + 'rule'">
+ <span>{{ data.taskName }}</span
+ >
+ <span v-if="item.alarmLevel !== '鎾ら槻'"
+ > {{ item.alarmLevel }}</span
+ >
<span v-if="item.linkInfo == '鑱斿姩浠诲姟'"> 鑱斿姩浠诲姟</span>
</p>
</div>
<el-button
- style="line-height:17px;border:none;padding:0;overflow:hidden;text-overflow:ellipsis;cursor:default;width:100%;text-align:left"
+ style="
+ line-height: 17px;
+ border: none;
+ padding: 0;
+ overflow: hidden;
+ text-overflow: ellipsis;
+ cursor: default;
+ width: 100%;
+ text-align: left;
+ "
>
<span
- v-for="(item,index) in data.alarmRules"
- :key="index+'rule1'"
- style="text-overflow:ellipsis;max-width:100px"
+ v-for="(item, index) in data.alarmRules"
+ :key="index + 'rule1'"
+ style="text-overflow: ellipsis; max-width: 100px"
>
- <span class="fontStyle color666">{{data.taskName}}</span>
+ <span class="fontStyle color666">{{ data.taskName }}</span
+ >
+ <span class="fontStyle color666" v-if="item.alarmLevel !== '鎾ら槻'"
+ > {{ item.alarmLevel }}</span
+ >
<span
class="fontStyle color666"
- v-if="item.alarmLevel !== '鎾ら槻'"
- > {{item.alarmLevel}}</span>
- <span class="fontStyle color666" v-if="item.linkInfo == '鑱斿姩浠诲姟'"> 鑱斿姩浠诲姟</span>
- <span v-if="index < data.alarmRules.length-1">/ </span>
+ v-if="item.linkInfo == '鑱斿姩浠诲姟'"
+ > 鑱斿姩浠诲姟</span
+ >
+ <span v-if="index < data.alarmRules.length - 1">/ </span>
</span>
</el-button>
</el-tooltip>
@@ -122,45 +156,61 @@
<span
class="fontStyle"
v-if="data.baseInfo[initialIndex].tableName"
- >{{ data.baseInfo[initialIndex].tableName }}</span>
+ >{{ data.baseInfo[initialIndex].tableName }}</span
+ >
<span
class="fontStyle"
v-if="data.baseInfo[initialIndex].targetName"
- >/ {{ data.baseInfo[initialIndex].targetName }}</span>
- <span
- class="fontStyle"
- v-if="data.baseInfo[initialIndex].labels"
- >/ {{ data.baseInfo[initialIndex].labels | idCard}}</span>
+ >/ {{ data.baseInfo[initialIndex].targetName }}</span
+ >
+ <span class="fontStyle" v-if="data.baseInfo[initialIndex].labels"
+ >/ {{ data.baseInfo[initialIndex].labels | idCard }}</span
+ >
<span
class="fontStyle"
v-if="data.baseInfo[initialIndex].monitorLevel"
- >/ {{ data.baseInfo[initialIndex].monitorLevel }}</span>
+ >/ {{ data.baseInfo[initialIndex].monitorLevel }}</span
+ >
</p>
</div>
<el-button
- style="line-height:17px;border:none;padding:0;margin:0;overflow:hidden;text-overflow:ellipsis;cursor:default;width:100%;text-align:left"
+ style="
+ line-height: 17px;
+ border: none;
+ padding: 0;
+ margin: 0;
+ overflow: hidden;
+ text-overflow: ellipsis;
+ cursor: default;
+ width: 100%;
+ text-align: left;
+ "
>
<span
- :style="data.baseInfo[initialIndex].bwType === '1'
- ? 'color: red;font-size:12px;line-height:20px'
- : 'font-size:12px;line-height:20px'"
+ :style="
+ data.baseInfo[initialIndex].bwType === '1'
+ ? 'color: red;font-size:12px;line-height:20px'
+ : 'font-size:12px;line-height:20px'
+ "
>
<span
class="fontStyle"
v-if="data.baseInfo[initialIndex].tableName"
- >{{ data.baseInfo[initialIndex].tableName }}</span>
+ >{{ data.baseInfo[initialIndex].tableName }}</span
+ >
<span
class="fontStyle"
v-if="data.baseInfo[initialIndex].targetName"
- >/ {{ data.baseInfo[initialIndex].targetName }}</span>
- <span
- class="fontStyle"
- v-if="data.baseInfo[initialIndex].labels"
- >/ {{ data.baseInfo[initialIndex].labels | idCard}}</span>
+ >/ {{ data.baseInfo[initialIndex].targetName }}</span
+ >
+ <span class="fontStyle" v-if="data.baseInfo[initialIndex].labels"
+ >/ {{ data.baseInfo[initialIndex].labels | idCard }}</span
+ >
<span
class="fontStyle"
v-if="data.baseInfo[initialIndex].monitorLevel"
- >/ {{ data.baseInfo[initialIndex].monitorLevel }}</span>
+ >/ {{ data.baseInfo[initialIndex].monitorLevel }}</span
+ >
</span>
</el-button>
</el-tooltip>
@@ -175,9 +225,9 @@
<el-tooltip content="鍔犲叆搴曞簱" placement="top" popper-class="atooltip">
<i class="iconfont icontianjiaren" @click="toAdd(data)"></i>
</el-tooltip>
- <el-tooltip content="鏀惰棌" placement="top" popper-class="atooltip">
+ <!-- <el-tooltip content="鏀惰棌" placement="top" popper-class="atooltip">
<i class="iconfont iconshoucang2"></i>
- </el-tooltip>
+ </el-tooltip> -->
</div>
</div>
<!-- 搴曞簱浜哄憳妯″紡 -->
@@ -191,23 +241,44 @@
<p
:title="data.baseInfo[0].compareScore"
class="score"
- style="font-family: PingFangSC-Medium;font-size: 20px;color: #3D68E1;letter-spacing: 0.4px;"
+ style="
+ font-family: PingFangSC-Medium;
+ font-size: 20px;
+ color: #3d68e1;
+ letter-spacing: 0.4px;
+ "
>
- <span>{{ data.baseInfo[0].compareScore | percentage}}</span>
+ <span>{{ data.baseInfo[0].compareScore | percentage }}</span>
</p>
<p
- :style="data.baseInfo[0].bwType == '0' ? 'font-size:12px;line-height:20px' : 'color:red;font-size:12px;line-height:20px'"
- >{{ data.baseInfo[0].tableName }}</p>
+ :style="
+ data.baseInfo[0].bwType == '0'
+ ? 'font-size:12px;line-height:20px'
+ : 'color:red;font-size:12px;line-height:20px'
+ "
+ >
+ {{ data.baseInfo[0].tableName }}
+ </p>
<p :style="data.baseInfo[0].bwType == '0' ? '' : 'color:red'">
- <span>{{ data.baseInfo[0].targetName }}</span>
- <span
- v-if="data.baseInfo[0].labels"
- >/ {{ data.baseInfo[0].labels | idCard}}</span>
+ <span>{{ data.baseInfo[0].targetName }}</span
+ >
+ <span v-if="data.baseInfo[0].labels"
+ >/ {{ data.baseInfo[0].labels | idCard }}</span
+ >
</p>
</div>
<div class="card-icon-box">
- <el-tooltip content="鏌ユ壘姝や汉" placement="top" popper-class="atooltip" style="margin-left:10px">
- <i class="iconfont iconsousuoren" @click="tosearch(data)" title="鏌ユ壘姝や汉"></i>
+ <el-tooltip
+ content="鏌ユ壘姝や汉"
+ placement="top"
+ popper-class="atooltip"
+ style="margin-left: 10px"
+ >
+ <i
+ class="iconfont iconsousuoren"
+ @click="tosearch(data)"
+ title="鏌ユ壘姝や汉"
+ ></i>
</el-tooltip>
</div>
</div>
@@ -223,34 +294,54 @@
@mouseleave="cardMouseleave($event)"
>
<p :title="data.picDate">
- <span class="fontStyle color222">{{ data.picDate | formatTime }}</span>
+ <span class="fontStyle color222">{{
+ data.picDate | formatTime
+ }}</span>
</p>
- <p :title="data.cameraAddr" style="margin-bottom: 8px;">
+ <p :title="data.cameraAddr" style="margin-bottom: 8px">
<span class="fontStyle color222">{{ data.cameraAddr }}</span>
</p>
<el-tooltip placement="right" popper-class="atooltip">
<div slot="content">
- <p v-for="(item,index) in data.alarmRules" :key="index+'rule'">
- <span>{{data.taskName}}</span>
- <span v-if="item.alarmLevel !== '鎾ら槻'">{{item.alarmLevel}}</span>
+ <p v-for="(item, index) in data.alarmRules" :key="index + 'rule'">
+ <span>{{ data.taskName }}</span
+ >
+ <span v-if="item.alarmLevel !== '鎾ら槻'">{{
+ item.alarmLevel
+ }}</span
+ >
<span v-if="item.linkInfo == '鑱斿姩浠诲姟'"> 鑱斿姩浠诲姟</span>
</p>
</div>
<el-button
- style="border:none;padding:0;overflow:hidden;text-overflow:ellipsis;cursor:default;width:100%;text-align:left"
+ style="
+ border: none;
+ padding: 0;
+ overflow: hidden;
+ text-overflow: ellipsis;
+ cursor: default;
+ width: 100%;
+ text-align: left;
+ "
>
<span
- v-for="(item,index) in data.alarmRules"
- :key="index+'rule1'"
- style="text-overflow:ellipsis;max-width:100px"
+ v-for="(item, index) in data.alarmRules"
+ :key="index + 'rule1'"
+ style="text-overflow: ellipsis; max-width: 100px"
>
- <span class="fontStyle color666">{{data.taskName}}</span>
+ <span class="fontStyle color666">{{ data.taskName }}</span
+ >
<span
class="fontStyle color666"
v-if="item.alarmLevel !== '鎾ら槻'"
- >{{item.alarmLevel}}</span>
- <span class="fontStyle color666" v-if="item.linkInfo == '鑱斿姩浠诲姟'"> 鑱斿姩浠诲姟</span>
- <span v-if="index < data.alarmRules.length-1">/ </span>
+ >{{ item.alarmLevel }}</span
+ >
+ <span
+ class="fontStyle color666"
+ v-if="item.linkInfo == '鑱斿姩浠诲姟'"
+ > 鑱斿姩浠诲姟</span
+ >
+ <span v-if="index < data.alarmRules.length - 1">/ </span>
</span>
</el-button>
</el-tooltip>
@@ -258,7 +349,11 @@
<div class="right-bottom">
<div v-if="!data.id" class="card-icon-box">
<!-- <i class="iconfont systemxing ml50" title="鏀惰棌" ></i> -->
- <el-tooltip content="鏌ユ壘姝や汉" placement="top" popper-class="atooltip">
+ <el-tooltip
+ content="鏌ユ壘姝や汉"
+ placement="top"
+ popper-class="atooltip"
+ >
<i class="iconfont iconsousuoren ml50" @click="tosearch(data)"></i>
</el-tooltip>
</div>
@@ -269,9 +364,9 @@
<el-tooltip content="璇︽儏" placement="top" popper-class="atooltip">
<i class="iconfont iconcaidan" @click="detailsClick($event)"></i>
</el-tooltip>
- <el-tooltip content="鏀惰棌" placement="top" popper-class="atooltip">
+ <!-- <el-tooltip content="鏀惰棌" placement="top" popper-class="atooltip">
<i class="iconfont iconshoucang2" @click="dialogVisible = true"></i>
- </el-tooltip>
+ </el-tooltip> -->
<!-- :class="
data.isAlarm ? 'iconfont systemmm' : 'iconfont systemxing'
"-->
@@ -280,15 +375,23 @@
<el-tooltip content="璇︽儏" placement="top" popper-class="atooltip">
<i class="iconfont iconcaidan" @click="detailsClick($event)"></i>
</el-tooltip>
- <el-tooltip content="鏌ユ壘姝や汉" placement="top" popper-class="atooltip">
+ <el-tooltip
+ content="鏌ユ壘姝や汉"
+ placement="top"
+ popper-class="atooltip"
+ >
<i class="iconfont iconsousuoren" @click="tosearch(data)"></i>
</el-tooltip>
- <el-tooltip content="鍔犲叆搴曞簱" placement="top" popper-class="atooltip">
+ <el-tooltip
+ content="鍔犲叆搴曞簱"
+ placement="top"
+ popper-class="atooltip"
+ >
<i class="iconfont icontianjiaren" @click="toAdd(data)"></i>
</el-tooltip>
- <el-tooltip content="鏀惰棌" placement="top" popper-class="atooltip">
+ <!-- <el-tooltip content="鏀惰棌" placement="top" popper-class="atooltip">
<i class="iconfont iconshoucang2" @click="dialogVisible = true"></i>
- </el-tooltip>
+ </el-tooltip> -->
</div>
</div>
</div>
@@ -307,40 +410,72 @@
<p
class="score"
v-if="VideoPhotoData.uploadType"
- style="font-family: PingFangSC-Medium;font-size: 20px;color: #3D68E1;letter-spacing: 0.4px;"
+ style="
+ font-family: PingFangSC-Medium;
+ font-size: 20px;
+ color: #3d68e1;
+ letter-spacing: 0.4px;
+ "
>
- <span v-if="data.id">{{ data.compareScore | percentage}}</span>
- <span v-else>{{ data.baseInfo[0].compareScore | percentage}}</span>
+ <span v-if="data.id">{{ data.compareScore | percentage }}</span>
+ <span v-else>{{ data.baseInfo[0].compareScore | percentage }}</span>
</p>
<p :title="data.picDate">
- <span class="fontStyle color222">{{ data.picDate | formatTime }}</span>
+ <span class="fontStyle color222">{{
+ data.picDate | formatTime
+ }}</span>
</p>
- <p :title="data.cameraAddr" style="margin-bottom: 8px;">
+ <p :title="data.cameraAddr" style="margin-bottom: 8px">
<span class="fontStyle color222">{{ data.cameraAddr }}</span>
</p>
- <el-tooltip placement="right" popper-class="atooltip" v-if="!VideoPhotoData.uploadType">
+ <el-tooltip
+ placement="right"
+ popper-class="atooltip"
+ v-if="!VideoPhotoData.uploadType"
+ >
<div slot="content">
- <p v-for="(item,index) in data.alarmRules" :key="index+'rule2'">
- <span class="fontStyle">{{data.taskName}}</span>
- <span
- class="fontStyle"
- v-if="item.alarmLevel !== '鎾ら槻'"
- >{{item.alarmLevel}}</span>
- <span v-if="item.linkInfo == '鑱斿姩浠诲姟'" class="fontStyle"> 鑱斿姩浠诲姟</span>
- <span v-if="index < data.alarmRules.length-1">/ </span>
+ <p v-for="(item, index) in data.alarmRules" :key="index + 'rule2'">
+ <span class="fontStyle">{{ data.taskName }}</span
+ >
+ <span class="fontStyle" v-if="item.alarmLevel !== '鎾ら槻'">{{
+ item.alarmLevel
+ }}</span
+ >
+ <span v-if="item.linkInfo == '鑱斿姩浠诲姟'" class="fontStyle"
+ > 鑱斿姩浠诲姟</span
+ >
+ <span v-if="index < data.alarmRules.length - 1">/ </span>
</p>
</div>
<el-button
- style="border:none;padding:0;margin:0px;overflow:hidden;text-overflow:ellipsis;cursor:default;width:100%;text-align:left"
+ style="
+ border: none;
+ padding: 0;
+ margin: 0px;
+ overflow: hidden;
+ text-overflow: ellipsis;
+ cursor: default;
+ width: 100%;
+ text-align: left;
+ "
>
- <span v-for="(item,index) in data.alarmRules" :key="index+'rule3'">
- <span class="fontStyle color666">{{data.taskName}}</span>
+ <span
+ v-for="(item, index) in data.alarmRules"
+ :key="index + 'rule3'"
+ >
+ <span class="fontStyle color666">{{ data.taskName }}</span
+ >
<span
class="fontStyle color666"
v-if="item.alarmLevel !== '鎾ら槻'"
- >{{item.alarmLevel}}</span>
- <span v-if="item.linkInfo == '鑱斿姩浠诲姟'" class="fontStyle color666"> 鑱斿姩浠诲姟</span>
- <span v-if="index < data.alarmRules.length-1">/ </span>
+ >{{ item.alarmLevel }}</span
+ >
+ <span
+ v-if="item.linkInfo == '鑱斿姩浠诲姟'"
+ class="fontStyle color666"
+ > 鑱斿姩浠诲姟</span
+ >
+ <span v-if="index < data.alarmRules.length - 1">/ </span>
</span>
</el-button>
</el-tooltip>
@@ -353,31 +488,52 @@
v-if="data.baseInfo && data.baseInfo[0].targetName != ''"
>
<div slot="content">
- <p v-for="(item,index) in data.baseInfo" :key="index+'base1'">
- <span class="fontStyle">{{item.tableName}}</span>
- <span class="fontStyle" v-if="item.targetName.length">/ {{item.targetName}}</span>
- <span
- class="fontStyle"
- v-if="item.labels.length"
- >/ {{item.labels | idCard}}</span>
- <span class="fontStyle" v-if="item.labels.length">/ {{item.labels | sex}}</span>
+ <p v-for="(item, index) in data.baseInfo" :key="index + 'base1'">
+ <span class="fontStyle">{{ item.tableName }}</span
+ >
+ <span class="fontStyle" v-if="item.targetName.length"
+ >/ {{ item.targetName }}</span
+ >
+ <span class="fontStyle" v-if="item.labels.length"
+ >/ {{ item.labels | idCard }}</span
+ >
+ <span class="fontStyle" v-if="item.labels.length"
+ >/ {{ item.labels | sex }}</span
+ >
</p>
</div>
<el-button
- style="border:none;padding:0;margin:0px;overflow:hidden;text-overflow:ellipsis;cursor:default;width:100%;text-align:left"
+ style="
+ border: none;
+ padding: 0;
+ margin: 0px;
+ overflow: hidden;
+ text-overflow: ellipsis;
+ cursor: default;
+ width: 100%;
+ text-align: left;
+ "
>
<span
- v-for="(item,index) in data.baseInfo"
- :key="index+'base'"
- :style="item.bwType == '1' ? 'color:red;font-size:12px;line-height:20px':'font-size:12px;line-height:20px'"
+ v-for="(item, index) in data.baseInfo"
+ :key="index + 'base'"
+ :style="
+ item.bwType == '1'
+ ? 'color:red;font-size:12px;line-height:20px'
+ : 'font-size:12px;line-height:20px'
+ "
>
- <span class="fontStyle">{{item.tableName}}</span>
- <span class="fontStyle" v-if="item.targetName.length">/ {{item.targetName}}</span>
- <span
- class="fontStyle"
- v-if="item.labels.length"
- >/ {{item.labels | idCard}}</span>
- <span class="fontStyle" v-if="item.labels.length">/ {{item.labels |sex }}</span>
+ <span class="fontStyle">{{ item.tableName }}</span
+ >
+ <span class="fontStyle" v-if="item.targetName.length"
+ >/ {{ item.targetName }}</span
+ >
+ <span class="fontStyle" v-if="item.labels.length"
+ >/ {{ item.labels | idCard }}</span
+ >
+ <span class="fontStyle" v-if="item.labels.length"
+ >/ {{ item.labels | sex }}</span
+ >
</span>
</el-button>
</el-tooltip>
@@ -386,15 +542,28 @@
placement="right"
popper-class="atooltip"
v-if="data.baseInfo == null"
- style="margin-top:5px"
+ style="margin-top: 5px"
>
<div slot="content">
- <span :style="'color:red;font-size:14px;line-height:20px'">{{data.showLabels}}</span>
+ <span :style="'color:red;font-size:14px;line-height:20px'">{{
+ data.showLabels
+ }}</span>
</div>
<el-button
- style="border:none;padding:0;margin:0px;overflow:hidden;text-overflow:ellipsis;cursor:default;width:100%;text-align:left"
+ style="
+ border: none;
+ padding: 0;
+ margin: 0px;
+ overflow: hidden;
+ text-overflow: ellipsis;
+ cursor: default;
+ width: 100%;
+ text-align: left;
+ "
>
- <span :style=" 'color:red;font-size:14px;line-height:20px'">{{data.showLabels}}</span>
+ <span :style="'color:red;font-size:14px;line-height:20px'">{{
+ data.showLabels
+ }}</span>
</el-button>
</el-tooltip>
</div>
@@ -402,7 +571,11 @@
<div v-if="!data.id" class="card-icon-box">
<!-- 搴曞簱浜哄憳 -->
<!-- <i class="iconfont systemxing ml50" title="鏀惰棌" ></i> -->
- <el-tooltip content="鏌ユ壘姝や汉" placement="top" popper-class="atooltip">
+ <el-tooltip
+ content="鏌ユ壘姝や汉"
+ placement="top"
+ popper-class="atooltip"
+ >
<i class="iconfont iconsousuoren ml50" @click="tosearch(data)"></i>
</el-tooltip>
</div>
@@ -411,9 +584,9 @@
<el-tooltip content="璇︽儏" placement="top" popper-class="atooltip">
<i class="iconfont iconcaidan" @click="detailsClick($event)"></i>
</el-tooltip>
- <el-tooltip content="鏀惰棌" placement="top" popper-class="atooltip">
+ <!-- <el-tooltip content="鏀惰棌" placement="top" popper-class="atooltip">
<i class="iconfont iconshoucang2"></i>
- </el-tooltip>
+ </el-tooltip> -->
<!-- :class="
data.isAlarm ? 'iconfont systemmm' : 'iconfont systemxing'
"-->
@@ -439,9 +612,9 @@
>
<i class="iconfont icontianjiaren" @click="toAdd(data)"></i>
</el-tooltip>
- <el-tooltip content="鏀惰棌" placement="top" popper-class="atooltip">
+ <!-- <el-tooltip content="鏀惰棌" placement="top" popper-class="atooltip">
<i class="iconfont iconshoucang2"></i>
- </el-tooltip>
+ </el-tooltip> -->
</div>
</div>
</div>
@@ -456,16 +629,24 @@
>
<div>
<p :title="data.picDate">
- <span class="fontStyle color222">{{ data.picDate | formatTime }}</span>
+ <span class="fontStyle color222">{{
+ data.picDate | formatTime
+ }}</span>
</p>
- <p :title="data.cameraAddr" style="margin-bottom: 8px;">
+ <p :title="data.cameraAddr" style="margin-bottom: 8px">
<span class="fontStyle color222">{{ data.cameraAddr }}</span>
</p>
- <p v-for="(item,index) in data.alarmRules" :key="index+'rule'">
- <span class="fontStyle color666">{{data.taskName}}</span> /
- <span class="fontStyle color666">{{item.alarmLevel}}</span> /
- <span v-if="item.linkInfo == '鑱斿姩浠诲姟'" class="fontStyle color666">鑱斿姩浠诲姟</span>
- <span v-if="index < data.alarmRules.length-1">/ </span>
+ <p v-for="(item, index) in data.alarmRules" :key="index + 'rule'">
+ <span class="fontStyle color666">{{ data.taskName }}</span
+ > /
+ <span class="fontStyle color666">{{ item.alarmLevel }}</span
+ > /
+ <span
+ v-if="item.linkInfo == '鑱斿姩浠诲姟'"
+ class="fontStyle color666"
+ >鑱斿姩浠诲姟</span
+ >
+ <span v-if="index < data.alarmRules.length - 1">/ </span>
</p>
</div>
</div>
@@ -477,74 +658,84 @@
<script>
Date.prototype.Format = function (fmt) {
var o = {
- "M+": this.getMonth() + 1, //鏈堜唤
- "d+": this.getDate(), //鏃�
- "H+": this.getHours(), //灏忔椂
- "m+": this.getMinutes(), //鍒�
- "s+": this.getSeconds(), //绉�
- "q+": Math.floor((this.getMonth() + 3) / 3), //瀛ｅ害
- "S": this.getMilliseconds() //姣
+ "M+": this.getMonth() + 1, //鏈堜唤
+ "d+": this.getDate(), //鏃�
+ "H+": this.getHours(), //灏忔椂
+ "m+": this.getMinutes(), //鍒�
+ "s+": this.getSeconds(), //绉�
+ "q+": Math.floor((this.getMonth() + 3) / 3), //瀛ｅ害
+ S: this.getMilliseconds(), //姣
};
- if (/(y+)/.test(fmt)) fmt = fmt.replace(RegExp.$1, (this.getFullYear() + "").substr(4 - RegExp.$1.length));
+ if (/(y+)/.test(fmt))
+ fmt = fmt.replace(
+ RegExp.$1,
+ (this.getFullYear() + "").substr(4 - RegExp.$1.length)
+ );
for (var k in o)
- if (new RegExp("(" + k + ")").test(fmt)) fmt = fmt.replace(RegExp.$1, (RegExp.$1.length == 1) ? (o[k]) : (("00" + o[k]).substr(("" + o[k]).length)));
+ if (new RegExp("(" + k + ")").test(fmt))
+ fmt = fmt.replace(
+ RegExp.$1,
+ RegExp.$1.length == 1 ? o[k] : ("00" + o[k]).substr(("" + o[k]).length)
+ );
return fmt;
-}
+};
export default {
mounted() {
//window.addEventListener("resize", this.watchWindow);
- window.addEventListener("resize", this.getBottom)
+ window.addEventListener("resize", this.getBottom);
},
props: {
data: {
type: Object,
- default: null
+ default: null,
},
showType: {
type: String,
- default: "search"
+ default: "search",
},
fromCluster: {
type: Boolean,
- default: false
+ default: false,
},
- searchT: {}
+ searchT: {},
},
computed: {
isId() {
- return this.data.id
- }
+ return this.data.id;
+ },
},
filters: {
formatTime(t) {
- return new Date(t).Format("yyyy-MM-dd HH:mm:ss")
+ return new Date(t).Format("yyyy-MM-dd HH:mm:ss");
},
percentage(score) {
- return score.toFixed(2) + "%"
+ return score.toFixed(2) + "%";
},
idCard(v) {
try {
- let obj = JSON.parse(v)
- return obj.idCard
+ let obj = JSON.parse(v);
+ return obj.idCard;
} catch (error) {
- return v.split("/")[1]
+ return v.split("/")[1];
}
},
sex(v) {
try {
- let obj = JSON.parse(v)
- return obj.sex
+ let obj = JSON.parse(v);
+ return obj.sex;
} catch (error) {
- return v.split("/")[0]
+ return v.split("/")[0];
}
},
httpImage(url) {
if (!url.length) {
- return ""
+ return "";
}
- return '/httpImage/' + url + ((url.indexOf("?") >= 0) ? '&' : '?') + 'width=160'
- }
+ return (
+ "/httpImage/" + url + (url.indexOf("?") >= 0 ? "&" : "?") + "width=160"
+ );
+ },
},
data() {
return {
@@ -552,33 +743,33 @@
initialIndex: 0,
carouselIndex: 0,
dialogVisible: false,
- overflowState: true
+ overflowState: true,
};
},
watch: {
data: {
handler(val, oldVal) {
- this.$forceUpdate()
+ this.$forceUpdate();
},
- deep: true
- }
+ deep: true,
+ },
},
methods: {
getBottom() {
this.$nextTick(() => {
- let imgDom = this.$refs.firstImg
+ let imgDom = this.$refs.firstImg;
if (imgDom) {
- let num = (imgDom.offsetHeight - imgDom.offsetWidth) / 2
+ let num = (imgDom.offsetHeight - imgDom.offsetWidth) / 2;
return `${num}px`;
}
return `4px`;
- })
+ });
},
getUrl(bwtype) {
if (bwtype == 1) {
- return `url(${require("@/assets/img/red.png")})`
+ return `url(${require("@/assets/img/red.png")})`;
} else {
- return `url(${require("@/assets/img/green.png")})`
+ return `url(${require("@/assets/img/green.png")})`;
}
},
changeInitialIndex(index) {
@@ -600,24 +791,53 @@
this.$emit("addToBase", item);
},
tosearch(item) {
- this.searchT
- let captureId = item.id == "" ? item.baseInfo[0].targetId : item.id
- let imgUrl = item.targetInfo ? item.targetInfo[0].picSmUrl : item.baseInfo[0].targetPicUrl
- let compType = 1 // 鏁版嵁鏉ヨ嚜浜巈s
+ this.searchT;
+ let captureId = item.id == "" ? item.baseInfo[0].targetId : item.id;
+ let imgUrl = item.targetInfo
+ ? item.targetInfo[0].picSmUrl
+ : item.baseInfo[0].targetPicUrl;
+ let compType = 1; // 鏁版嵁鏉ヨ嚜浜巈s
if (!item.id || item.id == "") {
- compType = 0 // 鏁版嵁鏉ヨ嚜浜庡簳搴�
+ compType = 0; // 鏁版嵁鏉ヨ嚜浜庡簳搴�
}
- let message
+ let message;
if (this.fromCluster) {
- message = 'toCluster?showType=findByPic&targetId=' + captureId + '&picSmUrl=' + imgUrl + '&compType=' + compType + '×tamp=' + new Date().getTime() + '&start=' + this.searchT[0] + '&end=' + this.searchT[1];
+ message =
+ "toCluster?showType=findByPic&targetId=" +
+ captureId +
+ "&picSmUrl=" +
+ imgUrl +
+ "&compType=" +
+ compType +
+ "×tamp=" +
+ new Date().getTime() +
+ "&start=" +
+ this.searchT[0] +
+ "&end=" +
+ this.searchT[1];
} else {
- message = 'toSearch?showType=findByPic&targetId=' + captureId + '&picSmUrl=' + imgUrl + '&compType=' + compType + '×tamp=' + new Date().getTime() + '&start=' + this.searchT[0] + '&end=' + this.searchT[1];
+ message =
+ "toSearch?showType=findByPic&targetId=" +
+ captureId +
+ "&picSmUrl=" +
+ imgUrl +
+ "&compType=" +
+ compType +
+ "×tamp=" +
+ new Date().getTime() +
+ "&start=" +
+ this.searchT[0] +
+ "&end=" +
+ this.searchT[1];
}
- window.parent.postMessage({
- msg: message
- }, "*")
- }
- }
+ window.parent.postMessage(
+ {
+ msg: message,
+ },
+ "*"
+ );
+ },
+ },
};
</script>
<style lang="scss">
diff --git a/src/main.ts b/src/main.ts
index f7af582..1bfbb8b 100644
--- a/src/main.ts
+++ b/src/main.ts
@@ -8,7 +8,7 @@
import numeral from 'numeral';
import preview from "vue-photo-preview";
import "vue-photo-preview/dist/skin.css";
-// import * as VueWindow from "@hscmap/vue-window";
+ import * as VueWindow from "@hscmap/vue-window";
import VueAwesomeSwiper from "vue-awesome-swiper";
import ToggleButton from 'vue-js-toggle-button';
@@ -24,7 +24,7 @@
Vue.config.productionTip = false;
Vue.mixin(Mixin);
Vue.use(preview);
-// Vue.use(VueWindow);
+ Vue.use(VueWindow);
Vue.use(VueAwesomeSwiper as any);
Vue.use(ToggleButton)
Vue.use(ImageShow)
diff --git a/src/views/connectUs/index.vue b/src/views/connectUs/index.vue
index d861af0..574d3ea 100644
--- a/src/views/connectUs/index.vue
+++ b/src/views/connectUs/index.vue
@@ -37,9 +37,12 @@
if (index == 0) {
this.$router.push("/");
}
- if (index == 2 || index == 4) {
+ if (index == 2) {
window.open("http://smartai.com/contact");
}
+ if (index == 4) {
+ window.open("http://smartai.com/consult");
+ }
},
},
};
diff --git a/src/views/hashrate/AlgManage/index.vue b/src/views/hashrate/AlgManage/index.vue
index 3619277..6e0ac08 100644
--- a/src/views/hashrate/AlgManage/index.vue
+++ b/src/views/hashrate/AlgManage/index.vue
@@ -16,7 +16,7 @@
<!-- 鍏嶈垂绠楁硶鍒楄〃 -->
<div class="label freeLabel">
- 鍏嶈垂绠楁硶 <span class="des">浠庢澶勬嫋鎷界畻娉曞浘鏍囧畨瑁呭埌璁惧</span>
+ 鏈湴绠楁硶 <span class="des">浠庢澶勬嫋鎷界畻娉曞浘鏍囧畨瑁呭埌璁惧</span>
</div>
<div class="freeList scroll">
<div
diff --git a/src/views/hashrate/CameraManage/CameraRules/components/CameraBox.vue b/src/views/hashrate/CameraManage/CameraRules/components/CameraBox.vue
index 1be8e23..cd4e442 100644
--- a/src/views/hashrate/CameraManage/CameraRules/components/CameraBox.vue
+++ b/src/views/hashrate/CameraManage/CameraRules/components/CameraBox.vue
@@ -275,8 +275,9 @@
.footer {
box-sizing: border-box;
- padding: 10px;
+ padding: 5px;
display: flex;
+ justify-content: center;
align-items: center;
.addModel {
diff --git a/src/views/hashrate/CameraManage/CameraRules/components/LinkageCameraBox.vue b/src/views/hashrate/CameraManage/CameraRules/components/LinkageCameraBox.vue
index 7687185..579333e 100644
--- a/src/views/hashrate/CameraManage/CameraRules/components/LinkageCameraBox.vue
+++ b/src/views/hashrate/CameraManage/CameraRules/components/LinkageCameraBox.vue
@@ -320,9 +320,10 @@
.footer {
box-sizing: border-box;
- padding: 10px;
+ padding: 5px;
display: flex;
align-items: center;
+ justify-content: center;
border-top: 1px solid #e9ebee;
.addModel {
diff --git a/src/views/index/components/commendContent.vue b/src/views/index/components/commendContent.vue
index 5e32f21..c8c5991 100644
--- a/src/views/index/components/commendContent.vue
+++ b/src/views/index/components/commendContent.vue
@@ -12,7 +12,7 @@
<div class="title">{{ item.productName }}</div>
<div class="des limitRow2">{{ item.description }}</div>
<price :priceNew="item.priceBase ? item.priceBase : 0"></price>
- <div class="button" @click="buyProduct(item.id)">绔嬪嵆璐拱</div>
+ <div class="button" @click="buyProduct(item.id)">绔嬪嵆瀹夎</div>
</div>
</div>
</template>
diff --git a/src/views/index/components/rightColumn.vue b/src/views/index/components/rightColumn.vue
index e761a5b..d6ff2af 100644
--- a/src/views/index/components/rightColumn.vue
+++ b/src/views/index/components/rightColumn.vue
@@ -14,7 +14,7 @@
</li>
</ul>
<price :priceNew="item.priceBase"></price>
- <div class="button" @click="buyProduct(item.id)">绔嬪嵆璐拱</div>
+ <div class="button" @click="buyProduct(item.id)">绔嬪嵆瀹夎</div>
</div>
</div>
</template>
diff --git a/src/views/index/components/rightForm.vue b/src/views/index/components/rightForm.vue
index 0d4744c..6208646 100644
--- a/src/views/index/components/rightForm.vue
+++ b/src/views/index/components/rightForm.vue
@@ -54,7 +54,7 @@
></price>
</div>
- <div class="button">绔嬪嵆璐拱</div>
+ <div class="button">绔嬪嵆瀹夎</div>
<div class="info">
浜у搧鏀寔<span class="blue">1璺�</span>瀹炴椂瑙嗛鍒嗘瀽锛屽彲缁戝畾<span
class="blue"
diff --git a/src/views/index/components/rightRrid.vue b/src/views/index/components/rightRrid.vue
index 2cca0d6..af7f84a 100644
--- a/src/views/index/components/rightRrid.vue
+++ b/src/views/index/components/rightRrid.vue
@@ -9,7 +9,7 @@
{{ item.description }}
</div>
<price :priceNew="item.priceBase"></price>
- <div class="button" @click="buyProduct(item.id)">绔嬪嵆璐拱</div>
+ <div class="button" @click="buyProduct(item.id)">绔嬪嵆瀹夎</div>
</div>
</div>
</template>
diff --git a/src/views/index/components/rightTabs.vue b/src/views/index/components/rightTabs.vue
index aae48b4..239a48a 100644
--- a/src/views/index/components/rightTabs.vue
+++ b/src/views/index/components/rightTabs.vue
@@ -50,7 +50,7 @@
</div>
<div class="bottom">
<div class="question">绔嬪嵆鍜ㄨ</div>
- <div class="buy">绔嬪嵆璐拱</div>
+ <div class="buy">绔嬪嵆瀹夎</div>
</div>
</div>
</div>
diff --git a/src/views/index/index.vue b/src/views/index/index.vue
index 161ba7c..ee0973f 100644
--- a/src/views/index/index.vue
+++ b/src/views/index/index.vue
@@ -79,7 +79,7 @@
<rightTabs v-if="item.typeId == 2" :data="item"></rightTabs>
</div>
- <div
+ <!-- <div
class="productItem"
v-for="(item, index) in productData1"
:key="index + '1'"
@@ -88,7 +88,7 @@
<productLeft :data="item"></productLeft>
<rightForm v-if="item.typeId == 1" :data="item"></rightForm>
<rightTabs v-if="item.typeId == 2" :data="item"></rightTabs>
- </div>
+ </div> -->
</div>
<Connect></Connect>
@@ -158,9 +158,9 @@
},
{
img: "/images/index/trialCenter.png",
- title: "璇曠敤涓績",
- des: "绠楁硶鍏嶈垂璇曠敤锛屼负鎮ㄦ彁渚� 0 闂ㄦ瀹炶返鏈轰細",
- router: "/trialCenter",
+ title: "搴旂敤鍟嗗煄",
+ des: "绠楁硶鎸夐渶瀹夎锛岀伒娲婚厤缃�",
+ router: "/product",
},
], //鎺ㄨ崘鍗＄墖鏁版嵁
activeBanner: 0, //閫変腑鐨刡anner
diff --git a/src/views/manageCenter/index.vue b/src/views/manageCenter/index.vue
index 7a85ad9..fe31d59 100644
--- a/src/views/manageCenter/index.vue
+++ b/src/views/manageCenter/index.vue
@@ -27,7 +27,7 @@
</div>
</div>
- <div class="equipmentInfo">
+ <!-- <div class="equipmentInfo">
<div class="equipmentCard">
<div class="label">璁惧鎬婚噺</div>
<div class="number">
@@ -116,9 +116,9 @@
</div>
</div>
</div>
- </div>
+ </div> -->
- <div class="performence">
+ <!-- <div class="performence">
<div class="title">璁惧杩愯鐘舵�佺洃娴�</div>
<div class="control">
<div
@@ -207,13 +207,13 @@
></el-pagination>
</div>
</div>
-
+ -->
<div class="map">
- <div class="title">绠楁硶棰勮鏁版嵁鍗犳瘮</div>
+ <div class="title">璁惧鍦板浘鍒嗗竷</div>
<div id="mapChart"></div>
</div>
- <div class="hashRate">
+ <!-- <div class="hashRate">
<div class="left">
<div class="title">绠楁硶棰勮鏁版嵁鍗犳瘮:</div>
<div class="info">
@@ -232,7 +232,7 @@
<div class="title">绠楁硶棰勮鏁版嵁鍗犳瘮</div>
<div id="pieChart"></div>
</div>
- </div>
+ </div> -->
</div>
<!-- 椤靛熬 -->
@@ -255,10 +255,10 @@
this.getInfo();
},
mounted() {
- this.initBar();
+ // this.initBar();
this.initMap();
- this.initScatter();
- this.initPie();
+ // this.initScatter();
+ // this.initPie();
},
data() {
return {
@@ -434,13 +434,13 @@
visualMap: {
left: "right",
min: 0,
- max: 100,
+ max: 10,
inRange: {
color: ["#FCFDFF", "#0065FF"],
},
itemWidth: 56,
itemHeight: 200,
- text: ["100", "0"],
+ text: ["10", "0"],
calculable: false,
},
geo: {
@@ -492,15 +492,15 @@
},
{
name: "鍖椾含",
- value: 99,
+ value: 0,
},
{
name: "澶╂触",
- value: 26,
+ value: 0,
},
{
name: "涓婃捣",
- value: 44,
+ value: 0,
},
{
name: "閲嶅簡",
@@ -516,11 +516,11 @@
},
{
name: "浜戝崡",
- value: 55,
+ value: 0,
},
{
name: "杈藉畞",
- value: 19,
+ value: 0,
},
{
name: "榛戦緳姹�",
@@ -532,15 +532,15 @@
},
{
name: "瀹夊窘",
- value: 60,
+ value: 0,
},
{
name: "灞变笢",
- value: 39,
+ value: 4,
},
{
name: "鏂扮枂",
- value: 4,
+ value: 0,
},
{
name: "姹熻嫃",
@@ -552,11 +552,11 @@
},
{
name: "姹熻タ",
- value: 36,
+ value: 0,
},
{
name: "婀栧寳",
- value: 52,
+ value: 0,
},
{
name: "骞胯タ",
@@ -564,11 +564,11 @@
},
{
name: "鐢樿們",
- value: 7,
+ value: 0,
},
{
name: "灞辫タ",
- value: 5,
+ value: 0,
},
{
name: "鍐呰挋鍙�",
@@ -576,27 +576,27 @@
},
{
name: "闄曡タ",
- value: 22,
+ value: 0,
},
{
name: "鍚夋灄",
- value: 4,
+ value: 0,
},
{
name: "绂忓缓",
- value: 18,
+ value: 0,
},
{
name: "璐靛窞",
- value: 5,
+ value: 0,
},
{
name: "骞夸笢",
- value: 98,
+ value: 0,
},
{
name: "闈掓捣",
- value: 1,
+ value: 0,
},
{
name: "瑗胯棌",
@@ -604,27 +604,27 @@
},
{
name: "鍥涘窛",
- value: 44,
+ value: 0,
},
{
name: "瀹佸",
- value: 4,
+ value: 0,
},
{
name: "娴峰崡",
- value: 22,
+ value: 0,
},
{
name: "鍙版咕",
- value: 3,
+ value: 0,
},
{
name: "棣欐腐",
- value: 5,
+ value: 0,
},
{
name: "婢抽棬",
- value: 555,
+ value: 0,
},
],
},
diff --git a/src/views/personalCenter/components/OrderMng.vue b/src/views/personalCenter/components/OrderMng.vue
index 32c145a..b366e26 100644
--- a/src/views/personalCenter/components/OrderMng.vue
+++ b/src/views/personalCenter/components/OrderMng.vue
@@ -85,7 +85,7 @@
sortable
width="180"
></el-table-column>
- <el-table-column
+ <!-- <el-table-column
prop="orderMoney"
label="璁㈠崟閲戦(鍏�)"
sortable
@@ -100,7 +100,7 @@
<div v-if="scope.row.payMethod == 4">鏀粯瀹漺ap绔�</div>
<div v-if="scope.row.payMethod == 5">0鍏冩敮浠�</div>
</template>
- </el-table-column>
+ </el-table-column> -->
<el-table-column
prop="status"
label="璁㈠崟鐘舵��"
@@ -168,21 +168,21 @@
<label>鍒涘缓浜猴細</label>
<span>{{ form.createUserName }}</span>
</div>
- <div class="item">
+ <!-- <div class="item">
<label>浠樻鏂瑰紡锛�</label>
<span>{{ form.source == 0 ? "婵�娲荤爜涓嬭浇" : "绾夸笂璐拱" }}</span>
- </div>
+ </div> -->
<div class="item">
<label>璁㈠崟鐘舵�侊細</label>
<span>{{ form.status }}</span>
</div>
- <div class="item">
+ <!-- <div class="item">
<label>璁㈠崟閲戦锛�</label>
<span>{{
form.source == 0 ? "--" : "锟� " + form.orderMoney + " 鍏�"
}}</span>
- </div>
+ </div> -->
</div>
</div>
</div>
@@ -200,7 +200,7 @@
>
<el-table-column prop="productName" label="浜у搧鍚嶇О"></el-table-column>
- <el-table-column label="閰嶇疆璇︽儏">
+ <!-- <el-table-column label="閰嶇疆璇︽儏">
<template slot-scope="scope">
<div style="text-align: left">
<p
@@ -241,22 +241,34 @@
</p>
</div>
</template>
- </el-table-column>
+ </el-table-column> -->
<el-table-column prop="devCount" label="鏁伴噺"></el-table-column>
- <el-table-column label="鏈嶅姟璧锋鏃堕棿">
+ <!-- <el-table-column label="鏈嶅姟璧锋鏃堕棿">
<template slot-scope="scope">
<p>{{ scope.row.startTime }}</p>
<p>{{ scope.row.endTime }}</p>
</template>
- </el-table-column>
+ </el-table-column> -->
<el-table-column label="閲戦">
<template slot-scope="scope">{{
form.source == 0 ? "--" : "锟� " + scope.row.price + " 鍏�"
}}</template>
</el-table-column>
+ <el-table-column label="鎿嶄綔">
+ <template slot-scope="scope">
+ <div
+ v-if="scope.row.url"
+ class="downloadLink button"
+ @click="download(scope.row.url)"
+ style="color: blue; cursor: pointer"
+ >
+ 涓嬭浇
+ </div>
+ </template>
+ </el-table-column>
</el-table>
</div>
- <div class="block">
+ <!-- <div class="block">
<div class="head-name">鏀粯淇℃伅</div>
<el-table
tooltip-effect="dark"
@@ -275,7 +287,6 @@
<div v-if="scope.row.payMethod == 5">0鍏冩敮浠�</div>
</template>
</el-table-column>
- <!-- <el-table-column prop="payTime" label="浠樻鏃堕棿" align="center" min-width="150" ></el-table-column> -->
<el-table-column prop="updateTime" label="浠樻鏃堕棿"></el-table-column>
<el-table-column prop="payMoney" label="浠樻閲戦"></el-table-column>
@@ -289,7 +300,7 @@
</template>
</el-table-column>
</el-table>
- </div>
+ </div> -->
</div>
</template>
@@ -640,6 +651,10 @@
this.showOrder = false;
this.searchingBtn();
},
+
+ download(url) {
+ window.location.href(url);
+ },
},
mounted() {},
};
diff --git a/src/views/product/components/productCard.vue b/src/views/product/components/productCard.vue
index 6645526..1f4df4f 100644
--- a/src/views/product/components/productCard.vue
+++ b/src/views/product/components/productCard.vue
@@ -26,7 +26,7 @@
</div>
<div class="des">{{ data.description }}</div>
<Price :priceNew="data.priceBase"></Price>
- <div class="button" @click="buyProduct">绔嬪嵆璐拱</div>
+ <div class="button" @click="buyProduct">绔嬪嵆瀹夎</div>
</div>
</template>
diff --git a/src/views/productDetail/components/PayCard.vue b/src/views/productDetail/components/PayCard.vue
index b4d8c35..c1019b3 100644
--- a/src/views/productDetail/components/PayCard.vue
+++ b/src/views/productDetail/components/PayCard.vue
@@ -41,12 +41,12 @@
</div>
</div>
- <div class="price">
+ <!-- <div class="price">
<div class="label">浠锋牸</div>
<div class="number">锟{ this.totalMoney }}.00</div>
- </div>
+ </div> -->
- <div class="row">
+ <!-- <div class="row">
<div class="label">璐拱鏁伴噺</div>
<el-input-number
v-model="cartItem.devCount"
@@ -82,7 +82,7 @@
>涓夊勾</el-button
>
</el-button-group>
- </div>
+ </div> -->
<div
class="row"
@@ -279,10 +279,10 @@
>
<div class="label">璁惧ID</div>
+ <!-- :multiple-limit="cartItem.devCount" -->
<el-select
collapse-tags
multiple
- :multiple-limit="cartItem.devCount"
v-model="cartItem.devIdList"
placeholder="璇烽�夋嫨璁惧ID"
:popper-append-to-body="false"
@@ -309,9 +309,7 @@
<div class="btns">
<!-- <div class="button addCar">鍔犲叆璐墿杞�</div> -->
- <div class="button pay" @click="confirmNow">
- {{ totalMoney ? "绔嬪嵆璐拱" : "鍏嶈垂璇曠敤" }}
- </div>
+ <div class="button pay" @click="confirmNow">绔嬪嵆瀹夎</div>
</div>
</div>
@@ -563,7 +561,8 @@
},
];
resumeOrder({
- orderMoney: this.numeral(this.totalMoney).value(),
+ // orderMoney: this.numeral(this.totalMoney).value(),
+ orderMoney: 0,
payMethod: 0,
products,
status: 0,
diff --git a/src/views/search/components/CardItem.vue b/src/views/search/components/CardItem.vue
index 6f9e32e..1446eff 100644
--- a/src/views/search/components/CardItem.vue
+++ b/src/views/search/components/CardItem.vue
@@ -283,9 +283,9 @@
<el-tooltip content="鍔犲叆搴曞簱" placement="top" popper-class="atooltip">
<i class="iconfont icontianjiaren" @click="toAdd(data)"></i>
</el-tooltip>
- <el-tooltip content="鏀惰棌" placement="top" popper-class="atooltip">
+ <!-- <el-tooltip content="鏀惰棌" placement="top" popper-class="atooltip">
<i class="iconfont iconshoucang2"></i>
- </el-tooltip>
+ </el-tooltip> -->
</div>
</div>
<!-- 搴曞簱浜哄憳妯″紡 -->
@@ -422,9 +422,9 @@
<el-tooltip content="璇︽儏" placement="top" popper-class="atooltip">
<i class="iconfont iconcaidan" @click="detailsClick($event)"></i>
</el-tooltip>
- <el-tooltip content="鏀惰棌" placement="top" popper-class="atooltip">
+ <!-- <el-tooltip content="鏀惰棌" placement="top" popper-class="atooltip">
<i class="iconfont iconshoucang2" @click="dialogVisible = true"></i>
- </el-tooltip>
+ </el-tooltip> -->
<!-- :class="
data.isAlarm ? 'iconfont systemmm' : 'iconfont systemxing'
"-->
@@ -447,9 +447,9 @@
>
<i class="iconfont icontianjiaren" @click="toAdd(data)"></i>
</el-tooltip>
- <el-tooltip content="鏀惰棌" placement="top" popper-class="atooltip">
+ <!-- <el-tooltip content="鏀惰棌" placement="top" popper-class="atooltip">
<i class="iconfont iconshoucang2" @click="dialogVisible = true"></i>
- </el-tooltip>
+ </el-tooltip> -->
</div>
</div>
</div>
@@ -642,9 +642,9 @@
<el-tooltip content="璇︽儏" placement="top" popper-class="atooltip">
<i class="iconfont iconcaidan" @click="detailsClick($event)"></i>
</el-tooltip>
- <el-tooltip content="鏀惰棌" placement="top" popper-class="atooltip">
+ <!-- <el-tooltip content="鏀惰棌" placement="top" popper-class="atooltip">
<i class="iconfont iconshoucang2"></i>
- </el-tooltip>
+ </el-tooltip> -->
<!-- :class="
data.isAlarm ? 'iconfont systemmm' : 'iconfont systemxing'
"-->
@@ -670,9 +670,9 @@
>
<i class="iconfont icontianjiaren" @click="toAdd(data)"></i>
</el-tooltip>
- <el-tooltip content="鏀惰棌" placement="top" popper-class="atooltip">
+ <!-- <el-tooltip content="鏀惰棌" placement="top" popper-class="atooltip">
<i class="iconfont iconshoucang2"></i>
- </el-tooltip>
+ </el-tooltip> -->
</div>
</div>
</div>
--
Gitblit v1.8.0