ehs_tanghHe
/
tanghe-report
5
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fixed　ｂｕｇ

Browse Source
qianlishi 4 years ago
parent 2e8236a135
commit 9c4a21017b
2 changed files with 182 additions and 159 deletions
Show Stats Download Patch File Download Diff File

52
report-ui/src/App.vue
Unescape Escape View File

@ -5,38 +5,44 @@
</template> </template>
<script> <script>
import '@/assets/iconfont/iconfont.css' import "@/assets/iconfont/iconfont.css";
import { initDictToLocalstorage } from '@/api/dict-data' import { initDictToLocalstorage } from "@/api/dict-data";
export default { export default {
name: 'App', name: "App",
provide () { provide() {
return { return {
reload: this.reload, reload: this.reload
} };
}, },
data () { data() {
return { return {
isRouterAlive: false, isRouterAlive: false
};
},
watch: {
$route(to, form) {
if (to.path == "/login") {
this.queryDictName();
}
} }
}, },
computed: {}, computed: {},
created () { created() {
// 初始化数据字典到浏览器本地缓存 this.queryDictName();
initDictToLocalstorage(() => {
this.isRouterAlive = true
})
},
mounted () {
},
beforeDestroy () {
}, },
methods: { methods: {
reload () { queryDictName() {
this.isRouterAlive = false // 初始化数据字典到浏览器本地缓存
this.$nextTick(function () { initDictToLocalstorage(() => {
this.isRouterAlive = true this.isRouterAlive = true;
}) });
}, },
reload() {
this.isRouterAlive = false;
this.$nextTick(function() {
this.isRouterAlive = true;
});
}
} }
} };
</script> </script>

289
report-ui/src/components/AnjiPlus/anji-select.vue
Unescape Escape View File

@ -22,38 +22,41 @@
--> -->
<template> <template>
<div> <div>
<el-select v-model="selectValue" <el-select
:clearable="clearable" v-model="selectValue"
:collapse-tags="collapseTags" :clearable="clearable"
filterable :collapse-tags="collapseTags"
class="filter-item" filterable
:placeholder="placeholder" class="filter-item"
:disabled="disabled" :placeholder="placeholder"
:multiple="multiple == null ? false : true" :disabled="disabled"
:remote="remoteFilter" :multiple="multiple == null ? false : true"
:remote-method="remoteQuery" :remote="remoteFilter"
@change="change"> :remote-method="remoteQuery"
<el-option v-for="(item, index) in options" @change="change"
:key="index" >
:label="getItemLabel(item, label)" <el-option
:value="item[option]" v-for="(item, index) in options"
:disabled="isDisabledOption(item)"> :key="index"
:label="getItemLabel(item, label)"
:value="item[option]"
:disabled="isDisabledOption(item)"
>
<template v-if="mergeLabel"> <template v-if="mergeLabel">
<span style="float: left">{{ getItemLabel(item, label) }}</span> <span style="float: left">{{ getItemLabel(item, label) }}</span>
<span style="float: right; color: #8492a6; font-size: 13px">{{ item[option] }}</span> <span style="float: right; color: #8492a6; font-size: 13px">{{
item[option]
}}</span>
</template> </template>
</el-option> </el-option>
<el-option v-if="totalPage > 1" <el-option v-if="totalPage > 1" label="搜索更多" value="" disabled />
label="搜索更多"
value=""
disabled />
</el-select> </el-select>
</div> </div>
</template> </template>
<script> <script>
import request from '@/utils/request' import request from "@/utils/request";
import { getStorageItem } from '@/utils/storage'; import { getStorageItem } from "@/utils/storage";
export default { export default {
props: { props: {
dictCode: null, // 当传入dictCode时，可以不用传递url dictCode: null, // 当传入dictCode时，可以不用传递url
@ -62,240 +65,254 @@ export default {
queryParam: { queryParam: {
type: Object, type: Object,
default: () => { default: () => {
return {} return {};
}, }
}, },
value: null, value: null,
placeholder: null, placeholder: null,
label: { label: {
type: String, type: String,
default: 'text', default: "text"
}, },
option: { option: {
type: String, type: String,
default: 'id', default: "id"
}, },
multiple: null, multiple: null,
localOptions: null, localOptions: null,
disabled: null, disabled: null,
clearable: { clearable: {
type: Boolean, type: Boolean,
default: true, default: true
}, },
collapseTags: { collapseTags: {
type: Boolean, type: Boolean,
default: false, default: false
}, },
mergeLabel: { mergeLabel: {
type: Boolean, type: Boolean,
default: false, default: false
}, },
// 禁用的下拉选项 // 禁用的下拉选项
disabledOptions: { disabledOptions: {
type: String, type: String,
default: () => { default: () => {
return '' return "";
}, }
}, },
// 使用远程搜索 // 使用远程搜索
remoteFilter: { remoteFilter: {
type: Boolean, type: Boolean,
default: false, default: false
}, }
}, },
data () { data() {
return { return {
options: null, options: null,
selectValue: null, selectValue: null,
// 如果是分页的， // 如果是分页的，
totalPage: 0, totalPage: 0
} };
}, },
computed: { computed: {
// 根据dictCode和url拼出最终的请求url // 根据dictCode和url拼出最终的请求url
requestUrl () { requestUrl() {
if (this.url != null && this.url.trim() != '') { if (this.url != null && this.url.trim() != "") {
if (this.url.indexOf('?') > 0) { if (this.url.indexOf("?") > 0) {
if (this.option == null) { if (this.option == null) {
console.log('url-' + this.url.substring(this.url.indexOf('?'))) console.log("url-" + this.url.substring(this.url.indexOf("?")));
} }
if (this.label == null) { if (this.label == null) {
} }
} }
return this.url return this.url;
} }
if (this.dictCode != null && this.dictCode.trim() != '') { if (this.dictCode != null && this.dictCode.trim() != "") {
return `/meta/gaeaDict/select/${this.dictCode}` return `/meta/gaeaDict/select/${this.dictCode}`;
} }
return null return null;
}, }
}, },
watch: { watch: {
value: function (val, oldVal) { value: function(val, oldVal) {
if (this.multiple != null) { if (this.multiple != null) {
if (!this.value) { if (!this.value) {
this.selectValue = [] this.selectValue = [];
} else { } else {
this.selectValue = this.value this.selectValue = this.value;
} }
} else { } else {
if (this.value != null && this.value != undefined) { if (this.value != null && this.value != undefined) {
this.selectValue = this.value this.selectValue = this.value;
} else { } else {
this.selectValue = '' this.selectValue = "";
} }
} }
}, },
url () { url() {
setTimeout(() => { setTimeout(() => {
this.queryData() this.queryData();
}, 500) }, 500);
}, }
}, },
created () { created() {
if (this.multiple != null) { if (this.multiple != null) {
this.selectValue = this.value this.selectValue = this.value;
} else { } else {
if (this.value != null) { if (this.value != null) {
this.selectValue = this.value this.selectValue = this.value;
} }
} }
}, },
mounted () { mounted() {
if (this.requestUrl == null) { if (this.requestUrl == null) {
this.options = this.localOptions this.options = this.localOptions;
return return;
} }
this.queryData() this.queryData();
}, },
methods: { methods: {
// 判断选择是否已经禁用 // 判断选择是否已经禁用
isDisabledOption (option) { isDisabledOption(option) {
if (option == null || this.disabledOptions == null || this.disabledOptions.length == 0) { if (
return false option == null ||
this.disabledOptions == null ||
this.disabledOptions.length == 0
) {
return false;
} }
var currentOptionVal = option[this.option] var currentOptionVal = option[this.option];
return this.disabledOptions.indexOf(currentOptionVal) >= 0 return this.disabledOptions.indexOf(currentOptionVal) >= 0;
}, },
change (value) { change(value) {
if (value === '') { if (value === "") {
value = null value = null;
} }
this.$emit('input', value) this.$emit("input", value);
// 根据当前值，找出对应的选项 // 根据当前值，找出对应的选项
var optionItem = this.options.find((item) => item[this.option] == value) var optionItem = this.options.find(item => item[this.option] == value);
this.$emit('change', value, optionItem) this.$emit("change", value, optionItem);
}, },
// 根据用户配置的label，生成对应的标签 // 根据用户配置的label，生成对应的标签
getItemLabel (item, label) { getItemLabel(item, label) {
if (label.indexOf('${') < 0 && label.indexOf('}' < 0)) { if (label.indexOf("${") < 0 && label.indexOf("}" < 0)) {
return item[label] return item[label];
} }
var reg = /\$\{[a-zA-Z0-9]*\}/g var reg = /\$\{[a-zA-Z0-9]*\}/g;
var list = label.match(reg) var list = label.match(reg);
// ["${id}", "${text}"] // ["${id}", "${text}"]
var result = label var result = label;
for (var i = 0; i < list.length; i++) { for (var i = 0; i < list.length; i++) {
var sub = list[i] var sub = list[i];
var key = sub.replace('${', '').replace('}', '') var key = sub.replace("${", "").replace("}", "");
result = result.replace(sub, item[key]) result = result.replace(sub, item[key]);
} }
return result return result;
}, },
// 从本地localStorage取 gaeaDict // 从本地localStorage取 gaeaDict
getOptionsFromLocalStorage () { getOptionsFromLocalStorage() {
var dicts = getStorageItem('gaeaDict') var dicts = getStorageItem("gaeaDict");
var options = [] var options = [];
if (!dicts.hasOwnProperty(this.dictCode)) { if (!dicts.hasOwnProperty(this.dictCode)) {
return [] return [];
} }
var dictItems = dicts[this.dictCode] var dictItems = dicts[this.dictCode];
for (var i = 0; i < dictItems.length; i++) { for (var i = 0; i < dictItems.length; i++) {
var dictItem = dictItems[i] var dictItem = dictItems[i];
options.push({ id: dictItem.id, text: dictItem.text }) options.push({ id: dictItem.id, text: dictItem.text });
} }
return options return options;
}, },
queryData () { queryData() {
// 所有从本地localStorage取，因为在App.vue中已经请求远程保存到本地了 // 所有从本地localStorage取，因为在App.vue中已经请求远程保存到本地了
var options = this.getOptionsFromLocalStorage() var options = this.getOptionsFromLocalStorage();
if (this.isNotBlank(options)) { if (this.isNotBlank(options)) {
this.options = options this.options = options;
return return;
} }
// 本地localStorage取不到，再从远程接口取 // 本地localStorage取不到，再从远程接口取
if (this.requestUrl == null) { if (this.requestUrl == null) {
return return;
} }
if (this.method != null && this.method.toLocaleLowerCase().trim() == 'post') { if (
this.queryDataByPost() this.method != null &&
this.method.toLocaleLowerCase().trim() == "post"
) {
this.queryDataByPost();
} else { } else {
this.queryDataByGet() this.queryDataByGet();
} }
}, },
queryDataByGet (keyword) { queryDataByGet(keyword) {
var param = this.deepClone(this.queryParam) var param = this.deepClone(this.queryParam);
if (this.isNotBlank(keyword)) { if (this.isNotBlank(keyword)) {
param['keyword'] = keyword param["keyword"] = keyword;
} }
param['multiple'] = this.multiple == null ? null : 1 param["multiple"] = this.multiple == null ? null : 1;
request({ request({
url: this.requestUrl, url: this.requestUrl,
headers: { noPrompt: true }, headers: { noPrompt: true },
params: param, params: param
}).then((response) => { }).then(response => {
this.setOptions(response.data) this.setOptions(response.data);
}) });
}, },
queryDataByPost (keyword) { queryDataByPost(keyword) {
var param = this.deepClone(this.queryParam) var param = this.deepClone(this.queryParam);
if (this.isNotBlank(keyword)) { if (this.isNotBlank(keyword)) {
param['keyword'] = keyword param["keyword"] = keyword;
} }
request({ request({
url: this.requestUrl, url: this.requestUrl,
method: 'post', method: "post",
headers: { noPrompt: true }, headers: { noPrompt: true },
data: param, data: param
}).then((response) => { }).then(response => {
this.setOptions(response.data) this.setOptions(response.data);
}) });
}, },
setOptions (resData) { setOptions(resData) {
if (resData == null || resData.length == 0) { if (resData == null || resData.length == 0) {
this.options = [] this.options = [];
this.totalPage = 0 this.totalPage = 0;
return return;
} }
if (this.isArray(resData)) { if (this.isArray(resData)) {
this.options = resData this.options = resData;
this.totalPage = 1 this.totalPage = 1;
return return;
} }
if (resData.records == null || resData.total == null || resData.pages == null) { if (
this.options = [] resData.records == null ||
return resData.total == null ||
resData.pages == null
) {
this.options = [];
return;
} }
this.totalPage = resData.pages this.totalPage = resData.pages;
// resData.records // resData.records
// resData.total // resData.total
// resData.size // resData.size
// resData.current // resData.current
this.options = resData.records this.options = resData.records;
}, },
remoteQuery (keyword) { remoteQuery(keyword) {
if (this.isBlank(keyword)) { if (this.isBlank(keyword)) {
return return;
} }
setTimeout(() => { setTimeout(() => {
if (this.method != null && this.method.toLocaleLowerCase().trim() == 'post') { if (
this.queryDataByPost(keyword) this.method != null &&
this.method.toLocaleLowerCase().trim() == "post"
) {
this.queryDataByPost(keyword);
} else { } else {
this.queryDataByGet(keyword) this.queryDataByGet(keyword);
} }
}, 200) }, 200);
}, }
}, }
} };
</script> </script>

Write Preview
Loading…
Cancel
Save