From cf91288ecebb860a48f885261fb3620059fbfb16 Mon Sep 17 00:00:00 2001
From: xiangpei <xiangpei@timesnew.cn>
Date: 星期五, 26 四月 2024 13:45:23 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/permission.js | 2
src/views/login.vue | 6
src/views/system/result/detail/index1.vue | 87 ++++++-------
src/views/system/score/default/index.vue | 198 +++++++++++---------------------
src/views/system/work-order/index.vue | 8
5 files changed, 116 insertions(+), 185 deletions(-)
diff --git a/src/permission.js b/src/permission.js
index 5f5442a..45c6285 100644
--- a/src/permission.js
+++ b/src/permission.js
@@ -8,7 +8,7 @@
NProgress.configure({ showSpinner: false })
-const whiteList = ['/login', '/register','/screen']
+const whiteList = ['/login', '/register']
router.beforeEach((to, from, next) => {
NProgress.start()
diff --git a/src/views/login.vue b/src/views/login.vue
index 623456e..79d950a 100644
--- a/src/views/login.vue
+++ b/src/views/login.vue
@@ -191,9 +191,9 @@
this.loginInfo = loginInfo.user
//濡傛灉杩斿洖涓�1姝ｅ父璺宠浆
if (this.loginInfo.firstLogin == 1) {
- this.$router.push({ path: "/" }).catch(() => { });
- return;
- this.$router.push({ path: this.redirect || "/" }).catch(() => { });
+ // this.$router.push({ path: "/" }).catch(() => { });
+ // return;
+ this.$router.push({ path: this.redirect || "/screen" }).catch(() => { });
} else {
localStorage.setItem('firstLogin', 0)
}
diff --git a/src/views/system/result/detail/index1.vue b/src/views/system/result/detail/index1.vue
index 44b2338..f0f402b 100644
--- a/src/views/system/result/detail/index1.vue
+++ b/src/views/system/result/detail/index1.vue
@@ -3,8 +3,8 @@
<div>
<el-menu :default-active="activeIndex" class="el-menu-demo" mode="horizontal" @select="handleSelect"
style="margin-bottom: 10px">
- <el-menu-item index="1">鐪佸巺鑰冩牳</el-menu-item>
- <el-menu-item index="2">鍖哄煙鑰冩牳</el-menu-item>
+ <el-menu-item index="0">鐪佸巺鑰冩牳</el-menu-item>
+ <el-menu-item index="1">鍖哄煙鑰冩牳</el-menu-item>
</el-menu>
</div>
@@ -63,8 +63,9 @@
</div>
<div style="text-align: right; margin-top: 10px">
- <el-pagination @size-change="handleSizeChange" @current-change="handleCurrentChange" :current-page="currentPage4"
- :page-sizes="[5, 10, 20]" :page-size="5" layout="total, sizes, prev, pager, next, jumper" :total="4">
+ <el-pagination @size-change="handleSizeChange" @current-change="handleCurrentChange"
+ :current-page="queryParams.pageNum" :page-sizes="[10, 20, 50]" :page-size="queryParams.pageSize"
+ layout="total, sizes, prev, pager, next, jumper" :total="tableData.length">
</el-pagination>
</div>
@@ -83,38 +84,18 @@
dicts: ['platform_examine_use', 'platform_examine_category'],
data() {
return {
- activeIndex: '1',
- activeIndex2: '2',
+ activeIndex: '0',
areaList: [],
date: '',
dateRange: '',
- company: '',
queryParams: {
pageNum: 1,
pageSize: 10,
deptId: null,
+ examinTag:0
},
- dataList: [
- {
- name: '鍏ㄩ儴',
- complete: {
- '4.5': 95.5, '4.6': 95.3, '4.7': 96.0, '4.8': 97.2, '4.9': 96.5,
- '4.10': 95.5, '4.11': 95.3, '4.12': 96.0, '4.13': 97.2, '4.14': 96.5,
- '4.15': 95.5, '4.16': 95.3, '4.17': 96.0, '4.18': 97.2, '4.19': 96.5,
- '4.20': 95.5, '4.21': 95.3, '4.22': 96.0, '4.23': 97.2, '4.24': 96.5,
- '4.25': 95.5, '4.26': 95.3, '4.27': 96.0, '4.28': 97.2, '4.29': 96.5
- },
- waiting: {
- '4.5': 94.8, '4.6': 91.3, '4.7': 95.3, '4.8': 92.3, '4.9': 93.3,
- '4.10': 94.8, '4.11': 91.3, '4.12': 95.3, '4.13': 92.3, '4.14': 93.3
- },
- pending: {
- '4.5': 91.6, '4.6': 92.6, '4.7': 93.7, '4.8': 94.0, '4.9': 95.9
- , '4.10': 91.6, '4.11': 92.6, '4.12': 93.7, '4.13': 94.0, '4.14': 95.9
- }
- }
- ],
tableData: [],
+ loading: false,
searchForm: {
time: null,
}
@@ -130,13 +111,11 @@
const year = date.getFullYear();
const month = (date.getMonth() + 1) >= 10 ? date.getMonth() + 1 : '0' + (date.getMonth() + 1);
this.date = year + '-' + month;
- console.log(this.date);
this.queryParams.date = this.date;
- this.getList(this.$route.query.index);
this.areaSelect();
},
computed: {
- ...mapState('dict', ['dict'])
+
},
methods: {
// 鍖哄煙涓嬫媺鏁版嵁
@@ -151,16 +130,17 @@
},
/** 瀵艰埅鍒囨崲 */
handleSelect(key) {
- this.activeIndex = key; // 鏇存柊褰撳墠婵�娲荤殑鑿滃崟椤�
- this.getList();
+ this.activeIndex = key;
+ this.queryParams.examinTag = key;
+ this.getList(this.queryParams.deptId);
},
/** 鏌ヨ鑰冩牳妯℃澘鍒楄〃 */
getList(deptId) {
this.loading = true;
+ lineChart.showLoading();
listScore(this.queryParams).then(response => {
this.tableData = response.data[deptId];
this.loading = false;
-
this.initChart(response.data[deptId]);
});
},
@@ -204,7 +184,7 @@
series: [
{
name: '杞﹁締鑰冩牳',
- data: this.filterData(dataList,0),
+ data: this.filterData(dataList, 0),
type: 'line',
itemStyle: {
color: 'rgba(62, 144, 247, 1)'
@@ -212,7 +192,7 @@
},
{
name: '浜鸿劯鑰冩牳',
- data: this.filterData(dataList,1),
+ data: this.filterData(dataList, 1),
type: 'line',
itemStyle: {
color: 'rgba(85, 192, 191, 1)'
@@ -220,7 +200,7 @@
},
{
name: '瑙嗛鑰冩牳',
- data: this.filterData(dataList,2),
+ data: this.filterData(dataList, 2),
type: 'line',
itemStyle: {
color: 'rgba(255, 165, 0, 1)'
@@ -229,30 +209,47 @@
]
};
lineChart.setOption(option, true);
+ lineChart.hideLoading();
},
groupByData(data) {
- if(!data) return [];
+ if (!data) return this.getAllDay().map((item) => [item, []]);
const tempGroup = {};
data.forEach((item) => {
- const { createTime } = item;
+ let { createTime } = item;
+ let tempTime = createTime.split('-');
+ createTime = tempTime[1] + '-' + tempTime[2];
if (!tempGroup[createTime]) {
tempGroup[createTime] = [];
}
tempGroup[createTime].push(item);
})
const tempArray = Object.entries(tempGroup).sort(([keyA], [keyB]) => new Date([keyA]) - new Date([keyB]));
-
return tempArray;
},
- filterData(data,tag) {
- if(!data) return [0];
+ filterData(data, tag) {
const scoreList = data.map((item) => {
let temp = item[1].find((exam) => exam.examineCategory === tag);
- return temp.score;
+ if (temp) {
+ return temp.score;
+ } else {
+ return;
+ }
});
- console.log(scoreList);
return scoreList;
+ },
+
+ getAllDay() {
+ const currentDate = this.date.split('-');
+ const currentYear = currentDate[0];
+ const currentMonth = currentDate[1];
+ const daysInMonth = new Date(currentYear, currentMonth, 0).getDate();
+ const datesOfMonth = [];
+ for (var day = 1; day <= daysInMonth; day++) {
+ const formattedDate = currentMonth + '-' + (day.toString().padStart(2, '0'));
+ datesOfMonth.push(formattedDate);
+ }
+ return datesOfMonth;
},
// 鐩戝惉鍙樺寲
@@ -279,10 +276,8 @@
},
mounted() {
- this.acitveData = this.dataList[0];
- this.company = this.acitveData.name;
lineChart = echarts.init(this.$refs.chartContent);
- this.initChart();
+ this.getList(this.$route.query.index);
this.observe();
},
beforeDestroy() {
diff --git a/src/views/system/score/default/index.vue b/src/views/system/score/default/index.vue
index 2a2670e..538e637 100644
--- a/src/views/system/score/default/index.vue
+++ b/src/views/system/score/default/index.vue
@@ -3,36 +3,18 @@
<el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="100px">
<el-form-item label="杩愮淮鑰冩牳鍗曚綅" prop="belongUnit">
<el-select v-model="queryParams.unitId" @change="handleQuery" clearable placeholder="杩愮淮鑰冩牳鍗曚綅">
- <el-option
- v-for="item in unitList"
- :key="item.id"
- :label="item.value"
- :value="item.id">
+ <el-option v-for="item in unitList" :key="item.id" :label="item.value" :value="item.id">
</el-option>
</el-select>
</el-form-item>
<el-form-item label="瀹℃牳鏃堕棿">
- <el-date-picker
- v-model="daterangeAuditingTime"
- style="width: 240px"
- value-format="yyyy-MM-dd HH:mm:ss"
- type="daterange"
- range-separator="-"
- start-placeholder="寮�濮嬫棩鏈�"
- end-placeholder="缁撴潫鏃ユ湡"
- ></el-date-picker>
+ <el-date-picker v-model="daterangeAuditingTime" style="width: 240px" value-format="yyyy-MM-dd HH:mm:ss"
+ type="daterange" range-separator="-" start-placeholder="寮�濮嬫棩鏈�" end-placeholder="缁撴潫鏃ユ湡"></el-date-picker>
</el-form-item>
<el-form-item label="鍒涘缓鏃堕棿">
- <el-date-picker
- v-model="daterangeCreateTime"
- style="width: 240px"
- value-format="yyyy-MM-dd HH:mm:ss"
- type="daterange"
- range-separator="-"
- start-placeholder="寮�濮嬫棩鏈�"
- end-placeholder="缁撴潫鏃ユ湡"
- ></el-date-picker>
+ <el-date-picker v-model="daterangeCreateTime" style="width: 240px" value-format="yyyy-MM-dd HH:mm:ss"
+ type="daterange" range-separator="-" start-placeholder="寮�濮嬫棩鏈�" end-placeholder="缁撴潫鏃ユ湡"></el-date-picker>
</el-form-item>
<el-form-item>
<el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">鎼滅储</el-button>
@@ -42,123 +24,76 @@
<el-row :gutter="10" class="mb8">
<el-col :span="1.5">
- <el-button
- type="primary"
- plain
- icon="el-icon-plus"
- size="mini"
- @click="handleAdd"
- v-hasPermi="['platform:score:add']"
- >鏂板</el-button>
+ <el-button type="primary" plain icon="el-icon-plus" size="mini" @click="handleAdd"
+ v-hasPermi="['platform:score:add']">鏂板</el-button>
</el-col>
<el-col :span="1.5">
- <el-button
- type="success"
- plain
- icon="el-icon-edit"
- size="mini"
- :disabled="single"
- @click="handleUpdate"
- v-hasPermi="['platform:score:edit']"
- >淇敼</el-button>
+ <el-button type="success" plain icon="el-icon-edit" size="mini" :disabled="single" @click="handleUpdate"
+ v-hasPermi="['platform:score:edit']">淇敼</el-button>
</el-col>
<el-col :span="1.5">
- <el-button
- type="danger"
- plain
- icon="el-icon-delete"
- size="mini"
- :disabled="multiple"
- @click="handleDelete"
- v-hasPermi="['platform:score:remove']"
- >鍒犻櫎</el-button>
+ <el-button type="danger" plain icon="el-icon-delete" size="mini" :disabled="multiple" @click="handleDelete"
+ v-hasPermi="['platform:score:remove']">鍒犻櫎</el-button>
</el-col>
<el-col :span="1.5">
- <el-button
- type="warning"
- plain
- icon="el-icon-download"
- size="mini"
- @click="handleExport"
- v-hasPermi="['platform:score:export']"
- >瀵煎嚭</el-button>
+ <el-button type="warning" plain icon="el-icon-download" size="mini" @click="handleExport"
+ v-hasPermi="['platform:score:export']">瀵煎嚭</el-button>
</el-col>
<right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
</el-row>
<el-table v-loading="loading" :data="auditingList" @selection-change="handleSelectionChange">
<el-table-column type="selection" width="55" align="center" />
- <el-table-column label="鑰冩牳鍗曚綅" align="center" prop="unitName" width="180"/>
+ <el-table-column label="鑰冩牳鍗曚綅" align="center" prop="unitName" width="180" />
<el-table-column label="鑰冩牳鍚堝悓" align="center" prop="contractName" width="180" />
- <el-table-column label="鑰冩牳瑙勫垯" align="center" prop="ruleName" width="120" :show-overflow-tooltip="true"/>
+ <el-table-column label="鑰冩牳瑙勫垯" align="center" prop="ruleName" width="120" :show-overflow-tooltip="true" />
<el-table-column label="鑰冩牳鎸囨爣" align="center" prop="num" width="120" />
<el-table-column label="鑰冩牳鎵ｅ垎" align="center" prop="score" width="120" />
<el-table-column label="鍒涘缓浜�" align="center" prop="createUser" />
<el-table-column label="瀹℃牳鐘舵��" align="center" prop="auditingStatus">
<template slot-scope="scope">
- <el-tag
- :type="scope.row.auditingStatus === '閫氳繃' ? 'success' : scope.row.auditingStatus === '鏈�氳繃' ? 'danger' : 'primary'"
- disable-transitions>{{scope.row.auditingStatus}}</el-tag>
- </template>
+ <el-tag
+ :type="scope.row.auditingStatus === '閫氳繃' ? 'success' : scope.row.auditingStatus === '鏈�氳繃' ? 'danger' : 'primary'"
+ disable-transitions>{{ scope.row.auditingStatus }}</el-tag>
+ </template>
</el-table-column>
<el-table-column label="瀹℃牳浜�" align="center" prop="auditingUser" />
<el-table-column label="鎿嶄綔" align="center" fixed="right" class-name="small-padding fixed-width">
<template slot-scope="scope">
- <el-button
- size="mini"
- type="text"
- icon="el-icon-s-check"
- @click="handleAuditing(scope.row)"
- v-hasPermi="['default:audit']"
- v-if="scope.row.auditingStatus === '寰呭鏍�'"
- >瀹℃牳</el-button>
- <el-button
- size="mini"
- type="text"
- icon="el-icon-edit"
- @click="handleUpdate(scope.row)"
- v-hasPermi="['system:auditing:edit']"
- >淇敼</el-button>
- <el-button
- size="mini"
- type="text"
- icon="el-icon-delete"
- @click="handleDelete(scope.row)"
- >鍒犻櫎</el-button>
+ <el-button size="mini" type="text" icon="el-icon-s-check" @click="handleAuditing(scope.row)"
+ v-hasPermi="['default:audit']" v-if="scope.row.auditingStatus === '寰呭鏍�'">瀹℃牳</el-button>
+ <el-button size="mini" type="text" icon="el-icon-edit" @click="handleUpdate(scope.row)"
+ v-if="scope.row.auditingStatus === '寰呭鏍�'" v-hasPermi="['system:auditing:edit']">淇敼</el-button>
+ <el-button size="mini" type="text" icon="el-icon-delete" @click="handleDelete(scope.row)">鍒犻櫎</el-button>
</template>
</el-table-column>
</el-table>
- <pagination
- v-show="total>0"
- :total="total"
- :page.sync="queryParams.pageNum"
- :limit.sync="queryParams.pageSize"
- @pagination="getList"
- />
+ <pagination v-show="total > 0" :total="total" :page.sync="queryParams.pageNum" :limit.sync="queryParams.pageSize"
+ @pagination="getList" />
<!-- 瀹℃牳 -->
<el-dialog title="杩愮淮鑰冩牳瀹℃牳" :visible.sync="auditingOpen" width="500px" append-to-body>
<el-form ref="auditingForm" :model="auditingForm" :rules="auditingRules" label-width="120px">
<el-form-item label="杩愮淮鑰冩牳鍗曚綅">
- <el-input v-model="auditingForm.unitName" disabled/>
+ <el-input v-model="auditingForm.unitName" disabled />
</el-form-item>
<el-form-item label="杩愮淮鑰冩牳瑙勫垯">
- <el-input v-model="auditingForm.ruleName" type="textarea" autosize disabled/>
+ <el-input v-model="auditingForm.ruleName" type="textarea" autosize disabled />
</el-form-item>
<el-form-item label="杩愮淮鑰冩牳鎸囨爣">
- <el-input v-model="auditingForm.num" disabled/>
+ <el-input v-model="auditingForm.num" disabled />
</el-form-item>
<el-form-item label="杩愮淮鑰冩牳鎵ｅ垎">
- <el-input v-model="auditingForm.score" disabled/>
+ <el-input v-model="auditingForm.score" disabled />
</el-form-item>
<el-form-item label="瀹℃牳缁撴灉" prop="auditingStatus">
<el-radio v-model="auditingForm.auditingStatus" label="閫氳繃">閫氳繃</el-radio>
<el-radio v-model="auditingForm.auditingStatus" label="鏈�氳繃">椹冲洖</el-radio>
</el-form-item>
<el-form-item label="瀹℃牳璇存槑" prop="remark">
- <el-input v-model="auditingForm.remark" type="textarea" show-word-limit maxlength="100"/>
+ <el-input v-model="auditingForm.remark" type="textarea" show-word-limit maxlength="100" />
</el-form-item>
</el-form>
<div slot="footer" class="dialog-footer">
@@ -172,12 +107,8 @@
<el-form ref="form" :model="form" :rules="rules" label-width="120px">
<el-form-item label="杩愮淮鑰冩牳鍗曚綅" prop="unitId">
<el-select v-model="form.unitId" placeholder="杩愮淮鑰冩牳鍗曚綅" @change="handleChangeUnit">
- <el-option
- v-for="item in unitList"
- :key="item.id"
- :label="item.value"
- :value="item.id">
- </el-option>
+ <el-option v-for="item in unitList" :key="item.id" :label="item.value" :value="item.id">
+ </el-option>
</el-select>
</el-form-item>
<el-form-item label="杩愮淮鑰冩牳瑙勫垯" prop="ruleIdsArray">
@@ -186,19 +117,11 @@
<div class="row-left">
<div class="block">
<span class="demonstration"></span>
- <el-cascader
- ref="cascader"
- v-model="form.ruleIdsArray"
- :options="options"
- @change="handleChange">
+ <el-cascader ref="cascader" v-model="form.ruleIdsArray" :options="options" @change="handleChange">
<template slot-scope="{ data }">
- <el-tooltip
- class="item"
- :disabled="data.label.length < 16 && !data.deductCategory"
- effect="dark"
+ <el-tooltip class="item" :disabled="data.label.length < 16 && !data.deductCategory" effect="dark"
:content="data.label.length < 16 ? data.deductCategory ? data.deductCategory + ' ' + data.calcFraction + (data.calcUnit ? '/' + data.calcUnit : '') : '' : (data.deductCategory ? data.label + ' ' + data.deductCategory + ' ' + data.calcFraction + (data.calcUnit ? '/' + data.calcUnit : '') : data.label)"
- placement="left"
- >
+ placement="left">
<span>{{ data.label }}</span>
</el-tooltip>
</template>
@@ -208,7 +131,7 @@
<div class="row-right" v-if="needNum">
<div>鎸囨爣</div>
<div class="margin-5">
- <el-input placeholder="璇疯緭鍏�" v-model="form.num" @input="handleChangeNum"/>
+ <el-input placeholder="璇疯緭鍏�" v-model="form.num" @input="handleChangeNum" />
</div>
</div>
</div>
@@ -242,8 +165,8 @@
unitList: [],
// 鑰冩牳妯℃澘
examineList: [
- {id:1 , value:"杞﹁締鑰冩牳"},
- {id:2 , value:"瑙嗛鑰冩牳"}
+ { id: 1, value: "杞﹁締鑰冩牳" },
+ { id: 2, value: "瑙嗛鑰冩牳" }
],
// 閬僵灞�
loading: true,
@@ -279,12 +202,15 @@
createTime: null,
},
// 琛ㄥ崟鍙傛暟
- form: {},
+ form: {
+ score: '',
+ temp: ''
+ },
// 琛ㄥ崟鏍￠獙
auditingRules: {
auditingStatus: [
- { required: true, message: "璇峰厛瀹屾垚瀹℃牳缁撴灉", trigger: "blur", },
- {
+ { required: true, message: "璇峰厛瀹屾垚瀹℃牳缁撴灉", trigger: "blur", },
+ {
validator: (rule, value, callback) => {
if (value === '寰呭鏍�') {
callback(new Error("璇峰厛瀹屾垚瀹℃牳缁撴灉"));
@@ -327,7 +253,7 @@
this.form.score = item.calcFraction;
} else {
this.needNum = true;
- this.form.score = null;
+ this.form.score = '';
}
if (this.form.num != null && this.needNum) {
this.handleChangeNum();
@@ -343,17 +269,18 @@
this.form.score = Math.floor(Math.ceil(this.form.num / this.calcObj.calcUnit) * this.calcObj.calcFraction * 100) / 100;
}
},
+
handleChangeUnit(value) {
getRuleListByUnitId(value).then((res) => {
this.options = this.getTreeData(res.data);
})
},
- getTreeData(data){
- for(var i=0;i<data.length;i++){
- if(data[i].children.length<1){
+ getTreeData(data) {
+ for (var i = 0; i < data.length; i++) {
+ if (data[i].children.length < 1) {
// children鑻ヤ负绌烘暟缁勶紝鍒欏皢children璁句负undefined
- data[i].children=undefined;
- }else {
+ data[i].children = undefined;
+ } else {
// children鑻ヤ笉涓虹┖鏁扮粍锛屽垯缁х画 閫掑綊璋冪敤 鏈柟娉�
this.getTreeData(data[i].children);
}
@@ -379,7 +306,7 @@
// 鎵撳紑瀹℃牳
handleAuditing(row) {
this.auditingOpen = true;
- this.auditingForm = {...row};
+ this.auditingForm = { ...row };
},
// 鍏抽棴瀹℃牳
closeAuditing() {
@@ -425,7 +352,8 @@
auditingStatus: null,
remark: null,
auditingTime: null,
- auditingUser: null
+ auditingUser: null,
+ score: ''
};
this.resetForm("form");
},
@@ -443,7 +371,7 @@
// 澶氶�夋閫変腑鏁版嵁
handleSelectionChange(selection) {
this.ids = selection.map(item => item.id)
- this.single = selection.length!==1
+ this.single = selection.length !== 1
this.multiple = !selection.length
},
/** 鏂板鎸夐挳鎿嶄綔 */
@@ -456,8 +384,12 @@
handleUpdate(row) {
this.reset();
const id = row.id || this.ids
+ if (row.auditingStatus != '寰呭鏍�') {
+ this.$message.warning("璇ヨ褰曞凡瀹℃牳锛屼笉鑳戒慨鏀�");
+ return;
+ }
getAuditing(id).then(response => {
- this.form = response.data;
+ this.form = { ...response.data };
this.open = true;
this.title = "淇敼杩愮淮鑰冩牳绉垎";
this.handleChangeUnit(this.form.unitId);
@@ -493,12 +425,12 @@
/** 鍒犻櫎鎸夐挳鎿嶄綔 */
handleDelete(row) {
const ids = row.id || this.ids;
- this.$modal.confirm('鏄惁纭鍒犻櫎杩愮淮鑰冩牳瀹℃牳缂栧彿涓�"' + ids + '"鐨勬暟鎹」锛�').then(function() {
+ this.$modal.confirm('鏄惁纭鍒犻櫎杩愮淮鑰冩牳瀹℃牳缂栧彿涓�"' + ids + '"鐨勬暟鎹」锛�').then(function () {
return delAuditing(ids);
}).then(() => {
this.getList();
this.$modal.msgSuccess("鍒犻櫎鎴愬姛");
- }).catch(() => {});
+ }).catch(() => { });
},
/** 瀵煎嚭鎸夐挳鎿嶄綔 */
handleExport() {
@@ -513,10 +445,12 @@
.margin-5 {
margin-left: 5px;
}
+
.row-warp {
display: flex;
flex-direction: column;
}
+
.row {
display: flex;
flex-direction: row;
@@ -524,11 +458,13 @@
justify-content: center;
margin: 5px 0;
}
+
.row-left {
flex: 1;
display: flex;
flex-direction: row;
}
+
.row-right {
flex: 1;
display: flex;
diff --git a/src/views/system/work-order/index.vue b/src/views/system/work-order/index.vue
index f558e8b..401bf4b 100644
--- a/src/views/system/work-order/index.vue
+++ b/src/views/system/work-order/index.vue
@@ -43,11 +43,11 @@
</el-form-item>
</el-form>
- <el-row>
- <el-col :span="8" v-for="item in workOrderList" :key="item" style="width: 390px;margin-left: 40px;margin-top:20px;">
- <el-card :body-style="{ padding: '0px' }">
+ <el-row :gutter="20">
+ <el-col :xl="6" :lg="8" :md="12" :sm="24" v-for="item in workOrderList" :key="item" style="margin-bottom: 20px;">
+ <el-card :body-style="{ padding: '0px',display: 'flex' }">
<el-image :preview-src-list="['https://img2.baidu.com/it/u=68398439,1553004927&fm=253&fmt=auto&app=138&f=JPEG?w=800&h=357']" fit="cover" src="https://img2.baidu.com/it/u=68398439,1553004927&fm=253&fmt=auto&app=138&f=JPEG?w=800&h=357" class="image"/>
- <div style="padding-right: 10px;padding-top: 10px;float: right;">
+ <div style="padding-right: 10px;padding-top: 10px;">
<el-row>
<el-col :span="24" class="time">鏁呴殰绫诲瀷锛�<el-tag size="small" type="danger">甯傛斂鏂藉伐</el-tag></el-col>
</el-row>
--
Gitblit v1.8.0