9421f0aa by 任超

style:区县接入样式修改

1 parent f79f1525
...@@ -95,16 +95,20 @@ ...@@ -95,16 +95,20 @@
95 <component :is="editItem" ref="editItem" :class="{ 'editForm': $store.state.business.Edit }" 95 <component :is="editItem" ref="editItem" :class="{ 'editForm': $store.state.business.Edit }"
96 :bsmYwsjb="bsmYwsjb" :bsmSjsb="dataReport.bsmReport || dataReport.bsmSjsb" /> 96 :bsmYwsjb="bsmYwsjb" :bsmSjsb="dataReport.bsmReport || dataReport.bsmSjsb" />
97 </div> 97 </div>
98 <div class="d-center" v-if="!$store.state.business.Edit"> 98
99 <btn nativeType="cz" @click="dialogVisible = false">取 消</btn>
100 <btn nativeType="cx" @click="submitForm">确 定</btn>
101 </div>
102 </div> 99 </div>
103 <div v-if="titleName == 'xyjg'"> 100 <div v-if="titleName == 'xyjg'">
104 <Xyjg :form-data='dataReport'></Xyjg> 101 <Xyjg :form-data='dataReport'></Xyjg>
105 </div> 102 </div>
106 <JsonEditor :resultInfo="resultInfo" class="JsonEditor" v-if="titleName == 'xml'" /> 103 <JsonEditor :resultInfo="resultInfo" class="JsonEditor" v-if="titleName == 'xml'" />
107 </div> 104 </div>
105 <div class="d-center" v-if="!$store.state.business.Edit && titleName == 'sjmx'">
106 <btn nativeType="cz" @click="dialogVisible = false">取 消</btn>
107 <btn nativeType="cx" @click="submitForm">确 定</btn>
108 </div>
109 <div class="d-center" v-if="!$store.state.business.Edit && titleName == 'xml'">
110 <btn nativeType="cx" @click="handleResubmit">重新上报</btn>
111 </div>
108 </el-dialog> 112 </el-dialog>
109 </template> 113 </template>
110 114
...@@ -255,7 +259,9 @@ export default { ...@@ -255,7 +259,9 @@ export default {
255 type: "error" 259 type: "error"
256 }) 260 })
257 }) 261 })
258 } 262 },
263 // 重新上报
264 handleResubmit () { }
259 } 265 }
260 } 266 }
261 </script> 267 </script>
...@@ -266,6 +272,7 @@ export default { ...@@ -266,6 +272,7 @@ export default {
266 /deep/.el-dialog__body { 272 /deep/.el-dialog__body {
267 display: flex; 273 display: flex;
268 flex-direction: column; 274 flex-direction: column;
275 padding-bottom: 25px;
269 } 276 }
270 277
271 /deep/ .el-tabs { 278 /deep/ .el-tabs {
...@@ -273,8 +280,6 @@ export default { ...@@ -273,8 +280,6 @@ export default {
273 } 280 }
274 281
275 .sjmx { 282 .sjmx {
276 padding-bottom: 25px;
277
278 /deep/.el-tabs__item { 283 /deep/.el-tabs__item {
279 height: 50px; 284 height: 50px;
280 padding-top: 6px; 285 padding-top: 6px;
...@@ -350,7 +355,7 @@ export default { ...@@ -350,7 +355,7 @@ export default {
350 } 355 }
351 356
352 .edit-content { 357 .edit-content {
353 height: 420px; 358 height: 45vh;
354 overflow-y: auto; 359 overflow-y: auto;
355 overflow-x: hidden; 360 overflow-x: hidden;
356 padding-right: 1px; 361 padding-right: 1px;
...@@ -362,9 +367,6 @@ export default { ...@@ -362,9 +367,6 @@ export default {
362 border-radius: 8px; 367 border-radius: 8px;
363 overflow: hidden; 368 overflow: hidden;
364 min-width: 1228px; 369 min-width: 1228px;
365 height: 825px !important;
366
367
368 370
369 .el-dialog__header { 371 .el-dialog__header {
370 display: flex; 372 display: flex;
......
1 <template> 1 <template>
2 <div> 2 <el-input type="textarea" :rows="6" disabled placeholder="配置参数" v-model="resultInfo">
3 <el-input type="textarea" :rows="6" :disabled="$store.state.business.Edit" placeholder="配置参数" v-model="resultInfo"> 3 </el-input>
4 </el-input>
5 <div class="d-center" v-if="!$store.state.business.Edit">
6 <btn nativeType="cx" @click="submitForm">重新上报</btn>
7 </div>
8 </div>
9 </template> 4 </template>
10 <script> 5 <script>
11 // 引入json编译器 6 // 引入json编译器
...@@ -15,17 +10,6 @@ export default { ...@@ -15,17 +10,6 @@ export default {
15 type: String, 10 type: String,
16 default: '' 11 default: ''
17 } 12 }
18 },
19 data () {
20 return {
21 myValue: this.value,
22 }
23 },
24 methods: {
25 onJsonChange (value) {
26 },
27 onJsonSave (value) {
28 }
29 } 13 }
30 } 14 }
31 15
......
...@@ -18,6 +18,9 @@ const actions = { ...@@ -18,6 +18,9 @@ const actions = {
18 getUserInfo ({ commit }) { 18 getUserInfo ({ commit }) {
19 return new Promise(async (resolve) => { 19 return new Promise(async (resolve) => {
20 let { result: res } = await getUserInfo(); 20 let { result: res } = await getUserInfo();
21 // require.ensure([], function (require) {
22 // require("@/assets/sass/smart-lift/index.scss");
23 // });
21 commit("SET_USERINFO", res); 24 commit("SET_USERINFO", res);
22 resolve(true); 25 resolve(true);
23 }); 26 });
......
...@@ -56,7 +56,7 @@ ...@@ -56,7 +56,7 @@
56 box-shadow: inset 0px 0px 12px 0px #02D9FD; 56 box-shadow: inset 0px 0px 12px 0px #02D9FD;
57 border-radius: 2px; 57 border-radius: 2px;
58 border: 1px solid #6BC1FC; 58 border: 1px solid #6BC1FC;
59 margin: 0 18px 15px 18px; 59 margin: 0 18px 10px 18px;
60 } 60 }
61 } 61 }
62 62
......