069ab92c by 任超

style:流程图

1 parent cf1e1de2
...@@ -5,4 +5,4 @@ NODE_ENV=development ...@@ -5,4 +5,4 @@ NODE_ENV=development
5 VUE_APP_BASE_API = '/bdcdj' 5 VUE_APP_BASE_API = '/bdcdj'
6 6
7 # 开发环境 7 # 开发环境
8 VUE_APP_API_BASE_URL = 'http://192.168.2.88:8018' 8 VUE_APP_API_BASE_URL = 'http://192.168.2.95:8018'
......
...@@ -59,7 +59,7 @@ export default { ...@@ -59,7 +59,7 @@ export default {
59 }, 59 },
60 heightNum: { 60 heightNum: {
61 type: Number, 61 type: Number,
62 default: 285, 62 default: 260,
63 }, 63 },
64 maxHeight: { 64 maxHeight: {
65 type: Number, 65 type: Number,
......
1 <template> 1 <template>
2 <transition name="fade" mode="out-in" v-if="isShow"> 2 <transition name="fade" mode="out-in" v-if="isShow">
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,'height':height}"> 4 <div class="ls-mask-window" :style="{'width':width,'minHeight':height}">
5 <div :style="{'text-align':titleStyle}"><b>{{title}}</b></div> 5 <div :style="{'text-align':titleStyle}"><b>{{title}}</b></div>
6 <i class="el-icon-close" @click="onCancel"></i> 6 <i class="el-icon-close" @click="onCancel"></i>
7 <div class="ls-mask-content"> 7 <div class="ls-mask-content">
...@@ -30,7 +30,7 @@ export default { ...@@ -30,7 +30,7 @@ export default {
30 editItem: "", 30 editItem: "",
31 titleStyle: 'center', 31 titleStyle: 'center',
32 width: "75%", 32 width: "75%",
33 height: "500px", 33 height: "230px",
34 formData: "",//父组件传递的参数 负责传给子组件 34 formData: "",//父组件传递的参数 负责传给子组件
35 } 35 }
36 }, 36 },
...@@ -82,6 +82,7 @@ export default { ...@@ -82,6 +82,7 @@ export default {
82 left: 0; 82 left: 0;
83 top: 0; 83 top: 0;
84 background: rgba(0, 0, 0, 0.3); 84 background: rgba(0, 0, 0, 0.3);
85 border-radius: 5px;
85 } 86 }
86 87
87 .ls-mask-window { 88 .ls-mask-window {
...@@ -103,7 +104,6 @@ export default { ...@@ -103,7 +104,6 @@ export default {
103 } 104 }
104 105
105 .ls-mask-footer { 106 .ls-mask-footer {
106 height: 45px;
107 border-top: 1px solid #f0f0f0; 107 border-top: 1px solid #f0f0f0;
108 display: flex; 108 display: flex;
109 justify-content: flex-end; 109 justify-content: flex-end;
...@@ -112,6 +112,7 @@ export default { ...@@ -112,6 +112,7 @@ export default {
112 width: 98%; 112 width: 98%;
113 bottom: 10px; 113 bottom: 10px;
114 right: 12px; 114 right: 12px;
115 padding-top: 10px;
115 } 116 }
116 117
117 /deep/.el-icon-close { 118 /deep/.el-icon-close {
......
1 <!--
2 功能:流程图
3 作者:calliope
4 -->
5 <template>
6 <div class='flowChart'>
7 <img :src="formData" alt="">
8 </div>
9 </template>
10 <script>
11
12 export default {
13 props: {
14 formData: {
15 type: String,
16 default: ''
17 }
18 }
19 }
20 </script>
21 <style scoped lang="scss">
22 @import "~@/styles/mixin.scss";
23
24 .flowChart {
25 margin: 20px 0;
26 }
27 </style>
...\ No newline at end of file ...\ No newline at end of file
...@@ -56,9 +56,6 @@ ...@@ -56,9 +56,6 @@
56 </div> 56 </div>
57 </div> 57 </div>
58 </div> 58 </div>
59 <dialogBox title="流程图" width="70%" isMain v-model="myValue" :isFullscreen="false" :isButton="false">
60 <img :src="imgSrc" style="margin: 20px 0" />
61 </dialogBox>
62 </div> 59 </div>
63 </template> 60 </template>
64 61
...@@ -82,7 +79,6 @@ export default { ...@@ -82,7 +79,6 @@ export default {
82 return { 79 return {
83 // 流程图 80 // 流程图
84 imgSrc: '', 81 imgSrc: '',
85 myValue: false,
86 // 折叠 82 // 折叠
87 isShowdrawer: true, 83 isShowdrawer: true,
88 // 默认选中 84 // 默认选中
...@@ -154,7 +150,11 @@ export default { ...@@ -154,7 +150,11 @@ export default {
154 case "B1": 150 case "B1":
155 getWorkFlowImage(this.bsmSlsq).then(res => { 151 getWorkFlowImage(this.bsmSlsq).then(res => {
156 this.imgSrc = URL.createObjectURL(res) 152 this.imgSrc = URL.createObjectURL(res)
157 this.myValue = true 153 this.$popup({
154 title: '流程图',
155 editItem: 'workflow/components/flowChart',
156 formData: this.imgSrc
157 })
158 }) 158 })
159 break; 159 break;
160 case "zsyl": 160 case "zsyl":
......
...@@ -106,7 +106,7 @@ export default { ...@@ -106,7 +106,7 @@ export default {
106 fetchData () { 106 fetchData () {
107 if (this.bsmSqyw) { 107 if (this.bsmSqyw) {
108 this.queryForm.sqywbm = this.djywbm; 108 this.queryForm.sqywbm = this.djywbm;
109 109 console.log(this.queryForm, this.bsmSqyw);
110 selectScBdcdy({ ...this.queryForm, ...this.pageData }).then((res) => { 110 selectScBdcdy({ ...this.queryForm, ...this.pageData }).then((res) => {
111 if (res.code === 200) { 111 if (res.code === 200) {
112 let { total, records } = res.result; 112 let { total, records } = res.result;
......