From 6cde85d8030db64ae1e499178529ab8a9ec80fe1 Mon Sep 17 00:00:00 2001
From: wl <173@qq.com>
Date: 星期四, 27 十月 2022 18:05:19 +0800
Subject: [PATCH] Merge branch 'master' of http://42.193.1.25:9521/r/sccg_ui into master
---
src/views/operate/disposal/casepool/pool/createUser/ill/index.vue | 2 +-
src/components/scene/index.vue | 2 +-
src/views/operate/car/myIndex/create/law/index.vue | 1 -
src/components/myUpload/index.vue | 4 ++--
src/views/operate/disposal/casepool/learn/updateUser/uploadResult/components/evidence/index.vue | 4 ++--
src/components/Upload/index.vue | 4 ++--
src/views/operate/log/index.vue | 1 -
src/components/filePictrue/index.vue | 1 +
src/components/solveProblem/index.vue | 10 +++++-----
src/views/operate/disposal/casepool/dispatch/updateUser/uploadResult/components/evidence/index.vue | 4 ++--
src/views/operate/disposal/casepool/escalation/createUser/ill/index.vue | 2 +-
src/views/operate/disposal/casepool/notDeal/updateUser/uploadResult/components/evidence/index.vue | 4 ++--
12 files changed, 19 insertions(+), 20 deletions(-)
diff --git a/src/components/Upload/index.vue b/src/components/Upload/index.vue
index 656aa7d..ec73e95 100644
--- a/src/components/Upload/index.vue
+++ b/src/components/Upload/index.vue
@@ -27,8 +27,8 @@
if (rawFile.type !== 'image/png' && rawFile.type !== 'image/svg+xml' && rawFile.type !== 'image/jpg' && rawFile.type !== 'image/jpeg') {
this.$message.error('鍥剧墖蹇呴』鏄� jpg/svg/jpeg/png 鏍煎紡!')
return false
- } else if (rawFile.size / 105 / 105 > 2) {
- this.$message.error('涓婁紶鍥剧墖涓嶈兘瓒呰繃 2MB!')
+ } else if (rawFile.size / 1024 / 1024 > 5) {
+ this.$message.error('涓婁紶鍥剧墖涓嶈兘瓒呰繃 5MB!')
return false
}
return true
diff --git a/src/components/filePictrue/index.vue b/src/components/filePictrue/index.vue
index 6e106a9..8260292 100644
--- a/src/components/filePictrue/index.vue
+++ b/src/components/filePictrue/index.vue
@@ -103,6 +103,7 @@
.my-demo {
position: relative;
height: 159px;
+ padding: 10px;
}
.tip {
diff --git a/src/components/myUpload/index.vue b/src/components/myUpload/index.vue
index 4b7be53..41d202d 100644
--- a/src/components/myUpload/index.vue
+++ b/src/components/myUpload/index.vue
@@ -46,8 +46,8 @@
if (rawFile.type !== 'image/png' && rawFile.type !== 'image/svg+xml' && rawFile.type !== 'image/jpg' && rawFile.type !== 'image/jpeg') {
this.$message.error('鍥剧墖蹇呴』鏄� jpg/svg/jpeg/png 鏍煎紡!')
return false
- } else if (rawFile.size / 105 / 105 > 2) {
- this.$message.error('涓婁紶鍥剧墖涓嶈兘瓒呰繃 2MB!')
+ } else if (rawFile.size / 1024 / 1024 > 5) {
+ this.$message.error('涓婁紶鍥剧墖涓嶈兘瓒呰繃 5MB!')
return false
}
return true
diff --git a/src/components/scene/index.vue b/src/components/scene/index.vue
index 791c5c8..fb62be2 100644
--- a/src/components/scene/index.vue
+++ b/src/components/scene/index.vue
@@ -50,7 +50,7 @@
<el-form-item label="褰撲簨浜轰俊鎭�:">
<el-input disabled v-model="investigation.type"></el-input>
</el-form-item>
- <el-form-item label="鎯呭喌鎻忚堪:">
+ <el-form-item label="澶勭疆缁撴灉:">
<el-input disabled v-model="investigation.description"></el-input>
</el-form-item>
<el-form-item label="鐓х墖闄勪欢:">
diff --git a/src/components/solveProblem/index.vue b/src/components/solveProblem/index.vue
index b997b5e..715b979 100644
--- a/src/components/solveProblem/index.vue
+++ b/src/components/solveProblem/index.vue
@@ -37,9 +37,7 @@
const { handlePassVo: mylist, baseCase } = this;
console.log(baseCase, mylist);
if (mylist) {
- this.list = mylist.workflowConfigSteps.filter(item => {
- return item.id !== 2
- });
+ this.list = mylist.workflowConfigSteps;
}
if (baseCase.dispatchInfo) {
this.dispatchInfo = baseCase.dispatchInfo;
@@ -51,9 +49,11 @@
const { dispatchInfo } = this;
if (name === '璋冨害') {
return '銆愭淳閬ｆ剰瑙併��'
- } else if (name === '鏍告煡') {
+ } else if (name === '澶勭悊') {
+ return '銆愬鐞嗙粨鏋溿��'
+ }else if (name === '鏍告煡') {
return '銆愭牳鏌ョ粨鏋溿��'
- } else if (name === '缁撴') {
+ } else if (name === '缁撴') {
return '銆愯瘎瀹氱粨鏋溿��'
}
return
diff --git a/src/views/operate/car/myIndex/create/law/index.vue b/src/views/operate/car/myIndex/create/law/index.vue
index 7f0ca0b..f6defdc 100644
--- a/src/views/operate/car/myIndex/create/law/index.vue
+++ b/src/views/operate/car/myIndex/create/law/index.vue
@@ -193,7 +193,6 @@
// 娣诲姞杞﹁締
handleCar() {
this.$refs.user.validate((valid) => {
- debugger;
if (valid) {
const { car } = this;
this.$axios({
diff --git a/src/views/operate/disposal/casepool/dispatch/updateUser/uploadResult/components/evidence/index.vue b/src/views/operate/disposal/casepool/dispatch/updateUser/uploadResult/components/evidence/index.vue
index e952b39..1781109 100644
--- a/src/views/operate/disposal/casepool/dispatch/updateUser/uploadResult/components/evidence/index.vue
+++ b/src/views/operate/disposal/casepool/dispatch/updateUser/uploadResult/components/evidence/index.vue
@@ -31,9 +31,9 @@
<el-input suffix-icon="el-icon-s-order" v-model="evidence.userInfo" @focus="openDialog"></el-input>
</el-form-item>
<!-- 鎯呭喌鎻忚堪 -->
- <el-form-item label="鎯呭喌鎻忚堪:" prop="description">
+ <el-form-item label="澶勭疆缁撴灉:" prop="description">
<el-input type="textarea" :autosize="{ minRows: 2, maxRows: 4}" maxlength="200" show-word-limit
- v-model="evidence.description" placeholder="璇疯緭鍏ユ儏鍐垫弿杩�,闄愬埗200瀛椾互鍐�"></el-input>
+ v-model="evidence.description" placeholder="璇疯緭鍏ュ缃粨鏋�,闄愬埗200瀛椾互鍐�"></el-input>
</el-form-item>
<!-- 鐓х墖闄勪欢 -->
<el-form-item label="鐓х墖闄勪欢:" prop="pic">
diff --git a/src/views/operate/disposal/casepool/escalation/createUser/ill/index.vue b/src/views/operate/disposal/casepool/escalation/createUser/ill/index.vue
index 01dbc8f..7cc5f93 100644
--- a/src/views/operate/disposal/casepool/escalation/createUser/ill/index.vue
+++ b/src/views/operate/disposal/casepool/escalation/createUser/ill/index.vue
@@ -48,7 +48,7 @@
</el-select>
</el-form-item>
<!-- 韬唤璇佹鍙嶉潰鐓х墖 -->
- <el-form-item class="optionItems" label="韬唤璇佹鍙嶉潰鐓х墖:" prop="positive">
+ <el-form-item class="optionItems" label="韬唤璇佹銆佸弽闈㈢収鐗�:" prop="positive">
<template>
<div class="idcard">
<el-upload class="upload-demo" :show-file-list="false"
diff --git a/src/views/operate/disposal/casepool/learn/updateUser/uploadResult/components/evidence/index.vue b/src/views/operate/disposal/casepool/learn/updateUser/uploadResult/components/evidence/index.vue
index ccf64a1..dba41f9 100644
--- a/src/views/operate/disposal/casepool/learn/updateUser/uploadResult/components/evidence/index.vue
+++ b/src/views/operate/disposal/casepool/learn/updateUser/uploadResult/components/evidence/index.vue
@@ -29,9 +29,9 @@
<el-input suffix-icon="el-icon-s-order" @focus="openDialog"></el-input>
</el-form-item>
<!-- 鎯呭喌鎻忚堪 -->
- <el-form-item label="鎯呭喌鎻忚堪:" prop="description">
+ <el-form-item label="澶勭疆缁撴灉:" prop="description">
<el-input type="textarea" :autosize="{ minRows: 2, maxRows: 4}" maxlength="200" show-word-limit
- v-model="evidence.description" placeholder="璇疯緭鍏ユ儏鍐垫弿杩�,闄愬埗200瀛椾互鍐�"></el-input>
+ v-model="evidence.description" placeholder="璇疯緭鍏ュ缃粨鏋�,闄愬埗200瀛椾互鍐�"></el-input>
</el-form-item>
<!-- 鐓х墖闄勪欢 -->
<el-form-item label="鐓х墖闄勪欢:" prop="photo">
diff --git a/src/views/operate/disposal/casepool/notDeal/updateUser/uploadResult/components/evidence/index.vue b/src/views/operate/disposal/casepool/notDeal/updateUser/uploadResult/components/evidence/index.vue
index ccf64a1..dba41f9 100644
--- a/src/views/operate/disposal/casepool/notDeal/updateUser/uploadResult/components/evidence/index.vue
+++ b/src/views/operate/disposal/casepool/notDeal/updateUser/uploadResult/components/evidence/index.vue
@@ -29,9 +29,9 @@
<el-input suffix-icon="el-icon-s-order" @focus="openDialog"></el-input>
</el-form-item>
<!-- 鎯呭喌鎻忚堪 -->
- <el-form-item label="鎯呭喌鎻忚堪:" prop="description">
+ <el-form-item label="澶勭疆缁撴灉:" prop="description">
<el-input type="textarea" :autosize="{ minRows: 2, maxRows: 4}" maxlength="200" show-word-limit
- v-model="evidence.description" placeholder="璇疯緭鍏ユ儏鍐垫弿杩�,闄愬埗200瀛椾互鍐�"></el-input>
+ v-model="evidence.description" placeholder="璇疯緭鍏ュ缃粨鏋�,闄愬埗200瀛椾互鍐�"></el-input>
</el-form-item>
<!-- 鐓х墖闄勪欢 -->
<el-form-item label="鐓х墖闄勪欢:" prop="photo">
diff --git a/src/views/operate/disposal/casepool/pool/createUser/ill/index.vue b/src/views/operate/disposal/casepool/pool/createUser/ill/index.vue
index cc4d427..78e13a9 100644
--- a/src/views/operate/disposal/casepool/pool/createUser/ill/index.vue
+++ b/src/views/operate/disposal/casepool/pool/createUser/ill/index.vue
@@ -63,7 +63,7 @@
</el-form-item>
</div>
<!-- 韬唤璇佹鍙嶉潰鐓х墖 -->
- <el-form-item class="optionItems" label="韬唤璇佹鍙嶉潰鐓х墖:" prop="positive">
+ <el-form-item class="optionItems" label="韬唤璇佹銆佸弽闈㈢収鐗�:" prop="positive">
<template>
<div class="idcard">
<el-upload class="upload-demo" :show-file-list="false"
diff --git a/src/views/operate/log/index.vue b/src/views/operate/log/index.vue
index e0a1363..1e2d8fc 100644
--- a/src/views/operate/log/index.vue
+++ b/src/views/operate/log/index.vue
@@ -63,7 +63,6 @@
<!-- 鏁版嵁灞曠ず -->
<el-table
ref="multipleTable"
- :default-sort="{ prop: 'createTime' }"
:header-cell-style="{
background: '#06122c',
'font-size': '12px',
--
Gitblit v1.8.0