Skip to content

bdc / bdcdj-web

Go to a project
Toggle navigation
Toggle navigation pinning
d7630003 by jiaozeping@pashanhoo.com
Options

Merge branch 'master' of http://yun.pashanhoo.com:9090/bdc/bdcdj-web

2 parents 318c545b 8f912d0f
Expand all
Inline Side-by-side
Showing 16 changed files with 60 additions and 72 deletions
...@@ -53,17 +53,6 @@ const defaultCallback = action => { ...@@ -53,17 +53,6 @@ const defaultCallback = action => {
53 callback(action); 53 callback(action);
54 } 54 }
55 } 55 }
56 if (currentMsg.resolve) {
57 if (action === 'confirm') {
58 if (instance.showInput) {
59 currentMsg.resolve({ value: instance.inputValue, action });
60 } else {
61 currentMsg.resolve(action);
62 }
63 } else if (currentMsg.reject && (action === 'cancel' || action === 'close')) {
64 currentMsg.reject(action);
65 }
66 }
67 } 56 }
68 }; 57 };
69 58
...@@ -120,7 +109,7 @@ const showNextMsg = () => { ...@@ -120,7 +109,7 @@ const showNextMsg = () => {
120 } 109 }
121 }; 110 };
122 111
123 const MessageBox = function(options, callback) { 112 const MessageBox = function (options, callback) {
124 if (Vue.prototype.$isServer) return; 113 if (Vue.prototype.$isServer) return;
125 if (typeof options === 'string' || isVNode(options)) { 114 if (typeof options === 'string' || isVNode(options)) {
126 options = { 115 options = {
...@@ -158,7 +147,7 @@ MessageBox.setDefaults = defaults => { ...@@ -158,7 +147,7 @@ MessageBox.setDefaults = defaults => {
158 MessageBox.defaults = defaults; 147 MessageBox.defaults = defaults;
159 }; 148 };
160 149
161 MessageBox.alert = (message, title, options) => { 150 MessageBox.alert = (title, message, options) => {
162 if (typeof title === 'object') { 151 if (typeof title === 'object') {
163 options = title; 152 options = title;
164 title = ''; 153 title = '';
......
1 <template> 1 <template>
2 <transition name="msgbox-fade"> 2 <transition name="msgbox-fade">
3 <div class="el-message-box__wrapper" tabindex="-1" 3 <div class="el-message-box__wrapper" tabindex="-1" v-show="visible" @click.self="handleWrapperClick" role="dialog"
4 v-show="visible" @click.self="handleWrapperClick" role="dialog"
5 aria-modal="true" :aria-label="title || 'dialog'"> 4 aria-modal="true" :aria-label="title || 'dialog'">
6 <div class="el-message-box" :class="[customClass, center && 'el-message-box--center']"> 5 <div class="el-message-box" :class="[customClass, center && 'el-message-box--center']">
7 <div class="el-message-box__content"> 6 <div class="el-message-box__content">
8 <slot> 7 <div class="el-message-box__container">
9 <p>{{ message }}</p> 8 <div v-if="title !== ''" class="message-title">标题：{{ title }}</div>
10 </slot> 9 <div v-if="message !== ''" class="richText" v-html="message"></div>
10 </div>
11 </div> 11 </div>
12 <div class="el-message-box__btns"> 12 <div class="el-message-box__btns">
13 <el-button :loading="cancelButtonLoading" :class="[cancelButtonClasses]" :round="roundButton" size="small" 13 <el-button :loading="cancelButtonLoading" :class="[cancelButtonClasses]" :round="roundButton" size="small"
...@@ -23,6 +23,8 @@ ...@@ -23,6 +23,8 @@
23 <script type="text/babel"> 23 <script type="text/babel">
24 import Popup from 'element-ui/src/utils/popup'; 24 import Popup from 'element-ui/src/utils/popup';
25 import Locale from 'element-ui/src/mixins/locale'; 25 import Locale from 'element-ui/src/mixins/locale';
26 import ElInput from 'element-ui/packages/input';
27 import ElButton from 'element-ui/packages/button';
26 import { addClass, removeClass } from 'element-ui/src/utils/dom'; 28 import { addClass, removeClass } from 'element-ui/src/utils/dom';
27 import { t } from 'element-ui/src/locale'; 29 import { t } from 'element-ui/src/locale';
28 import Dialog from 'element-ui/src/utils/aria-dialog'; 30 import Dialog from 'element-ui/src/utils/aria-dialog';
...@@ -37,6 +39,7 @@ let typeMap = { ...@@ -37,6 +39,7 @@ let typeMap = {
37 39
38 export default { 40 export default {
39 mixins: [Popup, Locale], 41 mixins: [Popup, Locale],
42
40 props: { 43 props: {
41 modal: { 44 modal: {
42 default: true 45 default: true
...@@ -66,6 +69,12 @@ export default { ...@@ -66,6 +69,12 @@ export default {
66 type: Boolean 69 type: Boolean
67 } 70 }
68 }, 71 },
72
73 components: {
74 ElInput,
75 ElButton
76 },
77
69 computed: { 78 computed: {
70 icon () { 79 icon () {
71 const { type, iconClass } = this; 80 const { type, iconClass } = this;
...@@ -187,11 +196,6 @@ export default { ...@@ -187,11 +196,6 @@ export default {
187 visible (val) { 196 visible (val) {
188 if (val) { 197 if (val) {
189 this.uid++; 198 this.uid++;
190 if (this.$type === 'alert' || this.$type === 'confirm') {
191 this.$nextTick(() => {
192 this.$refs.confirm.$el.focus();
193 });
194 }
195 this.focusAfterClosed = document.activeElement; 199 this.focusAfterClosed = document.activeElement;
196 messageBox = new Dialog(this.$el, this.focusAfterClosed, this.getFirstFocus()); 200 messageBox = new Dialog(this.$el, this.focusAfterClosed, this.getFirstFocus());
197 } 201 }
...@@ -263,15 +267,15 @@ export default { ...@@ -263,15 +267,15 @@ export default {
263 } 267 }
264 }; 268 };
265 </script> 269 </script>
266 <style scoped lang="scss"> 270 <style scoped>
267 .el-message-box__wrapper { 271 /deep/.message-title {
268 background: none; 272 font-size: 18px;
273 font-weight: 700;
274 margin-bottom: 5px;
269 } 275 }
270 .el-message-box { 276
271 border: none; 277 /deep/.el-message-box__content img {
272 } 278 width: 100%;
273 .el-message-box__content { 279 height: 100%;
274 min-height: 150px;
275 padding-top: 30px;
276 } 280 }
277 </style> 281 </style>
...\ No newline at end of file ...\ No newline at end of file
......
...@@ -9,12 +9,10 @@ ...@@ -9,12 +9,10 @@
9 </div> 9 </div>
10 <div class="right-menu"> 10 <div class="right-menu">
11 <svg-icon class="function" icon-class='function' /> 11 <svg-icon class="function" icon-class='function' />
12 <el-dropdown class="avatar-container right-menu-item hover-effect" @command="handleCommand"> 12 <div class="avatar-wrapper right-menu-item hover-effect">
13 <div class="avatar-wrapper">
14 <img :src="avatar + '?imageView2/1/w/80/h/80'" class="user-avatar" /> 13 <img :src="avatar + '?imageView2/1/w/80/h/80'" class="user-avatar" />
15 <span style="margin-left: 10px;">{{ name }}</span> 14 <span style="margin-left: 10px;">{{ name }}</span>
16 </div> 15 </div>
17 </el-dropdown>
18 16
19 <svg-icon class="shutdown" icon-class='shutdown' /> 17 <svg-icon class="shutdown" icon-class='shutdown' />
20 </div> 18 </div>
...@@ -220,7 +218,6 @@ export default { ...@@ -220,7 +218,6 @@ export default {
220 } 218 }
221 } 219 }
222 220
223 .avatar-container {
224 .avatar-wrapper { 221 .avatar-wrapper {
225 position: relative; 222 position: relative;
226 display: flex; 223 display: flex;
...@@ -243,6 +240,5 @@ export default { ...@@ -243,6 +240,5 @@ export default {
243 } 240 }
244 } 241 }
245 } 242 }
246 }
247 } 243 }
248 </style> 244 </style>
......
...@@ -325,8 +325,7 @@ aside { ...@@ -325,8 +325,7 @@ aside {
325 } 325 }
326 326
327 .allow, 327 .allow,
328 .prohibit 328 .prohibit .suspend {
329 .suspend {
330 position: relative; 329 position: relative;
331 margin: 0 auto; 330 margin: 0 auto;
332 text-align: left; 331 text-align: left;
...@@ -380,6 +379,7 @@ aside { ...@@ -380,6 +379,7 @@ aside {
380 height: 5px; 379 height: 5px;
381 border-radius: 50%; 380 border-radius: 50%;
382 } 381 }
382
383 //错误日志样式 后期超优化 383 //错误日志样式 后期超优化
384 .item-cwnr { 384 .item-cwnr {
385 white-space: pre-wrap; 385 white-space: pre-wrap;
...@@ -390,3 +390,7 @@ aside { ...@@ -390,3 +390,7 @@ aside {
390 -webkit-line-clamp: 3; 390 -webkit-line-clamp: 3;
391 -webkit-box-orient: vertical; 391 -webkit-box-orient: vertical;
392 } 392 }
393
394 .item-cwnr img {
395 height: 30px;
396 }
...\ No newline at end of file ...\ No newline at end of file
......
...@@ -14,7 +14,7 @@ ...@@ -14,7 +14,7 @@
14 top: $headerHeight; 14 top: $headerHeight;
15 bottom: 0; 15 bottom: 0;
16 left: 0; 16 left: 0;
17 z-index: 1001; 17 z-index: 80;
18 background-color: $subMenuBg; 18 background-color: $subMenuBg;
19 // overflow: hidden; 19 // overflow: hidden;
20 20
......
...@@ -19,16 +19,14 @@ ...@@ -19,16 +19,14 @@
19 <h5 class="title">系统通知</h5> 19 <h5 class="title">系统通知</h5>
20 <i class="el-icon-s-unfold pointer"></i> 20 <i class="el-icon-s-unfold pointer"></i>
21 </div> 21 </div>
22 <vue-seamless-scroll :data="noticeList" :class-option="classOption">
23 <ul> 22 <ul>
24 <li v-for="(item, index) in noticeList" :key="index" @click="handleNotice" class="flexst pointer"> 23 <li v-for="(item, index) in noticeList" :key="index" @click="handleNotice(item)" class="flexst pointer">
25 <p class="list-title">{{ item.noticeTitle }}</p> 24 <p class="list-title">{{ item.noticeTitle }}</p>
26 <p class="marginZL15">{{ item.createtime.substring(0, 10) }}</p> 25 <p class="marginZL15">{{ item.createtime.substring(0, 10) }}</p>
27 <p v-if="item.userBrowse == '1'" style="color:red">未读</p> 26 <p v-if="item.userBrowse == '1'" style="color:red">未读</p>
28 <p v-else>已读</p> 27 <p v-else>已读</p>
29 </li> 28 </li>
30 </ul> 29 </ul>
31 </vue-seamless-scroll>
32 </el-card> 30 </el-card>
33 </el-col> 31 </el-col>
34 </el-row> 32 </el-row>
...@@ -150,25 +148,17 @@ export default { ...@@ -150,25 +148,17 @@ export default {
150 year: '1996', 148 year: '1996',
151 value: 31056 149 value: 31056
152 }], 150 }],
151 // 系统通知
152 noticeData: {
153
154 },
153 noticeList: [], 155 noticeList: [],
154 todoList: [], 156 todoList: [],
155 doneList: [], 157 doneList: [],
156 policyList: [] 158 policyList: [],
159
157 } 160 }
158 }, 161 },
159 // 计算属性 类似于data概念
160 computed: {
161 classOption () {
162 return {
163 step: 0.5, // 数值越大速度滚动越快
164 limitMoveNum: 2, // 开始无缝滚动的数据量 this.dataList.length
165 hoverStop: true, // 是否开启鼠标悬停stop
166 direction: 1, // 0向下 1向上 2向左 3向右
167 openWatch: true, // 开启数据实时监控刷新dom
168 singleHeight: 0, // 单步运动停止的高度(默认值0是无缝不停止的滚动) direction => 0/1
169 };
170 },
171 },
172 mounted () { 162 mounted () {
173 this.buildChart(); 163 this.buildChart();
174 this.queryTodoList(); 164 this.queryTodoList();
...@@ -184,7 +174,7 @@ export default { ...@@ -184,7 +174,7 @@ export default {
184 queryTodoList () { 174 queryTodoList () {
185 getHomeTodoList().then(res => { 175 getHomeTodoList().then(res => {
186 if (res.result) { 176 if (res.result) {
187 this.todoList = res.result.slice(0, 5) 177 this.todoList = res.result
188 } 178 }
189 }) 179 })
190 }, 180 },
...@@ -204,7 +194,7 @@ export default { ...@@ -204,7 +194,7 @@ export default {
204 this.noticeList.forEach(item => { 194 this.noticeList.forEach(item => {
205 item.createtime = this._timedate(item.createtime) 195 item.createtime = this._timedate(item.createtime)
206 }) 196 })
207 this.policyList = res.result.policyList.slice(0, 5) 197 this.policyList = res.result.policyList
208 } 198 }
209 }) 199 })
210 }, 200 },
...@@ -252,9 +242,8 @@ export default { ...@@ -252,9 +242,8 @@ export default {
252 chart.line().position('year*value').size(2).shape('smooth'); 242 chart.line().position('year*value').size(2).shape('smooth');
253 chart.render(); 243 chart.render();
254 }, 244 },
255 handleNotice () { 245 handleNotice (item) {
256 this.$alertMes('9999999999') 246 this.$alertMes(item.noticeTitle, item.noticeContent)
257 //setReadStatus({'bsmNotice':bsmNotice})
258 } 247 }
259 } 248 }
260 } 249 }
......
...@@ -81,6 +81,12 @@ export default { ...@@ -81,6 +81,12 @@ export default {
81 }; 81 };
82 }, 82 },
83 created () { 83 created () {
84 var qllx = this.$route.query.sqywbm.substr(0,3)
85 if(qllx == 'A09'){
86 this.title = '土地经营权登记信息'
87 }else{
88 this.title = '农用地使用权登记信息'
89 }
84 this.loadData(); 90 this.loadData();
85 }, 91 },
86 methods: { 92 methods: {
......
...@@ -25,7 +25,6 @@ ...@@ -25,7 +25,6 @@
25 </template> 25 </template>
26 26
27 <script> 27 <script>
28 import '@/styles/package/theme/index.scss'
29 import { addSysNotice } from "@/api/notice.js" 28 import { addSysNotice } from "@/api/notice.js"
30 import { upload } from "@/api/system.js" 29 import { upload } from "@/api/system.js"
31 export default { 30 export default {
......
...@@ -9,14 +9,9 @@ ...@@ -9,14 +9,9 @@
9 <el-row :gutter="8"> 9 <el-row :gutter="8">
10 <el-col :span="24" class="margin-top-middle"> 10 <el-col :span="24" class="margin-top-middle">
11 通知内容： 11 通知内容：
12 <!-- <span v-html="formData.item.noticeContent"></span> --> 12 <quill-editor class="ql-editor" v-model="formData.item.noticeContent" ref="myQuillEditor"
13 <quill-editor class="ql-editor" 13 :options="editorOption">
14 v-model="formData.item.noticeContent"
15 ref="myQuillEditor"
16 :options="editorOption"
17 >
18 </quill-editor> 14 </quill-editor>
19 <!-- <el-input type="textarea" :rows="20" v-model="formData.item.noticeContent"></el-input> -->
20 </el-col> 15 </el-col>
21 </el-row> 16 </el-row>
22 <el-row :gutter="8"> 17 <el-row :gutter="8">
...@@ -63,6 +58,7 @@ export default { ...@@ -63,6 +58,7 @@ export default {
63 .margin-top-middle { 58 .margin-top-middle {
64 margin-top: 10px 59 margin-top: 10px
65 } 60 }
61
66 /deep/.ql-editor { 62 /deep/.ql-editor {
67 padding: 0px; 63 padding: 0px;
68 } 64 }
......
...@@ -53,6 +53,7 @@ export default { ...@@ -53,6 +53,7 @@ export default {
53 return { 53 return {
54 isDialog: false, 54 isDialog: false,
55 viewDialog: false, 55 viewDialog: false,
56
56 ruleForm: { 57 ruleForm: {
57 noticeTitle: '', 58 noticeTitle: '',
58 noticeStatus: '' 59 noticeStatus: ''
......
...@@ -28,7 +28,7 @@ class data extends filter { ...@@ -28,7 +28,7 @@ class data extends filter {
28 { 28 {
29 label: "通知内容", 29 label: "通知内容",
30 render: (h, scope) => { 30 render: (h, scope) => {
31 return <div class="item-cwnr">{scope.row.noticeContent}</div> 31 return <div class="item-cwnr" domPropsInnerHTML={scope.row.noticeContent}></div>
32 } 32 }
33 }, 33 },
34 { 34 {
......
...@@ -65,7 +65,7 @@ class data extends filter { ...@@ -65,7 +65,7 @@ class data extends filter {
65 }, 65 },
66 { 66 {
67 prop: "mj", 67 prop: "mj",
68 label: "农用地面积(㎡)", 68 label: "面积(㎡)",
69 }, 69 },
70 { 70 {
71 prop: "qlsdfsmc", 71 prop: "qlsdfsmc",
......
...@@ -15,11 +15,15 @@ export function queueDjywmc (djywbm) { ...@@ -15,11 +15,15 @@ export function queueDjywmc (djywbm) {
15 vm = "fwsyq"; 15 vm = "fwsyq";
16 break; 16 break;
17 case "A23100"://农用地使用权(首次登记) 17 case "A23100"://农用地使用权(首次登记)
18 case "A09100"://土地经营权（首次登记）
18 vm = "nydsyq100"; 19 vm = "nydsyq100";
19 break; 20 break;
20 case "A23200": 21 case "A23200":
21 case "A23300": 22 case "A23300":
22 case "A23400": 23 case "A23400":
24 case "A09200":
25 case "A09300":
26 case "A09400":
23 vm = "nydsyq200"; 27 vm = "nydsyq200";
24 break; 28 break;
25 case "A05200": 29 case "A05200":
......