inl-ui 0.0.12 → 0.0.13
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/dist/index.js +32 -32
- package/dist/index.js.map +1 -1
- package/package.json +1 -1
- package/src/pageComponent/views/pss/components/Info.tsx +2 -2
- package/src/pageComponent/views/pss/components/NewOrder.tsx +6 -17
- package/src/pageComponent/views/pss/components/table.tsx +12 -12
- package/src/pageComponent/views/pssRecord/index.tsx +11 -10
package/package.json
CHANGED
|
@@ -267,9 +267,9 @@ export default defineComponent({
|
|
|
267
267
|
)}
|
|
268
268
|
</Col>
|
|
269
269
|
<Col span={8}>
|
|
270
|
-
<div class="label"
|
|
270
|
+
<div class="label">名称:</div>
|
|
271
271
|
<div class="value">
|
|
272
|
-
{dataObj.value.equipCode}
|
|
272
|
+
{/* {dataObj.value.equipCode} */}
|
|
273
273
|
{dataObj.value.equipName}
|
|
274
274
|
</div>
|
|
275
275
|
</Col>
|
|
@@ -125,24 +125,12 @@ export default defineComponent({
|
|
|
125
125
|
columns: [
|
|
126
126
|
{
|
|
127
127
|
dataIndex: "name",
|
|
128
|
-
title: "
|
|
129
|
-
width: "30%",
|
|
128
|
+
title: "名称",
|
|
130
129
|
ellipsis: true,
|
|
131
|
-
customRender: (rowCell: any) => {
|
|
132
|
-
const { record } = rowCell;
|
|
133
|
-
const { code, name } = record;
|
|
134
|
-
return (
|
|
135
|
-
<div>
|
|
136
|
-
{code}
|
|
137
|
-
{name}
|
|
138
|
-
</div>
|
|
139
|
-
);
|
|
140
|
-
},
|
|
141
130
|
},
|
|
142
131
|
{
|
|
143
132
|
dataIndex: "location",
|
|
144
133
|
title: "设备位置",
|
|
145
|
-
width: "30%",
|
|
146
134
|
ellipsis: true,
|
|
147
135
|
},
|
|
148
136
|
{
|
|
@@ -334,7 +322,7 @@ export default defineComponent({
|
|
|
334
322
|
<div class="device" key={device.id}>
|
|
335
323
|
<div class="titleLine flex-center">
|
|
336
324
|
<span class="title">
|
|
337
|
-
{device.code}
|
|
325
|
+
{/* {device.code} */}
|
|
338
326
|
{device.name}
|
|
339
327
|
</span>
|
|
340
328
|
|
|
@@ -496,7 +484,7 @@ export default defineComponent({
|
|
|
496
484
|
{/* <Input
|
|
497
485
|
class="serach"
|
|
498
486
|
prefix={<SearchOutlined />}
|
|
499
|
-
placeholder="
|
|
487
|
+
placeholder="名称"
|
|
500
488
|
style="margin-bottom: 24px; width: 200px"
|
|
501
489
|
/>
|
|
502
490
|
<Form
|
|
@@ -526,7 +514,7 @@ export default defineComponent({
|
|
|
526
514
|
<Table
|
|
527
515
|
pagination={false}
|
|
528
516
|
columns={eqModal.columns}
|
|
529
|
-
scroll={{ y: 440 }}
|
|
517
|
+
scroll={{ x: 760, y: 440 }}
|
|
530
518
|
dataSource={eqModal.dataSource}
|
|
531
519
|
// class="cus-table"
|
|
532
520
|
rowKey={(record: any) => {
|
|
@@ -566,7 +554,8 @@ export default defineComponent({
|
|
|
566
554
|
|
|
567
555
|
<div class="activedBox">
|
|
568
556
|
{selectedList.value.map((selected: any, idx: number) => {
|
|
569
|
-
const name = `${selected.code}${selected.name}`;
|
|
557
|
+
// const name = `${selected.code}${selected.name}`;
|
|
558
|
+
const name = selected.name;
|
|
570
559
|
const textLength = 10;
|
|
571
560
|
const title = name.length > textLength ? name : "";
|
|
572
561
|
return (
|
|
@@ -210,9 +210,9 @@ export default defineComponent({
|
|
|
210
210
|
width: 140,
|
|
211
211
|
},
|
|
212
212
|
{
|
|
213
|
-
|
|
214
|
-
title: "
|
|
215
|
-
key: "numAndName",
|
|
213
|
+
dataIndex: "equipName",
|
|
214
|
+
title: "名称",
|
|
215
|
+
// key: "numAndName",
|
|
216
216
|
width: 200,
|
|
217
217
|
},
|
|
218
218
|
{
|
|
@@ -720,15 +720,15 @@ export default defineComponent({
|
|
|
720
720
|
);
|
|
721
721
|
}
|
|
722
722
|
|
|
723
|
-
// 设备编号/名称
|
|
724
|
-
if (column.key === "numAndName") {
|
|
725
|
-
|
|
726
|
-
|
|
727
|
-
|
|
728
|
-
|
|
729
|
-
|
|
730
|
-
|
|
731
|
-
}
|
|
723
|
+
// // 设备编号/名称
|
|
724
|
+
// if (column.key === "numAndName") {
|
|
725
|
+
// return (
|
|
726
|
+
// <span>
|
|
727
|
+
// {record.equipCode}
|
|
728
|
+
// {record.equipName}
|
|
729
|
+
// </span>
|
|
730
|
+
// );
|
|
731
|
+
// }
|
|
732
732
|
|
|
733
733
|
// 回路数量
|
|
734
734
|
if (column.key === "loopsNum") {
|
|
@@ -109,8 +109,9 @@ const com = defineComponent({
|
|
|
109
109
|
width: 120,
|
|
110
110
|
},
|
|
111
111
|
{
|
|
112
|
-
|
|
113
|
-
|
|
112
|
+
dataIndex: "equipName",
|
|
113
|
+
title: "名称",
|
|
114
|
+
// key: "numAndName",
|
|
114
115
|
width: 200,
|
|
115
116
|
},
|
|
116
117
|
{
|
|
@@ -252,14 +253,14 @@ const com = defineComponent({
|
|
|
252
253
|
);
|
|
253
254
|
}
|
|
254
255
|
|
|
255
|
-
// 设备编号/名称
|
|
256
|
-
if (column.key === "numAndName") {
|
|
257
|
-
|
|
258
|
-
|
|
259
|
-
|
|
260
|
-
|
|
261
|
-
|
|
262
|
-
}
|
|
256
|
+
// // 设备编号/名称
|
|
257
|
+
// if (column.key === "numAndName") {
|
|
258
|
+
// return (
|
|
259
|
+
// <span>
|
|
260
|
+
// {record.equipCode}-{record.equipName}
|
|
261
|
+
// </span>
|
|
262
|
+
// );
|
|
263
|
+
// }
|
|
263
264
|
|
|
264
265
|
// 回路数量
|
|
265
266
|
if (column.key === "loopsNum") {
|