From 576cfb49d7a8244f9a018d9c31b58b664737817b Mon Sep 17 00:00:00 2001
From: haoxuan <haoxuan>
Date: 星期六, 19 八月 2023 21:41:07 +0800
Subject: [PATCH] 样式修改
---
.env | 2
src/components/Knowledge.vue | 20
src/views/visualization.vue | 1038 ++++++++++++++++++++++++++++++---------------------------
3 files changed, 560 insertions(+), 500 deletions(-)
diff --git a/.env b/.env
index 1ae7212..d79cc13 100644
--- a/.env
+++ b/.env
@@ -3,7 +3,7 @@
# 椤甸潰 title 鍓嶇紑
VUE_APP_TITLE=Basic
NODE_ENV=development
-VUE_APP_BATH_PATH='http://192.168.20.120:8003'
+VUE_APP_BATH_PATH='http://127.0.0.1:8003'
# 缃戠粶璇锋眰鍏敤鍦板潃
VUE_APP_API=/api/
diff --git a/src/components/Knowledge.vue b/src/components/Knowledge.vue
index c1db1f7..97fa7f8 100644
--- a/src/components/Knowledge.vue
+++ b/src/components/Knowledge.vue
@@ -1,17 +1,17 @@
<template>
- <div class="keyword-ring" style="height:100%">
+ <div class="keyword-ring" style="height:calc(100% - 40px)">
<!-- width="400" height="400" -->
<svg width="100%" height="100%">
<circle cx="200" cy="200" r="155" fill="none" stroke-width="3" />
<circle cx="200" cy="200" r="125" fill="none" stroke-width="3" />
<circle cx="200" cy="200" r="95" fill="none" stroke-width="3" />
<circle cx="200" cy="200" r="65" fill="none" stroke-width="3" />
- <text class="text-item" x="60" y="80" style="fill: #000; font-weight: bold; padding:5px;
+ <text class="text-item" x="60" y="80" style="fill: rgb(211 211 211); font-weight: bold; padding:5px;
font-size:14px;
display:inline-block;
border-radius:8px;
background:#007101;
- color:#fff; cursor: pointer;postion:absolute;left:200;top:40">
+ cursor: pointer;postion:absolute;left:200;top:40">
璇姤璀�
</text>
<text class="text-item" x="50" y="170" text-anchor="middle"
@@ -20,14 +20,14 @@
display:inline-block;
border-radius:8px;
background:#007101;
- color:#fff;">绠¤矾鏁村姩</text>
- <text class="text-item" x="215" y="250" text-anchor="middle" font-size="20px"
+ fill: rgb(211 211 211);">绠¤矾鏁村姩</text>
+ <text class="text-item" x="245" y="250" text-anchor="middle" font-size="20px"
style="padding:5px;
font-size:14px;
display:inline-block;
border-radius:8px;
background:#007101;
- color:#fff;">鍐峰嵈娌瑰害楂�</text>
+ fill: rgb(211 211 211);">鍐峰嵈娌瑰害楂�</text>
<text
x="50"
y="270"
@@ -37,7 +37,7 @@
display:inline-block;
border-radius:8px;
background:#007101;
- color:#fff;"
+ fill: rgb(211 211 211);"
text-anchor="middle"
>
娓呮磥搴﹁秴宸�
@@ -48,14 +48,14 @@
display:inline-block;
border-radius:8px;
background:#007101;
- color:#fff;">娓呮磥搴﹁秴宸�</text>
- <text x="240" class="text-item" y="110" text-anchor="middle" font-size="20px"
+ fill: rgb(211 211 211);">娓呮磥搴﹁秴宸�</text>
+ <text x="280" class="text-item" y="110" text-anchor="middle" font-size="20px"
style="padding:5px;
font-size:14px;
display:inline-block;
border-radius:8px;
background:#007101;
- color:#fff;">淇濇姢鍣ㄦ姤璀�</text>
+ fill:rgb(211 211 211)">淇濇姢鍣ㄦ姤璀�</text>
<image xlink:href="../../public/璇煶.png" x="105" y="100" width="110" height="110" />
</svg>
</div>
diff --git a/src/views/visualization.vue b/src/views/visualization.vue
index f38df0b..6322a9b 100644
--- a/src/views/visualization.vue
+++ b/src/views/visualization.vue
@@ -3,106 +3,113 @@
<div class="home">
<template v-if="Object.keys(taskData).length > 0">
<div class="left">
- <p class="title">
- 璁続423鐢熶骇绠＄悊鐪嬫澘
- <span
- class="font el-icon-setting set-title"
- style="float: right"
- @click="setUrl"
- ></span>
- </p>
- <div class="statelist">
- <span class="title-item"
- >璁㈠崟缂栧彿:
- <span class="color_4efefa">{{
- taskData.Order.orderId || ""
- }}</span>
- </span>
- <span class="title-item"
- >褰撳墠宸ュ簭:
- <span class="color_4efefa">{{
- taskData.Procedure.procedure.procedureName || ""
- }}</span>
- </span>
- <span class="title-item"
- >鍚庨亾宸ュ簭: <span class="color_4efefa">
- <!-- {{
+ <p class="title">
+ 鐢熶骇绠＄悊鐪嬫澘
+ <span
+ class="font el-icon-setting set-title"
+ style="float: right"
+ @click="setUrl"
+ ></span>
+ </p>
+ <div class="statelist">
+ <span class="title-item"
+ >璁㈠崟缂栧彿:
+ <span class="color_4efefa">{{ taskData.Order.orderId || "" }}</span>
+ </span>
+ <span class="title-item"
+ >褰撳墠宸ュ簭:
+ <span class="color_4efefa">{{
+ taskData.Procedure.procedure.procedureName || ""
+ }}</span>
+ </span>
+ <span class="title-item"
+ >鍚庨亾宸ュ簭:
+ <span class="color_4efefa">
+ <!-- {{
taskData.NextProcedure.procedure.procedureName || "--"
}} -->
- </span>
</span>
- <span class="title-item"
- >宸ヤ綔浜烘暟: <span class="color_4efefa">{{ taskData.Procedure.procedure.workers.length || 0}}浜�</span>
- </span>
- </div>
- <div class="content">
- <div class="content_left">
- <div class="content-top">
- <div class="small_title">褰撳墠瀹屾垚</div>
- <div class="content_leftBttom">
- <dl>
- <dd style="font-size: 26px; font-weight: 600">{{ finishNumber }}{{ taskData.Order.unit }}</dd>
- </dl>
- </div>
- </div>
- <div class="content-top">
- <div class="small_title">姝ｅ搧鐢熶骇</div>
- <div class="content_leftBttom">
- <dl>
- <dd style="font-size: 26px; font-weight: 600">{{
- taskData.Order.amount || 0
- }}{{ taskData.Order.unit }}</dd>
- </dl>
- </div>
+ </span>
+ <span class="title-item"
+ >宸ヤ綔浜烘暟:
+ <span class="color_4efefa"
+ >{{ taskData.Procedure.procedure.workers.length || 0 }}浜�</span
+ >
+ </span>
+ </div>
+ <div class="content">
+ <div class="content_left">
+ <div class="content-top">
+ <div class="small_title">褰撳墠瀹屾垚</div>
+ <div class="content_leftBttom">
+ <dl>
+ <dd style="font-size: 26px; font-weight: 600">
+ {{ finishNumber }}{{ taskData.Order.unit }}
+ </dd>
+ </dl>
</div>
</div>
- <div class="content_right">
- <el-descriptions :column="2" :colon="true">
- <el-descriptions-item label="浜у搧鍚嶇О">{{
- taskData.Order.productName || ""
- }}</el-descriptions-item>
- <el-descriptions-item label="鏁伴噺">{{
- taskData.Order.amount || 0
- }}{{ taskData.Order.unit }}</el-descriptions-item>
- <el-descriptions-item label="浜よ揣鏃ユ湡">{{
- taskData.Order.deliverDate || ""
- }}</el-descriptions-item>
- <el-descriptions-item label="宸ユ椂">
- {{ taskData.Procedure.procedure.workHours || "" }}
- </el-descriptions-item>
- <el-descriptions-item label="璧锋鏃堕棿">{{
- formatDate(taskData.Procedure.procedure.startTime) || ""
- }} - {{ formatDate(taskData.Procedure.procedure.endTime) }}</el-descriptions-item>
- <el-descriptions-item label="璐х墿鎻忚堪"
- >{{
- taskData.Order.orderAttr || ""
+ <div class="content-top">
+ <div class="small_title">姝ｅ搧鐢熶骇</div>
+ <div class="content_leftBttom">
+ <dl>
+ <dd style="font-size: 26px; font-weight: 600">
+ {{ taskData.Order.amount || 0 }}{{ taskData.Order.unit }}
+ </dd>
+ </dl>
+ </div>
+ </div>
+ </div>
+ <div class="content_right">
+ <el-descriptions :column="2" :colon="true">
+ <el-descriptions-item label="浜у搧鍚嶇О">{{
+ taskData.Order.productName || ""
+ }}</el-descriptions-item>
+ <el-descriptions-item label="鏁伴噺"
+ >{{ taskData.Order.amount || 0
+ }}{{ taskData.Order.unit }}</el-descriptions-item
+ >
+ <el-descriptions-item label="浜よ揣鏃ユ湡">{{
+ taskData.Order.deliverDate || ""
+ }}</el-descriptions-item>
+ <el-descriptions-item label="宸ユ椂">
+ {{ taskData.Procedure.procedure.workHours || "" }}
+ </el-descriptions-item>
+ <el-descriptions-item label="璧锋鏃堕棿"
+ >{{
+ formatDate(taskData.Procedure.procedure.startTime) || ""
+ }}
+ -
+ {{
+ formatDate(taskData.Procedure.procedure.endTime)
}}</el-descriptions-item
- >
- <el-descriptions-item label="瀹㈡埛鍚嶇О"
- >{{
- taskData.Order.customer || ""
- }}</el-descriptions-item
- >
- <el-descriptions-item label="鍙傛暟瑕佹眰"
- >{{
- taskData.Order.parameter || ""
- }}</el-descriptions-item
- >
- </el-descriptions>
- <el-descriptions :column="1" :colon="true">
- <el-descriptions-item label="瀹屾垚搴�" style="width: 100%">
- <!--:text-format="format" -->
- <el-progress
- define-back-color="#007101"
- color="#00CC66"
- :text-inside="true"
- :stroke-width="30"
- :percentage="parseInt(finishNumber/taskData.Order.amount)"
-
- ></el-progress
- >
- </el-descriptions-item>
- <!-- <el-descriptions-item label="鍚堟牸鐜�" style="width: 100%">
+ >
+ <el-descriptions-item label="璐х墿鎻忚堪">{{
+ taskData.Order.orderAttr || ""
+ }}</el-descriptions-item>
+ <el-descriptions-item label="瀹㈡埛鍚嶇О">{{
+ taskData.Order.customer || ""
+ }}</el-descriptions-item>
+ <el-descriptions-item label="鍙傛暟瑕佹眰">{{
+ taskData.Order.parameter || ""
+ }}</el-descriptions-item>
+ </el-descriptions>
+ <el-descriptions :column="1" :colon="true">
+ <el-descriptions-item label="瀹屾垚搴�" style="width: 100%">
+ <!--:text-format="format" -->
+ <el-progress
+ define-back-color="#133EAF"
+ color="#09E5ED"
+ :text-inside="true"
+ :stroke-width="30"
+ :percentage="
+ finishNumber && taskData.Order.amount
+ ? parseInt(finishNumber / taskData.Order.amount)
+ : 0
+ "
+ ></el-progress>
+ </el-descriptions-item>
+ <!-- <el-descriptions-item label="鍚堟牸鐜�" style="width: 100%">
<el-progress
define-back-color="#007101"
color="#00CC66"
@@ -111,167 +118,174 @@
:percentage="passrate"
></el-progress>
</el-descriptions-item> -->
- </el-descriptions>
- </div>
+ </el-descriptions>
</div>
- <div class="bottom">
- <div class="bottom_list">
- <div class="bottom-title">
- 杈撳叆璧勬簮
- <el-button type="primary" class="color_f70f83" size="small">
- 鐗╂枡鍛煎彨</el-button
- >
- </div>
- <el-carousel
- direction="vertical"
- height="calc(100% - 0px)"
- :interval="500"
- class="card-box"
- ref="cardBox1"
- v-if="
- taskData.Procedure.procedure &&
- taskData.Procedure.procedure.inputMaterials
- "
+ </div>
+ <div class="bottom">
+ <div class="bottom_list">
+ <div class="bottom-title">杈撳叆璧勬簮</div>
+ <el-carousel
+ direction="vertical"
+ height="calc(100% - 0px)"
+ :interval="500"
+ class="card-box"
+ ref="cardBox1"
+ v-if="
+ taskData.Procedure.procedure &&
+ taskData.Procedure.procedure.inputMaterials
+ "
+ >
+ <el-carousel-item
+ :key="index"
+ v-for="(item, index) in inputMaterials"
>
- <el-carousel-item
- :key="index"
- v-for="(item, index) in inputMaterials"
- >
- <div
- class="card"
- :key="index2"
- v-for="(list, index2) in item"
- >
- <div class="card_content">
- <div class="card_contentLeft">
- {{ list.materialId}}
- </div>
- </div>
- <div class="card_top">
- <div>
- <!-- 璁惧12<i
+ <div class="card" :key="index2" v-for="(list, index2) in item">
+ <div class="card_content">
+ <div class="card_contentLeft">{{ list.materialId }}</div>
+ </div>
+ <div class="card_top">
+ <div>
+ <!-- 璁惧12<i
style="font-size: 14px"
class="el-icon-right font-arrow-20"
></i>
璁惧13 -->
- {{ list.materialName}}
- </div>
+ {{ list.materialName }}
</div>
- <div class="card_top2">
- <div style="line-height:45px;text-align:center;">
- {{ list.amount}} {{ list.unit }}</div>
- <!-- <span class="card-top-r-t">鐢熶骇瀹屾垚</span>
+ </div>
+ <div class="card_top2">
+ <div style="line-height: 45px; text-align: center">
+ {{ list.amount }} {{ list.unit }}
+ </div>
+ <!-- <span class="card-top-r-t">鐢熶骇瀹屾垚</span>
<span class="card-top-r-b">12鏈�28鏃� 08:24</span> -->
+ </div>
+ </div>
+ </el-carousel-item>
+ </el-carousel>
+ <el-button type="primary" class="color_f70f83">
+ <i class="el-icon-phone-outline" />鐗╂枡鍛煎彨</el-button
+ >
+ </div>
+ <i class="el-icon-arrow-right font-arrow-20 color_4efefa"></i>
+ <div class="bottom_list">
+ <div class="bottom-title">
+ 褰撳墠宸ュ簭:{{ taskData.Procedure.procedure.procedureName || "" }}
+ </div>
+ <el-carousel
+ direction="vertical"
+ height="calc(100% - 0px)"
+ :interval="500"
+ class="card-box"
+ ref="cardBox2"
+ v-if="taskData.Procedure.procedure && procedureList"
+ >
+ <el-carousel-item
+ :key="index"
+ v-for="(item, index) in procedureList"
+ >
+ <div class="card" :key="index2" v-for="(list, index2) in item">
+ <template v-if="list.name == '宸ュ簭'">
+ <div class="card_content">
+ <div class="card_contentLeft color_blue">
+ {{ list.deviceName }}
+ <!-- <span style="float: right">6m/s</span> -->
+ </div>
</div>
- </div>
- </el-carousel-item>
- </el-carousel>
- </div>
- <i class="el-icon-arrow-right font-arrow-20 color_4efefa"></i>
- <div class="bottom_list">
- <div class="bottom-title">褰撳墠宸ュ簭:{{
- taskData.Procedure.procedure.procedureName || ""
- }}</div>
- <el-carousel
- direction="vertical"
- height="calc(100% - 0px)"
- :interval="500"
- class="card-box"
- ref="cardBox2"
- v-if="
- taskData.Procedure.procedure &&
- procedureList
- "
- >
- <el-carousel-item
- :key="index"
- v-for="(item, index) in procedureList"
- >
- <div class="card"
- :key="index2"
- v-for="(list, index2) in item">
- <template v-if="list.name=='宸ュ簭'">
- <div class="card_content">
- <div class="card_contentLeft color_blue">
- {{ list.deviceName }}
- <!-- <span style="float: right">6m/s</span> -->
- </div>
+ <div class="card_top-3">
+ <span class="card-top-r-t"
+ >瀹屾垚杩涘害锛歿{
+ parseInt(finishNumber / taskData.Order.amount) || 0
+ }}</span
+ >
+ <span class="card-top-r-b">
+
+ <el-progress
+ define-back-color="#133EAF"
+ color="#09E5ED"
+ :text-inside="true"
+ :stroke-width="10"
+ :percentage="
+ parseInt(finishNumber / taskData.Order.amount)
+ "
+ :show-text="false"
+ ></el-progress>
+ </span>
+ </div>
+ <div class="card_top-2">
+ <div style="line-height: 45px; text-align: center">
+ 鐢熶骇涓�
</div>
- <div class="card_top-3">
- <span class="card-top-r-t">瀹屾垚杩涘害锛歿{ parseInt(finishNumber/taskData.Order.amount)||0 }}</span>
- <span class="card-top-r-b">
- <el-progress
- define-back-color="#007101"
- color="#00CC66"
- :text-inside="true"
- :stroke-width="10"
- :percentage="parseInt(finishNumber/taskData.Order.amount)"
- :show-text="false"
- ></el-progress>
- </span>
- </div>
- <div class="card_top-2">
- <div style="line-height:45px;text-align:center;">
- 鐢熶骇涓�</div>
- <!-- <span class="card-top-r-t">瀹屾垚杩涘害锛�50%</span>
+ <!-- <span class="card-top-r-t">瀹屾垚杩涘害锛�50%</span>
<span class="card-top-r-b">12鏈�28鏃� 08:24</span> -->
- </div>
- </template>
- <template v-else>
- <div class="card_content">
- <div class="card_contentLeft color_blue">
- 宸ヨ壓缂栧彿锛歿{ list.number }}
- </div>
- </div>
- <div class="card_top-4">
- 宸ヨ壓鐨勫叿浣撲俊鎭鐐瑰嚮鎺у埗鏌ョ湅锛�
- </div>
- </template>
- </div>
- </el-carousel-item>
- </el-carousel>
-
- <p
- style="font-size: 22px; margin-left: 12px; margin-top: 50px"
- ></p>
- </div>
- <i class="el-icon-arrow-right font-arrow-20 color_4efefa"></i>
- <div class="bottom_list">
- <div class="bottom-title">
- <span>杈撳嚭璧勬簮</span>
- <el-button type="primary" class="color_organge" size="small">
- 杩愯緭鍛煎彨</el-button
- >
- </div>
- <el-carousel
- direction="vertical"
- height="calc(100% - 0px)"
- :interval="500"
- ref="cardBox3"
- class="card-box"
- v-if="
- taskData.Procedure.procedure &&
- taskData.Procedure.procedure.outputMaterials
- "
+ </div>
+ </template>
+ <template v-else>
+ <!-- <div class="card_content">
+
+ </div> -->
+ <div class="card_top-4"><div>宸ヨ壓缂栧彿锛歿{ list.number }}</div>
+ <div style="font-size:14px;color:#cfcfcf;line-height:20px">宸ヨ壓鐨勫叿浣撲俊鎭鐐瑰嚮鎺у埗鏌ョ湅锛�</div></div>
+ </template>
+ </div>
+ </el-carousel-item>
+ </el-carousel>
+
+ <p style="font-size: 22px; margin-left: 12px; margin-top: 50px"></p>
+ <div class="right-small-btn">
+ <el-button type="primary"> 鎵撳嵃</el-button>
+ <el-popover
+ placement="top-end"
+ width="160"
+ class="button-finish"
+ v-model="finishShow"
+ trigger="click"
>
- <el-carousel-item
- :key="index"
- v-for="(item, index) in outputMaterials"
- >
+ <p>璇风‘璁ゆ槸鍚﹀凡瀹屾垚璇ョ敓浜т换鍔�?</p>
+ <div style="text-align: right; margin: 0">
+ <el-button size="mini" @click="finishShow = false">
+ 鍙栨秷</el-button
+ >
+ <el-button type="primary" size="mini" @click="finishClick">
+ 纭畾</el-button
+ >
+ </div>
+ <el-button type="primary" slot="reference"> 瀹屾垚</el-button>
+ </el-popover>
+ </div>
+ </div>
+ <i class="el-icon-arrow-right font-arrow-20 color_4efefa"></i>
+ <div class="bottom_list">
+ <div class="bottom-title">
+ <span>杈撳嚭璧勬簮</span>
+ </div>
+ <el-carousel
+ direction="vertical"
+ height="calc(100% - 0px)"
+ :interval="500"
+ ref="cardBox3"
+ class="card-box"
+ v-if="
+ taskData.Procedure.procedure &&
+ taskData.Procedure.procedure.outputMaterials
+ "
+ >
+ <el-carousel-item
+ :key="index"
+ v-for="(item, index) in outputMaterials"
+ >
<div
class="card-box"
:key="index2"
v-for="(list, index2) in item"
>
- <div
- class="card"
- >
+ <div class="card">
<div class="card_content">
- <div class="card_contentLeft">{{ list.materialId}}</div>
+ <div class="card_contentLeft">{{ list.materialId }}</div>
</div>
<div class="card_top">
<div>
- {{ list.materialName}}
+ {{ list.materialName }}
<!-- 璁惧12<i
style="font-size: 14px"
class="el-icon-right font-arrow-20"
@@ -280,11 +294,11 @@
</div>
</div>
<div class="card_top2">
- <div style="line-height:45px;text-align:center;">
- {{ list.amount}} {{ list.unit }}</div>
+ <div style="line-height: 45px; text-align: center">
+ {{ list.amount }} {{ list.unit }}
+ </div>
<!-- <span class="card-top-r-t">鐢熶骇瀹屾垚</span>
<span class="card-top-r-b">12鏈�28鏃� 08:24</span> -->
-
</div>
<!-- <div class="card-info-box">棰勮10鍒嗛挓閫佽揪</div> -->
</div>
@@ -309,10 +323,13 @@
</div>
</div> -->
</div>
- </el-carousel-item>
- </el-carousel>
- </div>
+ </el-carousel-item>
+ </el-carousel>
+ <el-button type="primary" class="color_f70f83">
+ <i class="el-icon-phone-outline" />杩愯緭鍛煎彨</el-button
+ >
</div>
+ </div>
</div>
<div class="right">
<div class="right_top">
@@ -341,23 +358,28 @@
</div>
<div class="right_dutyLst">
<div class="right-small-title">褰撳墠鍊肩彮</div>
- <div class='right-person-box'>
- <dl class="right-small-person" v-for="(item,index) in taskData.Procedure.procedure.workers" :key="index">
- <dt>
- <!-- <el-avatar
+ <div class="right-person-box">
+ <dl
+ class="right-small-person"
+ v-for="(item, index) in taskData.Procedure.procedure.workers"
+ :key="index"
+ >
+ <dt>
+ <!-- <el-avatar
class="img-class"
src="https://cube.elemecdn.com/0/88/03b0d39583f48206768a7534e55bcpng.png"
></el-avatar> -->
- <i class="el-icon-s-custom color_green" style='margin:10px;font-size:40px; '/>
- </dt>
- <span
- style="font-size: 20px; font-weight: 600; margin-right: 10px"
- >{{ item.workerName || "" }}</span
- >
- <span style="color: #666">{{
- item.phoneNum || ""
- }}</span>
- </dl>
+ <i
+ class="el-icon-s-custom"
+ style="margin: 10px; font-size: 40px"
+ />
+ </dt>
+ <span
+ style="font-size: 20px; font-weight: 600; margin-right: 10px"
+ >{{ item.workerName || "" }}</span
+ >
+ <span style="color: #666">{{ item.phoneNum || "" }}</span>
+ </dl>
</div>
<!-- <div
style="
@@ -371,32 +393,14 @@
>
缂栧彿锛歿{ taskData.Procedure.procedure.workers.workerId || "" }}
</div> -->
- <div class="right-small-btn">
- <el-button type="primary"> 鎵撳嵃</el-button>
- <el-popover
- placement="top-end"
- width="160"
- class="button-finish"
- v-model="finishShow"
- trigger="click"
- >
- <p>璇风‘璁ゆ槸鍚﹀凡瀹屾垚璇ョ敓浜т换鍔�?</p>
- <div style="text-align: right; margin: 0">
- <el-button size="mini" @click="finishShow = false">
- 鍙栨秷</el-button
- >
- <el-button type="primary" size="mini" @click="finishClick">
- 纭畾</el-button
- >
- </div>
- <el-button type="primary" slot="reference"> 瀹屾垚</el-button>
- </el-popover>
- </div>
</div>
<div class="right_base">
+ <div class="right-small-title" style="line-height:40px;">鐭ヨ瘑搴�</div>
<Knowledge />
<div class="right-base-btn call">
- <el-button type="primary"> 绾㈢伅鍛煎彨</el-button>
+ <el-button type="primary"
+ ><i class="el-icon-phone-outline" /> 绾㈢伅鍛煎彨</el-button
+ >
</div>
</div>
</div>
@@ -452,12 +456,29 @@
progress: 70, //杩涘害
passrate: 30, //鍚堟牸鐜�
production: 25, //鐢熶骇涓�
- finishNumber:0,
+ finishNumber: 0,
// 鍙充晶瀹屾垚
finishShow: false,
- inputMaterials: [],
- outputMaterials:[],
- procedureList:[],
+ inputMaterials: [
+ {
+ amount: 1,
+ materialId: 1,
+ materialName: 1,
+ },
+ ],
+ outputMaterials: [],
+ procedureList: [
+ [
+ {
+ number:10,
+ name:'宸ュ簭'
+ },
+ {
+ number:10,
+ },
+
+ ]
+ ],
taskData: {
Order: {
amount: "",
@@ -477,7 +498,13 @@
procedure: {
deviceId: "",
endTime: "",
- inputMaterials: [],
+ inputMaterials: [
+ {
+ amount: 1,
+ materialId: 1,
+ materialName: 1,
+ },
+ ],
outputMaterials: [],
procedureId: "",
procedureName: "",
@@ -503,36 +530,35 @@
// }, 3000);
this.getTaskInfo();
setInterval(() => {
- this.getProgressInfo()
+ this.getProgressInfo();
}, 60000);
},
methods: {
- getProgressInfo(){
- getProgress().then(res=>{
- if(res.code==200){
-
- }
- })
+ getProgressInfo() {
+ getProgress().then((res) => {
+ if (res.code == 200) {
+ }
+ });
},
- getDateObj (ms) {
- const now = ms ? new Date(ms) : new Date()
- const y = now.getFullYear()
- let m = now.getMonth() + 1
- m = m > 9 ? m : '0' + m
- let d = now.getDate()
- d = d > 9 ? d : '0' + d
- return { y, m, d }
- },
+ getDateObj(ms) {
+ const now = ms ? new Date(ms) : new Date();
+ const y = now.getFullYear();
+ let m = now.getMonth() + 1;
+ m = m > 9 ? m : "0" + m;
+ let d = now.getDate();
+ d = d > 9 ? d : "0" + d;
+ return { y, m, d };
+ },
// 鏍煎紡鍖栨椂闂� ==> yyyy-mm-dd
- formatDate (value, str) {
- if (value) {
- const dateObj = this.getDateObj(value)
- return '' + dateObj.y + '-' + dateObj.m + '-' + dateObj.d
- } else {
- return ''
- }
- },
+ formatDate(value, str) {
+ if (value) {
+ const dateObj = this.getDateObj(value);
+ return "" + dateObj.y + "-" + dateObj.m + "-" + dateObj.d;
+ } else {
+ return "";
+ }
+ },
setInterCard(value, name) {
let height = 200;
let num = 1;
@@ -569,24 +595,29 @@
getTaskInfo() {
getTaskInfo().then((res) => {
if (res.code == 200) {
- this.taskData=res.data;
- this.procedureList.push([{
- name:'宸ュ簭',
- ...this.taskData.Procedure.procedure
- }])
- if(this.taskData.Procedure.ID){
- startTask({id:this.taskData.Procedure.ID}).then(res=>{
- if(res.code==200){
+ this.taskData = res.data;
+ this.procedureList.push([
+ {
+ name: "宸ュ簭",
+ ...this.taskData.Procedure.procedure,
+ },
+ ]);
+ if (this.taskData.Procedure.ID) {
+ startTask({ id: this.taskData.Procedure.ID }).then((res) => {
+ if (res.code == 200) {
// res.data.number
- this.procedureList[0].push({number:res.data.number,name:'宸ヨ壓'})
+ this.procedureList[0].push({
+ number: res.data.number,
+ name: "宸ヨ壓",
+ });
}
- })
+ });
}
- console.log(this.procedureList,'===1111procedureList')
+ console.log(this.procedureList, "===1111procedureList");
// setTimeout(() => {
- this.setInterCard("inputMaterials", "cardBox1");
- // this.setInterCard('procedureList','cardBox2')
- this.setInterCard('outputMaterials','cardBox3')
+ this.setInterCard("inputMaterials", "cardBox1");
+ // this.setInterCard('procedureList','cardBox2')
+ this.setInterCard("outputMaterials", "cardBox3");
// }, 5000);
}
});
@@ -606,10 +637,9 @@
finishClick() {
finishTask({ id: this.taskData.Procedure.ID }).then((res) => {
if (res.code == 200) {
- this.finishShow=false;
- this.getTaskInfo()
+ this.finishShow = false;
+ this.getTaskInfo();
this.$message.success("鎿嶄綔鎴愬姛锛�");
-
}
});
},
@@ -628,11 +658,16 @@
font-size: 30px;
font-weight: 700;
}
+.el-button--primary {
+ border: 0;
+ font-weight: 700 !important;
+ font-size: 16px !important;
+}
.color_4efefa {
color: #4efefa;
}
-.el-carousel__indicators--vertical{
- display:none;
+.el-carousel__indicators--vertical {
+ display: none;
}
.color_blue {
background: #33ccff !important;
@@ -644,26 +679,31 @@
background: #f76c0f !important;
}
.color_f70f83 {
- background: #f70f83 !important;
+ background: #09e5ed !important;
+ color: #333 !important;
}
.bottom_list {
position: relative;
padding: 10px;
width: 30%;
height: 100%;
- background: #111438;
+ border-radius: 6px;
+ background: rgb(22 72 173);
// float:left;
.bottom-title {
font-weight: 600;
- font-size: 16px;
+ font-size: 22px;
height: 30px;
line-height: 30px;
- margin-bottom: 10px;
+ margin-bottom: 30px;
.el-button--primary {
color: #fff;
float: right;
border: 0 !important;
}
+ }
+ .el-button--primary {
+ width: 100%;
}
.call {
background: #4efefa;
@@ -696,27 +736,56 @@
}
.card-box {
width: 100%;
- height: calc(100% - 40px);
+ height: calc(100% - 50px - 50px);
// overflow:auto;
// height:300px;
}
}
.small_title {
- font-size: 20px;
+ font-size: 24px;
font-weight: 600;
+ margin-bottom: 10px;
+}
+.right-small-btn {
+ margin-top: 10px;
+ width: calc(100% - 20px);
+ margin:0 auto;
+ position: absolute;
+ bottom: 10px;
+ left: 10px;
+ overflow: hidden;
+ .el-button--primary {
+ width: 46%;
+ background: #09e5ed;
+ float: left;
+ border-radius: 6px;
+ color: #333;
+ font-weight: 700;
+ font-size: 18px;
+ }
+ .button-finish {
+ width: 46%;
+ float: right;
+ .el-button--primary {
+ width: 100%;
+ background: red;
+ color: #fff;
+ border: 0;
+ }
+ }
}
.home {
width: 100%;
height: 100%;
color: #fff;
- background: rgba(2, 10, 38, 1);
+ background: rgb(19 35 90);
overflow: hidden;
.left {
width: calc(78% - 60px);
height: 100%;
min-height: 100%;
- background: rgba(2, 10, 38, 1);
+ background: rgb(19 35 90);
float: left;
padding: 30px;
padding-top: 20px;
@@ -731,40 +800,45 @@
width: 100%;
margin: 0 auto;
height: 50px;
- display: flex;
flex-wrap: nowrap;
align-content: center;
justify-content: space-around;
align-items: center;
.title-item {
- width: 20%;
+ width: calc(25% - 50px);
+ float: left;
+ margin-right: 10px;
padding: 15px 20px;
text-align: center;
border-radius: 4px;
display: inline-block;
- background: rgba(12, 79, 218, 1);
+ background: rgb(22 72 173);
font-size: 16px;
font-weight: 600;
+ &:nth-last-child(1) {
+ margin-right: 0;
+ }
}
}
.content {
width: 100%;
height: 240px;
- margin: 20px 0px;
+ margin: 30px 0px;
overflow: hidden;
.content_left {
- width: 22%;
+ width: 24%;
height: 100%;
float: left;
// padding:2%;
.content-top {
- background: hsl(225, 85%, 67%);
- height: calc(50% - 25px);
+ background: rgb(22 72 173);
+ height: calc(50% - 30px);
padding-top: 20px;
text-align: center;
line-height: 30px;
+ border-radius: 6px;
&:nth-of-type(1) {
- margin-bottom: 10px;
+ margin-bottom: 20px;
}
}
.content_leftBttom {
@@ -788,9 +862,12 @@
height: 100%;
float: right;
padding: 0 10px;
+ background: rgb(22 72 173);
+ border-radius: 6px;
// background: #233b9e;
.el-descriptions__body {
background: transparent;
+ font-size: 18px;
}
.el-descriptions__table {
width: 100%;
@@ -810,7 +887,7 @@
.bottom {
width: 100%;
- height: calc(100% - 470px);
+ height: calc(100% - 500px);
display: flex;
flex-wrap: nowrap;
align-content: center;
@@ -819,114 +896,122 @@
margin-top: 20px;
// position: relative;
- .card {
- width: 100%;
- height: 70px;
- // border: 1px solid #ccc;
- background: #ffff;
+ .card {
+ width: 100%;
+ height: 70px;
+ // border: 1px solid #ccc;
+ background: #6b83ff;
+ border-radius: 5px;
+ margin-top: 20px;
+ color: #333;
+ position: relative;
+ .card_top-2,
+ .card_top-3 {
+ width: 50%;
+ height: 45px;
border-radius: 5px;
- margin-top: 10px;
- color: #333;
- position: relative;
- .card_top-2,
- .card_top-3 {
- width: 50%;
- height: 45px;
- border-radius: 5px;
- background: #fff;
- font-size: 12px;
- float: left;
- .card-top-r-t {
- width: 100%;
- text-align: center;
- display: inline-block;
- height: 20px;
- line-height: 20px;
- margin-top: 3px;
- }
- .card-top-r-b {
- width: 100%;
- height: 20px;
- line-height: 20px;
- text-align: center;
- display: inline-block;
- }
- }
- .card_top-3 {
- background: #f2f2f2;
- .card-top-r-t {
- width: 90%;
-
- margin: 0 auto;
- margin-bottom: 5px;
- display: block;
- text-align: left;
- }
- .card-top-r-b {
- width: 90%;
- display: block;
- margin: 0 auto;
- }
- }
-
- .card_top,
- .card_top-4 {
- width: 50%;
- height: 45px;
- border-radius: 5px;
- background: #f2f2f2;
- font-size: 12px;
- line-height: 45px;
- float: left;
-
- > div {
- margin-left: 12px;
- position: relative;
- p {
- position: absolute;
- top: -14px;
- right: 15px;
- font-size: 14px;
- }
- }
- }
- .card_top-4 {
- width: calc(100% - 20px);
- padding: 0 10px;
- line-height: 20px;
- }
- .card-info-box {
- position: absolute;
- background: red;
- border-radius: 6px;
- font-size: 12px;
- color: #fff;
- padding: 3px 5px;
- top: 3px;
- right: 40px;
- }
- .card_content {
+ background: #6b83ff;
+ font-size: 12px;
+ color: #fff;
+ float: left;
+ .card-top-r-t {
width: 100%;
- border-radius: 5px;
- height: 25px;
- // background: #4765c0;
- .card_contentLeft {
- width: calc(100% - 10px);
- height: 25px;
- line-height: 25px;
- font-size: 12px;
- padding: 0 5px;
- border-radius: 5px 5px 0 0;
- background: #ffcc33;
- }
+ text-align: center;
+ display: inline-block;
+ height: 20px;
+ line-height: 20px;
+ margin-top: 3px;
+ }
+ .card-top-r-b {
+ width: 100%;
+ height: 20px;
+ line-height: 20px;
+ text-align: center;
+ display: inline-block;
+ }
+ }
+ .card_top-3 {
+ color: #fff;
+ .card-top-r-t {
+ width: 90%;
- .card_contentRight {
- width: 100%;
- height: 38%;
- font-size: 12px;
+ margin: 0 auto;
+ margin-bottom: 5px;
+ display: block;
+ text-align: left;
+ }
+ .card-top-r-b {
+ width: 90%;
+ display: block;
+ margin: 0 auto;
+ }
+ }
+
+ .card_top,
+ .card_top-4 {
+ width: 50%;
+ height: 45px;
+ border-radius: 5px;
+ background: #6b83ff;
+ color: #fff;
+ font-size: 12px;
+ line-height: 45px;
+ float: left;
+
+ > div {
+ margin-left: 12px;
+ position: relative;
+ p {
+ position: absolute;
+ top: -14px;
+ right: 15px;
+ font-size: 14px;
}
}
}
+ .card_top-4 {
+ width: calc(100% - 20px);
+ padding: 0 10px;
+ height: 70px;
+
+ line-height: 40px;
+ color: #fff;
+ background: rgb(19, 35, 90);
+ font-size:20px;
+ }
+ .card-info-box {
+ position: absolute;
+ background: red;
+ border-radius: 6px;
+ font-size: 12px;
+ color: #fff;
+ padding: 3px 5px;
+ top: 3px;
+ right: 40px;
+ }
+ .card_content {
+ width: 100%;
+ border-radius: 5px;
+ height: 25px;
+ // background: #4765c0;
+ .card_contentLeft {
+ width: calc(100% - 10px);
+ height: 25px;
+ line-height: 25px;
+ font-size: 12px;
+ padding: 0 5px;
+ color: #fff;
+ border-radius: 5px 5px 0 0;
+ background: rgb(19, 35, 90);
+ }
+
+ .card_contentRight {
+ width: 100%;
+ height: 38%;
+ font-size: 12px;
+ }
+ }
+ }
}
}
.right {
@@ -997,8 +1082,8 @@
width: 100%;
.el-button--primary {
width: 100%;
- background: #fff;
- color: #4765c0;
+ background: #09e5ed;
+ color: #333;
font-weight: 700;
font-size: 18px;
}
@@ -1009,37 +1094,36 @@
border-radius: 4px;
line-height: 30px;
overflow: hidden;
- background: #00cc66;
+ // background: #00cc66;
margin-top: 10px;
padding: 5px 10px;
- position:relative;
+ position: relative;
.right-small-title {
width: auto;
padding: 5px;
- font-size: 14px;
- float: right;
+ font-size: 18px;
+ // float: left;
border-radius: 8px;
- background: #007101;
+ // background: #007101;
}
- .right-person-box{
- width:100%;
- height:calc(100% - 100px);
- overflow:auto;
- margin-top:20px;
+ .right-person-box {
+ width: 100%;
+ height: calc(100% - 40px);
+ overflow: auto;
+ margin-top: -10px;
}
.right-small-person {
width: 100%;
height: 60px;
line-height: 60px;
- margin-bottom:10px;
+ margin-bottom: 10px;
border-radius: 10px;
- background: #fff;
- color: #333;
-
+ background: rgb(19, 35, 90);
+ color: #fff;
dt {
float: left;
-
+
margin-right: 10px;
.img-class {
height: 50px;
@@ -1051,42 +1135,18 @@
padding-top: 10px;
}
}
- .right-small-btn {
- margin-top: 10px;
- width: 100%;
- position:absolute;
- bottom:10px;
- left:0;
- overflow: hidden;
- .el-button--primary {
- width: 46%;
- background: #fff;
- float: left;
- border-radius: 6px;
- color: #4765c0;
- font-weight: 700;
- font-size: 18px;
- }
- .button-finish {
- width: 46%;
- float: right;
- .el-button--primary {
- width: 100%;
- }
- }
- }
}
.right_base {
width: 100%;
height: calc(100% - 520px);
- min-height:200px;
+ min-height: 200px;
// overflow-y:auto;
position: relative;
.right-base-btn {
- width:100%;
- position:absolute;
- bottom:0;
- left:0;
+ width: 100%;
+ position: absolute;
+ bottom: 0;
+ left: 0;
.el-button--primary {
width: 100%;
background: #ff0000;
--
Gitblit v1.8.0