From 85841ef9441aff46d80c7458c928e085e78911a1 Mon Sep 17 00:00:00 2001
From: heyujie <516346543@qq.com>
Date: 星期五, 01 四月 2022 14:43:10 +0800
Subject: [PATCH] 订单管理
---
src/views/personalCenter/components/OrderMng.vue | 863 +++++++++++++++++++++++++++++++++++++++++++++++
src/views/personalCenter/components/SubAccount.vue | 72 ---
src/views/personalCenter/components/Content.vue | 23 -
src/views/personalCenter/components/BasicInfo.vue | 59 +-
src/views/personalCenter/components/InfoCard.vue | 58 ---
5 files changed, 909 insertions(+), 166 deletions(-)
diff --git a/src/views/personalCenter/components/BasicInfo.vue b/src/views/personalCenter/components/BasicInfo.vue
index 93abbae..934021f 100644
--- a/src/views/personalCenter/components/BasicInfo.vue
+++ b/src/views/personalCenter/components/BasicInfo.vue
@@ -68,7 +68,7 @@
</el-form-item>
</el-form>
<div class="btns">
- <div class="searchBtn" @click="searchingBtn">淇濆瓨</div>
+ <div class="searchBtn" @click="save">淇濆瓨</div>
</div>
</div>
</template>
@@ -286,6 +286,9 @@
goto(i) {
this.activeIndex = i;
},
+ save(){
+
+ },
// 璺冲埌璁惧璇︽儏
checkDetail(row) {
this.$router.push({
@@ -312,42 +315,40 @@
},
// 鏌ヨ鍒楄〃
- searchingBtn() {
- let param = {
- page: this.page,
- size: this.size,
- // startTime: this.searchTime[0],
- // endTime: this.searchTime[1],
- inputText: this.inputText,
- };
- findDevList(param)
- .then((res) => {
- this.dataList = res.data.list;
- //鏃堕棿鍒嗚鏄剧ず
+ // searchingBtn() {
+ // let param = {
+ // page: this.page,
+ // size: this.size,
+ // // startTime: this.searchTime[0],
+ // // endTime: this.searchTime[1],
+ // inputText: this.inputText,
+ // };
+ // findDevList(param)
+ // .then((res) => {
+ // this.dataList = res.data.list;
+ // //鏃堕棿鍒嗚鏄剧ず
- this.dataList.forEach((item) => {
- item.installTime = item.installTime.split(" ");
- item.firstUseTime = item.firstUseTime.split(" ");
- });
- this.total = res.data.total;
- if (res.data.total <= this.size) {
- this.page = 1;
- }
- })
- .catch((err) => {
- console.log(err);
- });
- },
+ // this.dataList.forEach((item) => {
+ // item.installTime = item.installTime.split(" ");
+ // item.firstUseTime = item.firstUseTime.split(" ");
+ // });
+ // this.total = res.data.total;
+ // if (res.data.total <= this.size) {
+ // this.page = 1;
+ // }
+ // })
+ // .catch((err) => {
+ // console.log(err);
+ // });
+ // },
//鍒嗛〉鍔熻兘
handleSizeChange(size) {
this.size = size;
- this.searchingBtn();
},
//鍒嗛〉鍔熻兘
refrash(page) {
this.page = page;
- this.searchingBtn();
},
//瑙ｇ粦鎸夐挳
@@ -387,13 +388,11 @@
//瑙ｇ粦鎴愬姛鍥炶皟
reflash() {
this.isShowUnbind = false;
- this.searchingBtn();
},
clearSearch() {
this.searchTime = this.getDateInit();
this.inputText = "";
- this.searchingBtn();
},
//閫�鍑洪泦缇�
diff --git a/src/views/personalCenter/components/Content.vue b/src/views/personalCenter/components/Content.vue
index b725687..a884994 100644
--- a/src/views/personalCenter/components/Content.vue
+++ b/src/views/personalCenter/components/Content.vue
@@ -4,28 +4,29 @@
<div class="right-content">
<SubAccount v-if="activeIndex == 4"></SubAccount>
<BasicInfo v-if="activeIndex == 3"></BasicInfo>
+ <OrderMng v-if="activeIndex == 1"></OrderMng>
</div>
</div>
</template>
<script>
-import { findDevList } from "@/api/device";
import SubAccount from "./SubAccount";
import LeftMenu from "./LeftMenu";
import BasicInfo from "./BasicInfo";
+import OrderMng from "./OrderMng";
+
export default {
created() {
window._AMapSecurityConfig = {
securityJsCode: "768ab79bdc4075aa082bc070c53bb3c4",
};
},
- mounted() {
- this.searchingBtn();
- },
+ mounted() {},
components: {
SubAccount, //琛ㄦ牸
LeftMenu,
BasicInfo,
+ OrderMng,
},
data() {
return {
@@ -51,20 +52,6 @@
this.activeIndex = i;
},
// 鏌ヨ鍒楄〃
- searchingBtn() {
- let param = {
- page: 1,
- size: 999,
- inputText: "",
- };
- findDevList(param)
- .then((res) => {
- this.nodes = res.data.list;
- })
- .catch((err) => {
- console.log(err);
- });
- },
},
};
</script>
diff --git a/src/views/personalCenter/components/InfoCard.vue b/src/views/personalCenter/components/InfoCard.vue
index 6098ced..5ea0a14 100644
--- a/src/views/personalCenter/components/InfoCard.vue
+++ b/src/views/personalCenter/components/InfoCard.vue
@@ -104,7 +104,6 @@
</template>
<script>
-import { findAllSdk, showSystemStates } from "@/api/device";
export default {
props: {
node: {
@@ -112,8 +111,6 @@
},
},
created() {
- this.getAlg();
- this.getDevicePerformance();
},
data() {
return {
@@ -124,60 +121,9 @@
},
methods: {
//鑾峰彇绠楁硶淇℃伅
- async getAlg() {
- const res = await findAllSdk({
- ip: this.node.devIp,
- port: this.node.serverPort,
- });
-
- res.data.data.forEach((item) => {
- //璁＄畻绠楁硶鎬绘暟
- if (item.installed) {
- this.algAll++;
- }
- //璁＄畻寰呭崌绾х畻娉�
- if (item.installed && item.isUpgrade) {
- this.algUpgrade++;
- }
- });
- },
+
//鑾峰彇璁惧鎬ц兘
- async getDevicePerformance() {
- const res = await showSystemStates({
- ip: this.node.devIp,
- port: this.node.serverPort,
- });
- this.devicePerformance.push({
- data: +res.data.mem.usedPercent.toString().split(".")[0],
- name: "鍐呭瓨",
- type: "mem",
- });
- this.devicePerformance.push({
- data: +res.data.gpu.toString().split(".")[0],
- name: "绠楀姏",
- type: "gpu",
- });
- this.devicePerformance.push({
- data: +res.data.cpu.toString().split(".")[0],
- name: "cpu",
- type: "cpu",
- });
-
- let distData = 0;
-
- res.data.disk.forEach((item) => {
- let distItem = +item.info.usedPercent.toString().split(".")[0];
- distData = distData + distItem;
- });
-
- this.devicePerformance.push({
- data: distData,
- name: `纭洏`,
- type: "dist",
- });
-
- console.log(this.devicePerformance);
- },
+
//鍏抽棴
close() {
this.$emit("close");
diff --git a/src/views/personalCenter/components/OrderMng.vue b/src/views/personalCenter/components/OrderMng.vue
new file mode 100644
index 0000000..a803d5d
--- /dev/null
+++ b/src/views/personalCenter/components/OrderMng.vue
@@ -0,0 +1,863 @@
+<template>
+ <div class="order-mng" v-if="!isShowDetail">
+ <div class="head-name">璁㈠崟绠＄悊</div>
+ <div class="search">
+ <div class="left">
+ <div class="id">
+ 璁㈠崟缂栧彿/浜у搧鍚嶇О
+ <el-input v-model="inputText" placeholder="璇疯緭鍏�"></el-input>
+ </div>
+
+ <div class="cluster">
+ 鍒涘缓鏃堕棿
+ <el-date-picker
+ size="small"
+ v-model="searchTime"
+ @change="save"
+ type="datetimerange"
+ start-placeholder="寮�濮嬫棩鏈�"
+ end-placeholder="缁撴潫鏃ユ湡"
+ :default-time="['00:00:00', '23:59:59']"
+ ></el-date-picker>
+ </div>
+ </div>
+
+ <div class="right">
+ <div class="button searchBtn" @click="save">鎼滅储</div>
+ <div class="button resetBtn" @click="save">閲嶇疆</div>
+ </div>
+ <div class="to-excel">
+ <span class="iconfont"></span> <span>瀵煎嚭</span>
+ </div>
+ </div>
+
+ <div class="table-area">
+ <el-table
+ id="multipleTable"
+ ref="multipleTable"
+ tooltip-effect="dark"
+ :data="dataList"
+ :fit="true"
+ :default-sort="{ prop: 'createTime', order: 'descending' }"
+ :stripe="true"
+ >
+ <el-table-column label="搴忓彿" width="55" class-name="index">
+ <template slot-scope="scope">{{
+ scope.$index + 1 + (page - 1) * size
+ }}</template>
+ </el-table-column>
+ <el-table-column
+ prop="name"
+ label="濮撳悕"
+ show-overflow-tooltip
+ ></el-table-column>
+ <el-table-column
+ prop="phone"
+ label="鎵嬫満鍙�"
+ show-overflow-tooltip
+ ></el-table-column>
+ <el-table-column prop="userType" label="鐢ㄦ埛绫诲瀷"></el-table-column>
+ <el-table-column prop="duration" label="鎺堟潈鏃堕暱"></el-table-column>
+ <el-table-column prop="authList" label="鏉冮檺"></el-table-column>
+
+ <el-table-column label="鐘舵��">
+ <template slot-scope="scope">
+ <div v-if="scope.row.isBind == 1" class="status green">宸茬粦瀹�</div>
+ <div v-else class="status">鏈粦瀹�</div>
+ </template>
+ </el-table-column>
+
+ <el-table-column label="鎿嶄綔">
+ <template slot-scope="scope">
+ <span class="option" @click="showDetail(scope.row)">璁㈠崟璇︽儏</span>
+ </template>
+ </el-table-column>
+ </el-table>
+ <div>
+ <el-pagination
+ @current-change="refrash"
+ @size-change="handleSizeChange"
+ :current-page="page"
+ :page-size="size"
+ layout="total, sizes, prev, pager, next, jumper"
+ :page-sizes="[5, 10, 15, 20, 25]"
+ :total="total"
+ background
+ ></el-pagination>
+ </div>
+ </div>
+ </div>
+ <div class="order-detail" v-else>
+ <div class="banner">
+ <span class="iconfont"></span> <span class="t">璁㈠崟璇︽儏</span>
+ </div>
+ <div class="block">
+ <div class="head-name">璁㈠崟淇℃伅</div>
+
+ <div class="order-general-view">
+
+ <div class="detail-list">
+ <div class="item">
+ <label>璁㈠崟缂栧彿锛�</label>
+ <span>{{ form.sn }}</span>
+ </div>
+ <div class="item">
+ <label>鍒涘缓鏃堕棿锛�</label>
+ <span>{{ form.createTime }}</span>
+ </div>
+ <div class="item">
+ <label>鍒涘缓浜猴細</label>
+ <span>{{ form.createUserName }}</span>
+ </div>
+ <div class="item">
+ <label>浠樻鏂瑰紡锛�</label>
+ <span>{{ form.source == 0 ? "婵�娲荤爜涓嬭浇" : "绾夸笂璐拱" }}</span>
+ </div>
+ <div class="item">
+ <label>璁㈠崟鐘舵�侊細</label>
+ <span>{{ form.status }}</span>
+ </div>
+
+ <div class="item">
+ <label>璁㈠崟閲戦锛�</label>
+ <span>{{
+ form.source == 0 ? "--" : "锟� " + form.orderMoney + " 鍏�"
+ }}</span>
+ </div>
+ </div>
+ </div>
+ </div>
+ <div class="block">
+ <div class="head-name">璁㈠崟璇︽儏</div>
+ <el-table
+ id="multipleTable"
+ ref="multipleTable"
+ tooltip-effect="dark"
+ :data="form.products"
+ style="width: 100%"
+ :fit="true"
+ :max-height="tableHeight"
+ :default-sort="{ prop: 'createTime', order: 'descending' }"
+ @selection-change="handleSelectionChange"
+ >
+ <el-table-column prop="productName" label="浜у搧鍚嶇О" width="220"></el-table-column>
+ <el-table-column prop="productTypeName" label="浜у搧绫诲瀷" width="140"></el-table-column>
+ <el-table-column prop="productVersion" label="鐗堟湰鍙�" width="140"></el-table-column>
+ <el-table-column label="閰嶇疆璇︽儏" min-width="180">
+ <template slot-scope="scope">
+ <div style="text-align: left">
+ <p v-if="scope.row.productType != 3 && scope.row.productType != 4 && scope.row.modules.length">
+ 妯″潡锛�
+ <span v-for="item in scope.row.modules" :key="item">{{ item + " " }}</span>
+ </p>
+ <p v-if="scope.row.productBaseDetail.hasChUnitPrice">
+ 閫氶亾鏁伴噺锛�
+ <span>{{ scope.row.ChCount }}</span>
+ </p>
+ <p v-if="scope.row.productBaseDetail.hasAuthPrice">
+ 鎺堟潈鏁伴噺锛�
+ <span>{{ scope.row.authCount }}</span>
+ </p>
+ <p v-if="scope.row.productType != 3 && scope.row.productType != 4 && scope.row.sdks.length">
+ 绠楁硶锛�
+ <span v-for="item in scope.row.sdks" :key="item">{{ item + " " }}</span>
+ </p>
+ <p>
+ 鏈嶅姟鏃堕暱锛�
+ <span>{{ scope.row.serveYear + "骞�" }}</span>
+ </p>
+ </div>
+ </template>
+ </el-table-column>
+ <el-table-column prop="devCount" label="鏁伴噺" width="110"></el-table-column>
+ <el-table-column label="鏈嶅姟璧锋鏃堕棿" min-width="180">
+ <template slot-scope="scope">
+ <p>{{ scope.row.startTime }}</p>
+ <p>{{ scope.row.endTime }}</p>
+ </template>
+ </el-table-column>
+ <el-table-column label="閲戦" prop="price" width="130">
+ <template slot-scope="scope">{{ form.source == 0 ? "--" : "锟� " + scope.row.price + " 鍏�" }}</template>
+ </el-table-column>
+ <el-table-column label="鎿嶄綔" min-width="200">
+ <template slot-scope="scope">
+ <div class="operation">
+ <span style="cursor: pointer" @click="downLoadEnclosure(scope.row)" v-if="scope.row.appendix.length"
+ >涓嬭浇闄勪欢</span
+ >
+ <span
+ style="cursor: pointer"
+ v-if="scope.row.orderStatus == 2 && (scope.row.productType == 3 || scope.row.productType == 4)"
+ @click="downLoadSoftware(scope.row)"
+ >涓嬭浇杞欢</span
+ >
+ <span
+ style="cursor: pointer"
+ v-if="scope.row.orderStatus == 2 && (scope.row.productType == 2 || scope.row.productType == 1)"
+ @click="downLoadSoftware(scope.row)"
+ >涓嬭浇瀹夎鍖�</span
+ >
+ <span
+ style="cursor: pointer"
+ v-if="scope.row.orderStatus == 2 && scope.row.productType == 5"
+ @click="downLoadAuth(scope.row)"
+ >涓嬭浇浜у搧瀵嗛挜</span
+ >
+ <span style="cursor: pointer" v-if="scope.row.productType != 2" @click="toDevice(scope.row)"
+ >鏌ョ湅璁惧</span
+ >
+ </div>
+ </template>
+ </el-table-column>
+ </el-table>
+ </div>
+ <div class="block">
+ <div class="head-name">鏀粯淇℃伅</div>
+ <el-table
+ tooltip-effect="dark"
+ :data="form.payInfo"
+ :fit="true"
+ :max-height="tableHeight"
+ :default-sort="{ prop: 'createTime', order: 'descending' }"
+ :span-method="tableSpanMethod"
+ >
+ <el-table-column prop="payMethod" label="鏀粯娓犻亾" width="150">
+ <template slot-scope="scope">
+ <div v-if="scope.row.payMethod == 1">绾夸笅姹囨</div>
+ <div v-if="scope.row.payMethod == 2">鏀粯瀹�</div>
+ <div v-if="scope.row.payMethod == 3">寰俊</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="浠樻鏃堕棿" width="180"></el-table-column>
+ <el-table-column prop="payMoney" label="浠樻閲戦" width="150"></el-table-column>
+ <el-table-column
+ prop="tradeNo"
+ label="闄勪欢鍑瘉鍙�/娴佹按鍙�"
+ v-if="form.payMethod == 2"
+ width="200"
+ ></el-table-column>
+ <el-table-column prop="payAccount" label="浠樻璐﹀彿" width="190"></el-table-column>
+ <el-table-column label="浠樻鍗曚綅/濮撳悕" prop="payUser" width="220"></el-table-column>
+ <el-table-column label="鏌ョ湅浠樻鍑瘉" width="200">
+ <template slot-scope="scope">
+ <div>
+ <el-image
+ style="width: 100px"
+ :fit="imageFit"
+ :src="`/httpImage/${scope.row.appendix}`"
+ :preview-src-list="[`/httpImage/${scope.row.appendix}`]"
+ ></el-image>
+ </div>
+ </template>
+ </el-table-column>
+ <el-table-column label="瀹℃牳鐘舵��" width="180">
+ <template slot-scope="scope">
+ <div>
+ <span v-if="scope.row.orderStatus == 11">瀹℃牳涓�</span>
+ <span v-if="scope.row.orderStatus == 12">宸查┏鍥�</span>
+ <span v-if="scope.row.orderStatus == 2">瀹℃牳閫氳繃</span>
+ </div>
+ </template>
+ </el-table-column>
+ <el-table-column label="鎿嶄綔" min-width="170">
+ <template slot-scope="scope">
+ <div v-if="scope.row.orderStatus !== 2">
+ <span class="cursor-pointer" @click="checkOrder(1)">瀹℃牳閫氳繃</span>
+ <span class="cursor-pointer" @click="checkOrder(2)">椹冲洖</span>
+ </div>
+ <span v-else>-</span>
+ </template>
+ </el-table-column>
+ </el-table>
+ </div>
+ </div>
+</template>
+
+<script>
+// import Steps from "./Steps";
+// import StepsCard from "./StepCard";
+// import TreeBox from "./TreeBox";
+export default {
+ components: {},
+ data() {
+ return {
+ searchTime: [
+ this.$moment().format("YYYY-MM-DD 00:00:00"),
+ this.$moment().format("YYYY-MM-DD HH:mm:ss"),
+ ], //鎼滅储鏃堕棿
+ page: 1,
+ size: 10, //鍒嗛〉鐩稿叧
+ inputText: "", //杈撳叆妗嗗唴瀹�
+ activeStep: 0,
+ activeIndex: 0,
+ total: 0, //鎬绘暟
+ dataList: [
+ {
+ name: "basic",
+ phone: "1121313232",
+ userType: "涓汉",
+ duration: "姘镐箙",
+ authList: "闆嗙兢1锛岄泦缇�2",
+ isBind: 1,
+ },
+ ],
+ isShowAdd: false, //鏄惁灞曠ず鏂板寮圭獥
+ isShowUnbind: false, //鏄惁灞曠ず瑙ｇ粦寮圭獥
+ unbindId: "",
+ durationArr: [
+ {
+ value: 0,
+ label: "涓�骞�",
+ },
+ {
+ value: 1,
+ label: "涓ゅ勾",
+ },
+ ], //鎵�灞為泦缇や笅鎷夋
+ cluster: null, //閫変腑鐨勯泦缇ょ被鍨�
+ showQuit: false, //灞曠ず閫�鍑洪泦缇ょ殑寮圭獥
+ showJoin: false, //灞曠ず鍔犲叆闆嗙兢鐨勫脊绐�
+ activeEquipment: null, //澶勭悊涓殑璁惧
+ isShowDetail: false,
+ form: {
+ id: "",
+ createTime: "",
+ createUserName: "",
+ payTime: "",
+ payMethod: "",
+ payAble: 0,
+ orderMoney: 0,
+ price: "",
+ serveYear: 1,
+ source: 0,
+ status: "",
+ products: [],
+ activeCodes: [],
+ payInfo: [],
+ },
+ };
+ },
+ methods: {
+ goback() {
+ this.isShowAdd = false;
+ this.activeIndex = 0;
+ },
+ goto(i) {
+ this.activeIndex = i;
+ },
+ // 璺冲埌璁惧璇︽儏
+ checkDetail(row) {
+ this.$router.push({
+ path: "/equipmentDetail",
+ query: {
+ id: row.devId,
+ ip: row.devIp,
+ port: row.serverPort,
+ ndid: row.id,
+ },
+ });
+ },
+
+ // 璺冲埌绠楁硶璇︽儏
+ algorithmDetail(row) {
+ this.$router.push({
+ path: "/algorithmDetail",
+ query: {
+ id: row.devId,
+ ip: row.devIp,
+ port: row.serverPort,
+ },
+ });
+ },
+
+ // 鏌ヨ鍒楄〃
+
+ save() {},
+ //鍒嗛〉鍔熻兘
+ handleSizeChange(size) {
+ this.size = size;
+ },
+ //鍒嗛〉鍔熻兘
+ refrash(page) {
+ this.page = page;
+ },
+
+ //瑙ｇ粦鎸夐挳
+ Untying(row) {
+ console.log(row);
+ this.unbindId = row.id;
+ this.isShowUnbind = true;
+ },
+
+ //鑾峰緱榛樿鏃堕棿
+ getDateInit() {
+ // 瑕佹眰 榛樿涓�涓湀
+ const end = new Date();
+ const start = new Date();
+ const nowDate = new Date();
+ nowDate.setHours(0);
+ nowDate.setMinutes(0);
+ nowDate.setSeconds(0);
+ nowDate.setMilliseconds(0);
+ start.setTime(nowDate.getTime() - 3600 * 1000 * 24 * 30);
+ end.setTime(nowDate.getTime() + 3600 * 1000 * 24 - 1);
+ return [
+ this.$moment(start).format("YYYY-MM-DD HH:mm:ss"),
+ this.$moment(end).format("YYYY-MM-DD HH:mm:ss"),
+ ];
+ },
+
+ //鍏抽棴鏂板寮圭獥
+ closeAddBox() {
+ this.isShowAdd = false;
+ },
+ // 鍏抽棴瑙ｇ粦寮圭獥
+ closeUnbindBox() {
+ this.isShowUnbind = false;
+ },
+
+ //瑙ｇ粦鎴愬姛鍥炶皟
+ reflash() {
+ this.isShowUnbind = false;
+ },
+
+ clearSearch() {
+ this.searchTime = this.getDateInit();
+ this.inputText = "";
+ },
+
+ //閫�鍑洪泦缇�
+ quitCluster(equipment) {
+ this.activeEquipment = equipment;
+ this.showQuit = true;
+ },
+
+ //鍔犲叆闆嗙兢
+ showDetail(equipment) {
+ this.activeEquipment = equipment;
+ this.isShowDetail = true;
+ },
+ },
+ mounted() {},
+};
+</script>
+
+<style scoped lang="scss">
+.order-mng {
+ padding: 20px;
+ .head-name {
+ font-weight: 700;
+ font-size: 16px;
+ line-height: 22px;
+ color: #3d3d3d;
+ border-left: 4px solid #0065ff;
+ padding-left: 10px;
+ }
+ .add-title {
+ font-weight: 700;
+ font-size: 16px;
+ cursor: pointer;
+ line-height: 22px;
+ color: #3d3d3d;
+ margin-bottom: 30px;
+ .iconfont {
+ margin-right: 10px;
+ }
+ }
+ .steps {
+ }
+
+ .searchBtn {
+ width: 60px;
+ height: 32px;
+ line-height: 32px;
+ text-align: center;
+ color: #fff;
+ background: #0065ff;
+ border-radius: 3px;
+ margin-right: 20px;
+ }
+ .right {
+ display: flex;
+ justify-content: space-between;
+ }
+ .to-excel {
+ box-sizing: border-box;
+ border-radius: 3px;
+ background: #0064ff;
+ display: flex;
+ width: 84px;
+ height: 32px;
+ color: #fff;
+ align-items: center;
+ justify-content: center;
+ margin-left: 195px;
+ }
+ .resetBtn {
+ width: 60px;
+ height: 32px;
+ line-height: 32px;
+ text-align: center;
+ color: #0065ff;
+ box-sizing: border-box;
+ border: 1px solid #0065ff;
+ border-radius: 3px;
+ }
+ .search {
+ display: flex;
+ font-size: 14px;
+ border-bottom: 1px solid #e9ebee;
+ margin-top: 30px;
+ border-radius: 3px;
+ box-sizing: border-box;
+ padding-bottom: 20px;
+ .left,
+ .right,
+ .id,
+ .time,
+ .cluster {
+ display: flex;
+ align-items: center;
+ .el-date-editor {
+ width: 300px;
+ height: 32px;
+ border-radius: 3px;
+ border: 1px solid #c0c5cc;
+ }
+ }
+
+ .id .el-input ::v-deep {
+ width: 200px;
+ }
+
+ .cluster::v-deep .el-input {
+ width: 300px;
+
+ margin-left: 10px;
+ margin-right: 20px;
+ .el-input__icon {
+ line-height: 32px;
+ }
+ input {
+ border-radius: 0;
+
+ &::-webkit-input-placeholder {
+ color: #999;
+ }
+
+ &:focus {
+ border-color: #0065ff;
+ }
+ }
+ }
+
+ .el-input ::v-deep {
+ width: 200px;
+ margin-left: 10px;
+ margin-right: 20px;
+ height: 32px;
+ line-height: 32px;
+ input {
+ border-radius: 3px;
+ height: 32px;
+ line-height: 32px;
+ &::-webkit-input-placeholder {
+ color: #999;
+ }
+
+ &:focus {
+ border-color: #0065ff;
+ }
+ }
+ }
+
+ .el-date-editor {
+ width: 318px;
+ height: 40px;
+ margin-left: 10px;
+ margin-right: 20px;
+ border-radius: 0;
+
+ &::-webkit-input-placeholder {
+ color: #999;
+ }
+
+ &.is-active {
+ border-color: #0065ff;
+ }
+ }
+ }
+
+ .btns {
+ display: flex;
+ margin: 20px 0;
+ text-align: center;
+ .add {
+ margin-right: 20px;
+ width: 126px;
+ height: 32px;
+ background: #0065ff;
+ color: #fff;
+ span {
+ margin-right: 5px;
+ line-height: 32px;
+ font-size: 14px;
+ }
+ }
+
+ .export {
+ width: 126px;
+ height: 32px;
+ border: 1px solid #0065ff;
+ color: #0065ff;
+ box-sizing: border-box;
+ span {
+ margin-right: 5px;
+ line-height: 32px;
+ font-size: 14px;
+ }
+ }
+ }
+
+ .el-table ::v-deep {
+ background-color: rgb(233, 235, 238);
+ padding: 1px;
+
+ &::after {
+ display: none;
+ }
+
+ td.index .cell {
+ padding-left: 16px;
+ padding-right: 4px;
+ }
+
+ .has-gutter tr th {
+ background: #f0f3f5;
+ font-size: 16px;
+ color: #3d3d3d;
+ font-weight: 700;
+ }
+
+ td .cell {
+ color: #3d3d3d;
+ }
+
+ tr:hover > td.el-table__cell {
+ background-color: #fff;
+ }
+
+ .el-table__row--striped .el-table__cell {
+ background-color: #f0f5fa !important;
+ }
+ tr:hover > td.el-table__cell {
+ background-color: #fff;
+ }
+
+ .el-table__row--striped .el-table__cell {
+ background-color: #f0f5fa !important;
+ }
+
+ .status {
+ color: #ff4b33;
+
+ &.green {
+ color: #36b24a;
+ }
+ }
+
+ .option {
+ margin-right: 10px;
+ color: rgb(0, 101, 255);
+ cursor: pointer;
+ }
+ }
+
+ .el-pagination ::v-deep {
+ margin-top: 30px;
+ text-align: center;
+ height: 24px;
+ .el-pagination__sizes {
+ margin-right: 0;
+ }
+
+ button {
+ margin: 0;
+ background-color: #fff;
+ border: 1px solid #c0c5cc;
+ border-radius: 2px;
+ }
+
+ .number {
+ background-color: #fff;
+
+ &:not(.disabled):hover {
+ color: #0065ff;
+ }
+
+ &:not(.disabled).active {
+ background-color: #0065ff;
+ color: #fff;
+ }
+ }
+
+ .el-input .el-input__inner {
+ padding-left: 0;
+
+ &:hover,
+ &:focus {
+ border-color: #0065ff;
+ }
+ }
+ }
+}
+.order-detail {
+ .el-table ::v-deep {
+ background-color: rgb(233, 235, 238);
+ padding: 1px;
+
+ &::after {
+ display: none;
+ }
+
+ td.index .cell {
+ padding-left: 16px;
+ padding-right: 4px;
+ }
+
+ .has-gutter tr th {
+ background: #f0f3f5;
+ font-size: 16px;
+ color: #3d3d3d;
+ font-weight: 700;
+ }
+
+ td .cell {
+ color: #3d3d3d;
+ }
+
+ tr:hover > td.el-table__cell {
+ background-color: #fff;
+ }
+
+ .el-table__row--striped .el-table__cell {
+ background-color: #f0f5fa !important;
+ }
+ tr:hover > td.el-table__cell {
+ background-color: #fff;
+ }
+
+ .el-table__row--striped .el-table__cell {
+ background-color: #f0f5fa !important;
+ }
+
+ .status {
+ color: #ff4b33;
+
+ &.green {
+ color: #36b24a;
+ }
+ }
+
+ .option {
+ margin-right: 10px;
+ font-size: 24px;
+ color: rgb(0, 101, 255);
+ cursor: pointer;
+ }
+ }
+ // padding: 0 20px;
+ background-color: #f3f5f8;
+ min-height: 856px;
+ .banner {
+ margin-bottom: 24px;
+ height: 64px;
+ background: #ffffff;
+ box-sizing: border-box;
+ padding: 20px;
+ .iconfont {
+ margin-right: 10px;
+ font-size: 18px;
+ }
+ .t {
+ font-size: 16px;
+ color: #666666;
+ line-height: 24px;
+ font-weight: 700;
+ }
+ }
+ .block {
+ box-sizing: border-box;
+ padding: 20px ;
+ padding-bottom: 30px;
+ margin-bottom: 24px;
+ background: #ffffff;
+ .head-name {
+ font-weight: 700;
+ font-size: 16px;
+ line-height: 22px;
+ color: #3d3d3d;
+ border-left: 4px solid #0065ff;
+ padding-left: 10px;
+ }
+ .order-general-view {
+ background: #fff;
+ .order-num {
+ text-align: left;
+ height: 22px;
+ font-size: 16px;
+ font-family: PingFangSC-Medium, PingFang SC;
+ font-weight: bold;
+ color: #111111;
+ line-height: 22px;
+ }
+ .detail-list {
+ display: flex;
+ flex-wrap: wrap;
+ text-align: left;
+ .item {
+ width: 25%;
+ // margin: 15px 0 0;
+ margin-top: 30px;
+ label {
+ height: 20px;
+ font-size: 14px;
+ font-family: PingFangSC-Regular, PingFang SC;
+ line-height: 20px;color: #666666;
+ }
+ span {
+ height: 20px;
+ font-size: 14px;
+ font-family: PingFangSC-Regular, PingFang SC;
+ font-weight: 700;
+ color: #3D3D3D;
+ line-height: 20px;
+ }
+ }
+ span.reserved {
+ color: #ccc;
+ }
+ }
+ }
+ }
+}
+</style>
+
+<style >
+.el-date-table td.start-date span,
+.el-date-table td.end-date span {
+ background-color: #0065ff;
+}
+
+.el-button--text span {
+ color: #0065ff;
+}
+
+.el-button.is-plain:hover,
+.el-button.is-plain:focus {
+ color: #0065ff;
+ border-color: #0065ff;
+}
+
+</style>
\ No newline at end of file
diff --git a/src/views/personalCenter/components/SubAccount.vue b/src/views/personalCenter/components/SubAccount.vue
index 380ef3a..4721b7c 100644
--- a/src/views/personalCenter/components/SubAccount.vue
+++ b/src/views/personalCenter/components/SubAccount.vue
@@ -23,8 +23,8 @@
</div>
<div class="right">
- <div class="button searchBtn" @click="searchingBtn">鎼滅储</div>
- <div class="button resetBtn" @click="clearSearch">閲嶇疆</div>
+ <div class="button searchBtn" @click="save">鎼滅储</div>
+ <div class="button resetBtn" @click="save">閲嶇疆</div>
</div>
</div>
@@ -67,29 +67,7 @@
<el-table-column prop="userType" label="鐢ㄦ埛绫诲瀷"></el-table-column>
<el-table-column prop="duration" label="鎺堟潈鏃堕暱"></el-table-column>
<el-table-column prop="authList" label="鏉冮檺"></el-table-column>
- <!-- <el-table-column label="瀹夎鏃堕棿" >
- <template slot-scope="scope">
- <div v-if="scope.row.installTime.length > 1">
- <div>{{ scope.row.installTime[0] }}</div>
- <div>{{ scope.row.installTime[1] }}</div>
- </div>
- <div v-else>--</div>
- </template>
- </el-table-column> -->
- <!-- <el-table-column label="棣栨浣跨敤鏃堕棿" >
- <template slot-scope="scope">
- <div v-if="scope.row.firstUseTime.length > 1">
- <div>{{ scope.row.firstUseTime[0] }}</div>
- <div>{{ scope.row.firstUseTime[1] }}</div>
- </div>
- <div v-else>--</div>
- </template>
- </el-table-column>
-
- <el-table-column label="鎵�灞為泦缇�" show-overflow-tooltip >
- <template> -- </template>
- </el-table-column> -->
-
+
<el-table-column label="鐘舵��">
<template slot-scope="scope">
<div v-if="scope.row.isBind == 1" class="status green">宸茬粦瀹�</div>
@@ -103,7 +81,6 @@
<span class="iconfont option" @click="joinCluster(scope.row)"
></span
>
-
<!-- 瑙ｇ粦 -->
<span class="iconfont option" @click="Untying(scope.row)"
></span
@@ -151,7 +128,7 @@
></JoinClusterBox>
</div>
<div class="sub-account" v-else-if="isShowAdd">
- <div class="add-title" @click="isShowAdd = false">
+ <div class="add-title" @click="isShowAdd=false">
<span class="iconfont"></span>
<span>娣诲姞瀛愯处鎴�</span>
</div>
@@ -212,8 +189,8 @@
</el-form>
<div class="right">
- <div class="button searchBtn" @click="searchingBtn">鎼滅储</div>
- <div class="button resetBtn" @click="clearSearch">閲嶇疆</div>
+ <div class="button searchBtn" @click="save">鎼滅储</div>
+ <div class="button resetBtn" @click="save">閲嶇疆</div>
</div>
</div>
<div class="sub-account" v-else-if="isShowRelate">
@@ -230,8 +207,6 @@
</template>
<script>
-import { findDevList } from "@/api/device";
-// import AddBox from "@/views/equipmentManagement/equipmentList/components/AddBox";
import UnbindBox from "@/views/equipmentManagement/equipmentDetail/components/UnbindBox";
import QuitClusterBox from "@/views/equipmentManagement/equipmentList/components/QuitClusterBox";
import JoinClusterBox from "@/views/equipmentManagement/equipmentList/components/JoinClusterBox";
@@ -452,6 +427,7 @@
},
methods: {
goback() {
+ this.isShowAdd=false
this.isShowRelate = false;
this.activeIndex = 0;
},
@@ -484,42 +460,17 @@
},
// 鏌ヨ鍒楄〃
- searchingBtn() {
- let param = {
- page: this.page,
- size: this.size,
- // startTime: this.searchTime[0],
- // endTime: this.searchTime[1],
- inputText: this.inputText,
- };
- findDevList(param)
- .then((res) => {
- this.dataList = res.data.list;
- //鏃堕棿鍒嗚鏄剧ず
+
+ save(){
- this.dataList.forEach((item) => {
- item.installTime = item.installTime.split(" ");
- item.firstUseTime = item.firstUseTime.split(" ");
- });
- this.total = res.data.total;
- if (res.data.total <= this.size) {
- this.page = 1;
- }
- })
- .catch((err) => {
- console.log(err);
- });
},
-
//鍒嗛〉鍔熻兘
handleSizeChange(size) {
this.size = size;
- this.searchingBtn();
},
//鍒嗛〉鍔熻兘
refrash(page) {
this.page = page;
- this.searchingBtn();
},
//瑙ｇ粦鎸夐挳
@@ -559,13 +510,11 @@
//瑙ｇ粦鎴愬姛鍥炶皟
reflash() {
this.isShowUnbind = false;
- this.searchingBtn();
},
clearSearch() {
this.searchTime = this.getDateInit();
this.inputText = "";
- this.searchingBtn();
},
//閫�鍑洪泦缇�
@@ -581,8 +530,7 @@
},
},
mounted() {
- this.searchTime = this.getDateInit();
- this.searchingBtn();
+
},
};
</script>
--
Gitblit v1.8.0