From b605156b6313178824c461d1e8133aa81188d9fa Mon Sep 17 00:00:00 2001 From: shidongli Date: Thu, 18 Apr 2024 16:18:14 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/manage/message/index.vue | 1 + src/views/manage/project/index.vue | 1 + src/views/manage/propaganda/index.vue | 98 +++++++++++++------ src/views/manage/script/index.vue | 10 +- src/views/manage/template/index.vue | 1 + .../operationInfo/operationInfo/index.vue | 2 + 6 files changed, 84 insertions(+), 29 deletions(-) diff --git a/src/views/manage/message/index.vue b/src/views/manage/message/index.vue index d64278a..d6849ed 100644 --- a/src/views/manage/message/index.vue +++ b/src/views/manage/message/index.vue @@ -249,6 +249,7 @@ v-model="form.textMessageContent" placeholder="请输入短信内容" type="textarea" + maxlength="300" /> diff --git a/src/views/manage/project/index.vue b/src/views/manage/project/index.vue index 30e8ca4..0496ac4 100644 --- a/src/views/manage/project/index.vue +++ b/src/views/manage/project/index.vue @@ -7,6 +7,7 @@ :inline="true" v-show="showSearch" label-width="68px" + @submit.native.prevent > - + + + + @@ -214,7 +224,7 @@ @@ -305,7 +315,11 @@ /> - + - + - - + +
@@ -734,7 +753,17 @@
-
+
标签： {{ item.indications }}， @@ -748,10 +777,7 @@ > {{ item.checkItems }}，
-
- 标签：暂无 - -
+
标签：暂无
加到文章
@@ -818,16 +844,17 @@ export default { name: "Propaganda", components: { stationAcatar }, data() { - //验证身份证 - var isimgPath = (rule, value, callback) => { + //验证身份证 + var isimgPath = (rule, value, callback) => { console.log(value) if (!this.form.imgPath) { callback(new Error("素材选择不能为空")); } else { - callback(); + callback(); } }; return { + maxLength: 20000, itemname: null, departmentName: null, diseaseTypeName: null, @@ -988,7 +1015,7 @@ export default { { required: true, message: "封面不能为空", trigger: "blur" } ], imgPath: [ - { required: true, message: "",validator: isimgPath, trigger: "blur" } + { required: true, message: "", validator: isimgPath, trigger: "blur" } ], }, }; @@ -1027,6 +1054,15 @@ export default { } }, methods: { + checkContentLength() { + // console.log(this.form.propagandaContent.length, 'this.form.propagandaContent.length') + if (this.form.propagandaContent.length - 7 > this.maxLength) { + this.$message({ + type: "error", + message: "已达到最大输入长度" + }); + } + }, //获取医院list selectAgencyinfo() { let query = { @@ -1446,6 +1482,12 @@ export default { submitForm() { // return console.log(this.form) + if (this.form.propagandaContent.length - 7 > this.maxLength) { + this.$message({ + type: "error", + message: "已达到最大输入长度" + }); + }else{ this.$refs["form"].validate(valid => { if (valid) { @@ -1460,7 +1502,7 @@ export default { } else { if (this.diseaseTypeName == '请选择病种') { this.form.diseaseTypeName = null - } else if(this.diseaseTypeName){ + } else if (this.diseaseTypeName) { this.form.diseaseTypeName = this.diseaseTypeName } addPropaganda(this.form).then(response => { @@ -1473,6 +1515,7 @@ export default { } } }); + } }, /** 删除按钮操作 */ handleDelete(row) { @@ -1498,7 +1541,6 @@ export default { // ::v-deep .el-form-item--medium .el-form-item__content{ // width: 800px; - // } .propagandaselect { width: 100px; diff --git a/src/views/manage/script/index.vue b/src/views/manage/script/index.vue index aa4163a..c802eb4 100644 --- a/src/views/manage/script/index.vue +++ b/src/views/manage/script/index.vue @@ -756,11 +756,19 @@ export default { }, // 预览点击 handlesee(row) { - const id = row.id + + if(row.scriptFilePath){ + const id = row.id getScript(id).then(response => { this.form = response.data; this.dialogsee = true; }); + + }else{ + this.$modal.msgError("暂无预览信息"); + + } + }, // 预览关闭 diff --git a/src/views/manage/template/index.vue b/src/views/manage/template/index.vue index 2dce7cb..1107c42 100644 --- a/src/views/manage/template/index.vue +++ b/src/views/manage/template/index.vue @@ -199,6 +199,7 @@ v-model="form.templateContent" placeholder="请输入模板内容" type="textarea" + maxlength="300" /> diff --git a/src/views/operationInfo/operationInfo/index.vue b/src/views/operationInfo/operationInfo/index.vue index 8f9ae4b..97cf151 100644 --- a/src/views/operationInfo/operationInfo/index.vue +++ b/src/views/operationInfo/operationInfo/index.vue @@ -7,6 +7,8 @@ :inline="true" v-show="showSearch" label-width="68px" + @submit.native.prevent + > Date: Thu, 18 Apr 2024 16:21:19 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/manage/projectdevice/index.vue | 10 ++++++++++ src/views/system/agency/index.vue | 1 + src/views/system/agencyCategory/index.vue | 1 + src/views/system/record/record.vue | 17 +++++------------ 4 files changed, 17 insertions(+), 12 deletions(-) diff --git a/src/views/manage/projectdevice/index.vue b/src/views/manage/projectdevice/index.vue index 5f05d48..01504f6 100644 --- a/src/views/manage/projectdevice/index.vue +++ b/src/views/manage/projectdevice/index.vue @@ -455,6 +455,16 @@ export default { /^\d{6}(18|19|20)?\d{2}(0[1-9]|1[0-2])(([0-2][1-9])|10|20|30|31)\d{3}(\d|X|x)$/, }, ], + deviceIp: [ + { + required: false, + message: "请输入正确的ip地址", + trigger: "blur", + pattern: + /^((25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)\.){3}(25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)$/, + }, + ], + deviceCode: [ { required: true, message: "设备编码不能为空", trigger: "blur" }, ], diff --git a/src/views/system/agency/index.vue b/src/views/system/agency/index.vue index c6736ee..c0540c9 100644 --- a/src/views/system/agency/index.vue +++ b/src/views/system/agency/index.vue @@ -502,6 +502,7 @@ v-model="form.agencySort" controls-position="right" :min="0" + :max="99999" placeholder="请输入机构排序" style="width: 208px" /> diff --git a/src/views/system/agencyCategory/index.vue b/src/views/system/agencyCategory/index.vue index 1b98558..2e4e1b4 100644 --- a/src/views/system/agencyCategory/index.vue +++ b/src/views/system/agencyCategory/index.vue @@ -228,6 +228,7 @@ v-model="form.categorySort" controls-position="right" :min="0" + :max="99999" placeholder="请输入类别排序" style="width: 250px" /> diff --git a/src/views/system/record/record.vue b/src/views/system/record/record.vue index dd8a7f2..a096995 100644 --- a/src/views/system/record/record.vue +++ b/src/views/system/record/record.vue @@ -388,7 +388,7 @@ @@ -430,22 +430,17 @@ export default { formlist: {}, materialsFilePath: "", materialsType: "", - // rules: { - // routeHandleRemark: [ - // { required: true, message: "请输入任务处理信息", trigger: "change" }, - // ], - // }, }; }, created() { console.log(this.$route.query); this.info(); + // 文字提醒 if (this.$route.query.textRemindContent) { this.formlists.textRemindContent = this.$route.query.textRemindContent; } - if( this.$route.query.routeHandleRemark){ - this.formlist.routeHandleRemark = - this.$route.query.routeHandleRemark; + if (this.$route.query.routeHandleRemark) { + this.formlist.routeHandleRemark = this.$route.query.routeHandleRemark; } // 文章末班 if (this.$route.query.taskType == "PROPAGANDA_ARTICLE") { @@ -484,8 +479,6 @@ export default { if (this.$route.query.routeHandleRemark) { this.questiondata.routeHandleRemark = this.$route.query.routeHandleRemark; - - } this.questiondata.subjectResultList.forEach((e) => { @@ -569,7 +562,7 @@ export default { };