Browse Source

Merge branch 'release-sy-v1.0.0' into 'dev'

Release sy v1.0.0

See merge request project/water/shuili-vue!78
master_tdsql
潘裕艺 1 year ago
parent
commit
ee440af769
  1. 2
      src/api/dike/index.js
  2. 3
      src/assets/styles/flex.scss
  3. 8
      src/views/dike/runManage/dangerWeakProject/inspectItemsSetting/itemDetails.vue
  4. 9
      src/views/dike/runManage/pestAnimalControl/governanceRecords/index.vue
  5. 8
      src/views/sluice/runManage/dangerWeakProject/inspectItemsSetting/itemDetails.vue

2
src/api/dike/index.js

@ -471,7 +471,7 @@ export function postDangerProjectItemsListData(data){
// 病险工程核查-删除核查项内容列表项
export function delDangerProjectItemsListData(id){
return request({
url: `/run/sz/dangerousProject/item/${id}`,
url: `/run/df/dangerousProject/item/${id}`,
method: 'delete',
})
}

3
src/assets/styles/flex.scss

@ -1,6 +1,9 @@
.flex {
display: flex;
}
.flex-wrap{
flex-wrap: wrap;
}
.flex-3{
flex: 3;
}

8
src/views/dike/runManage/dangerWeakProject/inspectItemsSetting/itemDetails.vue

@ -4,7 +4,7 @@
<div class="method-details-page">
<div class="flex justify-between items-center">
<span v-if="editTitle">
<el-input class="input" v-model="itemName"></el-input>
<el-input class="input" v-model="itemName" :maxlength="50"></el-input>
<i
class="el-icon-check cursor-pointer ml-4 font-16"
style="color: #409eff"
@ -58,7 +58,11 @@
</el-col>
<el-col :span="18">
<div class="item-row-content">
<el-input v-if="item.edit" v-model="item.content"></el-input>
<el-input
v-if="item.edit"
v-model="item.content"
:maxlength="500"
></el-input>
<div v-else>{{ item.content }}</div>
</div>
</el-col>

9
src/views/dike/runManage/pestAnimalControl/governanceRecords/index.vue

@ -373,8 +373,8 @@ export default {
},
//
beforeUpload(e) {
if (this.recordForm.images?.length >= 10) {
this.$message.warning("最多上传10张图片");
if (this.recordForm.images?.length >= 9) {
this.$message.warning("最多上传9张图片");
return false;
}
return true;
@ -926,7 +926,7 @@ export default {
</el-table-column>
</el-table>
<el-form-item label-width="120px" label="上传图片" prop="images">
<div class="flex flex-wrap">
<div class="flex flex-wrap w-full">
<div
style="width: 148px; height: 148px"
v-for="(url, index) in recordForm.images"
@ -967,7 +967,7 @@ export default {
:before-upload="beforeUpload"
:showFileList="false"
accept=".jpg,.png,.jpeg"
:maxlength="10"
:maxlength="9"
>
<i slot="default" class="el-icon-plus"></i>
</el-upload>
@ -976,6 +976,7 @@ export default {
<el-input
type="textarea"
:rows="3"
:maxlength="500"
placeholder="请输入"
v-model="recordForm.remark"
>

8
src/views/sluice/runManage/dangerWeakProject/inspectItemsSetting/itemDetails.vue

@ -4,7 +4,7 @@
<div class="method-details-page">
<div class="flex justify-between items-center">
<span v-if="editTitle">
<el-input class="input" v-model="itemName"></el-input>
<el-input class="input" v-model="itemName" :maxlength="50"></el-input>
<i
class="el-icon-check cursor-pointer ml-4 font-16"
style="color: #409eff"
@ -58,7 +58,11 @@
</el-col>
<el-col :span="18">
<div class="item-row-content">
<el-input v-if="item.edit" v-model="item.content"></el-input>
<el-input
v-if="item.edit"
v-model="item.content"
:maxlength="500"
></el-input>
<div v-else>{{ item.content }}</div>
</div>
</el-col>

Loading…
Cancel
Save