From 5c0c6ad7ac6f28e970532af9936de638830f1161 Mon Sep 17 00:00:00 2001
From: ZZJ <10913410+zzj2100@user.noreply.gitee.com>
Date: 星期四, 28 七月 2022 10:20:51 +0800
Subject: [PATCH] bugxiufu
---
src/views/hashrate/CameraManage/CameraRules/components/SdkBox.vue | 23 ++-
src/Pool/PollData.ts | 4
src/views/hashrate/CameraManage/index.vue | 4
src/views/equipmentManagement/algorithmDetail/index.vue | 2
src/components/canvas/index.vue | 26 ++++
public/images/register/phone2.png | 0
src/views/product/components/ProductContent.vue | 5
src/views/personalCenter/components/OrderMng.vue | 12 +
src/views/personalCenter/components/SubAccount.vue | 6
src/api/camera.ts | 9 +
src/views/hashrate/HashManage/index.vue | 15 ++
src/views/register/resetPassword/index.vue | 69 +++++++++++
src/views/register/registerSuccess/index.vue | 2
src/views/hashrate/CameraManage/CameraRules/components/CameraBox.vue | 2
src/Pool/TreeData.ts | 26 ++--
public/images/register/phone1.png | 0
src/views/equipmentManagement/equipmentList/components/FormList.vue | 72 +++++++-----
public/images/register/psw2.png | 0
src/api/clusterManage.ts | 2
src/views/hashrate/HashManage/components/ClusterList.vue | 1
src/components/IndexHeader.vue | 39 +++++-
src/router/index.js | 5
src/views/hashrate/CameraManage/CameraRules/components/LinkageCameraBox.vue | 2
src/api/area.ts | 4
src/views/product/index.vue | 6 +
src/scripts/httpRequest.ts | 5
src/views/register/index.vue | 6
public/images/register/psw1.png | 0
src/views/productDetail/components/UploadBox.vue | 8 +
29 files changed, 274 insertions(+), 81 deletions(-)
diff --git a/public/images/register/phone1.png b/public/images/register/phone1.png
new file mode 100644
index 0000000..a03f112
--- /dev/null
+++ b/public/images/register/phone1.png
Binary files differ
diff --git a/public/images/register/phone2.png b/public/images/register/phone2.png
new file mode 100644
index 0000000..b17a4ab
--- /dev/null
+++ b/public/images/register/phone2.png
Binary files differ
diff --git a/public/images/register/psw1.png b/public/images/register/psw1.png
new file mode 100644
index 0000000..b1e6309
--- /dev/null
+++ b/public/images/register/psw1.png
Binary files differ
diff --git a/public/images/register/psw2.png b/public/images/register/psw2.png
new file mode 100644
index 0000000..7125b38
--- /dev/null
+++ b/public/images/register/psw2.png
Binary files differ
diff --git a/src/Pool/PollData.ts b/src/Pool/PollData.ts
index 1a50fc4..cbd192b 100644
--- a/src/Pool/PollData.ts
+++ b/src/Pool/PollData.ts
@@ -156,7 +156,9 @@
// 璁＄畻绯荤粺淇℃伅
let res: any
if(sessionStorage.getItem("clusterId")) {
- res = await clusterSysInfo({});
+ res = await clusterSysInfo({
+ clusterId: "",
+ });
}
else {
res = await devicesSysInfo({
diff --git a/src/Pool/TreeData.ts b/src/Pool/TreeData.ts
index 8b93a3d..7156994 100644
--- a/src/Pool/TreeData.ts
+++ b/src/Pool/TreeData.ts
@@ -392,21 +392,21 @@
}
async fetchGbTree() {
- // 鍚庨棬
- // const rsp: any = await getGB28181CameraTree({
- // searchType: this.searchCamType,
- // cameraName: this.searchInput
- // })
+ const rsp: any = await getGB28181CameraTree({
+ parentId: "",
+ searchType: this.searchCamType,
+ cameraName: this.searchInput
+ })
- // if (rsp && rsp.success) {
- // this.gb28181Data = rsp.data ? rsp.data : []
- // if (this.gb28181Data && this.gb28181Data.length > 0) {
- // this.sortTreeData(this.gb28181Data)
- // }
+ if (rsp && rsp.success) {
+ this.gb28181Data = rsp.data.treeMenu ? rsp.data.treeMenu : []
+ if (this.gb28181Data && this.gb28181Data.length > 0) {
+ this.sortTreeData(this.gb28181Data)
+ }
- // this.gb28181DataPure = JSON.parse(JSON.stringify(this.gb28181Data))
- // this.isFold(this.gb28181Data)
- // }
+ this.gb28181DataPure = JSON.parse(JSON.stringify(this.gb28181Data))
+ this.isFold(this.gb28181Data)
+ }
}
async fetchTreeData() {
diff --git a/src/api/area.ts b/src/api/area.ts
index c26d38b..087b428 100644
--- a/src/api/area.ts
+++ b/src/api/area.ts
@@ -12,8 +12,8 @@
export const getGB28181CameraTree = (query: any) => {
return request({
url: "/saas/api-s/gb28181/tree",
- method: "get",
- params: query
+ method: "post",
+ data: query
});
};
diff --git a/src/api/camera.ts b/src/api/camera.ts
index 1cd0040..824cdfd 100644
--- a/src/api/camera.ts
+++ b/src/api/camera.ts
@@ -81,6 +81,15 @@
});
};
+//鍒锋柊鍥芥爣搴曞浘
+export const updategb28181 = (data: any) => {
+ return request({
+ url: "/saas/api-s/gb28181/camera/capture",
+ method: "post",
+ data:data
+ });
+};
+
export const updateCameraTask = (params: any) => {
return request({
url: "/data/api-v/cameraTask/updateCameraTaskStatus",
diff --git a/src/api/clusterManage.ts b/src/api/clusterManage.ts
index 625053e..4230d7b 100644
--- a/src/api/clusterManage.ts
+++ b/src/api/clusterManage.ts
@@ -176,7 +176,7 @@
//鑾峰彇闆嗙兢涓媍pu
export const clusterSysInfo = (data: any) => {
return request({
- url: "/saas/api-d/device/clusterSysInfo",
+ url: "/saas/api-d/device/userClusterInfo",
method: "post",
data
})
diff --git a/src/components/IndexHeader.vue b/src/components/IndexHeader.vue
index 3602825..f1dfd76 100644
--- a/src/components/IndexHeader.vue
+++ b/src/components/IndexHeader.vue
@@ -8,7 +8,7 @@
</router-link>
<div class="title" @click="$router.push('/')">宸ヤ笟浜掕仈缃戝钩鍙�</div>
<div class="label" @click="$router.push('/')">棣栭〉</div>
- <div class="label">浜戞湇鍔�</div>
+ <!-- <div class="label">浜戞湇鍔�</div> -->
<div class="label" @click="$router.push('/manageCenter')">绠＄悊涓績</div>
<div class="label" @click="$router.push('/product')">搴旂敤鍟嗗煄</div>
</div>
@@ -23,7 +23,9 @@
>
<div class="iconList" slot="suffix">
<i class="search iconfont" v-if="!isShow"></i>
- <i class="search iconfont" v-if="isShow"></i>
+ <i class="search iconfont" @click="search" v-if="isShow"
+ ></i
+ >
<i class="del iconfont" v-if="isShow" @click="showInputBox(false)"
></i
>
@@ -116,14 +118,18 @@
<div class="hotKey">
<div class="title">鐑棬鎼滅储</div>
<ul class="keyCard">
- <li class="keyItem" v-for="(item, index) in hotKeyArr" :key="index">
+ <li
+ class="keyItem"
+ @click="jumpToSearch(item)"
+ v-for="(item, index) in hotKeyArr"
+ :key="index"
+ >
{{ item }}
</li>
- x
</ul>
</div>
- <div class="historyKey">
+ <!-- <div class="historyKey">
<div class="title colorLight">鍘嗗彶鎼滅储</div>
<ul class="keyCard">
@@ -135,7 +141,7 @@
{{ item }}
</li>
</ul>
- </div>
+ </div> -->
</div>
<!-- 閬僵灞� -->
@@ -165,7 +171,7 @@
return {
keyWord: "", //杈撳叆妗嗗唴瀹�
isShow: false, //鏄剧ず涓嬫媺妗�
- hotKeyArr: ["绠楁硶", "鏅鸿兘AI", "浜戞湇鍔�", "绠＄悊涓績", "瀹炴椂闊宠棰�", "鐭俊"], //鐑棬鍏抽敭璇�
+ hotKeyArr: ["鎵撶數璇�", "绂诲矖", "鐫″矖", "鍏ヤ镜", "绂诲矖", "瀹夊叏甯�"], //鐑棬鍏抽敭璇�
historyKeyArr: ["浜戞湇鍔�", "绠楁硶", "绠＄悊鏈嶅姟", "搴旂敤"], //鍘嗗彶鍏抽敭璇�
isShowBox: false, //杈撳叆涓嬫媺妗�
userInfo: null, //鐢ㄦ埛淇℃伅
@@ -178,6 +184,7 @@
showInputBox(toggle) {
this.isShow = toggle;
this.isShowBox = toggle;
+ this.keyWord = "";
this.$emit("showInputBox", toggle);
},
@@ -225,6 +232,24 @@
},
});
},
+
+ search() {
+ this.$router.push({
+ path: "/product",
+ query: {
+ keyWord: this.keyWord,
+ },
+ });
+ },
+
+ jumpToSearch(keyWord) {
+ this.$router.push({
+ path: "/product",
+ query: {
+ keyWord,
+ },
+ });
+ },
},
};
</script>
diff --git a/src/components/canvas/index.vue b/src/components/canvas/index.vue
index d3672d5..2467ad5 100644
--- a/src/components/canvas/index.vue
+++ b/src/components/canvas/index.vue
@@ -42,7 +42,7 @@
</template>
<script>
import canvasDialog from "./Dialog";
-import { updateSnapshot } from "@/api/camera";
+import { updateSnapshot, updategb28181 } from "@/api/camera";
export default {
name: "myCanvas",
components: {
@@ -188,6 +188,30 @@
if (this.currentCamera.cameraId) {
let _this = this;
+ if (_this.currentCamera.type === 1) {
+ await updategb28181({
+ id: _this.currentCamera.cameraId,
+ }).then((res) => {
+ if (res.data.cameraId === _this.currentCamera.cameraId) {
+ _this.baseImg = "data:image/png;base64," + res.data.base64;
+ _this.$emit(
+ "refresh",
+ _this.baseImg,
+ _this.currentCamera.cameraName
+ );
+ _this.$forceUpdate();
+ _this.$notify({
+ type: "success",
+ message: "搴曞浘宸插埛鏂�",
+ });
+ }
+ });
+
+ this.$emit("changeLoading", false);
+
+ return;
+ }
+
await updateSnapshot({
id: _this.currentCamera.cameraId,
name: _this.currentCamera.cameraName,
diff --git a/src/router/index.js b/src/router/index.js
index 986c676..a77adb6 100644
--- a/src/router/index.js
+++ b/src/router/index.js
@@ -23,6 +23,11 @@
),
},
{
+ path: "/register/resetPassword",
+ component: () =>
+ import(/* webpackChunkName: "about" */ "../views/register/resetPassword"),
+ },
+ {
path: "/login",
name: "login",
component: () => import(/* webpackChunkName: "about" */ "../views/login"),
diff --git a/src/scripts/httpRequest.ts b/src/scripts/httpRequest.ts
index 2253ea4..36ccb94 100644
--- a/src/scripts/httpRequest.ts
+++ b/src/scripts/httpRequest.ts
@@ -33,6 +33,11 @@
if(config.url === '/saas/api-s/camera/rule/getLinkRulesByCameraIds') {
config.data.devId = sessionStorage.getItem('cameraDevId')
}
+
+ //鍚庨棬
+ if(config.url === '/saas/api-d/device/userClusterInfo') {
+ config.data.clusterId = ''
+ }
}
diff --git a/src/views/equipmentManagement/algorithmDetail/index.vue b/src/views/equipmentManagement/algorithmDetail/index.vue
index 2f4f5d2..927ef29 100644
--- a/src/views/equipmentManagement/algorithmDetail/index.vue
+++ b/src/views/equipmentManagement/algorithmDetail/index.vue
@@ -126,7 +126,7 @@
{
label: "搴旂敤鎬绘暟",
count: "",
- img: "/images/equipmentManagement/搴旂敤_绾�.png",
+ img: "/images/equipmentManagement/app.png",
color: "red",
},
{
diff --git a/src/views/equipmentManagement/equipmentList/components/FormList.vue b/src/views/equipmentManagement/equipmentList/components/FormList.vue
index ba5dcab..678493a 100644
--- a/src/views/equipmentManagement/equipmentList/components/FormList.vue
+++ b/src/views/equipmentManagement/equipmentList/components/FormList.vue
@@ -114,42 +114,54 @@
<el-table-column label="鎿嶄綔" min-width="180">
<template slot-scope="scope">
<!-- 鍔犲叆 -->
- <span
- class="iconfont option"
- @click="joinCluster(scope.row)"
+ <el-tooltip
+ content="鍔犲叆闆嗙兢"
+ placement="top"
v-if="!scope.row.clusterId"
- :class="{ disable: scope.row.isOnline != 1 }"
- ></span
>
+ <span
+ class="iconfont option"
+ @click="joinCluster(scope.row)"
+ :class="{ disable: scope.row.isOnline != 1 }"
+ ></span
+ >
+ </el-tooltip>
<!-- 閫�鍑� -->
- <span
- class="iconfont option"
- @click="quitCluster(scope.row)"
- v-else
- :class="{ disable: scope.row.isOnline != 1 }"
- ></span
- >
+ <el-tooltip content="閫�鍑洪泦缇�" placement="top" v-else>
+ <span
+ class="iconfont option"
+ @click="quitCluster(scope.row)"
+ :class="{ disable: scope.row.isOnline != 1 }"
+ ></span
+ >
+ </el-tooltip>
<!-- 绠楁硶璇︽儏 -->
- <span
- class="iconfont option"
- :class="{ disable: scope.row.isOnline != 1 }"
- @click="algorithmDetail(scope.row)"
- ></span
- >
+ <el-tooltip content="搴旂敤璇︽儏" placement="top">
+ <span
+ class="iconfont option"
+ :class="{ disable: scope.row.isOnline != 1 }"
+ @click="algorithmDetail(scope.row)"
+ ></span
+ >
+ </el-tooltip>
<!-- 璁惧璇︽儏 -->
- <span
- class="iconfont option"
- :class="{ disable: scope.row.isOnline != 1 }"
- @click="checkDetail(scope.row)"
- ></span
- >
+ <el-tooltip content="璁惧璇︽儏" placement="top">
+ <span
+ class="iconfont option"
+ :class="{ disable: scope.row.isOnline != 1 }"
+ @click="checkDetail(scope.row)"
+ ></span
+ >
+ </el-tooltip>
<!-- 瑙ｇ粦 -->
- <span
- class="iconfont option"
- @click="Untying(scope.row)"
- :class="{ disable: scope.row.isOnline != 1 }"
- ></span
- >
+ <el-tooltip content="瑙ｉ櫎缁戝畾" placement="top">
+ <span
+ class="iconfont option"
+ @click="Untying(scope.row)"
+ :class="{ disable: scope.row.isOnline != 1 }"
+ ></span
+ >
+ </el-tooltip>
</template>
</el-table-column>
</el-table>
diff --git a/src/views/hashrate/CameraManage/CameraRules/components/CameraBox.vue b/src/views/hashrate/CameraManage/CameraRules/components/CameraBox.vue
index 1247b70..1be8e23 100644
--- a/src/views/hashrate/CameraManage/CameraRules/components/CameraBox.vue
+++ b/src/views/hashrate/CameraManage/CameraRules/components/CameraBox.vue
@@ -48,7 +48,7 @@
</div>
<div class="footer">
- <div class="button addModel">娣诲姞鍒版ā鏉�</div>
+ <!-- <div class="button addModel">娣诲姞鍒版ā鏉�</div> -->
<div class="button addRule" @click="addRule">娣诲姞鏂板満鏅�</div>
</div>
</div>
diff --git a/src/views/hashrate/CameraManage/CameraRules/components/LinkageCameraBox.vue b/src/views/hashrate/CameraManage/CameraRules/components/LinkageCameraBox.vue
index 78c7d24..7687185 100644
--- a/src/views/hashrate/CameraManage/CameraRules/components/LinkageCameraBox.vue
+++ b/src/views/hashrate/CameraManage/CameraRules/components/LinkageCameraBox.vue
@@ -48,7 +48,7 @@
</div>
</div>
<div class="footer">
- <div class="button addModel">娣诲姞鍒版ā鏉�</div>
+ <!-- <div class="button addModel">娣诲姞鍒版ā鏉�</div> -->
<div class="button addRule" @click="addRule">娣诲姞鏂板満鏅�</div>
</div>
</div>
diff --git a/src/views/hashrate/CameraManage/CameraRules/components/SdkBox.vue b/src/views/hashrate/CameraManage/CameraRules/components/SdkBox.vue
index a9d5f93..ff9d97d 100644
--- a/src/views/hashrate/CameraManage/CameraRules/components/SdkBox.vue
+++ b/src/views/hashrate/CameraManage/CameraRules/components/SdkBox.vue
@@ -4,15 +4,20 @@
<div class="close iconfont" @click="close()"></div>
<div class="sdkList scroll">
- <img
+ <el-tooltip
v-for="(item, index) in this.TaskMange.list1"
:key="index"
- :src="item.iconBlob"
- alt=""
- draggable="true"
- @dragstart="dragstart(item)"
- @dragend="dragleave"
- />
+ :content="item.sdk_name"
+ placement="top"
+ >
+ <img
+ :src="item.iconBlob"
+ alt=""
+ draggable="true"
+ @dragstart="dragstart(item)"
+ @dragend="dragleave"
+ />
+ </el-tooltip>
</div>
</div>
</template>
@@ -20,6 +25,10 @@
<script>
import bus from "@/plugin/bus";
export default {
+ created() {
+ console.log(121212);
+ console.log(this.TaskMange.list1);
+ },
methods: {
close() {
this.$emit("close");
diff --git a/src/views/hashrate/CameraManage/index.vue b/src/views/hashrate/CameraManage/index.vue
index f07d8be..b738df9 100644
--- a/src/views/hashrate/CameraManage/index.vue
+++ b/src/views/hashrate/CameraManage/index.vue
@@ -148,10 +148,10 @@
this.selectedNodes = [];
},
beforeDestroy() {
- clearInterval(this.intervalTimer);
- //this.TreeDataPool.treeActiveName = "camera";
sessionStorage.removeItem("devId");
sessionStorage.removeItem("clusterId");
+ clearInterval(this.intervalTimer);
+ //this.TreeDataPool.treeActiveName = "camera";
},
mounted() {
this.$nextTick(() => {
diff --git a/src/views/hashrate/HashManage/components/ClusterList.vue b/src/views/hashrate/HashManage/components/ClusterList.vue
index 077e737..b732588 100644
--- a/src/views/hashrate/HashManage/components/ClusterList.vue
+++ b/src/views/hashrate/HashManage/components/ClusterList.vue
@@ -84,6 +84,7 @@
},
hiddenList() {
this.showCluster = true;
+ this.$emit("refreshCluster");
},
back() {
this.$emit("back");
diff --git a/src/views/hashrate/HashManage/index.vue b/src/views/hashrate/HashManage/index.vue
index 37d4ba7..1a220da 100644
--- a/src/views/hashrate/HashManage/index.vue
+++ b/src/views/hashrate/HashManage/index.vue
@@ -77,6 +77,7 @@
:list="deviceList"
@chooseCluster="chooseCluster"
@chooseDevice="chooseDevice"
+ @refreshCluster="chooseCluster(ClusterId)"
@back="back"
:listType="listType"
></ClusterList>
@@ -88,7 +89,6 @@
import ClusterList from "./components/ClusterList";
import {
userStatisticRunInfo,
- userSysInfo,
userStatisticRun,
clusterStatisticRunInfo,
clusterSysInfo,
@@ -102,6 +102,8 @@
ClusterList,
},
created() {
+ sessionStorage.removeItem("devId");
+ sessionStorage.removeItem("clusterId");
this.getUserInfo();
this.getUserDevice();
},
@@ -120,6 +122,7 @@
},
deviceList: [],
listType: "cluster",
+ ClusterId: "",
};
},
methods: {
@@ -160,7 +163,9 @@
res1.data.stackRunningCount,
};
}
- const res2 = await userSysInfo();
+ const res2 = await clusterSysInfo({
+ clusterId: "",
+ });
if (res2 && res2.success) {
this.systemInfo = {
cpu: parseInt(res2.data.cpu.usedPercent),
@@ -215,7 +220,10 @@
res1.data.stackRunningCount,
};
}
- const res2 = await clusterSysInfo({ clusterId: id });
+ const res2 = await clusterSysInfo(
+ //id
+ { clusterId: "" }
+ );
if (res2 && res2.success) {
this.systemInfo = {
cpu: parseInt(res2.data.cpu.usedPercent),
@@ -283,6 +291,7 @@
chooseCluster(id) {
this.getClusterInfo(id);
this.getClusterDevice(id);
+ this.ClusterId = id;
},
back() {
this.getUserInfo();
diff --git a/src/views/personalCenter/components/OrderMng.vue b/src/views/personalCenter/components/OrderMng.vue
index b8c9777..32c145a 100644
--- a/src/views/personalCenter/components/OrderMng.vue
+++ b/src/views/personalCenter/components/OrderMng.vue
@@ -93,9 +93,12 @@
></el-table-column>
<el-table-column label="鏀粯鏂瑰紡">
<template slot-scope="scope">
- <div v-if="scope.row.payMethod == 0">绾夸笅姹囨</div>
- <div v-if="scope.row.payMethod == 1">鏀粯瀹�</div>
- <div v-if="scope.row.payMethod == 2">寰俊</div>
+ <div v-if="scope.row.payMethod == 0">灏氭湭鏀粯</div>
+ <div v-if="scope.row.payMethod == 1">绾夸笅姹囨</div>
+ <div v-if="scope.row.payMethod == 2">鏀粯瀹�</div>
+ <div v-if="scope.row.payMethod == 3">寰俊</div>
+ <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
@@ -264,9 +267,12 @@
>
<el-table-column prop="payMethod" label="鏀粯娓犻亾" min-width="80">
<template slot-scope="scope">
+ <div v-if="scope.row.payMethod == 0">灏氭湭鏀粯</div>
<div v-if="scope.row.payMethod == 1">绾夸笅姹囨</div>
<div v-if="scope.row.payMethod == 2">鏀粯瀹�</div>
<div v-if="scope.row.payMethod == 3">寰俊</div>
+ <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 prop="payTime" label="浠樻鏃堕棿" align="center" min-width="150" ></el-table-column> -->
diff --git a/src/views/personalCenter/components/SubAccount.vue b/src/views/personalCenter/components/SubAccount.vue
index 2de1e99..996cc34 100644
--- a/src/views/personalCenter/components/SubAccount.vue
+++ b/src/views/personalCenter/components/SubAccount.vue
@@ -135,11 +135,11 @@
<el-form-item label="瀵嗙爜" prop="password">
<el-input v-model="ruleForm.password" style="width: 350px"></el-input>
</el-form-item>
- <el-form-item label="閲嶇疆瀵嗙爜">
+ <!-- <el-form-item label="閲嶇疆瀵嗙爜">
<el-checkbox v-model="ruleForm.isChangePwd"
>棣栨鐧婚檰淇敼瀵嗙爜</el-checkbox
>
- </el-form-item>
+ </el-form-item> -->
<el-form-item label="鐢ㄦ埛绫诲瀷" prop="userType">
<el-radio v-model="ruleForm.userType" :label="1">涓汉</el-radio>
<el-radio v-model="ruleForm.userType" :label="2">鍏徃</el-radio>
@@ -900,4 +900,4 @@
color: #0065ff;
border-color: #0065ff;
}
-</style>
\ No newline at end of file
+</style>
diff --git a/src/views/product/components/ProductContent.vue b/src/views/product/components/ProductContent.vue
index d7280ee..9abfaff 100644
--- a/src/views/product/components/ProductContent.vue
+++ b/src/views/product/components/ProductContent.vue
@@ -79,6 +79,11 @@
import { findAllCenterProduct, findDicByType } from "@/api/product";
import productCard from "@/views/product/components/productCard";
export default {
+ created() {
+ if (this.$route.query.keyWord) {
+ this.inputText = this.$route.query.keyWord;
+ }
+ },
mounted() {
this.getDic();
this.getProductList();
diff --git a/src/views/product/index.vue b/src/views/product/index.vue
index f836e37..dc4f1af 100644
--- a/src/views/product/index.vue
+++ b/src/views/product/index.vue
@@ -43,5 +43,11 @@
color: #666;
}
}
+
+ .IndexHeader ::v-deep {
+ .el-input {
+ display: none;
+ }
+ }
}
</style>
\ No newline at end of file
diff --git a/src/views/productDetail/components/UploadBox.vue b/src/views/productDetail/components/UploadBox.vue
index 44b2ab0..6e7bde6 100644
--- a/src/views/productDetail/components/UploadBox.vue
+++ b/src/views/productDetail/components/UploadBox.vue
@@ -61,7 +61,13 @@
<el-form-item label="澶囨敞" prop="reserved">
<el-input type="textarea" v-model="item.reserved"></el-input>
</el-form-item>
- <el-form-item label="浠樻鍑瘉" prop="pic">
+ <el-form-item
+ label="浠樻鍑瘉"
+ :prop="`list[${index}].appendix`"
+ :rules="[
+ { required: true, message: '璇蜂笂浼犲嚟璇�', trigger: 'blur' },
+ ]"
+ >
<el-image
class="preview"
v-if="item.appendix"
diff --git a/src/views/register/index.vue b/src/views/register/index.vue
index 34be8f8..4487a98 100644
--- a/src/views/register/index.vue
+++ b/src/views/register/index.vue
@@ -74,7 +74,7 @@
width: 100%;
min-width: 1280px;
min-height: 960px;
- background: url("/images/register/娉ㄥ唽.png");
+ background: url("/images/register/register.png");
background-size: 100% 100%;
font-size: 14px;
@@ -90,13 +90,13 @@
.registerHeart {
margin: 0 auto;
- width: 1280px;
+ width: 1200px;
overflow: hidden;
.registerForm {
position: relative;
overflow: hidden;
- margin-top: 60px;
+ margin-top: 5vh;
width: 660px;
height: 730px;
background: #ffffff;
diff --git a/src/views/register/registerSuccess/index.vue b/src/views/register/registerSuccess/index.vue
index df47053..7372de2 100644
--- a/src/views/register/registerSuccess/index.vue
+++ b/src/views/register/registerSuccess/index.vue
@@ -70,7 +70,7 @@
width: 660px;
height: 450px;
left: 320px;
- top: 262px;
+ top: 22vh;
text-align: center;
background: #ffffff;
diff --git a/src/views/register/resetPassword/index.vue b/src/views/register/resetPassword/index.vue
new file mode 100644
index 0000000..c781e00
--- /dev/null
+++ b/src/views/register/resetPassword/index.vue
@@ -0,0 +1,69 @@
+<template>
+ <div class="resetPassword">
+ <Header> </Header>
+ <div class="container">
+ <div class="title">
+ <div class="left">璇峰畬鍠勮处鎴蜂俊鎭�</div>
+ </div>
+ <div class="stepArea" v-if="step === 0">
+ <img src="/images/register/" alt="" />
+ </div>
+ </div>
+ <Footer></Footer>
+ </div>
+</template>
+
+<script>
+import Header from "@/components/Header";
+import Footer from "@/components/Footer";
+export default {
+ components: {
+ Header,
+ Footer,
+ },
+};
+</script>
+
+<style lang="scss" scoped>
+.resetPassword {
+ position: absolute;
+ height: 100%;
+ width: 100%;
+ min-width: 1280px;
+ background: url("/images/register/success.png");
+ background-size: 100% 100%;
+ font-size: 14px;
+
+ .title {
+ display: flex;
+ justify-content: space-between;
+ align-items: center;
+ margin: 0 30px 0 30px;
+ height: 74px;
+ border-bottom: 1px solid #e9ebee;
+
+ .left {
+ font-size: 18px;
+ font-weight: 700;
+ }
+ }
+
+ .container {
+ position: absolute;
+ width: 660px;
+ height: 468px;
+ left: 320px;
+ top: 22vh;
+ text-align: center;
+ background: #ffffff;
+ }
+
+ .Footer {
+ position: absolute;
+ width: 100%;
+ bottom: 0;
+ background-color: #252525;
+ color: #9b9ea0;
+ }
+}
+</style>
\ No newline at end of file
--
Gitblit v1.8.0