|
@@ -843,20 +843,39 @@
|
|
|
</el-col>
|
|
|
|
|
|
<el-col :span="8" v-if="isShow">
|
|
|
- <el-form-item :label="this.$t('action.excelUpload')">
|
|
|
- <el-upload
|
|
|
- class="excel-uploader"
|
|
|
- :action="`${excelUploadUrl}`"
|
|
|
- :show-file-list="false"
|
|
|
- :on-success="excelUploaded"
|
|
|
- :before-upload="handleExcelBefore"
|
|
|
- :limit="1"
|
|
|
- >
|
|
|
- <el-button size="small" type="primary">{{ this.$t('action.uploadFile') }}</el-button>
|
|
|
- </el-upload>
|
|
|
- <el-link :href="excelUploadDemo" type="primary" target="_blank" icon="el-icon-download" :underline="false">excel表格模板</el-link>
|
|
|
+ <el-form-item :label="this.$t('zy20240205.choiceTimeZone')" prop="time_zone">
|
|
|
+ <el-select v-model="formmodel.time_zone"
|
|
|
+ :placeholder="this.$t('zy20240205.choiceTimeZone')"
|
|
|
+ filterable clearable>
|
|
|
+ <el-option v-for="(item,index) in timeZoneType" :key="index" :label="item.key" :value="item.value" />
|
|
|
+ </el-select>
|
|
|
</el-form-item>
|
|
|
</el-col>
|
|
|
+
|
|
|
+ <el-col :span="8" v-if="isShow">
|
|
|
+ <el-form-item :label="this.$t('zy20240205.choiceLanguage')" prop="language">
|
|
|
+ <el-select v-model="formmodel.language"
|
|
|
+ :placeholder="this.$t('zy20240205.choiceLanguage')"
|
|
|
+ filterable clearable>
|
|
|
+ <el-option v-for="(item,index) in languageType" :key="index" :label="item.key" :value="item.value" />
|
|
|
+ </el-select>
|
|
|
+ </el-form-item>
|
|
|
+ </el-col>
|
|
|
+
|
|
|
+<!-- <el-form-item :label="this.$t('action.excelUpload')">-->
|
|
|
+<!-- <el-upload-->
|
|
|
+<!-- class="excel-uploader"-->
|
|
|
+<!-- :action="`${excelUploadUrl}`"-->
|
|
|
+<!-- :show-file-list="false"-->
|
|
|
+<!-- :on-success="excelUploaded"-->
|
|
|
+<!-- :before-upload="handleExcelBefore"-->
|
|
|
+<!-- :limit="1"-->
|
|
|
+<!-- >-->
|
|
|
+<!-- <el-button size="small" type="primary">{{ this.$t('action.uploadFile') }}</el-button>-->
|
|
|
+<!-- </el-upload>-->
|
|
|
+<!-- <el-link :href="excelUploadDemo" type="primary" target="_blank" icon="el-icon-download" :underline="false">excel表格模板</el-link>-->
|
|
|
+<!-- </el-form-item>-->
|
|
|
+ </el-col>
|
|
|
</el-row>
|
|
|
</fieldset>
|
|
|
|
|
@@ -887,6 +906,8 @@ import {SERIAL_TYPE} from "@/utils/enum/SerialTypeEnum";
|
|
|
import {SERIAL_KEY_TYPE} from "@/utils/enum/SerialKeyTypeEnum";
|
|
|
import {DEVICE_BUTTON_TYPE} from "@/utils/enum/DeviceButtonTypeEnum";
|
|
|
import * as API_event from "@/api/ncs_event";
|
|
|
+import {TIME_ZONE_TYPE} from "@/utils/enum/TimeZoneTypeEnum";
|
|
|
+import {LANGUAGE_TYPE} from "@/utils/enum/Language";
|
|
|
|
|
|
const serverUrl = domain.serverUrl
|
|
|
const DeviceUrl = domain.DeviceUrl
|
|
@@ -924,6 +945,8 @@ export default {
|
|
|
excelUploadUrl: DeviceUrl + '/ncs/excel/upload/' + this.partId,
|
|
|
excelUploadDemo: serverUrl + '/upload/excel/demo/excel_demo.xlsx',
|
|
|
serialType: SERIAL_TYPE.getKeyValueList(),
|
|
|
+ timeZoneType: TIME_ZONE_TYPE.getKeyValueList(),
|
|
|
+ languageType: LANGUAGE_TYPE.getKeyValueList(),
|
|
|
deviceButtonFunctionStr: this.$t('zy20240611.deviceButtonFunctionStr'),
|
|
|
selectKey: this.$t('zy20240611.selectKey'),
|
|
|
selectTcpType: this.$t('action.choiceType'),
|