From 8de133a20d6f2dad17bb0f6c7ee046fe9de353a2 Mon Sep 17 00:00:00 2001 From: dai <851733175@qq.com> Date: Wed, 9 Nov 2022 10:19:02 +0800 Subject: [PATCH 1/5] 1 --- .env.development | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.env.development b/.env.development index d1c8a3e7c..e6abb72d8 100644 --- a/.env.development +++ b/.env.development @@ -8,7 +8,7 @@ VUE_APP_API_SERVER = http://192.168.1.140/api # VUE_APP_API_SERVER = https://epmet-dev.elinkservice.cn:41080/api # VUE_APP_API_SERVER = https://epmet-dev.elinkservice.cn/api -# VUE_APP_NODE_ENV=dev_sdtdt -VUE_APP_NODE_ENV=dev +VUE_APP_NODE_ENV=dev_sdtdt +# VUE_APP_NODE_ENV=dev #项目根路径 VUE_APP_PUBLIC_PATH=epmet-oper \ No newline at end of file From 99767f4ecd84a52e930460370574a87ff525531d Mon Sep 17 00:00:00 2001 From: jiangyy Date: Wed, 9 Nov 2022 11:17:02 +0800 Subject: [PATCH 2/5] =?UTF-8?q?=E9=9A=8F=E8=AE=BF=E8=AE=B0=E5=BD=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../base/epidemic/natFocus/nfVisiteList.vue | 95 +++++++++++++++++- .../base/epidemic/veroFocus/vfVisiteList.vue | 98 +++++++++++++++++-- 2 files changed, 183 insertions(+), 10 deletions(-) diff --git a/src/views/modules/base/epidemic/natFocus/nfVisiteList.vue b/src/views/modules/base/epidemic/natFocus/nfVisiteList.vue index a95eec6df..e8984d8c4 100644 --- a/src/views/modules/base/epidemic/natFocus/nfVisiteList.vue +++ b/src/views/modules/base/epidemic/natFocus/nfVisiteList.vue @@ -37,6 +37,23 @@ + + + +
- + + +
+
+ +
+ 随访时间： + {{ formData.visitTime||'--' }} +
+
+ 随访内容： + {{ formData.content||'--' }} +
+ +
+
+
取 消 - {{formType==='add'?'取 消':'关 闭'}} + 确 定
+
@@ -116,6 +154,7 @@ export default { data () { return { tableLoading: false, + formType: 'add', tableData: [], total: 0, @@ -188,11 +227,33 @@ export default { }, handleAdd () { + this.formData.id = '' + this.formType = 'add' + this.dialogVisible = true + }, + + handleWatch (row) { + this.formType = 'detail' + this.formData = JSON.parse(JSON.stringify(row)) this.dialogVisible = true }, async handleComfirm () { + + this.$refs['ref_form'].validate((valid, messageObj) => { + if (!valid) { + app.util.validateRule(messageObj) + + } else { + this.handleAddVisit() + } + + }) + + }, + + async handleAddVisit () { this.formData.visitTime = this.formData.visitTime + ':00' let url = "/epmetuser/followup/save" // let url = "http://yapi.elinkservice.cn/mock/245/epmetuser/followup/save" @@ -205,7 +266,6 @@ export default { } else { this.$message.error(msg) } - }, handleCancle () { @@ -215,6 +275,31 @@ export default { }, + async handleDel (rowData) { + let message = "确认删除?"; + + this.$confirm(message, "提示", { + confirmButtonText: "确定", + cancelButtonText: "取消", + type: "warning", + }).then(() => { + this.delEvent(rowData.id); + }).catch((err) => { }); + }, + async delEvent (id) { + const url = "/epmetuser/followup/delete"; + let idsArr = [id]; + + const { data, code, msg } = await requestPost(url, idsArr); + + if (code === 0) { + this.$message.success("删除成功！"); + this.loadTable(); + } else { + this.$message.error("操作失败！"); + } + }, + //导出表格 async handleExport () { let today = new Date() @@ -324,5 +409,7 @@ export default { \ No newline at end of file diff --git a/src/views/modules/base/epidemic/veroFocus/vfVisiteList.vue b/src/views/modules/base/epidemic/veroFocus/vfVisiteList.vue index 882deeffb..5c7885fe5 100644 --- a/src/views/modules/base/epidemic/veroFocus/vfVisiteList.vue +++ b/src/views/modules/base/epidemic/veroFocus/vfVisiteList.vue @@ -33,12 +33,29 @@ header-align="center" align="center" label="随访内容" + :show-overflow-tooltip="true" min-width="280"> + + +
@@ -59,7 +76,8 @@ append-to-body @closed="handleCancle">
- + + +
+
+ +
+ 随访时间： + {{ formData.visitTime||'--' }} +
+
+ 随访内容： + {{ formData.content||'--' }} +
+ +
+
+
取 消 - {{formType==='add'?'取 消':'关 闭'}} + 确 定
@@ -118,7 +155,7 @@ export default { data () { return { tableLoading: false, - + formType: 'add', tableData: [], total: 0, pageSize: 20, @@ -189,11 +226,33 @@ export default { }, handleAdd () { + this.formData.id = '' + this.formType = 'add' + this.dialogVisible = true + }, + + handleWatch (row) { + this.formType = 'detail' + this.formData = JSON.parse(JSON.stringify(row)) this.dialogVisible = true }, async handleComfirm () { + + this.$refs['ref_form'].validate((valid, messageObj) => { + if (!valid) { + app.util.validateRule(messageObj) + + } else { + this.handleAddVisit() + } + + }) + + }, + async handleAddVisit () { + this.formData.visitTime = this.formData.visitTime + ':00' let url = "/epmetuser/followup/save" // let url = "http://yapi.elinkservice.cn/mock/245/epmetuser/followup/save" @@ -206,15 +265,40 @@ export default { } else { this.$message.error(msg) } - }, handleCancle () { - this.$refs.ref_form.resetFields() + this.formData.visitTime = '' + this.formData.content = '' this.dialogVisible = false }, + async handleDel (rowData) { + let message = "确认删除?"; + + this.$confirm(message, "提示", { + confirmButtonText: "确定", + cancelButtonText: "取消", + type: "warning", + }).then(() => { + this.delEvent(rowData.id); + }).catch((err) => { }); + }, + async delEvent (id) { + const url = "/epmetuser/followup/delete"; + let idsArr = [id]; + + const { data, code, msg } = await requestPost(url, idsArr); + + if (code === 0) { + this.$message.success("删除成功！"); + this.loadTable(); + } else { + this.$message.error("操作失败！"); + } + }, + //导出表格 async handleExport () { let today = new Date() @@ -324,5 +408,7 @@ export default { \ No newline at end of file From b45c08a6d5b6c348dcbab701f8d9b7fca25304cc Mon Sep 17 00:00:00 2001 From: jiangyy Date: Wed, 9 Nov 2022 14:10:55 +0800 Subject: [PATCH 3/5] =?UTF-8?q?=E5=8F=AF=E8=A7=86=E5=8C=96=E9=87=8D?= =?UTF-8?q?=E7=82=B9=E5=BD=A2=E6=88=90=E6=9F=A5=E8=AF=A2=E6=94=B9=E6=88=90?= =?UTF-8?q?name?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../zhongdianxingcheng/zhongdianxingcheng.vue | 17 +++++++++++++---- 1 file changed, 13 insertions(+), 4 deletions(-) diff --git a/src/views/modules/visual/communityGovern/zhongdianxingcheng/zhongdianxingcheng.vue b/src/views/modules/visual/communityGovern/zhongdianxingcheng/zhongdianxingcheng.vue index c3084c377..184dc1c5f 100644 --- a/src/views/modules/visual/communityGovern/zhongdianxingcheng/zhongdianxingcheng.vue +++ b/src/views/modules/visual/communityGovern/zhongdianxingcheng/zhongdianxingcheng.vue @@ -99,6 +99,7 @@ export default { colorArray: [], pieData: [], + name: '', code: '', dangerLevel: '', @@ -192,11 +193,15 @@ export default { }, async handleAreaChange (val) { + + debugger if (val.length > 0) { // this.code = val.join('-') - this.code = val[val.length - 1] + // this.code = val[val.length - 1] + this.name = this.$refs["sourceArea"].getCheckedNodes()[0].label } else { - this.code = '' + // this.code = '' + this.name = '' } await this.getPieChart() @@ -268,7 +273,8 @@ export default { const url = "/epmetuser/tripreport/emphasisTripPieDetail"; // const url = "http://yapi.elinkservice.cn/mock/245/epmetuser/tripreport/emphasisTripPieDetail"; let params = { - code: this.code, + + name: this.name, }; @@ -418,7 +424,7 @@ export default { const url = "/epmetuser/tripreport/list"; // const url = "http://yapi.elinkservice.cn/mock/245/epmetuser/tripreport/list"; let params = { - code: this.code, + name: this.name, dangerLevel: this.dangerLevel, pageNo: this.demand.pageNo, pageSize: this.demand.pageSize, @@ -491,6 +497,9 @@ export default { this.getApiData(); window.scrollTo(0, 0); }, + // sourceAllCode (val) { + // // debugger + // } }, }; From 1332ca92a0090b6917b1016494410110509aa8f2 Mon Sep 17 00:00:00 2001 From: dai <851733175@qq.com> Date: Thu, 10 Nov 2022 17:32:29 +0800 Subject: [PATCH 4/5] =?UTF-8?q?=E4=B8=B4=E6=97=B6=E6=94=B9=E4=B8=80?= =?UTF-8?q?=E4=B8=8B=E8=81=94=E5=BB=BA=E6=B4=BB=E5=8A=A8=E5=9B=BE=E7=89=87?= =?UTF-8?q?=E6=98=BE=E7=A4=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/components/tinymce2/index.vue | 17 ++- .../regionalParty/activitysDetail.vue | 121 +++++++----------- .../regionalParty/activitysForm.vue | 2 +- 3 files changed, 64 insertions(+), 76 deletions(-) diff --git a/src/views/components/tinymce2/index.vue b/src/views/components/tinymce2/index.vue index 8f7f561d6..89323c172 100644 --- a/src/views/components/tinymce2/index.vue +++ b/src/views/components/tinymce2/index.vue @@ -93,7 +93,7 @@ export default { toolbar: // "formats undo redo paste print fontsizeselect fontselect template fullpage|wordcount ltr rtl visualchars visualblocks toc spellchecker searchreplace|save preview pagebreak nonbreaking|media image|outdent indent aligncenter alignleft alignright alignjustify lineheight underline quicklink h2 h3 blockquote numlist bullist table removeformat forecolor backcolor bold italic strikethrough hr charmap link insertdatetime|subscript superscript cut codesample code |anchor preview fullscreen|help", "formats undo redo|fontsizeselect|fontselect|forecolor backcolor bold italic underline strikethrough removeformat|image media link|outdent indent|aligncenter alignleft alignright alignjustify lineheight quicklink h2 h3 blockquote numlist bullist table|subscript superscript codesample code|preview fullscreen|wordcount|help", - content_style: "p {margin: 5px 0; font-size: 14px}", + content_style: "p {margin: 5px 0; font-size: 14px} img{max-width:100%;}", fontsize_formats: "12px 14px 16px 18px 24px 36px 48px 56px 72px", font_formats: "微软雅黑=Microsoft YaHei,Helvetica Neue,PingFang SC,sans-serif;苹果苹方=PingFang SC,Microsoft YaHei,sans-serif;宋体=simsun,serif;仿宋体=FangSong,serif;黑体=SimHei,sans-serif;Arial=arial,helvetica,sans-serif;Arial Black=arial black,avant garde;Book Antiqua=book antiqua,palatino;", @@ -152,6 +152,21 @@ export default { // tinymce.init; // 初始化 const revert_data = (content) => { + // content = + // ' '; + // content = content.replace(/<(img).*?(>|\/>|<\/img>)/g, function (mats) { + // if (mats.indexOf("style") < 0) { + // return mats.replace( + // /<\s*img/, + // '
-
-
+
-
所属网格： {{ formData.gridName }} @@ -24,8 +21,7 @@
活动内容： -

+

服务人数： @@ -42,90 +38,70 @@
活动地图：
-
-
活动成果： -

- +

-
- 关 闭 - + 关 闭
-
- - - diff --git a/src/views/modules/communityParty/regionalParty/activitysForm.vue b/src/views/modules/communityParty/regionalParty/activitysForm.vue index 4777fb487..1c1dfc789 100644 --- a/src/views/modules/communityParty/regionalParty/activitysForm.vue +++ b/src/views/modules/communityParty/regionalParty/activitysForm.vue @@ -349,7 +349,7 @@ export default { let style_img = "style='width:50px;height:40px;' " if (this.formData.content) { - this.formData.content = this.formData.content.replace(/ Date: Thu, 10 Nov 2022 17:44:38 +0800 Subject: [PATCH 5/5] =?UTF-8?q?=E8=BF=98=E6=9C=89=E5=85=9A=E5=BB=BA?= =?UTF-8?q?=E5=A3=B0=E9=9F=B3=E4=B9=9F=E6=94=B9=E4=BA=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/modules/cpts/base/cpts/edit.vue | 425 ++++++++++++---------- 1 file changed, 234 insertions(+), 191 deletions(-) diff --git a/src/views/modules/cpts/base/cpts/edit.vue b/src/views/modules/cpts/base/cpts/edit.vue index cc4fcbf79..afc83f45b 100644 --- a/src/views/modules/cpts/base/cpts/edit.vue +++ b/src/views/modules/cpts/base/cpts/edit.vue @@ -1,205 +1,235 @@ @@ -385,7 +427,7 @@ export default { }, }, - data () { + data() { return { iniLoaded: false, loading: false, @@ -407,19 +449,19 @@ export default { computed: {}, watch: { editParams: { - handler () { + handler() { this.computeFmData(); }, deep: true, }, }, - async mounted () { + async mounted() { this.initForm(); }, methods: { - async initForm () { + async initForm() { this.iniFmData(); if (this.formId && this.formType != "add") { @@ -427,11 +469,11 @@ export default { } }, - computeFmData () { + computeFmData() { console.log(this.fmData); }, - iniFmData () { + iniFmData() { const { editParams, fmData, editParamsDiv } = this; editParams.forEach((item, index) => { if (typeof item.value == "function") { @@ -503,7 +545,7 @@ export default { this.iniLoaded = true; }, - handleClickHtmlNode (e) { + handleClickHtmlNode(e) { //在判断事件目标节点的时候，考虑到兼容性应该统一转换成大写或小写进行判断 if (e.target.localName.toLowerCase() === "a") { // 通过判端目标节点以后，就能在这里对其进行操作啦。 @@ -512,7 +554,7 @@ export default { } }, - async getFmOptions (index, url, params, cookFn) { + async getFmOptions(index, url, params, cookFn) { const { data, code, msg } = await requestPost(url, { ...params, }); @@ -525,13 +567,13 @@ export default { } }, - handleChangeCascader (vals, item) { + handleChangeCascader(vals, item) { this.fmData[item["keyName"]] = vals; if (typeof item.handleChangeFn == "function") { item.handleChangeFn(vals, item, this); } }, - handleChangeSelect (vals, item) { + handleChangeSelect(vals, item) { console.log(vals, item); this.fmData[item["keyName"]] = vals; if (typeof item.handleChangeFn == "function") { @@ -539,14 +581,14 @@ export default { } }, - beforeImgUpload (file, item) { + beforeImgUpload(file, item) { if (typeof item.beforeImgUpload == "function") { if (!item.beforeImgUpload(file, item, this)) return false; } return true; }, - handleImgRemove (file, item) { + handleImgRemove(file, item) { console.log("handleImgRemove", file); let url = file.response ? file.response.data.url : file.url; if (url) { @@ -568,7 +610,7 @@ export default { } }, - handleImgExceed (res, item) { + handleImgExceed(res, item) { console.log(res); // this.$message({ // type: "warning", @@ -576,7 +618,7 @@ export default { // }); }, - handleImgSuccess (res, file, item) { + handleImgSuccess(res, file, item) { console.log("handleImgSuccess", res); if (res.code === 0 && res.msg === "success") { let { fmData } = this; @@ -612,12 +654,12 @@ export default { } }, - handleImgError (res, file, item) { + handleImgError(res, file, item) { console.log(res); }, // 地图初始化函数，本例取名为init，开发者可根据实际情况定义 - initMap (item) { + initMap(item) { let { latitude, longitude } = this.$store.state.user; map = new daiMap( @@ -756,12 +798,12 @@ export default { } }, - watchImg (src) { + watchImg(src) { window.open(src); }, // 过滤文本 - dormatHtml (content) { + dormatHtml(content) { if ( content.startsWith( "\n\n\n\n\n" @@ -773,7 +815,7 @@ export default { return content; }, - cookBeforeSubmit (data) { + cookBeforeSubmit(data) { Object.keys(data).forEach((k) => { if (typeof data[k] == "string") { data[k] = this.dormatHtml(data[k]); @@ -782,7 +824,7 @@ export default { return data; }, - async handleComfirm () { + async handleComfirm() { this.btnDisable = true; setTimeout(() => { this.btnDisable = false; @@ -814,7 +856,7 @@ export default { }); }, - async submit () { + async submit() { const { editConfig, fmData, formType, editFixedParams } = this; if ( typeof editConfig.beforeSubmit == "function" && @@ -854,7 +896,7 @@ export default { } }, - handleCancle () { + handleCancle() { this.$emit("close"); }, }, @@ -927,13 +969,14 @@ export default { .item { min-width: 45%; - .item-rich-text { + /deep/ .item-rich-text { width: 817px; max-height: 500px; overflow: auto; img { max-width: 100%; + height: auto; } &.z-show { box-sizing: border-box;