Browse Source

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

Release sy v1.0.0

See merge request project/water/shuili-vue!75
master_tdsql
潘裕艺 1 year ago
parent
commit
71e60ca200
  1. 2
      src/views/dike/runManage/dangerWeakProject/inspectProjects/fillReport.vue
  2. 4
      src/views/dike/runManage/dangerWeakProject/inspectTasks/taskDetails.vue
  3. 2
      src/views/dike/runManage/enginerring/inspectionPlan/index.vue
  4. 6
      src/views/dike/runManage/maintenance/maintenanceRecords/index.vue
  5. 8
      src/views/dike/runManage/pestAnimalControl/governanceRecords/index.vue
  6. 2
      src/views/dike/runManage/superVisionInspetion/methodsManage/details.vue
  7. 2
      src/views/dike/runManage/superVisionInspetion/projectManage/projectReport.vue
  8. 2
      src/views/dike/runManage/superVisionInspetion/questionManage/index.vue
  9. 2
      src/views/dike/runManage/supervisionInspetion/methodsManage/details.vue
  10. 2
      src/views/dike/runManage/supervisionInspetion/projectManage/projectReport.vue
  11. 2
      src/views/dike/runManage/supervisionInspetion/questionManage/index.vue
  12. 2
      src/views/sluice/runManage/dangerWeakProject/inspectProjects/fillReport.vue
  13. 2
      src/views/sluice/runManage/dangerWeakProject/inspectTasks/taskDetails.vue
  14. 2
      src/views/sluice/runManage/enginerring/inspectionPlan/index.vue
  15. 6
      src/views/sluice/runManage/maintenance/maintenanceRecords/index.vue
  16. 2
      src/views/sluice/runManage/supervisionInspetion/methodsManage/details.vue
  17. 2
      src/views/sluice/runManage/supervisionInspetion/projectManage/projectReport.vue
  18. 2
      src/views/sluice/runManage/supervisionInspetion/questionManage/index.vue

2
src/views/dike/runManage/dangerWeakProject/inspectProjects/fillReport.vue

@ -355,7 +355,7 @@ export default {
:before-upload="beforeUpload" :before-upload="beforeUpload"
:showFileList="false" :showFileList="false"
accept=".jpg,.png,.jpeg" accept=".jpg,.png,.jpeg"
:maxLength="99" :limit="99"
> >
<el-button <el-button
type="primary" type="primary"

4
src/views/dike/runManage/dangerWeakProject/inspectTasks/taskDetails.vue

@ -385,7 +385,7 @@ export default {
<el-input <el-input
:disabled="previewMode" :disabled="previewMode"
style="width: 240px" style="width: 240px"
:maxLength="50" :maxlength="50"
v-model="ruleForm.name" v-model="ruleForm.name"
placeholder="请输入" placeholder="请输入"
/> />
@ -483,7 +483,7 @@ export default {
:disabled="previewMode" :disabled="previewMode"
type="textarea" type="textarea"
:rows="5" :rows="5"
:maxLength="500" :maxlength="500"
placeholder=" 请输入" placeholder=" 请输入"
/> />
</el-form-item> </el-form-item>

2
src/views/dike/runManage/enginerring/inspectionPlan/index.vue

@ -596,7 +596,7 @@ export default {
v-model:file-list="ruleForm.files" v-model:file-list="ruleForm.files"
:showFileList="false" :showFileList="false"
accept=".PDF,.docx,.doc,.excel,.ppt,.jpg,.png,.txt" accept=".PDF,.docx,.doc,.excel,.ppt,.jpg,.png,.txt"
:maxLength="9" :limit="9"
> >
<el-button type="primary">上传</el-button> <el-button type="primary">上传</el-button>
</el-upload> </el-upload>

6
src/views/dike/runManage/maintenance/maintenanceRecords/index.vue

@ -609,7 +609,7 @@ export default {
<el-input <el-input
v-model="ruleForm.before" v-model="ruleForm.before"
placeholder="请输入" placeholder="请输入"
maxLength="100" maxlength="100"
style="width: 202px" style="width: 202px"
:disabled="prohibitEditing" :disabled="prohibitEditing"
/> />
@ -618,7 +618,7 @@ export default {
<el-input <el-input
v-model="ruleForm.middle" v-model="ruleForm.middle"
placeholder="请输入" placeholder="请输入"
maxLength="100" maxlength="100"
style="width: 202px" style="width: 202px"
:disabled="prohibitEditing" :disabled="prohibitEditing"
/> />
@ -627,7 +627,7 @@ export default {
<el-input <el-input
v-model="ruleForm.after" v-model="ruleForm.after"
placeholder="请输入" placeholder="请输入"
maxLength="100" maxlength="100"
style="width: 202px" style="width: 202px"
:disabled="prohibitEditing" :disabled="prohibitEditing"
/> />

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

@ -872,7 +872,7 @@ export default {
<template slot-scope="scope"> <template slot-scope="scope">
<el-input <el-input
v-model="scope.row.drugName" v-model="scope.row.drugName"
maxLength="100" maxlength="100"
placeholder="请输入药物名称" placeholder="请输入药物名称"
/> />
</template> </template>
@ -881,7 +881,7 @@ export default {
<template slot-scope="scope"> <template slot-scope="scope">
<el-input <el-input
v-model="scope.row.concentration" v-model="scope.row.concentration"
maxLength="100" maxlength="100"
placeholder="请输入浓度" placeholder="请输入浓度"
/> />
</template> </template>
@ -890,7 +890,7 @@ export default {
<template slot-scope="scope"> <template slot-scope="scope">
<el-input <el-input
v-model="scope.row.dose" v-model="scope.row.dose"
maxLength="100" maxlength="100"
placeholder="请输入剂量" placeholder="请输入剂量"
/> />
</template> </template>
@ -967,7 +967,7 @@ export default {
:before-upload="beforeUpload" :before-upload="beforeUpload"
:showFileList="false" :showFileList="false"
accept=".jpg,.png,.jpeg" accept=".jpg,.png,.jpeg"
:maxLength="10" :maxlength="10"
> >
<i slot="default" class="el-icon-plus"></i> <i slot="default" class="el-icon-plus"></i>
</el-upload> </el-upload>

2
src/views/dike/runManage/superVisionInspetion/methodsManage/details.vue

@ -12,7 +12,7 @@
:before-upload="beforeUpload" :before-upload="beforeUpload"
:showFileList="false" :showFileList="false"
accept=".PDF" accept=".PDF"
:maxLength="1" :limit="1"
> >
<el-button type="primary">{{ <el-button type="primary">{{
detailsData.superviseCheckWay ? "重新上传" : "上传文件" detailsData.superviseCheckWay ? "重新上传" : "上传文件"

2
src/views/dike/runManage/superVisionInspetion/projectManage/projectReport.vue

@ -449,7 +449,7 @@ export default {
:before-upload="beforeUpload" :before-upload="beforeUpload"
:showFileList="false" :showFileList="false"
accept=".jpg,.png,.jpeg" accept=".jpg,.png,.jpeg"
:maxLength="99" :limit="99"
> >
<el-button <el-button
type="primary" type="primary"

2
src/views/dike/runManage/superVisionInspetion/questionManage/index.vue

@ -428,7 +428,7 @@ export default {
:before-upload="beforeUpload" :before-upload="beforeUpload"
:showFileList="false" :showFileList="false"
accept=".jpg,.png,.jpeg" accept=".jpg,.png,.jpeg"
:maxLength="99" :limit="99"
> >
<el-button type="primary">上传</el-button> <el-button type="primary">上传</el-button>
</el-upload> </el-upload>

2
src/views/dike/runManage/supervisionInspetion/methodsManage/details.vue

@ -12,7 +12,7 @@
:before-upload="beforeUpload" :before-upload="beforeUpload"
:showFileList="false" :showFileList="false"
accept=".PDF" accept=".PDF"
:maxLength="1" :limit="1"
> >
<el-button type="primary">{{ <el-button type="primary">{{
detailsData.superviseCheckWay ? "重新上传" : "上传文件" detailsData.superviseCheckWay ? "重新上传" : "上传文件"

2
src/views/dike/runManage/supervisionInspetion/projectManage/projectReport.vue

@ -449,7 +449,7 @@ export default {
:before-upload="beforeUpload" :before-upload="beforeUpload"
:showFileList="false" :showFileList="false"
accept=".jpg,.png,.jpeg" accept=".jpg,.png,.jpeg"
:maxLength="99" :limit="99"
> >
<el-button <el-button
type="primary" type="primary"

2
src/views/dike/runManage/supervisionInspetion/questionManage/index.vue

@ -428,7 +428,7 @@ export default {
:before-upload="beforeUpload" :before-upload="beforeUpload"
:showFileList="false" :showFileList="false"
accept=".jpg,.png,.jpeg" accept=".jpg,.png,.jpeg"
:maxLength="99" :limit="99"
> >
<el-button type="primary">上传</el-button> <el-button type="primary">上传</el-button>
</el-upload> </el-upload>

2
src/views/sluice/runManage/dangerWeakProject/inspectProjects/fillReport.vue

@ -356,7 +356,7 @@ export default {
:before-upload="beforeUpload" :before-upload="beforeUpload"
:showFileList="false" :showFileList="false"
accept=".jpg,.png,.jpeg" accept=".jpg,.png,.jpeg"
:maxLength="99" :limit="99"
> >
<el-button <el-button
type="primary" type="primary"

2
src/views/sluice/runManage/dangerWeakProject/inspectTasks/taskDetails.vue

@ -492,7 +492,7 @@ export default {
v-model="ruleForm.content" v-model="ruleForm.content"
:disabled="previewMode" :disabled="previewMode"
type="textarea" type="textarea"
:maxLength="500" :maxlength="500"
:rows="5" :rows="5"
placeholder=" 请输入" placeholder=" 请输入"
/> />

2
src/views/sluice/runManage/enginerring/inspectionPlan/index.vue

@ -609,7 +609,7 @@ export default {
v-model:file-list="ruleForm.files" v-model:file-list="ruleForm.files"
:showFileList="false" :showFileList="false"
accept=".PDF,.docx,.doc,.excel,.ppt,.jpg,.png,.txt" accept=".PDF,.docx,.doc,.excel,.ppt,.jpg,.png,.txt"
:maxLength="9" :limit="9"
> >
<el-button type="primary">上传</el-button> <el-button type="primary">上传</el-button>
</el-upload> </el-upload>

6
src/views/sluice/runManage/maintenance/maintenanceRecords/index.vue

@ -599,7 +599,7 @@ export default {
<el-input <el-input
v-model="ruleForm.before" v-model="ruleForm.before"
placeholder="请输入" placeholder="请输入"
maxLength="100" maxlength="100"
style="width: 202px" style="width: 202px"
:disabled="prohibitEditing" :disabled="prohibitEditing"
/> />
@ -608,7 +608,7 @@ export default {
<el-input <el-input
v-model="ruleForm.middle" v-model="ruleForm.middle"
placeholder="请输入" placeholder="请输入"
maxLength="100" maxlength="100"
style="width: 202px" style="width: 202px"
:disabled="prohibitEditing" :disabled="prohibitEditing"
/> />
@ -617,7 +617,7 @@ export default {
<el-input <el-input
v-model="ruleForm.after" v-model="ruleForm.after"
placeholder="请输入" placeholder="请输入"
maxLength="100" maxlength="100"
style="width: 202px" style="width: 202px"
:disabled="prohibitEditing" :disabled="prohibitEditing"
/> />

2
src/views/sluice/runManage/supervisionInspetion/methodsManage/details.vue

@ -12,7 +12,7 @@
:before-upload="beforeUpload" :before-upload="beforeUpload"
:showFileList="false" :showFileList="false"
accept=".PDF" accept=".PDF"
:maxLength="1" :limit="1"
> >
<el-button type="primary">{{ <el-button type="primary">{{
detailsData.superviseCheckWay ? "重新上传" : "上传文件" detailsData.superviseCheckWay ? "重新上传" : "上传文件"

2
src/views/sluice/runManage/supervisionInspetion/projectManage/projectReport.vue

@ -453,7 +453,7 @@ export default {
:before-upload="beforeUpload" :before-upload="beforeUpload"
:showFileList="false" :showFileList="false"
accept=".jpg,.png,.jpeg" accept=".jpg,.png,.jpeg"
:maxLength="99" :limit="99"
> >
<el-button <el-button
type="primary" type="primary"

2
src/views/sluice/runManage/supervisionInspetion/questionManage/index.vue

@ -456,7 +456,7 @@ export default {
:before-upload="beforeUpload" :before-upload="beforeUpload"
:showFileList="false" :showFileList="false"
accept=".jpg,.png,.jpeg" accept=".jpg,.png,.jpeg"
:maxLength="99" :limit="99"
> >
<el-button type="primary">上传</el-button> <el-button type="primary">上传</el-button>
</el-upload> </el-upload>

Loading…
Cancel
Save