|
@@ -74,6 +74,7 @@
|
|
v-model="date"
|
|
v-model="date"
|
|
:disabled="searchActive.time !== -1"
|
|
:disabled="searchActive.time !== -1"
|
|
@change="change"
|
|
@change="change"
|
|
|
|
+ :disabled-date="disDate"
|
|
type="daterange"
|
|
type="daterange"
|
|
:clearable="false"
|
|
:clearable="false"
|
|
value-format="YYYY-MM-DD"
|
|
value-format="YYYY-MM-DD"
|
|
@@ -98,7 +99,14 @@
|
|
<analysisList ref="analysisListEle" />
|
|
<analysisList ref="analysisListEle" />
|
|
</div>
|
|
</div>
|
|
|
|
|
|
- <analysisHotList @changeSearch="hotList" :province="areaification[searchActive.area] ? areaification[searchActive.area].name : undefined" />
|
|
|
|
|
|
+ <analysisHotList
|
|
|
|
+ @changeSearch="hotList"
|
|
|
|
+ :province="
|
|
|
|
+ areaification[searchActive.area]
|
|
|
|
+ ? areaification[searchActive.area].name
|
|
|
|
+ : undefined
|
|
|
|
+ "
|
|
|
|
+ />
|
|
<el-icon :size="45" class="upload" v-show="showUpload" @click="upload"
|
|
<el-icon :size="45" class="upload" v-show="showUpload" @click="upload"
|
|
><Upload
|
|
><Upload
|
|
/></el-icon>
|
|
/></el-icon>
|
|
@@ -165,38 +173,38 @@ let page = 1;
|
|
onMounted(() => {
|
|
onMounted(() => {
|
|
getList();
|
|
getList();
|
|
});
|
|
});
|
|
- getEconomize({
|
|
|
|
- data: {
|
|
|
|
|
|
+getEconomize({
|
|
|
|
+ data: {
|
|
// key: 'b264662362c25150a1e6612013a7b921',
|
|
// key: 'b264662362c25150a1e6612013a7b921',
|
|
// keywords: '中国',
|
|
// keywords: '中国',
|
|
// subdistrict: 2,
|
|
// subdistrict: 2,
|
|
- },
|
|
|
|
- }).then(r => {
|
|
|
|
- const list = r || [];
|
|
|
|
- for (let i = 0; i < list.length; i++) {
|
|
|
|
- const v = list[i];
|
|
|
|
- const city = [
|
|
|
|
- {
|
|
|
|
- type: 'option',
|
|
|
|
- name: '全部',
|
|
|
|
- id: -1,
|
|
|
|
- },
|
|
|
|
- ...v.districts.map((item, index) => {
|
|
|
|
- return {
|
|
|
|
- type: 'option',
|
|
|
|
- name: item.alias,
|
|
|
|
- id: index,
|
|
|
|
- };
|
|
|
|
- })
|
|
|
|
- ];
|
|
|
|
- areaification.value.push({
|
|
|
|
|
|
+ },
|
|
|
|
+}).then(r => {
|
|
|
|
+ const list = r || [];
|
|
|
|
+ for (let i = 0; i < list.length; i++) {
|
|
|
|
+ const v = list[i];
|
|
|
|
+ const city = [
|
|
|
|
+ {
|
|
type: 'option',
|
|
type: 'option',
|
|
- name: v.alias,
|
|
|
|
- child: city,
|
|
|
|
- id: i,
|
|
|
|
- });
|
|
|
|
- }
|
|
|
|
- });
|
|
|
|
|
|
+ name: '全部',
|
|
|
|
+ id: -1,
|
|
|
|
+ },
|
|
|
|
+ ...v.districts.map((item, index) => {
|
|
|
|
+ return {
|
|
|
|
+ type: 'option',
|
|
|
|
+ name: item.alias,
|
|
|
|
+ id: index,
|
|
|
|
+ };
|
|
|
|
+ }),
|
|
|
|
+ ];
|
|
|
|
+ areaification.value.push({
|
|
|
|
+ type: 'option',
|
|
|
|
+ name: v.alias,
|
|
|
|
+ child: city,
|
|
|
|
+ id: i,
|
|
|
|
+ });
|
|
|
|
+ }
|
|
|
|
+});
|
|
|
|
|
|
getClass({}).then(res => {
|
|
getClass({}).then(res => {
|
|
const li = res || [];
|
|
const li = res || [];
|
|
@@ -221,10 +229,12 @@ const getList = () => {
|
|
};
|
|
};
|
|
|
|
|
|
const sheng = areaification.value[searchActive.value.area] || {};
|
|
const sheng = areaification.value[searchActive.value.area] || {};
|
|
- if (sheng.name && sheng.name !== '全部') {
|
|
|
|
- const city = sheng.child[searchActive.value.areaSon] && sheng.child[searchActive.value.areaSon].name;
|
|
|
|
|
|
+ if (sheng.name && sheng.name !== '全部') {
|
|
|
|
+ const city =
|
|
|
|
+ sheng.child[searchActive.value.areaSon] &&
|
|
|
|
+ sheng.child[searchActive.value.areaSon].name;
|
|
const l = [sheng.name];
|
|
const l = [sheng.name];
|
|
- if(city !== '全部') l.push(city || '');
|
|
|
|
|
|
+ if (city !== '全部') l.push(city || '');
|
|
search.city = l.join(',');
|
|
search.city = l.join(',');
|
|
}
|
|
}
|
|
search.category === '全部' ? (search.category = '') : '';
|
|
search.category === '全部' ? (search.category = '') : '';
|
|
@@ -282,6 +292,10 @@ const scroll = e => {
|
|
const upload = () => {
|
|
const upload = () => {
|
|
scrollbar.value.setScrollTop(0);
|
|
scrollbar.value.setScrollTop(0);
|
|
};
|
|
};
|
|
|
|
+const nowT = Date.now();
|
|
|
|
+const disDate = date => {
|
|
|
|
+ return date.getTime() > nowT;
|
|
|
|
+};
|
|
</script>
|
|
</script>
|
|
|
|
|
|
<style scoped>
|
|
<style scoped>
|