Skip to content

bdc / bdcjg-web

Go to a project
Toggle navigation
Toggle navigation pinning
4b2cbf53 by xiaomiao
Options

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

2 parents 5911ffa6 6b568ffa
Expand all
Inline Side-by-side
Showing 9 changed files with 57 additions and 54 deletions
...@@ -45,6 +45,18 @@ export default { ...@@ -45,6 +45,18 @@ export default {
45 color: #FFFFFF !important; 45 color: #FFFFFF !important;
46 } 46 }
47 47
48 .ace_content {
49 background-color: #05275B !important;
50 }
51
52 .ace_marker-layer .ace_active-line {
53 background-color: #4e8ae2 !important;
54 }
55
56 .ace-jsoneditor .ace_variable {
57 color: #FFFFFF !important;
58 }
59
48 .jsoneditor-menu { 60 .jsoneditor-menu {
49 background-color: #074487 !important; 61 background-color: #074487 !important;
50 } 62 }
......
1 <template> 1 <template>
2 <transition name="msgbox-fade" v-if="myShow"> 2 <transition name="msgbox-fade" v-if="myShow">
3 <div class="ls-mask" v-loading="loading"> 3 <div class="ls-mask" v-loading="loading">
4 <div class="ls-mask-window" :style="{ 'width': width }"> 4 <div class="ls-mask-window dialogBox" :style="{ 'width': width }">
5 <div class="ls-head"> 5 <div class="ls-head">
6 <div class="ls-title" :style="{ 'text-align': titleStyle }"> 6 <div class="ls-title" :style="{ 'text-align': titleStyle }">
7 <svg-icon v-if="iconClass != ''" :icon-class='iconClass' /> 7 <svg-icon v-if="iconClass != ''" :icon-class='iconClass' />
...@@ -105,6 +105,9 @@ export default { ...@@ -105,6 +105,9 @@ export default {
105 } 105 }
106 </script> 106 </script>
107 <style scoped lang="scss" > 107 <style scoped lang="scss" >
108 @import "~@/styles/mixin.scss";
109 @import "~@/styles/dialogBox.scss";
110
108 .ls-mask { 111 .ls-mask {
109 width: 100%; 112 width: 100%;
110 height: 100%; 113 height: 100%;
...@@ -138,7 +141,7 @@ export default { ...@@ -138,7 +141,7 @@ export default {
138 .ls-title { 141 .ls-title {
139 padding: 10px; 142 padding: 10px;
140 color: #ffffff; 143 color: #ffffff;
141 background: linear-gradient(90deg, #1D66DC 0%, #081B56 100%); 144 // background: linear-gradient(90deg, #1D66DC 0%, #081B56 100%);
142 font-size: 16px; 145 font-size: 16px;
143 } 146 }
144 147
......
...@@ -47,9 +47,12 @@ export default { ...@@ -47,9 +47,12 @@ export default {
47 } 47 }
48 } 48 }
49 49
50 .app-main { 50 .appMain {
51 height: calc(100% -94px) !important; 51 height: calc(100vh - 94px) !important;
52 // padding: 10px;
53 box-sizing: border-box; 52 box-sizing: border-box;
53
54 .app-main {
55 height: 100%;
56 }
54 } 57 }
55 </style> 58 </style>
......
1 .dialogBox { 1 .dialogBox {
2 overflow: hidden; 2 overflow: hidden;
3 background: url("~@/image/dialogBg.png") no-repeat; 3 background: url("~@/image/dialogBg.png") no-repeat !important;
4 background-size: 100% 100%; 4 background-size: 100% 100% !important;
5 5
6 .dialog_title { 6 .dialog_title {
7 display: flex; 7 display: flex;
......
...@@ -9,19 +9,6 @@ ...@@ -9,19 +9,6 @@
9 start-placeholder="开始日期" end-placeholder="结束日期"> 9 start-placeholder="开始日期" end-placeholder="结束日期">
10 </el-date-picker> 10 </el-date-picker>
11 </el-col> 11 </el-col>
12 <!-- <el-col :span="6">
13 <el-form-item label="开始时间">
14 <el-date-picker type="date" :picker-options="pickerOptionsStart" clearable
15 v-model="form.startTime" value-format="yyyy-MM-dd"></el-date-picker>
16 </el-form-item>
17 </el-col>
18 <el-col :span="6">
19 <el-form-item label="结束时间">
20 <el-date-picker clearable :picker-options="pickerOptionsEnd" v-model="form.endTime"
21 value-format="yyyy-MM-dd">
22 </el-date-picker>
23 </el-form-item>
24 </el-col> -->
25 <!-- 按钮操作 --> 12 <!-- 按钮操作 -->
26 <el-col :span="12" class="btnColRight"> 13 <el-col :span="12" class="btnColRight">
27 <el-button type="default" @click="resetForm"> 重置 </el-button> 14 <el-button type="default" @click="resetForm"> 重置 </el-button>
...@@ -155,6 +142,8 @@ export default { ...@@ -155,6 +142,8 @@ export default {
155 }; 142 };
156 </script> 143 </script>
157 <style scoped lang="scss"> 144 <style scoped lang="scss">
145 @import "~@/styles/public.scss";
146
158 .jktjDetail { 147 .jktjDetail {
159 background-color: #fff; 148 background-color: #fff;
160 height: 100%; 149 height: 100%;
...@@ -164,7 +153,7 @@ export default { ...@@ -164,7 +153,7 @@ export default {
164 .echarts-box { 153 .echarts-box {
165 display: flex; 154 display: flex;
166 justify-content: center; 155 justify-content: center;
167 height: 100%; 156 height: 500px;
168 157
169 .chart { 158 .chart {
170 width: 100%; 159 width: 100%;
......
1 <template> 1 <template>
2 <!-- 监控日志 --> 2 <!-- 监控日志 -->
3 <div class="jktjDetail form-clues"> 3 <div class="jktjDetail from-clues">
4 <!-- 头部搜索 --> 4 <!-- 头部搜索 -->
5 <div class="from-clues-header"> 5 <div class="from-clues-header">
6 <el-form ref="form" :model="form" label-width="80px"> 6 <el-form ref="form" :model="form" label-width="80px">
...@@ -158,6 +158,8 @@ export default { ...@@ -158,6 +158,8 @@ export default {
158 }; 158 };
159 </script> 159 </script>
160 <style scoped lang="scss"> 160 <style scoped lang="scss">
161 @import "~@/styles/public.scss";
162
161 .jktjDetail { 163 .jktjDetail {
162 // background-color: #fff; 164 // background-color: #fff;
163 height: 100%; 165 height: 100%;
......
...@@ -14,13 +14,13 @@ ...@@ -14,13 +14,13 @@
14 </el-form-item> 14 </el-form-item>
15 </el-col> 15 </el-col>
16 <el-col :span="6"> 16 <el-col :span="6">
17 <el-form-item label="开始日期" prop="startTime"> 17 <el-form-item label="接收开始日期" prop="startTime">
18 <el-date-picker type="date" class="width100" placeholder="开始日期" :picker-options="pickerOptionsStart" 18 <el-date-picker type="date" class="width100" placeholder="开始日期" :picker-options="pickerOptionsStart"
19 clearable v-model="form.startTime" value-format="yyyy-MM-dd"></el-date-picker> 19 clearable v-model="form.startTime" value-format="yyyy-MM-dd"></el-date-picker>
20 </el-form-item> 20 </el-form-item>
21 </el-col> 21 </el-col>
22 <el-col :span="6"> 22 <el-col :span="6">
23 <el-form-item label="结束日期" prop="endTime"> 23 <el-form-item label="接收结束日期" prop="endTime">
24 <el-date-picker type="date" class="width100" placeholder="结束日期" :picker-options="pickerOptionsEnd" 24 <el-date-picker type="date" class="width100" placeholder="结束日期" :picker-options="pickerOptionsEnd"
25 clearable v-model="form.endTime" value-format="yyyy-MM-dd"></el-date-picker> 25 clearable v-model="form.endTime" value-format="yyyy-MM-dd"></el-date-picker>
26 </el-form-item> 26 </el-form-item>
...@@ -33,14 +33,27 @@ ...@@ -33,14 +33,27 @@
33 </el-row> 33 </el-row>
34 <el-row class="mt-10"> 34 <el-row class="mt-10">
35 <el-col :span="6"> 35 <el-col :span="6">
36 <el-form-item label="业务名称" prop="ywmc"> 36 <el-form-item label="业务号" prop="ywh">
37 <el-select v-model="form.ywmc" class="width100" clearable placeholder="业务名称"> 37 <el-input v-model="form.ywh" class="width100" placeholder="业务号"></el-input>
38 <el-option v-for="item in statusOptions" :key="item.value" :label="item.label" :value="item.value"> 38 </el-form-item>
39 </el-col>
40 <el-col :span="3">
41 <el-form-item label="权利类型" prop="qllx">
42 <el-select v-model="form.ywmc" class="width100" clearable placeholder="权利类型">
43 <el-option v-for="item in dicData['A8']" :key="item.DCODE" :label="item.DNAME" :value="item.DCODE">
39 </el-option> 44 </el-option>
40 </el-select> 45 </el-select>
41 </el-form-item> 46 </el-form-item>
42 </el-col> 47 </el-col>
43 <el-col :span="6"> 48 <el-col :span="3">
49 <el-form-item label="登记类型" prop="djlx">
50 <el-select v-model="form.ywmc" class="width100" clearable placeholder="登记类型">
51 <el-option v-for="item in dicData['A21']" :key="item.DCODE" :label="item.DNAME" :value="item.DCODE">
52 </el-option>
53 </el-select>
54 </el-form-item>
55 </el-col>
56 <el-col :span="3">
44 <el-form-item label="检查结果" prop="jcjg"> 57 <el-form-item label="检查结果" prop="jcjg">
45 <el-select v-model="form.jcjg" class="width100" clearable placeholder="检查结果"> 58 <el-select v-model="form.jcjg" class="width100" clearable placeholder="检查结果">
46 <el-option v-for="item in []" :key="item.value" :label="item.label" :value="item.value"> 59 <el-option v-for="item in []" :key="item.value" :label="item.label" :value="item.value">
...@@ -48,7 +61,7 @@ ...@@ -48,7 +61,7 @@
48 </el-select> 61 </el-select>
49 </el-form-item> 62 </el-form-item>
50 </el-col> 63 </el-col>
51 <el-col :span="6"> 64 <el-col :span="3">
52 <el-form-item label="入库结果" prop="rkjg"> 65 <el-form-item label="入库结果" prop="rkjg">
53 <el-select v-model="form.rkjg" class="width100" clearable placeholder="入库结果"> 66 <el-select v-model="form.rkjg" class="width100" clearable placeholder="入库结果">
54 <el-option v-for="item in []" :key="item.value" :label="item.label" :value="item.value"> 67 <el-option v-for="item in []" :key="item.value" :label="item.label" :value="item.value">
...@@ -87,7 +100,7 @@ import { getDataReportPage } from "@/api/sbbwcx.js"; ...@@ -87,7 +100,7 @@ import { getDataReportPage } from "@/api/sbbwcx.js";
87 export default { 100 export default {
88 name: "jsbwcx", 101 name: "jsbwcx",
89 mixins: [tableMixin], 102 mixins: [tableMixin],
90 data () { 103 data() {
91 return { 104 return {
92 // 开始结束日期限制 105 // 开始结束日期限制
93 pickerOptionsStart: { 106 pickerOptionsStart: {
...@@ -177,30 +190,11 @@ export default { ...@@ -177,30 +190,11 @@ export default {
177 }, 190 },
178 // 业务名称 191 // 业务名称
179 statusOptions: [], 192 statusOptions: [],
180 // 行政区
181 xzqOptions: [
182 {
183 value: "632321",
184 label: "同仁县",
185 },
186 {
187 value: "632322",
188 label: "尖扎县",
189 },
190 {
191 value: "632323",
192 label: "泽库县",
193 },
194 {
195 value: "632324",
196 label: "河南县",
197 },
198 ],
199 }; 193 };
200 }, 194 },
201 methods: { 195 methods: {
202 // 初始化数据 196 // 初始化数据
203 queryClick () { 197 queryClick() {
204 getDataReportPage({ ...this.form, ...this.pageData }).then((res) => { 198 getDataReportPage({ ...this.form, ...this.pageData }).then((res) => {
205 if (res.code === 200) { 199 if (res.code === 200) {
206 let { total, records } = res.result; 200 let { total, records } = res.result;
...@@ -210,14 +204,14 @@ export default { ...@@ -210,14 +204,14 @@ export default {
210 }); 204 });
211 }, 205 },
212 // 重置 206 // 重置
213 resetForm () { 207 resetForm() {
214 this.$refs.ruleForm.resetFields(); 208 this.$refs.ruleForm.resetFields();
215 }, 209 },
216 featchData () { 210 featchData() {
217 this.queryClick(); 211 this.queryClick();
218 }, 212 },
219 // 详情 213 // 详情
220 handleEdit () { 214 handleEdit() {
221 this.$popupDialog( 215 this.$popupDialog(
222 "业务报文", 216 "业务报文",
223 "components/JsonEditor/index", 217 "components/JsonEditor/index",
......
...@@ -8,7 +8,7 @@ ...@@ -8,7 +8,7 @@
8 <el-col :span="6"> 8 <el-col :span="6">
9 <el-form-item label="行政区" prop="pcode"> 9 <el-form-item label="行政区" prop="pcode">
10 <el-select v-model="form.pcode" class="width100" clearable placeholder="行政区"> 10 <el-select v-model="form.pcode" class="width100" clearable placeholder="行政区">
11 <el-option v-for="item in []" :key="item.value" :label="item.label" :value="item.value"> 11 <el-option v-for="item in dicData['A20']" :key="item.DCODE" :label="item.DNAME" :value="item.DCODE">
12 </el-option> 12 </el-option>
13 </el-select> 13 </el-select>
14 </el-form-item> 14 </el-form-item>
......