Browse Source

Merge branch 'dev-0420' of http://git.elinkit.com.cn:7070/r/epmet-oper-gov into dev-0420

shibei_master
jiangyy 3 years ago
parent
commit
8b437c987e
  1. 5
      package.json
  2. 1
      public/index.html
  3. BIN
      src/assets/img/shuju/measure/jijin.png
  4. BIN
      src/assets/img/shuju/measure/minban.png
  5. BIN
      src/assets/img/shuju/measure/other.png
  6. 3
      src/assets/scss/modules/visual/people.scss
  7. 71
      src/assets/scss/modules/visual/warning-people-list.scss
  8. 3
      src/assets/scss/people-info.scss
  9. 6
      src/views/components/rangeInput.vue
  10. 179
      src/views/components/tinymce/index.vue
  11. 185
      src/views/components/tinymce2/index.vue
  12. 418
      src/views/components/tinymce2/zh_CN.js
  13. 63
      src/views/modules/base/community/roomForm.vue
  14. 11
      src/views/modules/base/community/roomTable.vue
  15. 100
      src/views/modules/base/epidemic/travelForm.vue
  16. 2195
      src/views/modules/base/organization/organization.vue
  17. 26
      src/views/modules/shequ/cpts/fangwu-info.vue
  18. 32
      src/views/modules/shequ/cpts/xuqiu-info.vue
  19. 2
      src/views/modules/shequ/index.vue
  20. 107
      src/views/modules/visual/warning/components/screen-table/index.vue
  21. 213
      src/views/modules/visual/warning/components/screen-table/people-list.vue
  22. 12
      src/views/modules/visual/warning/index.vue
  23. 142
      src/views/modules/warning/components/screen-table/index.vue
  24. 184
      src/views/modules/warning/components/screen-table/people-list.vue
  25. 12
      src/views/modules/warning/index.vue
  26. 2
      src/views/modules/workPc/guidance/DetailForm.vue
  27. 2
      src/views/pages/login.vue

5
package.json

@ -16,7 +16,7 @@
"et:list": "gulp themes"
},
"dependencies": {
"@tinymce/tinymce-vue": "^4.0.4",
"@tinymce/tinymce-vue": "^3.2.8",
"axios": "^0.19.0",
"babel-eslint": "^8.0.1",
"babel-plugin-component": "^1.1.1",
@ -45,6 +45,7 @@
"throttle-debounce": "^3.0.1",
"v-distpicker": "^1.2.2",
"vue": "^2.6.11",
"vue-baidu-map": "^0.21.22",
"vue-i18n": "^8.12.0",
"vue-quill-editor": "^3.0.6",
"vue-router": "^3.0.7",
@ -53,6 +54,7 @@
},
"devDependencies": {
"@antv/f2": "^3.8.10-beta.1",
"@tinymce/tinymce-vue": "^3.2.8",
"@vue/cli-plugin-babel": "^3.10.0",
"@vue/cli-plugin-eslint": "^3.10.0",
"@vue/cli-service": "^3.10.0",
@ -62,6 +64,7 @@
"natives": "^1.1.6",
"ol": "^6.9.0",
"script-loader": "^0.7.2",
"tinymce": "^5.8.2",
"vue-template-compiler": "^2.6.11"
},
"eslintConfig": {

1
public/index.html

@ -8,6 +8,7 @@
<link rel="shortcut icon" href="<%= BASE_URL %>favicon.ico" />
<script charset="utf-8" src="https://map.qq.com/api/gljs?v=1.exp&libraries=service&key=LWBBZ-TIGC3-VFP3L-YNMWH-FJB7T-JFBLO"></script>
<script charset="utf-8" src="https://map.qq.com/api/gljs?v=1.exp&key=OB4BZ-D4W3U-B7VVO-4PJWW-6TKDJ-WPB77"></script>
<!-- f2图表 -->
<!-- <script src="https://gw.alipayobjects.com/os/lib/antv/f2/3.8.1/dist/f2.min.js"></script> -->

BIN
src/assets/img/shuju/measure/jijin.png

Binary file not shown.

Before

Width:  |  Height:  |  Size: 1.5 KiB

After

Width:  |  Height:  |  Size: 2.1 KiB

BIN
src/assets/img/shuju/measure/minban.png

Binary file not shown.

Before

Width:  |  Height:  |  Size: 1.5 KiB

After

Width:  |  Height:  |  Size: 2.1 KiB

BIN
src/assets/img/shuju/measure/other.png

Binary file not shown.

Before

Width:  |  Height:  |  Size: 1.5 KiB

After

Width:  |  Height:  |  Size: 2.1 KiB

3
src/assets/scss/modules/visual/people.scss

@ -263,9 +263,10 @@
}
.tab {
@include toe;
margin: 0 5px;
min-width: 80px;
padding: 0 10px;
padding: 0 8px;
height: 36px;
background: rgba(255, 255, 255, 0);
border: 1px solid #1257c9;

71
src/assets/scss/modules/visual/warning-people-list.scss

@ -0,0 +1,71 @@
@import "../../c/config";
@import "../../c/function";
@import "./c/common";
.m-pop {
@include shield;
background-color: rgba(#000, 0.9);
overflow-y: auto;
.wrap {
position: relative;
margin: 120px auto;
width: 1180px;
.title {
padding: 10px;
font-size: 22px;
font-family: PingFang SC;
font-weight: 800;
color: #ffffff;
display: flex;
align-items: center;
img {
display: block;
margin-right: 5px;
}
span {
display: block;
}
}
.btn-close {
position: absolute;
top: -15px;
right: -15px;
cursor: pointer;
}
.content {
margin-top: 20px;
min-height: 500px;
}
}
}
.m-pagination {
box-sizing: border-box;
margin-top: 20px;
width: 100%;
height: 40px;
display: flex;
justify-content: flex-end;
/deep/ .el-pagination.is-background .el-pager li:not(.disabled).active {
background: #0266d1;
color: #000d3f;
}
/deep/ .el-pagination .el-pager li {
background: #002e74;
}
/deep/ .el-pagination .btn-prev {
background: #002e74;
}
/deep/ .el-pagination .btn-next {
background: #002e74;
}
}

3
src/assets/scss/people-info.scss

@ -104,9 +104,10 @@
}
.tab {
@include toe;
margin: 0 5px;
min-width: 80px;
padding: 0 10px;
padding: 0 8px;
height: 36px;
background: #fff;
border: 1px solid #eee;

6
src/views/components/rangeInput.vue

@ -102,9 +102,9 @@ export default {
display: flex;
align-items: center;
}
.wd50 {
// width: 45%;
}
// .wd50 {
// // width: 45%;
// }
.demo-form-inline {
::v-deep .el-form-item {
width: 40%;

179
src/views/components/tinymce/index.vue

@ -1,154 +1,157 @@
/* eslint-disable */
<template>
<textarea :id="tinymceId"
style="visibility: hidden;" />
<textarea :id="tinymceId" style="visibility: hidden" />
</template>
<script>
import loadTinymce from '@/utils/loadTinymce'
import { plugins, toolbar } from './config'
import { debounce } from 'throttle-debounce'
import Cookie from 'js-cookie'
import loadTinymce from "@/utils/loadTinymce";
import { plugins, toolbar } from "./config";
import { debounce } from "throttle-debounce";
import Cookie from "js-cookie";
// import constants from '@/utils/constants'
import nextTick from "dai-js/tools/nextTick";
let num = 1
let num = 1;
export default {
name: 'Tinymce',
name: "Tinymce",
props: {
id: {
type: String,
default: () => {
num === 10000 && (num = 1)
return `tinymce${+new Date()}${num++}`
}
num === 10000 && (num = 1);
return `tinymce${+new Date()}${num++}`;
},
},
value: {
default: ''
default: "",
},
customerId: {
type: String,
default: ''
}
default: "",
},
},
data () {
data() {
return {
tinymceId: this.id
}
tinymceId: this.id,
};
},
mounted () {
loadTinymce(tinymce => {
let token = this.getUserToken()
mounted() {
loadTinymce((tinymce) => {
let token = this.getUserToken();
// let uploadUrl = '1111'
let uploadUrl = window.SITE_CONFIG['apiURL'] + '/oss/file/function/upload'
let uploadUrl =
window.SITE_CONFIG["apiURL"] + "/oss/file/function/upload";
// :data="{customerId:customerId}"
// let uploadUrl = constants.userUploadUrl
// eslint-disable-next-line global-require
require('./zh_CN')
require("./zh_CN");
let conf = {
selector: `#${this.tinymceId}`,
language: 'zh_CN',
menubar: 'false',
skin_url: '/' + process.env.VUE_APP_PUBLIC_PATH + '/tinymce/skins/ui/tduck',
content_style: 'p {margin:3px 0; border:0px; padding:0px}',
content_css: '/' + process.env.VUE_APP_PUBLIC_PATH + '/tinymce/skins/content/tduck',
cache_suffix: '?v=0.0.1',
language: "zh_CN",
menubar: "false",
skin_url:
"/" + process.env.VUE_APP_PUBLIC_PATH + "/tinymce/skins/ui/tduck",
content_style: "p {margin:3px 0; border:0px; padding:0px}",
content_css:
"/" +
process.env.VUE_APP_PUBLIC_PATH +
"/tinymce/skins/content/tduck",
cache_suffix: "?v=0.0.1",
plugins,
toolbar,
toolbar_drawer: 'sliding',
toolbar_mode: 'sliding',
toolbar_drawer: "sliding",
toolbar_mode: "sliding",
height: 400,
// fontsize_formats: "8pt 10pt 12pt 14pt 18pt 24pt 36pt",
branding: false,
object_resizing: false,
end_container_on_empty_block: true,
powerpaste_word_import: 'clean',
powerpaste_word_import: "clean",
// code_dialog_height: 450,
// code_dialog_width: 1000,
// autoresize_max_height: 450, //
// autoresize_min_height: 350, //
advlist_bullet_styles: 'square',
advlist_number_styles: 'default',
default_link_target: '_blank',
advlist_bullet_styles: "square",
advlist_number_styles: "default",
default_link_target: "_blank",
link_title: false,
statusbar: false,
nonbreaking_force_tab: true,
// images_upload_url: uploadUrl,
images_upload_handler: function (blobInfo, succFun, failFun) {
var xhr, formData
var file = blobInfo.blob()// file
xhr = new XMLHttpRequest()
xhr.withCredentials = false
xhr.open('POST', uploadUrl)
xhr.setRequestHeader('token', token)
var xhr, formData;
var file = blobInfo.blob(); // file
xhr = new XMLHttpRequest();
xhr.withCredentials = false;
xhr.open("POST", uploadUrl);
xhr.setRequestHeader("token", token);
xhr.onload = function () {
var json
var json;
if (xhr.status != 200) {
failFun('HTTP Error: ' + xhr.status)
return
failFun("HTTP Error: " + xhr.status);
return;
}
json = JSON.parse(xhr.responseText)
if (!json || typeof json.data.url != 'string') {
failFun('Invalid JSON: ' + xhr.responseText)
return
json = JSON.parse(xhr.responseText);
if (!json || typeof json.data.url != "string") {
failFun("Invalid JSON: " + xhr.responseText);
return;
}
succFun(json.data.url)
}
formData = new FormData()
succFun(json.data.url);
};
formData = new FormData();
formData.append('file', file, file.name)//
formData.append("file", file, file.name); //
// formData.append('customerId', '111')
xhr.send(formData)
}
}
conf = Object.assign(conf, this.$attrs)
conf.init_instance_callback = editor => {
if (this.value) editor.setContent(this.value)
this.vModel(editor)
}
xhr.send(formData);
},
};
conf = Object.assign(conf, this.$attrs);
conf.init_instance_callback = (editor) => {
if (this.value) editor.setContent(this.value);
this.vModel(editor);
};
tinymce.init(conf)
})
tinymce.init(conf);
});
},
destroyed () {
this.destroyTinymce()
destroyed() {
this.destroyTinymce();
},
methods: {
vModel (editor) {
vModel(editor) {
// setContent
const debounceSetContent = debounce(250, editor.setContent)
this.$watch('value', (val, prevVal) => {
const debounceSetContent = debounce(250, editor.setContent);
this.$watch("value", (val, prevVal) => {
if (editor && val !== prevVal && val !== editor.getContent()) {
if (typeof val !== 'string') val = val.toString()
debounceSetContent.call(editor, val)
if (typeof val !== "string") val = val.toString();
debounceSetContent.call(editor, val);
}
})
});
editor.on('change keyup undo redo', () => {
this.$emit('input', editor.getContent())
})
editor.on('blur', () => {
this.$emit('blur')
})
editor.on("change keyup undo redo", () => {
this.$emit("input", editor.getContent());
});
editor.on("blur", () => {
this.$emit("blur");
});
console.log('init_instance_callback1111111111')
},
getUserToken () {
let token = localStorage.getItem('token')
getUserToken() {
let token = localStorage.getItem("token");
// console.log('token', token)
// return this.$store.getters['user/isLogin']
return token
return token;
},
destroyTinymce () {
if (!window.tinymce) return
const tinymce = window.tinymce.get(this.tinymceId)
destroyTinymce() {
if (!window.tinymce) return;
const tinymce = window.tinymce.get(this.tinymceId);
if (tinymce) {
tinymce.destroy()
tinymce.destroy();
}
}
}
}
},
},
};
</script>

185
src/views/components/tinymce2/index.vue

@ -0,0 +1,185 @@
<template>
<editor v-model="content" tag-name="div" :init="init" />
</template>
<script>
import tinymce from "tinymce/tinymce";
import Editor from "@tinymce/tinymce-vue";
import "tinymce/themes/silver/theme"; //
import "tinymce/icons/default"; //
import "tinymce/plugins/link";
import "tinymce/plugins/code";
import "tinymce/plugins/table";
import "tinymce/plugins/lists";
import "tinymce/plugins/advlist";
import "tinymce/plugins/anchor";
import "tinymce/plugins/autolink"; //
import "tinymce/plugins/autoresize";
import "tinymce/plugins/autosave";
import "tinymce/plugins/charmap"; //
import "tinymce/plugins/code"; //
import "tinymce/plugins/codesample"; //
import "tinymce/plugins/directionality"; //
import "tinymce/plugins/fullpage"; //
import "tinymce/plugins/fullscreen"; //
import "tinymce/plugins/help"; //
import "tinymce/plugins/hr"; //线
import "tinymce/plugins/image"; //
import "tinymce/plugins/imagetools"; //
import "tinymce/plugins/importcss"; //
import "tinymce/plugins/insertdatetime"; //
import "tinymce/plugins/media"; //
import "tinymce/plugins/nonbreaking"; //
import "tinymce/plugins/noneditable"; //
import "tinymce/plugins/pagebreak"; //
import "tinymce/plugins/paste"; //
import "tinymce/plugins/preview"; //
import "tinymce/plugins/print"; //
import "tinymce/plugins/quickbars"; //
import "tinymce/plugins/save"; //
import "tinymce/plugins/searchreplace"; //
import "tinymce/plugins/spellchecker"; //
import "tinymce/plugins/tabfocus"; //
import "tinymce/plugins/template"; //
import "tinymce/plugins/textpattern"; //
import "tinymce/plugins/toc"; //
import "tinymce/plugins/visualblocks"; //
import "tinymce/plugins/visualchars"; //
import "tinymce/plugins/wordcount"; //
import { debounce } from "throttle-debounce";
export default {
props: {
value: {
default: "",
},
height: {
default: 400,
},
},
components: {
editor: Editor,
},
data() {
let uploadUrl =
window.SITE_CONFIG["apiURL"] + "/oss/file/upload-resi-event-file";
let token = this.getUserToken();
let init = {
language_url: require("./zh_CN.js"), //
language: "zh_CN",
skin_url: require("tinymce/skins/ui/oxide/skin.css"), //
menubar: false, //
autoresize_bottom_margin: 50,
max_height: this.height,
min_height: this.height,
// height: this.height || 500,
// height: 320,
toolbar_mode: "none",
toolbar_drawer: "sliding",
toolbar_mode: "sliding",
plugins:
"wordcount visualchars visualblocks toc textpattern template tabfocus spellchecker searchreplace save quickbars print preview paste pagebreak noneditable nonbreaking media insertdatetime importcss imagetools image hr help fullscreen fullpage directionality codesample code charmap link code table lists advlist anchor autolink autoresize autosave", // import
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",
content_style: "p {margin: 5px 0; font-size: 14px}",
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;",
branding: false,
elementpath: false,
resize: false, //
statusbar: false, //
object_resizing: false,
end_container_on_empty_block: true,
powerpaste_word_import: "clean",
// code_dialog_height: 450,
// code_dialog_width: 1000,
// autoresize_max_height: 450, //
// autoresize_min_height: 350, //
advlist_bullet_styles: "square",
advlist_number_styles: "default",
default_link_target: "_blank",
link_title: false,
nonbreaking_force_tab: true,
//
images_upload_handler: function (blobInfo, succFun, failFun) {
var xhr, formData;
var file = blobInfo.blob(); // file
xhr = new XMLHttpRequest();
xhr.withCredentials = false;
xhr.open("POST", uploadUrl);
xhr.setRequestHeader("token", token);
xhr.onload = function () {
var json;
if (xhr.status != 200) {
failFun("HTTP Error: " + xhr.status);
return;
}
json = JSON.parse(xhr.responseText);
if (!json || typeof json.data.url != "string") {
failFun("Invalid JSON: " + xhr.responseText);
return;
}
succFun(json.data.url);
};
formData = new FormData();
formData.append("file", file, file.name); //
formData.append("customerId", localStorage.getItem("customerId"));
xhr.send(formData);
},
};
// init = Object.assign(init, this.$attrs);
init.init_instance_callback = (editor) => {
if (this.value) editor.setContent(this.value);
this.vModel(editor);
};
// tinymce.init; //
const revert_data = (content) => {
this.$emit("input", content);
};
return {
content: this.value,
init,
revert_data,
};
},
mounted() {},
methods: {
vModel(editor) {
// setContent
const debounceSetContent = debounce(250, editor.setContent);
this.$watch("value", (val, prevVal) => {
if (editor && val !== prevVal && val !== editor.getContent()) {
if (typeof val !== "string") val = val.toString();
debounceSetContent.call(editor, val);
}
});
editor.on("change keyup undo redo", () => {
this.$emit("input", editor.getContent());
});
editor.on("blur", () => {
this.$emit("blur");
});
},
getUserToken() {
return localStorage.getItem("token");
},
destroyTinymce() {
tinymce.destroy();
},
},
watch: {
content() {
this.revert_data(this.content);
},
},
};
</script>

418
src/views/components/tinymce2/zh_CN.js

@ -0,0 +1,418 @@
import tinymce from "tinymce/tinymce";
tinymce.addI18n('zh_CN', {
"Redo": "恢复",
"Undo": "撤销",
"Cut": "剪切",
"Copy": "复制",
"Paste": "粘贴",
"Select all": "全选",
"New document": "新建文档",
"Ok": "确定",
"Cancel": "取消",
"Visual aids": "网格线",
"Bold": "粗体",
"Italic": "斜体",
"Underline": "下划线",
"Strikethrough": "删除线",
"Superscript": "上标",
"Subscript": "下标",
"Clear formatting": "清除格式",
"Align left": "左对齐",
"Align center": "居中",
"Align right": "右对齐",
"Justify": "两端对齐",
"Bullet list": "符号列表",
"Numbered list": "数字列表",
"Decrease indent": "减少缩进",
"Increase indent": "增加缩进",
"Close": "关闭",
"Formats": "格式",
"Your browser doesn't support direct access to the clipboard. Please use the Ctrl+X/C/V keyboard shortcuts instead.": "当前浏览器不支持访问剪贴板,请使用快捷键Ctrl+X/C/V复制粘贴",
"Headers": "标题",
"Header 1": "标题1",
"Header 2": "标题2",
"Header 3": "标题3",
"Header 4": "标题4",
"Header 5": "标题5",
"Header 6": "标题6",
"Headings": "标题",
"Heading 1": "标题1",
"Heading 2": "标题2",
"Heading 3": "标题3",
"Heading 4": "标题4",
"Heading 5": "标题5",
"Heading 6": "标题6",
"Preformatted": "预格式化",
"Div": "Div区块",
"Pre": "预格式文本",
"Code": "代码",
"Paragraph": "段落",
"Blockquote": "引用",
"Inline": "文本",
"Blocks": "区块",
"Paste is now in plain text mode. Contents will now be pasted as plain text until you toggle this option off.": "当前为纯文本粘贴模式,再次点击可以回到普通粘贴模式。",
"Fonts": "字体",
"Font Sizes": "字号",
"Class": "Class",
"Browse for an image": "浏览图像",
"OR": "或",
"Drop an image here": "拖放一张图片文件至此",
"Upload": "上传",
"Block": "块",
"Align": "对齐",
"Default": "默认",
"Circle": "空心圆",
"Disc": "实心圆",
"Square": "方块",
"Lower Alpha": "小写英文字母",
"Lower Greek": "小写希腊字母",
"Lower Roman": "小写罗马字母",
"Upper Alpha": "大写英文字母",
"Upper Roman": "大写罗马字母",
"Anchor...": "锚点...",
"Name": "名称",
"Id": "id",
"Id should start with a letter, followed only by letters, numbers, dashes, dots, colons or underscores.": "id应该以字母开头,后跟字母、数字、横线、点、冒号或下划线。",
"You have unsaved changes are you sure you want to navigate away?": "你对文档的修改尚未保存,确定离开吗?",
"Restore last draft": "恢复上次的草稿",
"Special characters...": "特殊字符...",
"Source code": "HTML源码",
"Insert/Edit code sample": "插入/编辑代码示例",
"Language": "语言",
"Code sample...": "代码示例...",
"Color Picker": "选取颜色",
"R": "R",
"G": "G",
"B": "B",
"Left to right": "从左到右",
"Right to left": "从右到左",
"Emoticons...": "表情符号...",
"Metadata and Document Properties": "元数据和文档属性",
"Title": "标题",
"Keywords": "关键词",
"Description": "描述",
"Robots": "机器人",
"Author": "作者",
"Encoding": "编码",
"Fullscreen": "全屏",
"Action": "操作",
"Shortcut": "快捷键",
"Help": "帮助",
"Address": "地址",
"Focus to menubar": "移动焦点到菜单栏",
"Focus to toolbar": "移动焦点到工具栏",
"Focus to element path": "移动焦点到元素路径",
"Focus to contextual toolbar": "移动焦点到上下文菜单",
"Insert link (if link plugin activated)": "插入链接 (如果链接插件已激活)",
"Save (if save plugin activated)": "保存(如果保存插件已激活)",
"Find (if searchreplace plugin activated)": "查找(如果查找替换插件已激活)",
"Plugins installed ({0}):": "已安装插件 ({0}):",
"Premium plugins:": "优秀插件:",
"Learn more...": "了解更多...",
"You are using {0}": "你正在使用 {0}",
"Plugins": "插件",
"Handy Shortcuts": "快捷键",
"Horizontal line": "水平分割线",
"Insert/edit image": "插入/编辑图片",
"Image description": "图片描述",
"Source": "地址",
"Dimensions": "大小",
"Constrain proportions": "保持宽高比",
"General": "常规",
"Advanced": "高级",
"Style": "样式",
"Vertical space": "垂直边距",
"Horizontal space": "水平边距",
"Border": "边框",
"Insert image": "插入图片",
"Image...": "图片...",
"Image list": "图片列表",
"Rotate counterclockwise": "逆时针旋转",
"Rotate clockwise": "顺时针旋转",
"Flip vertically": "垂直翻转",
"Flip horizontally": "水平翻转",
"Edit image": "编辑图片",
"Image options": "图片选项",
"Zoom in": "放大",
"Zoom out": "缩小",
"Crop": "裁剪",
"Resize": "调整大小",
"Orientation": "方向",
"Brightness": "亮度",
"Sharpen": "锐化",
"Contrast": "对比度",
"Color levels": "色阶",
"Gamma": "伽马值",
"Invert": "反转",
"Apply": "应用",
"Back": "后退",
"Insert date/time": "插入日期/时间",
"Date/time": "日期/时间",
"Insert/Edit Link": "插入/编辑链接",
"Insert/edit link": "插入/编辑链接",
"Text to display": "显示文字",
"Url": "地址",
"Open link in...": "链接打开方式...",
"Current window": "当前窗口打开",
"None": "在当前窗口/框架打开",
"New window": "在新窗口打开",
"Remove link": "删除链接",
"Anchors": "锚点",
"Link...": "链接...",
"Paste or type a link": "粘贴或输入链接",
"The URL you entered seems to be an email address. Do you want to add the required mailto: prefix?": "你所填写的URL地址为邮件地址,需要加上mailto:前缀吗?",
"The URL you entered seems to be an external link. Do you want to add the required http:// prefix?": "你所填写的URL地址属于外部链接,需要加上http://:前缀吗?",
"Link list": "链接列表",
"Insert video": "插入视频",
"Insert/edit video": "插入/编辑视频",
"Insert/edit media": "插入/编辑媒体",
"Alternative source": "替代资源",
"Alternative image URL": "资源备用地址",
"Media poster (Image URL)": "封面(图片地址)",
"Paste your embed code below:": "将内嵌代码粘贴在下面:",
"Embed": "内嵌",
"Media...": "多媒体...",
"Nonbreaking space": "不间断空格",
"Page break": "分页符",
"Paste as text": "粘贴为文本",
"Preview": "预览",
"Print...": "打印...",
"Save": "保存",
"Find": "查找",
"Replace with": "替换为",
"Replace": "替换",
"Replace all": "替换全部",
"Previous": "上一个",
"Next": "下一个",
"Find and replace...": "查找并替换...",
"Could not find the specified string.": "未找到搜索内容。",
"Match case": "区分大小写",
"Find whole words only": "全单词匹配",
"Spell check": "拼写检查",
"Ignore": "忽略",
"Ignore all": "忽略全部",
"Finish": "完成",
"Add to Dictionary": "添加到字典",
"Insert table": "插入表格",
"Table properties": "表格属性",
"Delete table": "删除表格",
"Cell": "单元格",
"Row": "行",
"Column": "列",
"Cell properties": "单元格属性",
"Merge cells": "合并单元格",
"Split cell": "拆分单元格",
"Insert row before": "在上方插入",
"Insert row after": "在下方插入",
"Delete row": "删除行",
"Row properties": "行属性",
"Cut row": "剪切行",
"Copy row": "复制行",
"Paste row before": "粘贴到上方",
"Paste row after": "粘贴到下方",
"Insert column before": "在左侧插入",
"Insert column after": "在右侧插入",
"Delete column": "删除列",
"Cols": "列",
"Rows": "行",
"Width": "宽",
"Height": "高",
"Cell spacing": "单元格外间距",
"Cell padding": "单元格内边距",
"Show caption": "显示标题",
"Left": "左对齐",
"Center": "居中",
"Right": "右对齐",
"Cell type": "单元格类型",
"Scope": "范围",
"Alignment": "对齐方式",
"H Align": "水平对齐",
"V Align": "垂直对齐",
"Top": "顶部对齐",
"Middle": "垂直居中",
"Bottom": "底部对齐",
"Header cell": "表头单元格",
"Row group": "行组",
"Column group": "列组",
"Row type": "行类型",
"Header": "表头",
"Body": "表体",
"Footer": "表尾",
"Border color": "边框颜色",
"Insert template...": "插入模板...",
"Templates": "模板",
"Template": "模板",
"Text color": "文字颜色",
"Background color": "背景色",
"Custom...": "自定义...",
"Custom color": "自定义颜色",
"No color": "无",
"Remove color": "删除颜色",
"Table of Contents": "目录",
"Show blocks": "显示区块边框",
"Show invisible characters": "显示不可见字符",
"Word count": "字数统计",
"Words: {0}": "字数:{0}",
"{0} words": "{0} 个字",
"File": "文件",
"Edit": "编辑",
"Insert": "插入",
"View": "查看",
"Format": "格式",
"Table": "表格",
"Tools": "工具",
"Powered by {0}": "Powered by {0}",
"Rich Text Area. Press ALT-F9 for menu. Press ALT-F10 for toolbar. Press ALT-0 for help": "在编辑区按ALT+F9打开菜单,按ALT+F10打开工具栏,按ALT+0查看帮助",
"Image title": "图片标题",
"Border width": "边框宽度",
"Border style": "边框样式",
"Error": "错误",
"Warn": "警告",
"Valid": "有效",
"To open the popup, press Shift+Enter": "此快捷为软回车(插入<br>)",
"Rich Text Area. Press ALT-0 for help.": "编辑区. 按Alt+0键打开帮助",
"System Font": "默认字体",
"Failed to upload image: {0}": "图片上传失败: {0}",
"Failed to load plugin: {0} from url {1}": "插件加载失败: {0} - {1}",
"Failed to load plugin url: {0}": "插件加载失败: {0}",
"Failed to initialize plugin: {0}": "插件初始化失败: {0}",
"example": "示例",
"Search": "查找",
"All": "全部",
"Currency": "货币",
"Text": "文本",
"Quotations": "引用",
"Mathematical": "数学运算符",
"Extended Latin": "拉丁语扩充",
"Symbols": "符号",
"Arrows": "箭头",
"User Defined": "自定义",
"dollar sign": "美元",
"currency sign": "货币",
"euro-currency sign": "欧元",
"colon sign": "冒号",
"cruzeiro sign": "克鲁赛罗币",
"french franc sign": "法郎",
"lira sign": "里拉",
"mill sign": "密尔",
"naira sign": "奈拉",
"peseta sign": "比塞塔",
"rupee sign": "卢比",
"won sign": "韩元",
"new sheqel sign": "新谢克尔",
"dong sign": "越南盾",
"kip sign": "老挝基普",
"tugrik sign": "图格里克",
"drachma sign": "德拉克马",
"german penny symbol": "德国便士",
"peso sign": "比索",
"guarani sign": "瓜拉尼",
"austral sign": "澳元",
"hryvnia sign": "格里夫尼亚",
"cedi sign": "塞地",
"livre tournois sign": "里弗弗尔",
"spesmilo sign": "一千spesoj的货币符号,该货币未使用",
"tenge sign": "坚戈",
"indian rupee sign": "印度卢比",
"turkish lira sign": "土耳其里拉",
"nordic mark sign": "北欧马克",
"manat sign": "马纳特",
"ruble sign": "卢布",
"yen character": "日元",
"yuan character": "人民币元",
"yuan character, in hong kong and taiwan": "元的繁体字",
"yen/yuan character variant one": "元(大写)",
"Loading emoticons...": "正在加载表情文字...",
"Could not load emoticons": "不能加载表情文字",
"People": "人类",
"Animals and Nature": "动物和自然",
"Food and Drink": "食物和饮品",
"Activity": "活动",
"Travel and Places": "旅游和地点",
"Objects": "物件",
"Flags": "旗帜",
"Characters": "字数",
"Characters (no spaces)": "字数(不含空格)",
"Error: Form submit field collision.": "错误: 表单提交字段冲突.",
"Error: No form element found.": "错误: 未找到可用的form.",
"Update": "更新",
"Color swatch": "颜色样本",
"Turquoise": "青绿",
"Green": "绿色",
"Blue": "蓝色",
"Purple": "紫色",
"Navy Blue": "海军蓝",
"Dark Turquoise": "深蓝绿色",
"Dark Green": "暗绿",
"Medium Blue": "中蓝",
"Medium Purple": "中紫",
"Midnight Blue": "深蓝",
"Yellow": "黄色",
"Orange": "橙色",
"Red": "红色",
"Light Gray": "浅灰",
"Gray": "灰色",
"Dark Yellow": "暗黄",
"Dark Orange": "暗橙",
"Dark Red": "暗红",
"Medium Gray": "中灰",
"Dark Gray": "深灰",
"Black": "黑色",
"White": "白色",
"Switch to or from fullscreen mode": "切换全屏模式",
"Open help dialog": "打开帮助对话框",
"history": "历史",
"styles": "样式",
"formatting": "格式化",
"alignment": "对齐",
"indentation": "缩进",
"permanent pen": "记号笔",
"comments": "注释",
"Anchor": "锚点",
"Special character": "特殊字符",
"Code sample": "代码示例",
"Color": "颜色",
"Emoticons": "表情",
"Document properties": "文档属性",
"Image": "图片",
"Insert link": "插入链接",
"Target": "目标",
"Link": "链接",
"Poster": "封面",
"Media": "音视频",
"Print": "打印",
"Prev": "上一个",
"Find and replace": "查找并替换",
"Whole words": "全字匹配",
"Spellcheck": "拼写检查",
"Caption": "标题",
"Insert template": "插入模板",
//以下为补充汉化内容 by 莫若卿
"Code view": "代码区域",
"Select...": "选择...",
"Format Painter": "格式刷",
"No templates defined.": "无内置模板",
"Special character...": "特殊字符...",
"Open link": "打开链接",
// "None": "无",
"Count": "统计",
"Document": "整个文档",
"Selection": "选取部分",
"Words": "字词数",
"{0} characters": "{0} 个字符",
"Alternative source URL": "替代资源地址",
"Alternative description": "替代说明文字",
"Accessibility": "可访问性",
"Image is decorative": "仅用于装饰",
//5.6新增
"Line height": "行高",
"Cut column": "剪切列",
"Copy column": "复制列",
"Paste column before": "粘贴到前方",
"Paste column after": "粘贴到后方",
// "Copy column": "复制列",
//帮助窗口内的文字
"Version": "版本",
"Keyboard Navigation": "键盘导航",
"Open popup menu for split buttons": "该组合键的作用是软回车(插入br)",
});

63
src/views/modules/base/community/roomForm.vue

@ -11,7 +11,7 @@
<el-form-item label="所属楼栋"
label-width="150px"
style="display: block">
<span>{{ agencyObj.neighborHoodName }}{{agencyObj.buildingName}}</span>
<span>{{ agencyObj.neighborHoodName }}{{agencyObj.label}}</span>
</el-form-item>
<el-form-item label="单元号"
@ -127,7 +127,8 @@
<script>
import { mapGetters } from 'vuex'
import { Loading } from 'element-ui' // Loading
import { requestPost } from '@/js/dai/request'
import { requestPost, requestGet } from '@/js/dai/request'
let loading //
export default {
@ -165,29 +166,28 @@ export default {
},
methods: {
async initForm (type, row) {
async initForm (type, row, agencyObj) {
this.$refs.ref_form.resetFields();
this.agencyObj = row
this.dataForm.neighborHoodId = this.agencyObj.neighborHoodId
this.dataForm.buildingId = this.agencyObj.buildingId
this.agencyObj = agencyObj
this.formType = type
if (row) {
this.dataForm = JSON.parse(JSON.stringify(row))
this.houseId = this.dataForm.houseId
this.dataForm.buildingUnitId = this.dataForm.unitNumKey
this.dataForm = { ... this.dataForm }
this.houseType = this.dataForm.houseTypeKey
this.purpose = this.dataForm.purposeKey
this.rentFlag = parseInt(this.dataForm.rentFlagKey)
// if (this.dataForm.rentFlagKey==='2') {
// this.rentFlag = parseInt(this.dataForm.rentFlagKey)
// } else {
// this.rentFlag = 0
// }
this.houseId = row.houseId
await this.loadHouseInfo()
// this.dataForm = JSON.parse(JSON.stringify(row))
// this.houseId = this.dataForm.houseId
// this.dataForm.buildingUnitId = this.dataForm.unitNumKey
// this.dataForm = { ... this.dataForm }
// this.houseType = this.dataForm.houseTypeKey
// this.purpose = this.dataForm.purposeKey
// this.rentFlag = parseInt(this.dataForm.rentFlagKey)
} else {
this.dataForm.neighborHoodId = this.agencyObj.neighborHoodId
this.dataForm.buildingId = this.agencyObj.id
}
@ -195,12 +195,33 @@ export default {
},
async loadHouseInfo () {
const url = "/gov/org/ichouse/" + this.houseId
const { data, code, msg } = await requestGet(url)
if (code === 0) {
// debugger
this.dataForm = { ...data }
this.houseType = this.dataForm.houseType
this.purpose = this.dataForm.purpose
this.rentFlag = parseInt(this.dataForm.rentFlag)
} else {
this.$message.error(msg)
}
},
//
async loadUnitList () {
const url = '/gov/org/building/buildingunitlist'
let params = {
buildingId: this.agencyObj.buildingId
buildingId: this.dataForm.buildingId
}
const { data, code, msg } = await requestPost(url, params)

11
src/views/modules/base/community/roomTable.vue

@ -2,7 +2,8 @@
<div>
<div class="div_btn">
<el-button style="float:left"
<el-button v-if="agencyObj.level==='building'||source!=='search'"
style="float:left"
class="diy-button--add"
size="small"
@click="handleAdd">新增房屋</el-button>
@ -162,6 +163,7 @@ let loading // 加载动画
export default {
data () {
return {
source: 'tree',//
importRoomLoading: false,
total: 0,
pageSize: 20,
@ -236,6 +238,7 @@ export default {
async loadTable (source, treeObj, ownerName, ownerPhone, rentFlag) {
this.source = source
this.tableLoading = true
if (source === 'tree') {//tree
@ -272,8 +275,8 @@ export default {
this.total = data.total
this.validTableDataNum = 0
data.list.forEach(item => {
item.houseNameShow = item.neighborHoodName + item.buildingName + item.unitNum + '单元' + item.doorName
item.unitNumShow = item.unitNum + '单元'
item.houseNameShow = item.neighborHoodName + item.buildingName + item.unitNum + item.doorName
if (item.agencyId === this.staffAgencyId) {
item.showBtn = true
this.validTableDataNum++
@ -298,6 +301,7 @@ export default {
this.formTitle = '房屋详情'
this.formShow = true
this.$nextTick(() => {
this.$refs.ref_form.initForm('detail', row, this.agencyObj)
})
},
@ -307,6 +311,7 @@ export default {
this.formTitle = '新增房屋'
this.formShow = true
this.$nextTick(() => {
console.log(this.agencyObj)
this.$refs.ref_form.initForm('add', null, this.agencyObj)
})
},

100
src/views/modules/base/epidemic/travelForm.vue

@ -346,21 +346,20 @@ export default {
return w + 'px'
},
lzayLoadArea(node, resolve) {
this.getArea(node, resolve)
// setTimeout(() => {
// }, 1000)
// this.getArea(node, resolve)
setTimeout(() => {
this.getArea(node, resolve)
}, 200)
},
async initForm (type, row) {
console.log('row----', row)
this.formType = type
this.formData.agencyId = this.agencyId
if (type != 'add') {
this.formData = { ...row, channel: [], content: '' }
this.sourceAllCode = row.sourceAddressPathCode && row.sourceAddressPathCode.split(',')
// this.formData = { ...row, channel: [], content: '' }
await this.loadFormData(row.id)
if (row.userType == 'icresi') this.isFromResi = true
else this.nowAllCode = row.presentAddressPathCode && row.presentAddressPathCode.split(',')
} else {
const { user } = this.$store.state
this.nowAllCode = user.areaCodePath
@ -507,35 +506,20 @@ export default {
this.handleSelAddress(personItem.houseId)
},
async loadFormData () {
async loadFormData (id) {
// const url = 'http://yapi.elinkservice.cn/mock/245/epmetuser/icNat/detail'
const url = '/epmetuser/icNat/detail'
const url = '/epmetuser/tripreport/detail'
let params = {
icNatId: this.icNatId,
id,
}
const { data, code, msg } = await requestPost(url, params)
if (code === 0) {
this.formData = data
this.formData.icNatId = this.icNatId
this.fileList = []
if (data.fileName) {
let obj = {
name: data.fileName,
type: data.attachmentType,
url: data.attachmentUrl,
}
// data.attachmentList.forEach(element => {
// element.name = element.fileName
// element.type = element.attachmentType
// element.size = element.attachmentSize
// });
this.fileList.push(obj)
}
this.hideUploadEdit = this.fileList.length >= this.limitNum;
console.log('deda-------', data)
this.formData = { ...data, channel: [], content: '' }
this.sourceAllCode = data.sourceAddressPathCode && data.sourceAddressPathCode.split(',')
if (data.userType == 'icresi') this.isFromResi = true
else this.nowAllCode = data.presentAddressPathCode && data.presentAddressPathCode.split(',')
} else {
this.$message.error(msg)
}
@ -592,58 +576,6 @@ export default {
},
handleRemove (file, fileList) {
this.hideUploadEdit = fileList.length >= this.limitNum;
this.formData.fileName = ''
this.formData.attachmentUrl = ''
this.formData.attachmentType = ''
this.fileList = []
},
handlePictureCardPreview (file) {
this.dialogImageUrl = file.url;
this.dialogVisible = true;
},
handleEditChange (file, fileList) {
this.hideUploadEdit = fileList.length >= this.limitNum;
},
beforeUpload (file) {
const array = file.name.split('.')
const extension = array[array.length - 1]
// const isLt1M = (file.size / 1024 / 1024) < 5
if (extension !== 'jpg'
&& extension !== 'png'
&& extension !== 'gif'
) {
this.$message.error('只能上传jpg、png、gif文件!')
return false
}
// if (!isLt1M) {
// this.$message.error(' 5MB!')
// }
// return isLt1M
},
handleFileSuccess (res, file) {
if (res.code === 0 && res.msg === 'success') {
const array = file.name.split('.')
const fileType = array[array.length - 1]
this.formData.fileName = file.name
this.formData.attachmentUrl = res.data.url
this.formData.attachmentType = 'image'
file.attachmentFormat = fileType
file.attachmentSize = file.size
} else this.$message.error(res.msg)
},
resetData () {
this.$refs.ref_form.resetFields()
this.formData.sourceAddressCode = ''

2195
src/views/modules/base/organization/organization.vue

File diff suppressed because it is too large

26
src/views/modules/shequ/cpts/fangwu-info.vue

@ -9,7 +9,7 @@
class="form"
>
<el-form-item
label="所属小区"
label="所属小区"
label-width="150px"
style="display: block"
>
@ -17,7 +17,7 @@
</el-form-item>
<el-form-item
label="所属楼栋"
label="所属楼栋"
label-width="150px"
style="display: block"
>
@ -25,7 +25,7 @@
</el-form-item>
<el-form-item
label="单元号"
label="单元号"
prop="buildingUnitId"
label-width="150px"
style="display: block"
@ -34,7 +34,7 @@
</el-form-item>
<el-form-item
label="门牌号"
label="门牌号"
prop="doorName"
label-width="150px"
style="display: block"
@ -43,7 +43,7 @@
</el-form-item>
<el-form-item
label="房屋类型"
label="房屋类型"
prop="houseType"
label-width="150px"
style="display: block"
@ -52,7 +52,7 @@
</el-form-item>
<el-form-item
label="房屋用途"
label="房屋用途"
prop="purpose"
label-width="150px"
style="display: block"
@ -61,7 +61,7 @@
</el-form-item>
<el-form-item
label="是否出租"
label="房屋状态:"
prop="rentFlag"
label-width="150px"
style="display: block"
@ -70,7 +70,7 @@
</el-form-item>
<el-form-item
label="房主姓名"
label="房主姓名"
prop="ownerName"
label-width="150px"
style="display: block"
@ -78,7 +78,7 @@
<span>{{ dataForm.ownerName }}</span>
</el-form-item>
<el-form-item
label="房主电话"
label="房主电话"
prop="ownerPhone"
label-width="150px"
style="display: block"
@ -86,7 +86,7 @@
<span>{{ dataForm.ownerPhone }}</span>
</el-form-item>
<el-form-item
label="房主身份证"
label="房主身份证"
prop="ownerIdCard"
label-width="150px"
style="display: block"
@ -118,7 +118,7 @@ export default {
doorName: "", //
houseType: "", //
purpose: "", //
rentFlag: 1, //10
rentFlag: 1, //10
ownerPhone: "", //
ownerName: "", //
ownerIdCard: "", //
@ -151,7 +151,7 @@ export default {
doorName: "", //
houseType: "1", //
purpose: "1", //
rentFlag: 1, //10
rentFlag: 1, //10
ownerPhone: "", //
ownerName: "", //
ownerIdCard: "", //
@ -191,7 +191,7 @@ export default {
.div_btn {
display: flex;
justify-content: flex-end;
justify-content: center;
}
.el-tabs {
margin: 0 20px;

32
src/views/modules/shequ/cpts/xuqiu-info.vue

@ -8,12 +8,12 @@
:disabled="formType === 'detail'"
class="form"
>
<el-form-item label="状态" label-width="150px" style="display: block">
<el-form-item label="状态" label-width="150px" style="display: block">
<span>{{ dataForm.statusName }}</span>
</el-form-item>
<el-form-item
label="所属网格"
label="所属网格"
label-width="150px"
style="display: block"
>
@ -21,7 +21,7 @@
</el-form-item>
<el-form-item
label="需求类型"
label="需求类型"
label-width="150px"
style="display: block"
>
@ -29,7 +29,7 @@
</el-form-item>
<el-form-item
label="需求内容"
label="需求内容"
label-width="150px"
style="display: block"
>
@ -37,32 +37,32 @@
</el-form-item>
<el-form-item
label="上报类型"
label="上报类型"
label-width="150px"
style="display: block"
>
<span>{{ dataForm.reportTypeName }}</span>
</el-form-item>
<el-form-item label="上报人" label-width="150px" style="display: block">
<el-form-item label="上报人" label-width="150px" style="display: block">
<span>{{ dataForm.reportUserName }}</span>
</el-form-item>
<el-form-item
label="上报时间"
label="上报时间"
label-width="150px"
style="display: block"
>
<span>{{ dataForm.reportTime }}</span>
</el-form-item>
<el-form-item label="需求人" label-width="150px" style="display: block">
<el-form-item label="需求人" label-width="150px" style="display: block">
<span>{{ dataForm.demandUserName }}</span>
</el-form-item>
<el-form-item
v-if="dataForm.serviceShowName"
label="服务方"
label="服务方"
label-width="150px"
style="display: block"
>
@ -71,7 +71,7 @@
<el-form-item
v-if="dataForm.wantServiceTime"
label="服务时间"
label="服务时间"
label-width="150px"
style="display: block"
>
@ -84,7 +84,7 @@
dataForm.serviceEndTime &&
dataForm.status == 'finished'
"
label="实际服务时间"
label="实际服务时间"
label-width="150px"
style="display: block"
>
@ -97,7 +97,7 @@
<el-form-item
v-if="dataForm.finishResult && dataForm.status == 'finished'"
label="完成情况"
label="完成情况"
label-width="150px"
style="display: block"
>
@ -108,7 +108,7 @@
<el-form-item
v-if="dataForm.score && dataForm.status == 'finished'"
label="评价得分"
label="评价得分"
label-width="150px"
style="display: block"
>
@ -117,7 +117,7 @@
<el-form-item
v-if="dataForm.finishDesc && dataForm.status == 'finished'"
label="评价备注"
label="评价备注"
label-width="150px"
style="display: block"
>
@ -126,7 +126,7 @@
<el-form-item
v-if="dataForm.cancelTime && dataForm.status == 'canceled'"
label="取消时间"
label="取消时间"
label-width="150px"
style="display: block"
>
@ -208,7 +208,7 @@ export default {
.div_btn {
display: flex;
justify-content: flex-end;
justify-content: center;
}
.el-tabs {
margin: 0 20px;

2
src/views/modules/shequ/index.vue

@ -138,7 +138,7 @@
label="用途">
</el-table-column>
<el-table-column prop="rentFlag"
label="是否出租">
label="房屋状态">
</el-table-column>
<el-table-column prop="ownerName"
label="房主姓名">

107
src/views/modules/visual/warning/components/screen-table/index.vue

@ -23,33 +23,10 @@
:key="indexs"
:style="tableContentStyle[indexs]"
>
<div v-if="Array.isArray(item)">
<span
v-show="rIndex < 3"
:key="resi.userId"
v-for="(resi, rIndex) in item"
>
{{ rIndex != 0 ? "、" : "" }}
<a @click="toUserInfo(resi.userId)">{{ resi.residentName }}</a>
</span>
<div v-if="item.type && item.type == 'btn'">
<a @click="handleClickBtn(item)">{{ item.name }}</a>
</div>
<span v-else>{{ item }}</span>
<span
v-if="indexs + 1 == value.length && item.length > 3"
class="more"
@click.stop="onClickMorePop(index)"
ref="morePop"
>
更多>
<div class="more-pop" v-if="visiblePopList[index]">
<span :key="resi.userId" v-for="(resi, rIndex) in item">
{{ rIndex != 0 ? "、" : "" }}
<a @click="toUserInfo(resi.userId)">{{
resi.residentName
}}</a>
</span>
</div>
</span>
</div>
</div>
<screen-loading v-if="visibleLoading">加载中</screen-loading>
@ -63,16 +40,27 @@
</div>
</div>
</div>
<people-list
v-if="showedPeopleList && buildingId"
:buildingId="buildingId"
:configId="configId"
:gridName="gridName"
@close="showedPeopleList = false"
/>
</div>
</template>
<script>
import ScreenLoading from "../screen-loading/index";
import Vue from "vue";
import peopleList from "./people-list";
export default {
name: "warning-table",
components: {
ScreenLoading,
peopleList,
},
props: {
headerList: {
@ -84,7 +72,8 @@ export default {
{ title: "所属网格" },
{ title: "所属小区" },
{ title: "楼号" },
{ title: "姓名" },
{ title: "预警人数" },
{ title: "操作" },
];
},
},
@ -162,49 +151,29 @@ export default {
},
data() {
return {
visiblePopList: [
false,
false,
false,
false,
false,
false,
false,
false,
false,
false,
],
//
showedPeopleList: false,
buildingId: "",
configId: "",
gridName: "",
};
},
watch: {
tableData(arr) {
if (Array.isArray(arr)) {
this.visiblePopList = new Array(arr.length).fill(false);
}
},
},
watch: {},
mounted() {
window.addEventListener("click", (e) => {
this.visiblePopList = new Array(this.visiblePopList.length).fill(false);
});
},
mounted() {},
created() {},
methods: {
toUserInfo(uid) {
this.$router.push({ path: `/main-shuju/visual-basicinfo-people/${uid}` });
handleClickBtn(item) {
this.showedPeopleList = true;
this.buildingId = item.buildingId;
this.configId = item.configId;
this.gridName = item.gridName;
},
onClickMorePop(index) {
this.visiblePopList.forEach((item, indexs) => {
if (index == indexs) {
Vue.set(this.visiblePopList, index, true);
} else {
Vue.set(this.visiblePopList, indexs, false);
}
});
toUserInfo(uid) {
this.$router.push({ path: `/main-shuju/visual-basicinfo-people/${uid}` });
},
},
};
@ -236,16 +205,19 @@ export default {
width: 5%;
}
&:nth-child(2) {
width: 20%;
width: 25%;
}
&:nth-child(3) {
width: 20%;
width: 25%;
}
&:nth-child(4) {
width: 15%;
}
&:nth-child(5) {
width: 40%;
width: 15%;
}
&:nth-child(6) {
width: 15%;
}
}
}
@ -275,16 +247,19 @@ export default {
width: 5%;
}
&:nth-child(2) {
width: 20%;
width: 25%;
}
&:nth-child(3) {
width: 20%;
width: 25%;
}
&:nth-child(4) {
width: 15%;
}
&:nth-child(5) {
width: 40%;
width: 15%;
}
&:nth-child(6) {
width: 15%;
}
a {
cursor: pointer;

213
src/views/modules/visual/warning/components/screen-table/people-list.vue

@ -0,0 +1,213 @@
<template>
<div class="m-pop">
<div class="wrap">
<cpt-card>
<div class="btn-close" @click="handleClose">
<img src="@/assets/img/shuju/people/close.png" />
</div>
<div class="wrap2">
<div class="title">
<span>人员列表</span>
</div>
<div class="content">
<div class="tb">
<cpt-tb
:col-list="colList"
:loading="loading"
:header="header"
:list="list"
@operate="toUserInfo"
></cpt-tb>
</div>
<div class="m-pagination">
<el-pagination
:current-page="pageNo"
:page-size="pageSize"
background
layout="prev, pager, next"
@size-change="pageSizeChangeHandleNew"
@current-change="pageCurrentChangeHandleNew"
:total="total"
>
</el-pagination>
</div>
</div>
</div>
</cpt-card>
</div>
<people-more
v-if="showedPeopleInfo && currentPepeleId"
:userId="currentPepeleId"
:gridName="gridName"
@close="showedPeopleInfo = false"
/>
</div>
</template>
<script>
import cptCard from "@/views/modules/visual/cpts/card";
import { requestPost } from "@/js/dai/request";
import peopleMore from "@/views/modules/shequ/cpts/people-more";
import cptTb from "@/views/modules/visual/cpts/tb";
import { mapGetters } from "vuex";
export default {
name: "people-list",
props: {
configId: {
type: String,
default: "",
},
buildingId: {
type: String,
default: "",
},
gridName: {
type: String,
default: "",
},
},
components: {
cptCard,
cptTb,
peopleMore,
},
data() {
return {
showedPeopleInfo: false,
currentPepeleId: "",
currentPepeleGridName: "",
colList: [
{
align: "center",
width: "5%",
},
{
align: "center",
width: "15%",
},
{
align: "center",
width: "10%",
},
{
align: "center",
width: "15%",
},
{
align: "center",
width: "20%",
},
{
align: "center",
width: "20%",
},
{
align: "center",
width: "10%",
},
],
header: ["序号", "姓名", "单元", "门牌号", "手机", "身份证", "操作"],
loading: false,
pageNo: 0,
pageSize: 12,
total: 0,
list: [],
srcList: [],
};
},
computed: {
maxTableHeight() {
return this.clientHeight - 450;
return 420;
},
...mapGetters(["clientHeight"]),
},
watch: {
userId() {
this.getApiData();
},
},
mounted() {
this.getApiData();
},
methods: {
pageSizeChangeHandleNew(val) {
this.pageNo = 1;
this.pageSize = val;
},
pageCurrentChangeHandleNew(val) {
this.pageNo = val;
this.getList();
},
handlePeopleItem(uid) {
console.log(uid);
this.currentPepeleId = uid;
this.showedPeopleInfo = true;
},
toUserInfo(index) {
let uid = this.srcList[index].userId;
this.$router.push({ path: `/main-shuju/visual-basicinfo-people/${uid}` });
},
handleClose() {
this.$emit("close");
},
async getApiData() {
this.getList();
},
async getList() {
const url = "/epmetuser/statsresiwarn/alluserwarnlist";
let params = {
buildingId: this.buildingId,
configId: this.configId,
pageNo: this.pageNo,
pageSize: this.pageSize,
};
const { data, code, msg } = await requestPost(url, params);
if (code === 0) {
const { list, total } = data;
this.list = list.map((item) => {
return [
{ type: "index" },
item.residentName,
item.unitName,
item.doorName,
item.mobile,
item.idCard,
{ type: "operate", list: ["查看更多"] },
];
});
this.total = total;
this.srcList = list;
} else {
this.$message.error(msg);
}
},
},
};
</script>
<style
lang="scss"
src="@/assets/scss/modules/visual/warning-people-list.scss"
scoped
></style>

12
src/views/modules/visual/warning/index.vue

@ -89,7 +89,8 @@ export default {
{ title: "所属网格" },
{ title: "所属小区" },
{ title: "楼号" },
{ title: "姓名" },
{ title: "预警人数" },
{ title: "操作" },
],
tableData: [
// [1,'','','2',''],
@ -133,7 +134,14 @@ export default {
item.gridName,
item.neighborhoodName,
item.buildingName,
item.userList || '暂无',
item.count,
{
type: "btn",
name: "查看人员",
buildingId: item.buildingId,
configId: item.configId,
gridName: item.gridName,
},
]);
});
this.tableData = tableData;

142
src/views/modules/warning/components/screen-table/index.vue

@ -24,38 +24,10 @@
:key="indexs"
:style="tableContentStyle[indexs]"
>
<div v-if="Array.isArray(item)">
<span
v-show="rIndex < 3"
:key="resi.userId"
v-for="(resi, rIndex) in item"
>
{{ rIndex != 0 ? "、" : "" }}
<a @click="handlePeopleItem(resi.userId, value[1])">{{
resi.residentName
}}</a>
</span>
<div v-if="item.type && item.type == 'btn'">
<a @click="handleClickBtn(item)">{{ item.name }}</a>
</div>
<span v-else>{{ item }}</span>
<span
v-if="indexs + 1 == value.length && item.length > 3"
class="more"
@click.stop="onClickMorePop(index)"
ref="morePop"
>
更多>
<div class="more-pop" v-if="visiblePopList[index]">
<span
:key="index + rIndex + resi.userId"
v-for="(resi, rIndex) in item"
>
{{ rIndex != 0 ? "、" : "" }}
<a @click="handlePeopleItem(resi.userId, value[1])">{{
resi.residentName
}}</a>
</span>
</div>
</span>
</div>
</div>
<screen-loading v-if="visibleLoading">加载中</screen-loading>
@ -66,11 +38,12 @@
</div>
</div>
<people-more
v-if="showedPeopleMoreInfo && currentPepeleId"
:userId="currentPepeleId"
:gridName="currentPepeleGridName"
@close="showedPeopleMoreInfo = false"
<people-list
v-if="showedPeopleList && buildingId"
:buildingId="buildingId"
:configId="configId"
:gridName="gridName"
@close="showedPeopleList = false"
/>
</div>
</template>
@ -78,13 +51,13 @@
<script>
import ScreenLoading from "../screen-loading/index";
import Vue from "vue";
import peopleMore from "@/views/modules/shequ/cpts/people-more";
import peopleList from "./people-list";
export default {
name: "warning-table",
components: {
ScreenLoading,
peopleMore,
peopleList,
},
props: {
headerList: {
@ -96,7 +69,8 @@ export default {
{ title: "所属网格" },
{ title: "所属小区" },
{ title: "楼号" },
{ title: "姓名" },
{ title: "预警人数" },
{ title: "操作" },
];
},
},
@ -156,80 +130,32 @@ export default {
type: Boolean,
default: true,
},
// //
// ava: {
// type: Number,
// default: 8
// },
// // --10%
// headerHeightAva: {
// type: String,
// default: '10%'
// },
// //
// tableContentAva: {
// type: Number,
// default: 5
// },
},
data() {
return {
//
showedPeopleMoreInfo: false,
currentPepeleId: "",
currentPepeleGridName: "",
visiblePopList: [
false,
false,
false,
false,
false,
false,
false,
false,
false,
false,
],
showedPeopleList: false,
buildingId: "",
configId: "",
gridName: "",
};
},
watch: {
tableData(arr) {
if (Array.isArray(arr)) {
this.visiblePopList = new Array(arr.length).fill(false);
}
},
},
watch: {},
mounted() {
window.addEventListener("click", (e) => {
this.visiblePopList = new Array(this.visiblePopList.length).fill(false);
});
},
mounted() {},
created() {},
methods: {
toUserInfo(uid) {
this.$router.push({ path: `/main-shuju/visual-basicinfo-people/${uid}` });
},
handlePeopleItem(uid, gridName) {
this.currentPepeleId = uid;
this.currentPepeleGridName = gridName;
this.showedPeopleMoreInfo = true;
handleClickBtn(item) {
this.showedPeopleList = true;
this.buildingId = item.buildingId;
this.configId = item.configId;
this.gridName = item.gridName;
},
onClickMorePop(index) {
this.visiblePopList.forEach((item, indexs) => {
if (index == indexs) {
Vue.set(this.visiblePopList, index, true);
} else {
Vue.set(this.visiblePopList, indexs, false);
}
});
toUserInfo(uid) {
this.$router.push({ path: `/main-shuju/visual-basicinfo-people/${uid}` });
},
},
};
@ -263,16 +189,19 @@ export default {
width: 5%;
}
&:nth-child(2) {
width: 20%;
width: 25%;
}
&:nth-child(3) {
width: 20%;
width: 25%;
}
&:nth-child(4) {
width: 15%;
}
&:nth-child(5) {
width: 40%;
width: 15%;
}
&:nth-child(6) {
width: 15%;
}
}
}
@ -305,16 +234,19 @@ export default {
width: 5%;
}
&:nth-child(2) {
width: 20%;
width: 25%;
}
&:nth-child(3) {
width: 20%;
width: 25%;
}
&:nth-child(4) {
width: 15%;
}
&:nth-child(5) {
width: 40%;
width: 15%;
}
&:nth-child(6) {
width: 15%;
}
a {
cursor: pointer;

184
src/views/modules/warning/components/screen-table/people-list.vue

@ -0,0 +1,184 @@
<template>
<div class="m-pop">
<div class="wrap">
<div class="btn-close" @click="handleClose">
<img src="@/assets/img/shuju/people/close.png" />
</div>
<div class="wrap2">
<div class="title">
<span>人员列表</span>
</div>
<div class="content">
<div class="tb">
<el-table
:data="list"
border
style="width: 100%;margin-top:20px;"
class="resi-table"
>
<el-table-column
label="序号"
type="index"
align="center"
width="50"
/>
<el-table-column prop="residentName" label="姓名">
</el-table-column>
<el-table-column prop="unitName" label="单元"> </el-table-column>
<el-table-column prop="doorName" label="门牌号" width="80">
</el-table-column>
<el-table-column prop="mobile" label="手机"> </el-table-column>
<el-table-column prop="idCard" label="身份证"> </el-table-column>
<el-table-column
fixed="right"
label="操作"
align="center"
width="120"
>
<template slot-scope="scope">
<el-button
@click="handlePeopleItem(scope.row.userId)"
type="text"
size="small"
>查看更多</el-button
>
</template>
</el-table-column>
</el-table>
</div>
<div class="pagination">
<el-pagination
:current-page="pageNo"
:page-size="pageSize"
background
layout="prev, pager, next"
@size-change="pageSizeChangeHandleNew"
@current-change="pageCurrentChangeHandleNew"
:total="total"
>
</el-pagination>
</div>
</div>
</div>
</div>
<people-more
v-if="showedPeopleInfo && currentPepeleId"
:userId="currentPepeleId"
:gridName="gridName"
@close="showedPeopleInfo = false"
/>
</div>
</template>
<script>
import cptCard from "@/views/modules/visual/cpts/card";
import { requestPost } from "@/js/dai/request";
import peopleMore from "@/views/modules/shequ/cpts/people-more";
import { mapGetters } from "vuex";
export default {
name: "people-list",
props: {
configId: {
type: String,
default: "",
},
buildingId: {
type: String,
default: "",
},
gridName: {
type: String,
default: "",
},
},
components: {
cptCard,
peopleMore,
},
data() {
return {
showedPeopleInfo: false,
currentPepeleId: "",
currentPepeleGridName: "",
loading: false,
pageNo: 0,
pageSize: 12,
total: 0,
list: [],
};
},
computed: {
maxTableHeight() {
return this.clientHeight - 450;
return 420;
},
...mapGetters(["clientHeight"]),
},
watch: {
userId() {
this.getApiData();
},
},
mounted() {
this.getApiData();
},
methods: {
pageSizeChangeHandleNew(val) {
this.pageNo = 1;
this.pageSize = val;
},
pageCurrentChangeHandleNew(val) {
this.pageNo = val;
this.getList();
},
handlePeopleItem(uid) {
console.log(uid);
this.currentPepeleId = uid;
this.showedPeopleInfo = true;
},
handleClose() {
this.$emit("close");
},
async getApiData() {
this.getList();
},
async getList() {
const url = "/epmetuser/statsresiwarn/alluserwarnlist";
let params = {
buildingId: this.buildingId,
configId: this.configId,
pageNo: this.pageNo,
pageSize: this.pageSize,
};
const { data, code, msg } = await requestPost(url, params);
if (code === 0) {
const { list, total } = data;
this.list = list;
this.total = total;
} else {
this.$message.error(msg);
}
},
},
};
</script>
<style lang="scss" src="@/assets/scss/people-info.scss" scoped></style>

12
src/views/modules/warning/index.vue

@ -98,7 +98,8 @@ export default {
{ title: "所属网格" },
{ title: "所属小区" },
{ title: "楼号" },
{ title: "姓名" },
{ title: "预警人数" },
{ title: "操作" },
],
tableData: [
// [1,'','','2',''],
@ -142,7 +143,14 @@ export default {
item.gridName,
item.neighborhoodName,
item.buildingName,
item.userList || "暂无",
item.count,
{
type: "btn",
name: "查看人员",
buildingId: item.buildingId,
configId: item.configId,
gridName: item.gridName,
},
]);
});
this.tableData = tableData;

2
src/views/modules/workPc/guidance/DetailForm.vue

@ -133,7 +133,7 @@ import { Loading } from 'element-ui' // 引入Loading服务
import { requestPost } from '@/js/dai/request'
import Tinymce from '@c/tinymce/index.vue'
import Tinymce from '@c/tinymce2/index.vue'
// import tinymce from 'tinymce/tinymce'
// import Editor from '@tinymce/tinymce-vue'
// import 'tinymce/themes/silver'

2
src/views/pages/login.vue

@ -213,7 +213,7 @@ export default {
//
this.$message.error("账号不存在");
this.endLoading();
} else if (data.length === 10) {
} else if (data.length === 1) {
this.selectCustomer(data[0]);
} else {
this.endLoading();

Loading…
Cancel
Save