Merge branch 'master' of http://gitea.xxhhcty.xyz:8080/zcdsj/factory_web
This commit is contained in:
commit
9043e45f65
|
|
@ -53,9 +53,13 @@
|
||||||
<el-option
|
<el-option
|
||||||
v-for="item in routeOptions"
|
v-for="item in routeOptions"
|
||||||
:key="item.id"
|
:key="item.id"
|
||||||
:label="item.name"
|
:label="item.name + (item.routepack_name ? '(' + item.routepack_name + ')' : '')"
|
||||||
:value="item.id"
|
:value="item.id"
|
||||||
>
|
>
|
||||||
|
<span style="display: flex; width: 100%; min-width: 0" :title="item.name + (item.routepack_name ? '(' + item.routepack_name + ')' : '')">
|
||||||
|
<span style="flex: 1; min-width: 0; overflow: hidden; text-overflow: ellipsis; white-space: nowrap">{{ item.name }}</span>
|
||||||
|
<span v-if="item.routepack_name" style="max-width: 45%; flex-shrink: 0; overflow: hidden; color: var(--el-text-color-secondary); text-overflow: ellipsis; white-space: nowrap">({{ item.routepack_name }})</span>
|
||||||
|
</span>
|
||||||
</el-option>
|
</el-option>
|
||||||
</el-select>
|
</el-select>
|
||||||
</el-form-item>
|
</el-form-item>
|
||||||
|
|
|
||||||
|
|
@ -31,10 +31,13 @@
|
||||||
<el-option
|
<el-option
|
||||||
v-for="item in routeOptions"
|
v-for="item in routeOptions"
|
||||||
:key="item.id"
|
:key="item.id"
|
||||||
:label="item.name"
|
:label="item.name + (item.routepack_name ? '(' + item.routepack_name + ')' : '')"
|
||||||
:value="item.id"
|
:value="item.id"
|
||||||
>
|
>
|
||||||
<span>[{{ item.routepack_name }}]{{ item.name }}</span>
|
<span style="display: flex; width: 100%; min-width: 0" :title="item.name + (item.routepack_name ? '(' + item.routepack_name + ')' : '')">
|
||||||
|
<span style="flex: 1; min-width: 0; overflow: hidden; text-overflow: ellipsis; white-space: nowrap">{{ item.name }}</span>
|
||||||
|
<span v-if="item.routepack_name" style="max-width: 45%; flex-shrink: 0; overflow: hidden; color: var(--el-text-color-secondary); text-overflow: ellipsis; white-space: nowrap">({{ item.routepack_name }})</span>
|
||||||
|
</span>
|
||||||
</el-option>
|
</el-option>
|
||||||
</el-select>
|
</el-select>
|
||||||
</el-form-item>
|
</el-form-item>
|
||||||
|
|
|
||||||
|
|
@ -28,10 +28,13 @@
|
||||||
<el-option
|
<el-option
|
||||||
v-for="item in routeOptions"
|
v-for="item in routeOptions"
|
||||||
:key="item.id"
|
:key="item.id"
|
||||||
:label="item.name"
|
:label="item.name + (item.routepack_name ? '(' + item.routepack_name + ')' : '')"
|
||||||
:value="item.id"
|
:value="item.id"
|
||||||
>
|
>
|
||||||
<span>[{{ item.routepack_name }}]{{ item.name }}</span>
|
<span style="display: flex; width: 100%; min-width: 0" :title="item.name + (item.routepack_name ? '(' + item.routepack_name + ')' : '')">
|
||||||
|
<span style="flex: 1; min-width: 0; overflow: hidden; text-overflow: ellipsis; white-space: nowrap">{{ item.name }}</span>
|
||||||
|
<span v-if="item.routepack_name" style="max-width: 45%; flex-shrink: 0; overflow: hidden; color: var(--el-text-color-secondary); text-overflow: ellipsis; white-space: nowrap">({{ item.routepack_name }})</span>
|
||||||
|
</span>
|
||||||
</el-option>
|
</el-option>
|
||||||
</el-select>
|
</el-select>
|
||||||
</el-form-item>
|
</el-form-item>
|
||||||
|
|
|
||||||
|
|
@ -48,9 +48,13 @@
|
||||||
<el-option
|
<el-option
|
||||||
v-for="item in routeOptions"
|
v-for="item in routeOptions"
|
||||||
:key="item.id"
|
:key="item.id"
|
||||||
:label="item.name"
|
:label="item.name + (item.routepack_name ? '(' + item.routepack_name + ')' : '')"
|
||||||
:value="item.id"
|
:value="item.id"
|
||||||
>
|
>
|
||||||
|
<span style="display: flex; width: 100%; min-width: 0" :title="item.name + (item.routepack_name ? '(' + item.routepack_name + ')' : '')">
|
||||||
|
<span style="flex: 1; min-width: 0; overflow: hidden; text-overflow: ellipsis; white-space: nowrap">{{ item.name }}</span>
|
||||||
|
<span v-if="item.routepack_name" style="max-width: 45%; flex-shrink: 0; overflow: hidden; color: var(--el-text-color-secondary); text-overflow: ellipsis; white-space: nowrap">({{ item.routepack_name }})</span>
|
||||||
|
</span>
|
||||||
</el-option>
|
</el-option>
|
||||||
</el-select>
|
</el-select>
|
||||||
</el-form-item>
|
</el-form-item>
|
||||||
|
|
|
||||||
|
|
@ -49,10 +49,13 @@
|
||||||
<el-option
|
<el-option
|
||||||
v-for="item in routeOptions"
|
v-for="item in routeOptions"
|
||||||
:key="item.id"
|
:key="item.id"
|
||||||
:label="item.name"
|
:label="item.name + (item.routepack_name ? '(' + item.routepack_name + ')' : '')"
|
||||||
:value="item.id"
|
:value="item.id"
|
||||||
>
|
>
|
||||||
<span>[{{ item.routepack_name }}]{{ item.name }}</span>
|
<span style="display: flex; width: 100%; min-width: 0" :title="item.name + (item.routepack_name ? '(' + item.routepack_name + ')' : '')">
|
||||||
|
<span style="flex: 1; min-width: 0; overflow: hidden; text-overflow: ellipsis; white-space: nowrap">{{ item.name }}</span>
|
||||||
|
<span v-if="item.routepack_name" style="max-width: 45%; flex-shrink: 0; overflow: hidden; color: var(--el-text-color-secondary); text-overflow: ellipsis; white-space: nowrap">({{ item.routepack_name }})</span>
|
||||||
|
</span>
|
||||||
</el-option>
|
</el-option>
|
||||||
</el-select>
|
</el-select>
|
||||||
</el-form-item>
|
</el-form-item>
|
||||||
|
|
|
||||||
|
|
@ -28,10 +28,13 @@
|
||||||
<el-option
|
<el-option
|
||||||
v-for="item in routeOptions"
|
v-for="item in routeOptions"
|
||||||
:key="item.id"
|
:key="item.id"
|
||||||
:label="item.name"
|
:label="item.name + (item.routepack_name ? '(' + item.routepack_name + ')' : '')"
|
||||||
:value="item.id"
|
:value="item.id"
|
||||||
>
|
>
|
||||||
<span>[{{ item.routepack_name }}]{{ item.name }}</span>
|
<span style="display: flex; width: 100%; min-width: 0" :title="item.name + (item.routepack_name ? '(' + item.routepack_name + ')' : '')">
|
||||||
|
<span style="flex: 1; min-width: 0; overflow: hidden; text-overflow: ellipsis; white-space: nowrap">{{ item.name }}</span>
|
||||||
|
<span v-if="item.routepack_name" style="max-width: 45%; flex-shrink: 0; overflow: hidden; color: var(--el-text-color-secondary); text-overflow: ellipsis; white-space: nowrap">({{ item.routepack_name }})</span>
|
||||||
|
</span>
|
||||||
</el-option>
|
</el-option>
|
||||||
</el-select>
|
</el-select>
|
||||||
</el-form-item>
|
</el-form-item>
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue