Merge branch 'main' into uat_us
commit
f7968667f6
|
@ -10,12 +10,16 @@
|
||||||
<el-input v-model="searchData.Version" style="width: 100px" />
|
<el-input v-model="searchData.Version" style="width: 100px" />
|
||||||
</el-form-item>
|
</el-form-item>
|
||||||
<el-form-item>
|
<el-form-item>
|
||||||
<el-button type="primary" @click="handleReset">{{
|
<el-button type="primary" icon="el-icon-search" @click="handleSearch">
|
||||||
$t("dictionary:browser:button:reset")
|
{{ $t('common:button:search') }}
|
||||||
}}</el-button>
|
</el-button>
|
||||||
<el-button type="primary" @click="handleSearch">{{
|
<el-button
|
||||||
$t("dictionary:browser:button:search")
|
type="primary"
|
||||||
}}</el-button>
|
icon="el-icon-refresh-left"
|
||||||
|
@click="handleReset"
|
||||||
|
>
|
||||||
|
{{ $t('common:button:reset') }}
|
||||||
|
</el-button>
|
||||||
</el-form-item>
|
</el-form-item>
|
||||||
</el-form>
|
</el-form>
|
||||||
<span style="margin-left: auto">
|
<span style="margin-left: auto">
|
||||||
|
|
|
@ -16,8 +16,16 @@
|
||||||
<el-input v-model="searchData.TagDescriptionCN" clearable style="width:120px;" />
|
<el-input v-model="searchData.TagDescriptionCN" clearable style="width:120px;" />
|
||||||
</el-form-item>
|
</el-form-item>
|
||||||
<el-form-item>
|
<el-form-item>
|
||||||
<el-button type="primary" @click="handleReset">Reset</el-button>
|
<el-button type="primary" icon="el-icon-search" @click="handleSearch">
|
||||||
<el-button type="primary" @click="handleSearch">Search</el-button>
|
{{ $t('common:button:search') }}
|
||||||
|
</el-button>
|
||||||
|
<el-button
|
||||||
|
type="primary"
|
||||||
|
icon="el-icon-refresh-left"
|
||||||
|
@click="handleReset"
|
||||||
|
>
|
||||||
|
{{ $t('common:button:reset') }}
|
||||||
|
</el-button>
|
||||||
</el-form-item>
|
</el-form-item>
|
||||||
</el-form>
|
</el-form>
|
||||||
<span style="margin-left:auto">
|
<span style="margin-left:auto">
|
||||||
|
|
|
@ -27,8 +27,16 @@
|
||||||
</el-select>
|
</el-select>
|
||||||
</el-form-item>
|
</el-form-item>
|
||||||
<el-form-item>
|
<el-form-item>
|
||||||
<el-button type="primary" @click="handleReset">重置</el-button>
|
<el-button type="primary" icon="el-icon-search" @click="handleSearch">
|
||||||
<el-button type="primary" @click="handleSearch">查询</el-button>
|
{{ $t('common:button:search') }}
|
||||||
|
</el-button>
|
||||||
|
<el-button
|
||||||
|
type="primary"
|
||||||
|
icon="el-icon-refresh-left"
|
||||||
|
@click="handleReset"
|
||||||
|
>
|
||||||
|
{{ $t('common:button:reset') }}
|
||||||
|
</el-button>
|
||||||
</el-form-item>
|
</el-form-item>
|
||||||
</el-form>
|
</el-form>
|
||||||
<span style="margin-left:auto">
|
<span style="margin-left:auto">
|
||||||
|
|
|
@ -8,9 +8,16 @@
|
||||||
<el-input v-model="searchData.QuestionName" clearable style="width:120px;" />
|
<el-input v-model="searchData.QuestionName" clearable style="width:120px;" />
|
||||||
</el-form-item>
|
</el-form-item>
|
||||||
<el-form-item>
|
<el-form-item>
|
||||||
<el-button type="primary" @click="handleReset">重置</el-button>
|
<el-button type="primary" icon="el-icon-search" @click="handleSearch">
|
||||||
<el-button type="primary" @click="handleSearch">查询</el-button>
|
{{ $t('common:button:search') }}
|
||||||
|
</el-button>
|
||||||
|
<el-button
|
||||||
|
type="primary"
|
||||||
|
icon="el-icon-refresh-left"
|
||||||
|
@click="handleReset"
|
||||||
|
>
|
||||||
|
{{ $t('common:button:reset') }}
|
||||||
|
</el-button>
|
||||||
</el-form-item>
|
</el-form-item>
|
||||||
</el-form>
|
</el-form>
|
||||||
<div>
|
<div>
|
||||||
|
|
|
@ -57,8 +57,16 @@
|
||||||
</el-select>
|
</el-select>
|
||||||
</el-form-item>
|
</el-form-item>
|
||||||
<el-form-item>
|
<el-form-item>
|
||||||
<el-button type="primary" @click="handleReset">重置</el-button>
|
<el-button type="primary" icon="el-icon-search" @click="handleSearch">
|
||||||
<el-button type="primary" @click="handleSearch">查询</el-button>
|
{{ $t('common:button:search') }}
|
||||||
|
</el-button>
|
||||||
|
<el-button
|
||||||
|
type="primary"
|
||||||
|
icon="el-icon-refresh-left"
|
||||||
|
@click="handleReset"
|
||||||
|
>
|
||||||
|
{{ $t('common:button:reset') }}
|
||||||
|
</el-button>
|
||||||
</el-form-item>
|
</el-form-item>
|
||||||
</el-form>
|
</el-form>
|
||||||
<span style="margin-left:auto">
|
<span style="margin-left:auto">
|
||||||
|
|
|
@ -16,8 +16,16 @@
|
||||||
<el-input v-model="searchData.TagDescriptionCN" clearable style="width:120px;" />
|
<el-input v-model="searchData.TagDescriptionCN" clearable style="width:120px;" />
|
||||||
</el-form-item>
|
</el-form-item>
|
||||||
<el-form-item>
|
<el-form-item>
|
||||||
<el-button type="primary" @click="handleReset">Reset</el-button>
|
<el-button type="primary" icon="el-icon-search" @click="handleSearch">
|
||||||
<el-button type="primary" @click="handleSearch">Search</el-button>
|
{{ $t('common:button:search') }}
|
||||||
|
</el-button>
|
||||||
|
<el-button
|
||||||
|
type="primary"
|
||||||
|
icon="el-icon-refresh-left"
|
||||||
|
@click="handleReset"
|
||||||
|
>
|
||||||
|
{{ $t('common:button:reset') }}
|
||||||
|
</el-button>
|
||||||
</el-form-item>
|
</el-form-item>
|
||||||
</el-form>
|
</el-form>
|
||||||
<span style="margin-left:auto">
|
<span style="margin-left:auto">
|
||||||
|
|
|
@ -38,8 +38,16 @@
|
||||||
</el-select>
|
</el-select>
|
||||||
</el-form-item>
|
</el-form-item>
|
||||||
<el-form-item>
|
<el-form-item>
|
||||||
<el-button type="primary" @click="handleReset">重置</el-button>
|
<el-button type="primary" icon="el-icon-search" @click="handleSearch">
|
||||||
<el-button type="primary" @click="handleSearch">查询</el-button>
|
{{ $t('common:button:search') }}
|
||||||
|
</el-button>
|
||||||
|
<el-button
|
||||||
|
type="primary"
|
||||||
|
icon="el-icon-refresh-left"
|
||||||
|
@click="handleReset"
|
||||||
|
>
|
||||||
|
{{ $t('common:button:reset') }}
|
||||||
|
</el-button>
|
||||||
</el-form-item>
|
</el-form-item>
|
||||||
</el-form>
|
</el-form>
|
||||||
<span style="margin-left:auto">
|
<span style="margin-left:auto">
|
||||||
|
|
|
@ -26,8 +26,16 @@
|
||||||
<el-input v-model="searchData.Type" clearable style="width:120px;" />
|
<el-input v-model="searchData.Type" clearable style="width:120px;" />
|
||||||
</el-form-item>
|
</el-form-item>
|
||||||
<el-form-item>
|
<el-form-item>
|
||||||
<el-button type="primary" @click="handleReset">Reset</el-button>
|
<el-button type="primary" icon="el-icon-search" @click="handleSearch">
|
||||||
<el-button type="primary" @click="handleSearch">Search</el-button>
|
{{ $t('common:button:search') }}
|
||||||
|
</el-button>
|
||||||
|
<el-button
|
||||||
|
type="primary"
|
||||||
|
icon="el-icon-refresh-left"
|
||||||
|
@click="handleReset"
|
||||||
|
>
|
||||||
|
{{ $t('common:button:reset') }}
|
||||||
|
</el-button>
|
||||||
</el-form-item>
|
</el-form-item>
|
||||||
</el-form>
|
</el-form>
|
||||||
<span style="margin-left:auto">
|
<span style="margin-left:auto">
|
||||||
|
|
|
@ -123,8 +123,16 @@
|
||||||
</el-select>
|
</el-select>
|
||||||
</el-form-item>
|
</el-form-item>
|
||||||
<el-form-item>
|
<el-form-item>
|
||||||
<el-button type="primary" @click="handleSearch">查询</el-button>
|
<el-button type="primary" icon="el-icon-search" @click="handleSearch">
|
||||||
<el-button type="primary" @click="handleReset">重置</el-button>
|
{{ $t('common:button:search') }}
|
||||||
|
</el-button>
|
||||||
|
<el-button
|
||||||
|
type="primary"
|
||||||
|
icon="el-icon-refresh-left"
|
||||||
|
@click="handleReset"
|
||||||
|
>
|
||||||
|
{{ $t('common:button:reset') }}
|
||||||
|
</el-button>
|
||||||
</el-form-item>
|
</el-form-item>
|
||||||
</el-form>
|
</el-form>
|
||||||
<span style="margin-left: auto">
|
<span style="margin-left: auto">
|
||||||
|
|
|
@ -3,15 +3,23 @@
|
||||||
<!-- 搜索框 -->
|
<!-- 搜索框 -->
|
||||||
<div class="search">
|
<div class="search">
|
||||||
<el-form :inline="true" size="mini" class="base-search-form">
|
<el-form :inline="true" size="mini" class="base-search-form">
|
||||||
<el-form-item label="编号:">
|
<el-form-item label="Code:">
|
||||||
<el-input v-model="searchData.Code" style="width:100px;" />
|
<el-input v-model="searchData.Code" style="width:100px;" />
|
||||||
</el-form-item>
|
</el-form-item>
|
||||||
<el-form-item label="模板:">
|
<el-form-item label="模板:">
|
||||||
<el-input v-model="searchData.Name" style="width:100px;" />
|
<el-input v-model="searchData.Name" style="width:100px;" />
|
||||||
</el-form-item>
|
</el-form-item>
|
||||||
<el-form-item>
|
<el-form-item>
|
||||||
<el-button type="primary" @click="handleReset">Reset</el-button>
|
<el-button type="primary" icon="el-icon-search" @click="handleSearch">
|
||||||
<el-button type="primary" @click="handleSearch">Search</el-button>
|
{{ $t('common:button:search') }}
|
||||||
|
</el-button>
|
||||||
|
<el-button
|
||||||
|
type="primary"
|
||||||
|
icon="el-icon-refresh-left"
|
||||||
|
@click="handleReset"
|
||||||
|
>
|
||||||
|
{{ $t('common:button:reset') }}
|
||||||
|
</el-button>
|
||||||
</el-form-item>
|
</el-form-item>
|
||||||
</el-form>
|
</el-form>
|
||||||
<span style="margin-left:auto;">
|
<span style="margin-left:auto;">
|
||||||
|
|
|
@ -6,7 +6,14 @@
|
||||||
<div class="login-body">
|
<div class="login-body">
|
||||||
<div class="login-l">
|
<div class="login-l">
|
||||||
<div class="login-logo">
|
<div class="login-logo">
|
||||||
<img src="@/assets/zzlogo-usa.png" alt="" class="usa-logo" />
|
<img v-if="language === 'zh'" src="@/assets/zzlogo2.png" alt="" />
|
||||||
|
<img
|
||||||
|
v-else-if="NODE_ENV === 'usa'"
|
||||||
|
src="@/assets/zzlogo-usa.png"
|
||||||
|
alt=""
|
||||||
|
class="usa-logo"
|
||||||
|
/>
|
||||||
|
<img v-else src="@/assets/zzlogo4.png" alt="" />
|
||||||
</div>
|
</div>
|
||||||
<div
|
<div
|
||||||
:class="{
|
:class="{
|
||||||
|
|
|
@ -392,15 +392,17 @@ export default {
|
||||||
},
|
},
|
||||||
],
|
],
|
||||||
searchHandle: [
|
searchHandle: [
|
||||||
{
|
|
||||||
label: this.$t('common:button:reset'),
|
|
||||||
type: 'primary',
|
|
||||||
emitKey: 'reset',
|
|
||||||
},
|
|
||||||
{
|
{
|
||||||
label: this.$t('common:button:search'),
|
label: this.$t('common:button:search'),
|
||||||
type: 'primary',
|
type: 'primary',
|
||||||
emitKey: 'search',
|
emitKey: 'search',
|
||||||
|
icon: 'el-icon-search'
|
||||||
|
},
|
||||||
|
{
|
||||||
|
label: this.$t('common:button:reset'),
|
||||||
|
type: 'primary',
|
||||||
|
emitKey: 'reset',
|
||||||
|
icon: 'el-icon-refresh-left'
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
label: this.$t('common:button:new'),
|
label: this.$t('common:button:new'),
|
||||||
|
|
|
@ -30,7 +30,7 @@
|
||||||
style="margin:0 10px;"
|
style="margin:0 10px;"
|
||||||
:images="[`${OSSclientConfig.basePath}${file.ImagePath}`]"
|
:images="[`${OSSclientConfig.basePath}${file.ImagePath}`]"
|
||||||
>
|
>
|
||||||
<el-button type="text" @click="previewImage(file.ImagePath)">
|
<el-button type="text" @click="previewImage(file.ImagePath)" style="width: 400px;white-space: normal; word-wrap: break-word;text-align: left;">
|
||||||
{{ file.FileName }}
|
{{ file.FileName }}
|
||||||
</el-button>
|
</el-button>
|
||||||
<img
|
<img
|
||||||
|
|
|
@ -31,7 +31,7 @@
|
||||||
style="margin:0 10px;"
|
style="margin:0 10px;"
|
||||||
:images="[`${OSSclientConfig.basePath}${file.ImagePath}`]"
|
:images="[`${OSSclientConfig.basePath}${file.ImagePath}`]"
|
||||||
>
|
>
|
||||||
<el-button type="text" @click="previewImage(file.ImagePath)">
|
<el-button type="text" @click="previewImage(file.ImagePath)" style="width: 400px;white-space: normal; word-wrap: break-word;text-align: left;">
|
||||||
{{ file.FileName }}
|
{{ file.FileName }}
|
||||||
</el-button>
|
</el-button>
|
||||||
<img
|
<img
|
||||||
|
|
Loading…
Reference in New Issue