d15c4f38 by renchao@pashanhoo.com

Merge branch 'dev'

2 parents c9379e12 8ee2dbc5
1 <!-- 1 <!--
2 * @Description: 2 * @Description:
3 * @Autor: renchao 3 * @Autor: renchao
4 * @LastEditTime: 2023-08-16 11:22:21 4 * @LastEditTime: 2023-08-16 17:02:36
5 --> 5 -->
6 <template> 6 <template>
7 <div class="from-clues loadingtext" v-Loading="loading" element-loading-text="拼命加载中..." style="height:720px;text-align: center;"> 7 <div class="from-clues loadingtext" v-Loading="loading" element-loading-text="拼命加载中..." style="height:720px;text-align: center;">
...@@ -30,6 +30,7 @@ ...@@ -30,6 +30,7 @@
30 }, 30 },
31 data () { 31 data () {
32 return { 32 return {
33 key: 0,
33 noData: false, 34 noData: false,
34 imgSrc: require('@/image/bdcqz/bdcqzs2.jpg'), 35 imgSrc: require('@/image/bdcqz/bdcqzs2.jpg'),
35 bdczmSrc: require('@/image/bdcqz/bdczm.jpg'), 36 bdczmSrc: require('@/image/bdcqz/bdczm.jpg'),
...@@ -133,9 +134,9 @@ ...@@ -133,9 +134,9 @@
133 context.fillText(this.bdcqz.qlr ? this.bdcqz.qlr : '', 129, 97); 134 context.fillText(this.bdcqz.qlr ? this.bdcqz.qlr : '', 129, 97);
134 context.fillText(this.bdcqz.gyqk ? this.bdcqz.gyqk : '', 129, 136); 135 context.fillText(this.bdcqz.gyqk ? this.bdcqz.gyqk : '', 129, 136);
135 136
136 this.bdcqz.bdcdyh = this.bdcqz.bdcdyh.slice(0, 6) + ' ' + this.bdcqz.bdcdyh.slice(6, 12) + ' ' + 137 this.bdcdyh = this.bdcqz.bdcdyh.slice(0, 6) + ' ' + this.bdcqz.bdcdyh.slice(6, 12) + ' ' +
137 this.bdcqz.bdcdyh.slice(12, 19) + ' ' + this.bdcqz.bdcdyh.slice(19, this.bdcqz.bdcdyh.length) 138 this.bdcqz.bdcdyh.slice(12, 19) + ' ' + this.bdcqz.bdcdyh.slice(19, this.bdcqz.bdcdyh.length)
138 context.fillText(this.bdcqz.bdcdyh ? this.bdcqz.bdcdyh : '', 129, 223); 139 context.fillText(this.bdcdyh ? this.bdcdyh : '', 129, 223);
139 140
140 141
141 142
......
...@@ -143,7 +143,7 @@ ...@@ -143,7 +143,7 @@
143 <div class="triangle"></div> 143 <div class="triangle"></div>
144 </div> 144 </div>
145 <el-row :gutter="10"> 145 <el-row :gutter="10">
146 <el-col :span="14" v-if="ruleForm.qlxx"> 146 <el-col :span="12" v-if="ruleForm.qlxx">
147 <el-form-item label="共有方式:"> 147 <el-form-item label="共有方式:">
148 <el-radio-group :disabled="!viewEdit" v-model="ruleForm.sldy.gyfs"> 148 <el-radio-group :disabled="!viewEdit" v-model="ruleForm.sldy.gyfs">
149 <el-radio label="0">单独所有</el-radio> 149 <el-radio label="0">单独所有</el-radio>
......