From 94622a4e89fc844b96016859dc136f868fe15d31 Mon Sep 17 00:00:00 2001
From: hailu <962012470@qq.com>
Date: 星期四, 16 二月 2023 18:48:16 +0800
Subject: [PATCH] 点智优化
---
dist.rar | 0
src/views/AboutView.vue | 4
src/views/BatchView.vue | 22 ++++-
src/views/SmartView.vue | 3
src/components/SeniorTranfer.vue | 140 ++--------------------------------
src/views/smartv.vue | 9 ++
src/views/SeniorView.vue | 11 +-
7 files changed, 44 insertions(+), 145 deletions(-)
diff --git a/dist.rar b/dist.rar
index e2569fe..7dd0583 100644
--- a/dist.rar
+++ b/dist.rar
Binary files differ
diff --git a/src/components/SeniorTranfer.vue b/src/components/SeniorTranfer.vue
index 0d3e18e..c250343 100644
--- a/src/components/SeniorTranfer.vue
+++ b/src/components/SeniorTranfer.vue
@@ -169,103 +169,38 @@
console.log(this.activeKey);
switch (this.activeKey) {
case 'ipcCodeSort':
-
url = GetIpcClass
- // params = [{ year: `${this.ICPYear}`,FieldName:'desc',ConditionalType:'1',FieldValue:this.parentCodeSearch}],
params = { "year": `${this.ICPYear}`, "json": JSON.stringify([{ FieldName: 'desc', ConditionalType: '1', FieldValue: this.parentCodeSearch }]) },
- // this.treeDimensions = { children: 'children', title: 'Desc', key: 'Code' }
-
- this.treeDimensions = { children: 'children', title: 'lable', key: 'value',valueshow:'valueshow' }
+ this.treeDimensions = { children: 'children', title: 'lable', key: 'Code' }
break;
case 'cpcCodeSort':
-
url = GetCpcClass
params = { "json": JSON.stringify([{ FieldName: 'desc', ConditionalType: '1', FieldValue: this.parentCodeSearch }]) },
-
- // this.treeDimensions = { children: 'children', title: 'Desc', key: 'Code' }
- this.treeDimensions = { children: 'children', title: 'lable', key: 'value',valueshow:'valueshow' }
-
+ this.treeDimensions = { children: 'children', title: 'lable', key: 'Code' }
+ // this.treeDimensions = { children: 'children', title: 'lable', key: 'value',valueshow:'valueshow' }
break;
case 'industrycode':
url = GetEcoindustryTree
params = { "json": JSON.stringify([{ FieldName: 'Name', ConditionalType: '1', FieldValue: this.parentCodeSearch }]) },
- this.treeDimensions = { children: 'children', title: 'lable', key: 'value',valueshow:'valueshow' }
- // console.log(this.treeDimensions);
+ // this.treeDimensions = { children: 'children', title: 'lable', key: 'value',valueshow:'valueshow' }
+ this.treeDimensions = { children: 'children', title: 'lable', key: 'value' }
break;
case 'strategicIndustryCode':
url = GetStraindustryTree
params = { "json": JSON.stringify([{ FieldName: 'Name', ConditionalType: '1', FieldValue: this.parentCodeSearch }]) },
-
- this.treeDimensions = { children: 'children', title: 'lable', key: 'value',valueshow:'valueshow' }
+ // this.treeDimensions = { children: 'children', title: 'lable', key: 'value',valueshow:'valueshow' }
+ this.treeDimensions = { children: 'children', title: 'lable', key: 'value' }
break;
case 'locarnoCodeSort':
url = GetLoccn
params = { "json": JSON.stringify([{ FieldName: 'desc', ConditionalType: '1', FieldValue: this.parentCodeSearch }]) },
- // this.treeDimensions = { children: 'children', title: 'Desc', key: 'Code' }
- this.treeDimensions = { children: 'children', title: 'lable', key: 'value' ,valueshow:'valueshow'}
+ this.treeDimensions = { children: 'children', title: 'lable', key: 'value' }
+ // this.treeDimensions = { children: 'children', title: 'lable', key: 'value' ,valueshow:'valueshow'}
break;
}
this.treeLoading = true
url(params).then(res => {
this.treeData = this.formatTreeData(res.Data)
- // console.log(this.treeData);
- // if (url.toString().indexOf('GetCpcClass') > 0) {
- // // this.treeData
- // for (let i = 0; i < this.treeData.length; i++) {
- // console.log(this.treeData[i]);
- // this.treeData[i].title = `${this.treeData[i].value} ${this.treeData[i].lable}`
- // for (let k = 0; k < this.treeData[i].children.length; k++) {
- // this.treeData[i].children[k].title = `${this.treeData[i].children[k].value} ${this.treeData[i].children[k].lable}`
- // }
- // }
- // }
- // if (url.toString().indexOf('GetStraindustryTree') > 0) {
- // // this.treeData
- // for (let i = 0; i < this.treeData.length; i++) {
- // console.log(this.treeData[i]);
- // this.treeData[i].title = `${this.treeData[i].value} ${this.treeData[i].title}`
- // for (let k = 0; k < this.treeData[i].children.length; k++) {
- // this.treeData[i].children[k].title = `${this.treeData[i].children[k].value} ${this.treeData[i].children[k].title}`
- // }
- // }
- // }
- // if (url.toString().indexOf('GetLoccn') > 0) {
- // // this.treeData
- // for (let i = 0; i < this.treeData.length; i++) {
- // console.log(this.treeData[i]);
- // this.treeData[i].title = `${this.treeData[i].value} ${this.treeData[i].lable}`
- // for (let k = 0; k < this.treeData[i].children.length; k++) {
- // this.treeData[i].children[k].title = `${this.treeData[i].children[k].value} ${this.treeData[i].children[k].lable}`
- // }
- // }
- // }
- // if (url.toString().indexOf('GetEcoindustryTree') > 0) {
- // console.log(1111);
- // // this.treeData
- // // for(let i=0;i<this.treeData.children.length;i++){
- // // console.log(this.treeData.children[i]);
- // // this.treeData.children[i].label= `${this.treeData.children[i].value } ${ this.treeData.children[i].label }`
- // // for(let k=0;k<this.treeData.children[i].children.length;k++){
- // // this.treeData.children[i].children[k].label= `${this.treeData.children[i].children[k].value } ${ this.treeData.children[i].children[k].label }`
- // // }
- // // }
- // for (let i = 0; i < this.treeData.length; i++) {
- // this.treeData[i].title = `${this.treeData[i].value} ${this.treeData[i].lable}`
- // for (let k = 0; k < this.treeData[i].children.length; k++) {
- // this.treeData[i].children[k].title = `${this.treeData[i].children[k].value} ${this.treeData[i].children[k].lable}`
- // for (let j = 0; j < this.treeData[i].children[k].children.length; j++) {
- // this.treeData[i].children[k].children[j].title = `${this.treeData[i].children[k].children[j].value} ${this.treeData[i].children[k].children[j].lable}`
- // for (let q = 0; q < this.treeData[i].children[k].children[j].children.length; q++) {
- // this.treeData[i].children[k].children[j].children[q].title = `${this.treeData[i].children[k].children[j].children[q].value} ${this.treeData[i].children[k].children[j].children[q].lable}`
-
- // }
- // }
- // }
- // }
-
-
- console.log(this.treeData);
- // }
this.treeLoading = false
})
},
@@ -295,7 +230,6 @@
case 'industrycode':
url = GetEcoindustryTree
this.treeDimensions = { children: 'children', title: 'lable', key: 'value' }
- // console.log(this.treeDimensions);
break;
case 'strategicIndustryCode':
url = GetStraindustryTree
@@ -313,47 +247,6 @@
this.treeLoading = true
url(params).then(res => {
this.treeData = this.formatTreeData(res.Data)
- // console.log(this.treeData);
- if (url.toString().indexOf('GetStraindustryTree') > 0) {
- // this.treeData
- for (let i = 0; i < this.treeData.length; i++) {
- console.log(this.treeData[i]);
- this.treeData[i].title = `${this.treeData[i].value} ${this.treeData[i].title}`
- for (let k = 0; k < this.treeData[i].children.length; k++) {
- this.treeData[i].children[k].title = `${this.treeData[i].children[k].value} ${this.treeData[i].children[k].title}`
- }
- }
- }
- if (url.toString().indexOf('GetLoccn') > 0) {
- // this.treeData
- for (let i = 0; i < this.treeData.length; i++) {
- console.log(this.treeData[i]);
- this.treeData[i].title = `${this.treeData[i].value} ${this.treeData[i].lable}`
- for (let k = 0; k < this.treeData[i].children.length; k++) {
- this.treeData[i].children[k].title = `${this.treeData[i].children[k].value} ${this.treeData[i].children[k].lable}`
- }
- }
- }
- if (url.toString().indexOf('GetEcoindustryTree') > 0) {
- console.log(1111);
-
- for (let i = 0; i < this.treeData.length; i++) {
- this.treeData[i].title = `${this.treeData[i].value} ${this.treeData[i].lable}`
- for (let k = 0; k < this.treeData[i].children.length; k++) {
- this.treeData[i].children[k].title = `${this.treeData[i].children[k].value} ${this.treeData[i].children[k].lable}`
- for (let j = 0; j < this.treeData[i].children[k].children.length; j++) {
- this.treeData[i].children[k].children[j].title = `${this.treeData[i].children[k].children[j].value} ${this.treeData[i].children[k].children[j].lable}`
- for (let q = 0; q < this.treeData[i].children[k].children[j].children.length; q++) {
- this.treeData[i].children[k].children[j].children[q].title = `${this.treeData[i].children[k].children[j].children[q].value} ${this.treeData[i].children[k].children[j].children[q].lable}`
-
- }
- }
- }
- }
-
-
- console.log(this.treeData);
- }
this.treeLoading = false
})
},
@@ -364,14 +257,11 @@
let that = this
function flatten(list = []) {
list.forEach(item => {
-
- item.title=(that.activeKey==='strategicIndustryCode')?item.valueshow.split(' ')[1]: item.valueshow
- // item.title= item.valueshow
+ // item.title=(that.activeKey==='strategicIndustryCode')?item.valueshow.split(' ')[1]: item.valueshow
+ item.title= item.valueshow
item.key = item[that.treeDimensions.key]
flatten(item.children);
-
});
-
}
console.log(tempList);
tempList = JSON.parse(JSON.stringify(listData))
@@ -401,20 +291,12 @@
url = GetCpcClassTree
}
this.copy=treeNode.dataRef.key
-
url({
// year: this.activeKey == 'cpcCodeSort' ? this.ICPYear : undefined,
year: this.activeKey == 'ipcCodeSort' ? this.ICPYear : undefined,
-
parentCode: treeNode.dataRef.key
-
}).then(res => {
- // if(this.parentCodeSearch){
- // treeNode.dataRef.children = this.formatTreeData(res.Data,0)
- // }else{
treeNode.dataRef.children = this.formatTreeData(res.Data)
- // }
-
this.treeData = [...this.treeData];
resolve();
})
diff --git a/src/views/AboutView.vue b/src/views/AboutView.vue
index 4dc1c39..f899259 100644
--- a/src/views/AboutView.vue
+++ b/src/views/AboutView.vue
@@ -119,7 +119,7 @@
</li>
</ul>
</section>
- <section class="application">
+ <!-- <section class="application">
<div class="title">鍏嶈垂浣撻獙鐢宠</div>
<ul>
<li>
@@ -152,7 +152,7 @@
margin: 10px auto -30px;
padding-left: 22px;">*濡傛灉鎮ㄥ鎴戜滑绯荤粺鏈変换浣曟剰瑙佹垨鑰呭缓璁紝璇峰皢淇℃伅鍙戦�佽嚦鎺㈡暟鐙楋紙闀囨睙锛変俊鎭鎶�鏈夐檺鍏徃閭tanshugou@139.com锛屾垜浠皢鍦ㄧ涓�鏃堕棿鑱旂郴鎮紒</div>
<div class="request" @click="application()">鐢宠寮�閫氬厤璐硅处鍙�</div>
- </section>
+ </section> -->
</main>
</div>
</template>
diff --git a/src/views/BatchView.vue b/src/views/BatchView.vue
index dfaeb9e..aa10cd6 100644
--- a/src/views/BatchView.vue
+++ b/src/views/BatchView.vue
@@ -164,17 +164,27 @@
this.$message.warning('杈撳叆鍐呭涓嶈兘涓虹┖');
return
}
- JSON.stringify(this.searchParams[this.currentTab]).replace('\n', ',').replace(';', ',').replace(' ', ',').split(',')
+ let num=0
+ let arr=this.searchParams[this.currentTab].replaceAll('\n', ',').replaceAll(';', ',').replaceAll(' ', ',').split(',')
+ // console.log(arr);
+ for(let i=0;i<arr.length;i++){
+ if(arr[i]){
+ num++
+ }
+ }
+ console.log(num);
+ // console.log(this.searchParams[this.currentTab].replaceAll('\n', ',').replaceAll(';', ',').replaceAll(' ', ',').split(',').length);
+ // JSON.stringify(this.searchParams[this.currentTab]).replaceAll('\n', ',').replaceAll(';', ',').replaceAll(' ', ',').split(',').length
if (this.currentTab === 'assigneeList') {
- console.log(JSON.stringify(this.searchParams[this.currentTab]).replace('\n', ',').replace(';', ',').replace(' ', ',').split(',').length);
- if (JSON.stringify(this.searchParams[this.currentTab]).replace('\n', ',').replace(';', ',').replace(' ', ',').split(',').length > 2000) {
- console.log(JSON.stringify(this.searchParams[this.currentTab]).replace('\n', ',').replace(';', ',').replace(' ', ',').split(',').length);
+ // console.log(JSON.stringify(this.searchParams[this.currentTab]).replaceAll('\n', ',').replaceAll(';', ',').replaceAll(' ', ',').split(',').length);
+ if (num> 2000) {
+ // console.log(JSON.stringify(this.searchParams[this.currentTab]).replaceAll('\n', ',').replaceAll(';', ',').replaceAll(' ', ',').split(',').length);
this.$message.warning('杈撳叆瀛楃鏁拌秴杩囦簡 2000 涓婇檺');
return
}
} else {
- console.log(JSON.stringify(this.searchParams[this.currentTab]).replace('\n', ',').replace(';', ',').replace(' ', ',').split(',').length);
- if (JSON.stringify(this.searchParams[this.currentTab]).replace('\n', ',').replace(';', ',').replace(' ', ',').split(',').length > 5000) {
+ // console.log(this.searchParams[this.currentTab].split('\n').join(',') );
+ if (num > 5000) {
this.$message.warning('杈撳叆瀛楃鏁拌秴杩囦簡 5000 涓婇檺');
return
}
diff --git a/src/views/SeniorView.vue b/src/views/SeniorView.vue
index 591ee8f..a27bab9 100644
--- a/src/views/SeniorView.vue
+++ b/src/views/SeniorView.vue
@@ -223,8 +223,8 @@
import { GetCountryMain } from '../api/url_analyst.js'
import SeniorTranfer from '@/components/SeniorTranfer.vue';
const options = {
- keyWords: [{ code: 'title0|abstract0', name: '鏍囬/鎽樿' }, { code: 'title0|abstract0|claim0', name: '鏍囬/鎽樿/鏉冨埄瑕佹眰' }, { code: 'title0|abstract0|claim0|description0', name: '鏍囬/鎽樿/鏉冨埄瑕佹眰/璇存槑涔�' }, { code: 'title0', name: '鏍囬' }, { code: 'abstract0', name: '鎽樿' }, { code: 'claim0', name: '鏉冨埄瑕佹眰' }, { code: 'description0', name: '璇存槑涔�' }],
- name: [{ code: 'assigneeHarmonizedName', name: '鐢宠浜�' }, { code: 'inventorHarmonizedName', name: "鍙戞槑浜�" }],
+ keyWords: [{ code: 'title0|abstract0|title1|abstract1', name: '鏍囬/鎽樿' }, { code: 'title0|abstract0|title1|abstract1|claim0|claim1', name: '鏍囬/鎽樿/鏉冨埄瑕佹眰' }, { code: 'title0|abstract0|description0|title1|abstract1|claim0|claim1', name: '鏍囬/鎽樿/鏉冨埄瑕佹眰/璇存槑涔�' }, { code: 'title0|title1', name: '鏍囬' }, { code: 'abstract0|abstract1', name: '鎽樿' }, { code: 'claim0|claim1', name: '鏉冨埄瑕佹眰' }, { code: 'description0', name: '璇存槑涔�' }],
+ name: [{ code: 'assigneeList', name: '鐢宠浜�' }, { code: 'inventorList', name: "鍙戞槑浜�" }],
address: [{ code: 'cnaddress', name: '鐢宠浜哄湴鍧�' }, { code: 'cnprovince', name: '涓浗鐢宠浜虹渷浠�' }, { code: 'cncity', name: '涓浗鐢宠浜哄湴甯�' }, { code: 'cncounty', name: '涓浗鐢宠浜哄尯鍘�' }, { code: 'assigneeCrossCountryCount', name: '鐢宠浜哄浗鍒�' }, { code: 'cncountry', name: '鍏紑鍥藉埆' }],
fenlei: [{ code: 'ipcCodeSort', name: 'IPC(鍥介檯鍒嗙被)' }, { code: 'cpcCodeSort', name: 'CPC(鍚堜綔涓撳埄鍒嗙被)' }, { code: 'industrycode', name: '鍥芥皯缁忔祹琛屼笟鍒嗙被' }, { code: 'strategicIndustryCode', name: '鎴樼暐鎬ф柊鍏翠骇涓氬垎绫�' },{ code: 'locarnoCodeSort', name: '娲涜喀璇哄垎绫�' }],
haoma: [{ code: 'publicationNumber', name: '鍏紑鍙�' }, { code: 'applicationNumber', name: '鐢宠鍙�' }, { code: 'pctNumber', name: 'PCT鍙�' },],
@@ -251,7 +251,7 @@
form: {
keyWords: [
{
- select: 'title0|abstract0',
+ select: 'title0|abstract0|title1|abstract1',
text: '',
logic: 'AND',
value: ''
@@ -259,7 +259,7 @@
],
name: [
{
- select: 'assigneeHarmonizedName',
+ select: 'assigneeList',
text: '',
logic: 'AND',
value: ''
@@ -443,12 +443,11 @@
field: item.select,
childFieldLevel: 0,
rule: key == "date" ? 'range' : item.select.indexOf('|') < 0 ? "or like" : 'or',
- val:(item.select==='strategicIndustryCode'||item.select=== 'industrycode')&&item.text.length>0?((','+item.text).replaceAll(',',',|')).substring(1):item.text,
+ val:(item.select==='strategicIndustryCode'||item.select=== 'industrycode'||item.select=== 'cpcCodeSort')&&item.text.length>0?((','+item.text).replaceAll(',',',|')).substring(1):item.text,
// val:(item.select==='strategicIndustryCode'||item.select=== 'industrycode'||item.select==='cpcCodeSort')&&item.text.length>0?((','+item.text).replaceAll(',',',|')).substring(1):item.text,
}
if(obj.field==="locarnoCodeSort"){
obj.val=(','+obj.val).replaceAll(',',',|').substring(1)
-
}
console.log(obj);
if (key == 'date') {
diff --git a/src/views/SmartView.vue b/src/views/SmartView.vue
index 5662510..a2b6b64 100644
--- a/src/views/SmartView.vue
+++ b/src/views/SmartView.vue
@@ -586,12 +586,13 @@
val: checkedList.map(item => item.code || item.text).join(','),
childFieldLevel: 0,
}
-
+console.log(field);
if (field.indexOf('ipcList') > -1) {
obj.field = 'ipcListObject'
// obj.childFieldLevel=1
// obj.val='B01'
} else if (field.indexOf('assigneeHarmonized') > -1) {
+
obj.field = 'assigneeHarmonizedNameArray'
} else if (field.indexOf('inventorHarmonized') > -1) {
obj.field = 'inventorHarmonizedNameArray'
diff --git a/src/views/smartv.vue b/src/views/smartv.vue
index ce30ae3..1a1f1e7 100644
--- a/src/views/smartv.vue
+++ b/src/views/smartv.vue
@@ -634,7 +634,14 @@
item.field = 'strategyIndustry'
} else if (field.indexOf('economyIndustry') > -1) {
obj.field = 'industrycode'
- obj.val= (','+obj.val).replaceAll(',','|')
+ obj.rule='like'
+ // obj.val= (','+obj.val).replaceAll(',','|')
+ let arr = obj.val.split(',')
+ let str = ''
+ for (let i = 0; i < arr.length; i++) {
+ str += '|' + arr[i] + ','
+ }
+ obj.val = str.substring(0, str.length - 1)
}
let val = item.val
let checkedCode = []
--
Gitblit v1.8.0