d5100df6 by lihua

fix: 修复

1 parent f9cc1f9e
...@@ -42,7 +42,7 @@ const processTableInfo = ref({ ...@@ -42,7 +42,7 @@ const processTableInfo = ref({
42 id: "process-table", 42 id: "process-table",
43 rowKey: 'guid', 43 rowKey: 'guid',
44 fields: [ 44 fields: [
45 { label: "序号", type: "index", width: TableColumnWidth.INDEX, align: "center" }, 45 // { label: "序号", type: "index", width: TableColumnWidth.INDEX, align: "center" },
46 { label: "编码", field: "code", width: 355 }, 46 { label: "编码", field: "code", width: 355 },
47 { label: "名称", field: "name", width: 160 }, 47 { label: "名称", field: "name", width: 160 },
48 { label: "类型", field: "type", width: 120 }, 48 { label: "类型", field: "type", width: 120 },
...@@ -113,7 +113,7 @@ const handleTableExpandChange = (row: any, expandedRows: any[]) => { ...@@ -113,7 +113,7 @@ const handleTableExpandChange = (row: any, expandedRows: any[]) => {
113 }).then((res: any) => { 113 }).then((res: any) => {
114 detailLoading.value = false; 114 detailLoading.value = false;
115 if (res?.code == proxy.$passCode) { 115 if (res?.code == proxy.$passCode) {
116 const data = res.data || []; 116 const data = res.data?.records || []
117 activities.value = []; 117 activities.value = [];
118 for (const d of data) { 118 for (const d of data) {
119 activities.value.push({ 119 activities.value.push({
...@@ -150,53 +150,56 @@ const handleTableExpandChange = (row: any, expandedRows: any[]) => { ...@@ -150,53 +150,56 @@ const handleTableExpandChange = (row: any, expandedRows: any[]) => {
150 :hollow="activity.hollow" :type="activity.type" placement="top"> 150 :hollow="activity.hollow" :type="activity.type" placement="top">
151 <div class="list_panel"> 151 <div class="list_panel">
152 <template v-if="activity.info?.bizType == '合约'"> 152 <template v-if="activity.info?.bizType == '合约'">
153 <div class="list_item"> 153 <div class="list_item">
154 <span class="item_label">合约发起方:</span> 154 <span class="item_label">合约发起方:</span>
155 <span class="item_value"><ellipsis-tooltip :content="activity.info?.contractSubmitName || '--'" 155 <span class="item_value"><ellipsis-tooltip :content="activity.info?.contractSubmitName || '--'"
156 class-name="w100f mr8-i" :refName="'tooltipOver' + 'contractSubmitName'"></ellipsis-tooltip></span> 156 class-name="w100f mr8-i"
157 </div> 157 :refName="'tooltipOver' + 'contractSubmitName'"></ellipsis-tooltip></span>
158 <div class="list_item"> 158 </div>
159 <span class="item_label">数据提供方:</span> 159 <div class="list_item">
160 <span class="item_value"><ellipsis-tooltip :content="activity.info?.contractProviderName || '--'" 160 <span class="item_label">数据提供方:</span>
161 class-name="w100f mr8-i" :refName="'tooltipOver' + 'contractProviderName'"></ellipsis-tooltip></span> 161 <span class="item_value"><ellipsis-tooltip :content="activity.info?.contractProviderName || '--'"
162 </div> 162 class-name="w100f mr8-i"
163 <div class="list_item"> 163 :refName="'tooltipOver' + 'contractProviderName'"></ellipsis-tooltip></span>
164 <span class="item_label">数据使用方:</span> 164 </div>
165 <span class="item_value"><ellipsis-tooltip :content="activity.info?.contractUseName || '--'" 165 <div class="list_item">
166 class-name="w100f mr8-i" :refName="'tooltipOver' + 'contractUseName'"></ellipsis-tooltip></span> 166 <span class="item_label">数据使用方:</span>
167 </div> 167 <span class="item_value"><ellipsis-tooltip :content="activity.info?.contractUseName || '--'"
168 class-name="w100f mr8-i"
169 :refName="'tooltipOver' + 'contractUseName'"></ellipsis-tooltip></span>
170 </div>
168 </template> 171 </template>
169 <template v-else-if="activity.info?.bizType == '连接器'"> 172 <template v-else-if="activity.info?.bizType == '连接器'">
170 <div class="list_item"> 173 <div class="list_item">
171 <span class="item_label">连接器名称:</span> 174 <span class="item_label">连接器名称:</span>
172 <span class="item_value"><ellipsis-tooltip :content="activity.info?.bizName || '--'" 175 <span class="item_value"><ellipsis-tooltip :content="activity.info?.bizName || '--'"
173 class-name="w100f mr8-i" :refName="'tooltipOver' + 'bizName'"></ellipsis-tooltip></span> 176 class-name="w100f mr8-i" :refName="'tooltipOver' + 'bizName'"></ellipsis-tooltip></span>
174 </div> 177 </div>
175 <div class="list_item"> 178 <div class="list_item">
176 <span class="item_label">所属企业:</span> 179 <span class="item_label">所属企业:</span>
177 <span class="item_value"><ellipsis-tooltip :content="activity.info?.submitter || '--'" 180 <span class="item_value"><ellipsis-tooltip :content="activity.info?.submitter || '--'"
178 class-name="w100f mr8-i" :refName="'tooltipOver' + 'submitter1'"></ellipsis-tooltip></span> 181 class-name="w100f mr8-i" :refName="'tooltipOver' + 'submitter1'"></ellipsis-tooltip></span>
179 </div> 182 </div>
180 <div class="list_item"> 183 <div class="list_item">
181 <span class="item_label">提交时间:</span> 184 <span class="item_label">提交时间:</span>
182 <span class="item_value">{{ activity.info?.updateTime || '--' }}</span> 185 <span class="item_value">{{ activity.info?.updateTime || '--' }}</span>
183 </div> 186 </div>
184 </template> 187 </template>
185 <template v-else> 188 <template v-else>
186 <div class="list_item"> 189 <div class="list_item">
187 <span class="item_label">数据产品名称:</span> 190 <span class="item_label">数据产品名称:</span>
188 <span class="item_value"><ellipsis-tooltip :content="activity.info?.bizName || '--'" 191 <span class="item_value"><ellipsis-tooltip :content="activity.info?.bizName || '--'"
189 class-name="w100f mr8-i" :refName="'tooltipOver' + 'bizName'"></ellipsis-tooltip></span> 192 class-name="w100f mr8-i" :refName="'tooltipOver' + 'bizName'"></ellipsis-tooltip></span>
190 </div> 193 </div>
191 <div class="list_item"> 194 <div class="list_item">
192 <span class="item_label">数据产品类型:</span> 195 <span class="item_label">数据产品类型:</span>
193 <span class="item_value">{{ activity.info?.bizType || '--' }}</span> 196 <span class="item_value">{{ activity.info?.bizType || '--' }}</span>
194 </div> 197 </div>
195 <div class="list_item"> 198 <div class="list_item">
196 <span class="item_label">提交方:</span> 199 <span class="item_label">提交方:</span>
197 <span class="item_value"><ellipsis-tooltip :content="activity.info?.submitter || '--'" 200 <span class="item_value"><ellipsis-tooltip :content="activity.info?.submitter || '--'"
198 class-name="w100f mr8-i" :refName="'tooltipOver' + 'submitter'"></ellipsis-tooltip></span> 201 class-name="w100f mr8-i" :refName="'tooltipOver' + 'submitter'"></ellipsis-tooltip></span>
199 </div> 202 </div>
200 </template> 203 </template>
201 <div class="list_item" style="width: 66.66%;"> 204 <div class="list_item" style="width: 66.66%;">
202 <span class="item_label">区块链ID:</span> 205 <span class="item_label">区块链ID:</span>
...@@ -218,6 +221,15 @@ const handleTableExpandChange = (row: any, expandedRows: any[]) => { ...@@ -218,6 +221,15 @@ const handleTableExpandChange = (row: any, expandedRows: any[]) => {
218 </el-timeline> 221 </el-timeline>
219 </template> 222 </template>
220 </el-table-column> 223 </el-table-column>
224 <el-table-column label="序号" type="index" width="56px" align="center" show-overflow-tooltip>
225 <template #default="scope">
226 <span>{{
227 blockPage.curr !== undefined
228 ? (blockPage.curr - 1) * blockPage.limit + scope.$index + 1
229 : scope.$index + 1
230 }}</span>
231 </template>
232 </el-table-column>
221 <el-table-column v-for="field in processTableInfo.fields" :prop="field.field" :label="field.label" 233 <el-table-column v-for="field in processTableInfo.fields" :prop="field.field" :label="field.label"
222 :width="field.width" :minWidth="field.minWidth" :align="field.align" show-overflow-tooltip> 234 :width="field.width" :minWidth="field.minWidth" :align="field.align" show-overflow-tooltip>
223 <template #default="scope"> 235 <template #default="scope">
......
Styling with Markdown is supported
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!