diff --git a/package-lock.json b/package-lock.json index ea57fbd7..71cde541 100644 --- a/package-lock.json +++ b/package-lock.json @@ -4281,7 +4281,7 @@ "fastclick": { "version": "1.0.6", "resolved": "https://registry.npmjs.org/fastclick/-/fastclick-1.0.6.tgz", - "integrity": "sha1-FhYlsnsaWAZAWTa9qaLBkm0Gvmo=", + "integrity": "sha512-cXyDBT4g0uWl/Xe75QspBDAgAWQ0lkPi/zgp6YFEUHj6WV6VIZl7R6TiDZhdOVU3W4ehp/8tG61Jev1jit+ztQ==", "dev": true }, "fastparse": { @@ -4436,7 +4436,7 @@ "font-awesome.css": { "version": "4.7.2", "resolved": "https://registry.npmjs.org/font-awesome.css/-/font-awesome.css-4.7.2.tgz", - "integrity": "sha1-B1pCARQo8gJyVO9phgx1ergWyVI=" + "integrity": "sha512-FIyRbig4PDY15NGzejM3b8OQ/lWvId8PHnE4CnuDtc8/YYs07cvnqLCyfvIJPwJl5SA/Rq+9jAe9W+Fr1pv0DA==" }, "for-in": { "version": "1.0.2", @@ -12350,7 +12350,7 @@ "vue-html5-editor": { "version": "1.1.1", "resolved": "https://registry.npmjs.org/vue-html5-editor/-/vue-html5-editor-1.1.1.tgz", - "integrity": "sha1-WRAhCoMNjI00eaHx/shHMZKqA7M=", + "integrity": "sha512-Ckmb8djta+XQMUQaxRcCUNBXEzjPF5p6c2nQ5ICcIuR8eYz4b0HAGzXlSDfL3ZxkrVHO2Hx0VrUORLu2Lwem4g==", "dev": true }, "vue-lazyload": { diff --git a/src/assets/images/sunVillage_info/index_btn_green.png b/src/assets/images/sunVillage_info/index_btn_green.png new file mode 100644 index 00000000..a7cdb917 Binary files /dev/null and b/src/assets/images/sunVillage_info/index_btn_green.png differ diff --git a/src/assets/images/sunVillage_info/index_head_green.png b/src/assets/images/sunVillage_info/index_head_green.png new file mode 100644 index 00000000..960cf9cd Binary files /dev/null and b/src/assets/images/sunVillage_info/index_head_green.png differ diff --git a/src/assets/images/sunVillage_info/index_head_red.png b/src/assets/images/sunVillage_info/index_head_red.png new file mode 100644 index 00000000..ee08b674 Binary files /dev/null and b/src/assets/images/sunVillage_info/index_head_red.png differ diff --git a/src/assets/images/sunVillage_info/index_icon_1_green.png b/src/assets/images/sunVillage_info/index_icon_1_green.png new file mode 100644 index 00000000..5b5c6a14 Binary files /dev/null and b/src/assets/images/sunVillage_info/index_icon_1_green.png differ diff --git a/src/assets/images/sunVillage_info/list_head_green.png b/src/assets/images/sunVillage_info/list_head_green.png new file mode 100644 index 00000000..318d5dcf Binary files /dev/null and b/src/assets/images/sunVillage_info/list_head_green.png differ diff --git a/src/assets/images/sunVillage_info/list_head_red.png b/src/assets/images/sunVillage_info/list_head_red.png new file mode 100644 index 00000000..9d2a8f9b Binary files /dev/null and b/src/assets/images/sunVillage_info/list_head_red.png differ diff --git a/src/assets/images/sunVillage_info/login_btn_green.png b/src/assets/images/sunVillage_info/login_btn_green.png new file mode 100644 index 00000000..0eace28c Binary files /dev/null and b/src/assets/images/sunVillage_info/login_btn_green.png differ diff --git a/src/assets/images/sunVillage_info/login_head_code_green.png b/src/assets/images/sunVillage_info/login_head_code_green.png new file mode 100644 index 00000000..c4b60fc4 Binary files /dev/null and b/src/assets/images/sunVillage_info/login_head_code_green.png differ diff --git a/src/assets/images/sunVillage_info/login_head_h_green.png b/src/assets/images/sunVillage_info/login_head_h_green.png new file mode 100644 index 00000000..6bf9f53e Binary files /dev/null and b/src/assets/images/sunVillage_info/login_head_h_green.png differ diff --git a/src/assets/images/sunVillage_info/login_main_green.png b/src/assets/images/sunVillage_info/login_main_green.png new file mode 100644 index 00000000..de0b92ed Binary files /dev/null and b/src/assets/images/sunVillage_info/login_main_green.png differ diff --git a/src/main.js b/src/main.js index 82346e0c..5f251465 100644 --- a/src/main.js +++ b/src/main.js @@ -14,6 +14,11 @@ import SearchTree from 'vue-search-tree' import VueHtml5Editor from 'vue-html5-editor' import "font-awesome/css/font-awesome.css" import VueCookies from 'vue-cookies' + +import "font-awesome/css/font-awesome.css" +import initRichText from './utils/initHTMLEditor'; +initRichText(); + //引用百度地图 import BaiduMap from 'vue-baidu-map' Vue.use(VueCookies); diff --git a/src/utils/initHTMLEditor.js b/src/utils/initHTMLEditor.js new file mode 100644 index 00000000..91f08708 --- /dev/null +++ b/src/utils/initHTMLEditor.js @@ -0,0 +1,135 @@ +/** + * author: Joker + * creationDate: 2018/1/22 + * usage: + */ +import Vue from 'vue' +import VueHtml5Editor from 'vue-html5-editor' +export default function () { + let opt = { + // 全局组件名称,使用new VueHtml5Editor(options)时该选项无效 + name: "vue-html5-editor", + // 是否显示模块名称,开启的话会在工具栏的图标后台直接显示名称 + showModuleName: true, + // 自定义各个图标的class,默认使用的是font-awesome提供的图标 + icons: { + text: "fa fa-pencil", + color: "fa fa-paint-brush", + font: "fa fa-font", + align: "fa fa-align-justify", + list: "fa fa-list", + link: "fa fa-chain", + unlink: "fa fa-chain-broken", + tabulation: "fa fa-table", + image: "fa fa-file-image-o", + hr: "fa fa-minus", + eraser: "fa fa-eraser", + undo: "fa-undo fa", + "full-screen": "fa fa-arrows-alt", + info: "fa fa-info", + }, + // 配置图片模块 + image: { + // 文件最大体积,单位字节 + sizeLimit: 512 * 1024 * 10, + // 上传参数,默认把图片转为base64而不上传 + // upload config,default null and convert image to base64 + upload: { + url: null, + headers: {}, + params: {}, + fieldName: {} + }, + // 压缩参数,默认使用localResizeIMG进行压缩,设置为null禁止压缩 + // width和height是文件的最大宽高 + compress: { + width: 600, + height: 600, + quality: 80 + }, + // 响应数据处理,最终返回图片链接 + uploadHandler(responseText){ + //default accept json data like {ok:false,msg:"unexpected"} or {ok:true,data:"image url"} + var json = JSON.parse(responseText); + console.info(json); + if (!json.ok) { + alert(json.msg) + } else { + return json.data + } + } + }, + // 语言,内建的有英文(en-us)和中文(zh-cn) + language: "zh-cn", + // 自定义语言 + i18n: { + "zh-cn": { + "align": "对齐方式", + "image": "图片", + "list": "列表", + "link": "链接", + "unlink": "去除链接", + "table": "表格", + "font": "文字", + "full screen": "全屏", + "text": "排版", + "eraser": "格式清除", + "info": "关于", + "color": "颜色", + "please enter a url": "请输入地址", + "create link": "创建链接", + "bold": "加粗", + "italic": "倾斜", + "underline": "下划线", + "strike through": "删除线", + "subscript": "上标", + "superscript": "下标", + "heading": "标题", + "font name": "字体", + "font size": "文字大小", + "left justify": "左对齐", + "center justify": "居中", + "right justify": "右对齐", + "ordered list": "有序列表", + "unordered list": "无序列表", + "fore color": "前景色", + "background color": "背景色", + "row count": "行数", + "column count": "列数", + "save": "确定", + "upload": "上传", + "progress": "进度", + "unknown": "未知", + "please wait": "请稍等", + "error": "错误", + "abort": "中断", + "reset": "重置" + } + }, + // 隐藏不想要显示出来的模块 + hiddenModules: ["info",], + // 自定义要显示的模块,并控制顺序 + visibleModules: [ + "text", + "color", + "font", + "align", + "list", + "link", + "unlink", + "tabulation", + "image", + "hr", + "eraser", + "undo", + "full-screen", + + ], + // 扩展模块,具体可以参考examples或查看源码 + // extended modules + modules: { + //omit,reference to source code of build-in modules + } + }; + Vue.use(VueHtml5Editor, opt); +} diff --git a/src/utils/request.js b/src/utils/request.js index 89f08671..ae607ddc 100644 --- a/src/utils/request.js +++ b/src/utils/request.js @@ -78,6 +78,7 @@ service.interceptors.response.use(res => { return; } } catch (e) { console.log(e); } + if (window.location.href.indexOf('lawEnforcement') != -1) { window.location.href = '/lawEnforcement/login'; } else if (window.location.href.indexOf('authenticRight') != -1) { @@ -85,7 +86,6 @@ service.interceptors.response.use(res => { } else if (window.location.href.indexOf('homesteadSurvey') != -1) { window.location.href = '/homesteadLogin'; } else if (window.location.href.indexOf('onlineHome') != -1) { - //window.location.href = '/onlineHomeLogin'; window.location.href = '/zjdLogin'; } else if (window.location.href.indexOf('yinnong') != -1) { window.location.href = '/yinnongLogin'; @@ -95,12 +95,10 @@ service.interceptors.response.use(res => { window.location.href = '/sunVillage/login'; } else if (window.location.href.indexOf('/homestead/') != -1) { window.location.href = '/homestead/login'; - } else if (window.location.href.indexOf('yinnong') != -1){ - window.location.href = '/yinnongLogin'; - //window.location.href = '/zjdLogin'; - /*window.location.href = '/index';*/ - } else { + }else if (window.location.href.indexOf('agriculturalTrusteeship') != -1){ window.location.href = '/agriculturalTrusteeship/login'; + } else { + window.location.href = '/login'; } }) }) diff --git a/src/views/sunVillage_info/arbitration/arbitrationDetail.vue b/src/views/sunVillage_info/arbitration/arbitrationDetail.vue index b342b50e..b92f7173 100644 --- a/src/views/sunVillage_info/arbitration/arbitrationDetail.vue +++ b/src/views/sunVillage_info/arbitration/arbitrationDetail.vue @@ -1,17 +1,23 @@