From 8ddce4804fcc5c71793b6328bb8601e33fad8a66 Mon Sep 17 00:00:00 2001
From: loulijun2021 <1694218219@qq.com>
Date: 星期五, 12 八月 2022 10:58:03 +0800
Subject: [PATCH] 1.修改看板标题名称2.缺陷定义导入
---
src/views/zlgl/qxdy.vue | 26 +++++++++++++++++++++++---
src/views/kb/cgdd.vue | 10 +++++-----
src/views/kb/ckgl.vue | 10 +++++-----
src/views/kb/zhkb.vue | 8 ++++----
src/utils/myEcharts.js | 2 +-
5 files changed, 38 insertions(+), 18 deletions(-)
diff --git a/src/utils/myEcharts.js b/src/utils/myEcharts.js
index 6267536..45a849a 100644
--- a/src/utils/myEcharts.js
+++ b/src/utils/myEcharts.js
@@ -504,7 +504,7 @@
},
title: {
text: titleText,
- x: '73%',
+ x: '66%',
y: '2%',
textStyle: {
// color: '#fff',
diff --git a/src/views/kb/cgdd.vue b/src/views/kb/cgdd.vue
index d4d0744..fc1bf15 100644
--- a/src/views/kb/cgdd.vue
+++ b/src/views/kb/cgdd.vue
@@ -19,17 +19,17 @@
<div class="content01">
<div class="pic01" />
<div class="number">{{ purchaseLeftTopData.ThisMonthPurchaseArrivalOrderCont }}</div>
- <div class="text">鏈湀閲囪喘鍗曟暟</div>
+ <div class="text">鏈湀閲囪喘璁㈠崟鏁�</div>
</div>
<div class="content01">
<div class="pic01" />
<div class="number">{{ purchaseLeftTopData.ThisMonthPurchaseOrderCont }}</div>
- <div class="text">鏈湀杩涜揣鍗曟暟</div>
+ <div class="text">鏈湀鍒拌揣鍗曟暟</div>
</div>
<div class="content01">
<div class="pic01" />
<div class="number">{{ purchaseLeftTopData.ThisMonthWareHouseOrderCont }}</div>
- <div class="text">鏈湀鍏ュ簱鍗曟暟</div>
+ <div class="text">鏈湀閲囪喘鍏ュ簱鍗曟暟</div>
<!-- <div id="pie01" ref="pie01" class="pie01" />-->
<!-- <div class="text" style="margin-top: -10px">褰撴湀寤舵湡鍗犳瘮</div>-->
</div>
@@ -39,7 +39,7 @@
<!-- 2-->
<div class="kb_left_bottom kb_pd10">
<div class="kb_left_bottom_content">
- <div class="content_head">鎴戞槸鏍囬锛�</div>
+ <div class="content_head">閲囪喘鍒拌揣璺熻釜锛�</div>
<div class="content_body">
<el-table
ref="tableData"
@@ -183,7 +183,7 @@
/>
<el-table-column
prop="cont"
- label="鏁伴噺"
+ label="寤舵湡娆℃暟"
width="125"
/>
</el-table>
diff --git a/src/views/kb/ckgl.vue b/src/views/kb/ckgl.vue
index 0377a2c..e99ab7f 100644
--- a/src/views/kb/ckgl.vue
+++ b/src/views/kb/ckgl.vue
@@ -16,7 +16,7 @@
<!-- 1-->
<div class="kb_left_top kb_pd10">
<div class="kb_left_top_block">
- <div class="headTitle">鎴愬搧鍏ュ簱鍗曪細</div>
+ <div class="headTitle">浜у搧寰呭叆搴擄細</div>
<div class="content">
<el-table
:data="tableData"
@@ -99,7 +99,7 @@
</div>
</div>
<div class="kb_left_top_block">
- <div class="headTitle">鎴愬搧鍑哄簱鍗曪細</div>
+ <div class="headTitle">浜у搧寰呭彂璐э細</div>
<div class="content">
<el-table
:data="tableData"
@@ -194,7 +194,7 @@
</div>
</div>
</div>
- <div class="kb_right kb_pd10">
+ <div v-if="false" class="kb_right kb_pd10">
<div class="kb_right_top kb_pd10">
<div class="kb_right_top_content">
<div class="content_head">搴撳瓨鎺掕锛�</div>
@@ -438,8 +438,8 @@
// 鑾峰彇echarts
getEcharts() {
- loadEcharts('bar03', bar03('鏈懆鍏ュ簱閲忔眹鎬�'))
- loadEcharts('bar04', bar03('鏈懆鍑鸿揣閲忔眹鎬�'))
+ loadEcharts('bar03', bar03('浜у搧搴撳瓨閲忔帓琛孴op5'))
+ loadEcharts('bar04', bar03('鍘熸枡搴撳瓨閲忔帓琛孴op5'))
},
// 鑾峰彇褰撳墠鏃堕棿
diff --git a/src/views/kb/zhkb.vue b/src/views/kb/zhkb.vue
index 5dd2d34..2e1b1f3 100644
--- a/src/views/kb/zhkb.vue
+++ b/src/views/kb/zhkb.vue
@@ -17,7 +17,7 @@
<div class="kb_left_top_title01">
<!-- <div class="PG01" />-->
<!-- <svg-icon icon-class="sccx" />-->
- 鐢熶骇浜х嚎锛�
+ 浜х嚎鍔犲伐涓换鍔★細
</div>
<div class="kb_left_top kb_pd10">
@@ -356,7 +356,7 @@
<!-- 2-->
<div class="kb_left_bottom kb_pd10">
<div class="kb_left_bottom_content">
- <div class="content_head">鍦ㄥ埗璁㈠崟锛�</div>
+ <div class="content_head">浜х嚎鍔犲伐浠诲姟锛�</div>
<div class="content_body">
<el-table
ref="tableData"
@@ -466,7 +466,7 @@
<div class="kb_right kb_pd10">
<div class="kb_right_top kb_pd10">
<div class="kb_right_top_content">
- <div class="content_head">褰撴棩杞﹂棿浜х嚎浜у搧鏁伴噺鎺掕锛�</div>
+ <div class="content_head">褰撴棩瀹屽伐浜у搧鏁伴噺鎺掕锛�</div>
<div class="content_body">
<el-table
ref="tableDataRank"
@@ -508,7 +508,7 @@
</div>
<div class="kb_right_bottom kb_pd10">
<div class="kb_right_bottom_content_title">
- 涓�鍛ㄥ唴Top5涓嶈壇锛�
+ 涓�鍛ㄤ笉鑹疶op5锛�
</div>
<div class="kb_right_bottom_content">
<div id="bar02" style="width: 100%;height:100%" />
diff --git a/src/views/zlgl/qxdy.vue b/src/views/zlgl/qxdy.vue
index 0e4f587..f5e3314 100644
--- a/src/views/zlgl/qxdy.vue
+++ b/src/views/zlgl/qxdy.vue
@@ -4,7 +4,7 @@
<div class="bodyTopButtonGroup">
<el-button type="primary" icon="el-icon-circle-plus-outline" @click="add('add')">鏂板</el-button>
- <!-- <el-button type="primary" icon="el-icon-upload2" @click="upload">瀵煎叆</el-button>-->
+ <el-button icon="el-icon-download" @click="upload">瀵煎叆</el-button>
</div>
<div class="bodyTopFormGroup">
<el-form
@@ -138,18 +138,23 @@
</div>
</span>
</el-dialog>
+
+ <!--瀵煎叆缁勪欢-->
+ <import-picker ref="importPickerFunc" class="importPickerClass" :shows.sync="shows" :title="title_value" :colos="colos" :code="code" />
+
</div>
</template>
<script>
import Pagination from '@/components/Pagination'
import { AddUpdateDedect, DedectSearch, DeleteDedect } from '@/api/zlgl'
+import ImportPicker from '@/components/ImportPicker'
const SER_HZ = /^[\u4e00-\u9fa5]+$/
export default {
name: 'QXDY',
components: {
- Pagination
+ Pagination, ImportPicker
},
data() {
const validateName = (rule, value, callback) => {
@@ -191,6 +196,16 @@
defectname: [
{ required: true, message: '璇疯緭鍏ョ己闄峰悕绉�', trigger: ['blur', 'change'] }
]
+ },
+ title_value: '鏁版嵁瀵煎叆 / 缂洪櫡瀹氫箟',
+ code: '18',
+ shows: false
+ }
+ },
+ watch: {
+ shows() {
+ if (!this.shows) {
+ this.getDedectSearch()
}
}
},
@@ -224,8 +239,13 @@
search() {
this.getDedectSearch()
},
+ // 瀵煎叆鎸夐挳
upload() {
-
+ this.shows = true
+ this.$refs.importPickerFunc.newDataFunc()
+ },
+ colos() {
+ this.shows = false
},
// 閲嶇疆
reset() {
--
Gitblit v1.9.3