diff --git a/package-lock.json b/package-lock.json
index 20e6250d5892cb081b95ab8cc1475ca021f5842c..a2df8579e11b925325af391ca4445872dcf138fb 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -11066,10 +11066,9 @@
}
},
"js-base64": {
- "version": "2.5.2",
- "resolved": "https://registry.npmjs.org/js-base64/-/js-base64-2.5.2.tgz",
- "integrity": "sha512-Vg8czh0Q7sFBSUMWWArX/miJeBWYBPpdU/3M/DKSaekLMqrqVPaedp+5mZhie/r0lgrcaYBfwXatEew6gwgiQQ==",
- "dev": true
+ "version": "3.6.1",
+ "resolved": "https://registry.npmjs.org/js-base64/-/js-base64-3.6.1.tgz",
+ "integrity": "sha512-Frdq2+tRRGLQUIQOgsIGSCd1VePCS2fsddTG5dTCqR0JHgltXWfsxnY0gIXPoMeRmdom6Oyq+UMOFg5suduOjQ=="
},
"js-beautify": {
"version": "1.11.0",
@@ -15621,6 +15620,14 @@
"js-base64": "^2.1.9",
"source-map": "^0.5.6",
"supports-color": "^3.2.3"
+ },
+ "dependencies": {
+ "js-base64": {
+ "version": "2.6.4",
+ "resolved": "https://registry.npmjs.org/js-base64/-/js-base64-2.6.4.tgz",
+ "integrity": "sha512-pZe//GGmwJndub7ZghVHz7vjb2LgC1m8B07Au3eYqeqv9emhESByMXxaEgkUkEqJe87oBbSniGYoQNIBklc7IQ==",
+ "dev": true
+ }
}
},
"strip-ansi": {
diff --git a/package.json b/package.json
index af138f3628cf1d5741ea08239137a775591626d0..b9d61185804e9ea7d4d488179565c67160a9543f 100644
--- a/package.json
+++ b/package.json
@@ -25,6 +25,7 @@
"flex.css": "^1.1.7",
"fuse.js": "^5.2.3",
"hotkeys-js": "^3.7.3",
+ "js-base64": "^3.6.1",
"js-cookie": "^2.2.1",
"lib-flexible": "^0.3.2",
"lodash": "^4.17.15",
diff --git a/src/views/content/client/page.vue b/src/views/content/client/page.vue
index 7ac56e4b68a1824a650cd7a91f546124b1d323af..0ed2a5e3c9951a22bb081a8ed8a9780af570ff37 100644
--- a/src/views/content/client/page.vue
+++ b/src/views/content/client/page.vue
@@ -63,12 +63,11 @@
v-model="state"
size="mini"
clearable
+ prefix-icon="el-icon-search"
:fetch-suggestions="querySearch"
placeholder="请输入公å¸å称"
- :trigger-on-focus="false"
@select="handleSelect"
></el-autocomplete>
- <el-button class="searchBtn" type="text">æœç´¢</el-button>
</div>
</div>
<div class="searchMsg d-flex flex-column">
@@ -191,11 +190,11 @@ export default {
clientAnalysis: {}, // 客户分æž
state: '',
companyInfo: {},
- selectYear: '1', // 选ä¸é‡è¦å®¢æˆ·é¡¹
+ selectYear: '2', // 选ä¸é‡è¦å®¢æˆ·é¡¹
yearList: [
- { id: '1', name: '综åˆ' },
{ id: '2', name: '按资金' },
- { id: '3', name: '按项目' }
+ { id: '3', name: '按项目' },
+ { id: '1', name: '综åˆ' }
], // é‡è¦å®¢æˆ·ä¸‹æ‹‰æ¡†
customerList: [], // é‡è¦å®¢æˆ·
partnerList: [] // åˆä½œä¼™ä¼´
@@ -301,5 +300,8 @@ export default {
@import '~@/assets/style/business.scss';
@import '~@/assets/style/client.scss';
</style>
-<style lang="scss">
+<style lang="scss" scoped>
+.search .el-autocomplete {
+ width:100%;
+}
</style>
diff --git a/src/views/content/organization/components/staffInfo.vue b/src/views/content/organization/components/staffInfo.vue
index b3b9d544abecb54de2250d493edcaf00c1afb10d..1a5dd5b34f9a324368e3ef4dca5fe428f6d33263 100644
--- a/src/views/content/organization/components/staffInfo.vue
+++ b/src/views/content/organization/components/staffInfo.vue
@@ -7,12 +7,12 @@
v-model="input"
size="mini"
clearable
+ prefix-icon="el-icon-search"
:fetch-suggestions="querySearch"
placeholder="请输入员工å称"
- :trigger-on-focus="false"
@select="handleSelect"
></el-autocomplete>
- <el-button class="searchBtn" type="text">æœç´¢</el-button>
+ <!-- <el-button class="searchBtn" type="text">æœç´¢</el-button> -->
</div>
</div>
<div class="tab-box">
@@ -174,6 +174,9 @@ export default {
<style lang="scss" scoped>
.staff-box {
font-size: .12rem;
+ .search .el-autocomplete {
+ width:100%;
+ }
.tab-box {
text-align: center;
padding: .2rem .24rem 0;
diff --git a/src/views/system/index/components/enterpriseDetail.vue b/src/views/system/index/components/enterpriseDetail.vue
index 20ecaecc9248d820015828325e64625537c38ccb..dcdd32420980c055f6e7adb4c0c112958ca07f11 100644
--- a/src/views/system/index/components/enterpriseDetail.vue
+++ b/src/views/system/index/components/enterpriseDetail.vue
@@ -25,7 +25,7 @@ import 'quill/dist/quill.snow.css'
import 'quill/dist/quill.bubble.css'
import headerLayout from '@/components/headerLayout/index' // 公共头部
import * as API_BASIC from '@/api/sys.basic.js'
-
+const Base64 = require('js-base64').Base64
export default {
components: { headerLayout },
data () {
@@ -60,7 +60,7 @@ export default {
async getIntroductionById () {
const _data = await API_BASIC.getIntroductionById({ id: 1 })
this.contentData = _data.data
- this.contentData.content = unescape(this.contentData.content)
+ this.contentData.content = Base64.decode(this.contentData.content)
},
async getCertificationList () {
const _data = await API_BASIC.getCertificationList()
@@ -70,17 +70,17 @@ export default {
async getMainBusinessById () {
const _data = await API_BASIC.getMainBusinessById({ id: 1 })
this.contentData = _data.data
- this.contentData.content = unescape(this.contentData.content)
+ this.contentData.content = Base64.decode(this.contentData.content)
},
async getGloryById () {
const _data = await API_BASIC.getGloryById({ id: 1 })
this.contentData = _data.data
- this.contentData.content = unescape(this.contentData.content)
+ this.contentData.content = Base64.decode(this.contentData.content)
},
async getCultureById () {
const _data = await API_BASIC.getCultureById({ id: 1 })
this.contentData = _data.data
- this.contentData.content = unescape(this.contentData.content)
+ this.contentData.content = Base64.decode(this.contentData.content)
},
goBack () {
this.$router.back(-1)
diff --git a/src/views/system/index/components/knowledgeDialog.vue b/src/views/system/index/components/knowledgeDialog.vue
index 3e38de8eda4bb6cb9725f80878a0a93338f3870e..510e5fe7ad2692757c2c77bfceefb67aae030296 100644
--- a/src/views/system/index/components/knowledgeDialog.vue
+++ b/src/views/system/index/components/knowledgeDialog.vue
@@ -27,12 +27,11 @@
v-model="state"
size="mini"
clearable
+ prefix-icon="el-icon-search"
:fetch-suggestions="querySearch"
placeholder="请输入"
- :trigger-on-focus="false"
@select="handleSelectChild"
></el-autocomplete>
- <el-button class="searchBtn" type="text">æœç´¢</el-button>
</div>
</div>
<h3>关系ç›é€‰</h3>
diff --git a/src/views/system/index/components/knowledgeGraph.vue b/src/views/system/index/components/knowledgeGraph.vue
index f4572f3c0da3442f77f81faf9cf93801b0a61482..ea925eaf8c38be12657cb092f9fbe1a1067b66c6 100644
--- a/src/views/system/index/components/knowledgeGraph.vue
+++ b/src/views/system/index/components/knowledgeGraph.vue
@@ -17,12 +17,11 @@
v-model="state"
size="mini"
clearable
+ prefix-icon="el-icon-search"
:fetch-suggestions="querySearch"
placeholder="请输入å称"
- :trigger-on-focus="false"
@select="handleSelect"
></el-autocomplete>
- <el-button class="searchBtn" type="text">æœç´¢</el-button>
</div>
</div>
@@ -149,6 +148,9 @@ export default {
.search{
width: calc(100% - 1.6rem);
margin-left: .2rem;
+ .el-autocomplete {
+ width: 100%;
+ }
}
#topology{
height: calc(100% - 1.12rem);
diff --git a/src/views/system/index/components/newsDetail.vue b/src/views/system/index/components/newsDetail.vue
index 7a0346b13d6587b061c64bdde21eb75472b26bc6..9aff77bcac51937752807f05dd4e8ee4bf484aeb 100644
--- a/src/views/system/index/components/newsDetail.vue
+++ b/src/views/system/index/components/newsDetail.vue
@@ -25,7 +25,7 @@
<script>
import headerLayout from '@/components/headerLayout/index' // 公共头部
-
+const Base64 = require('js-base64').Base64
export default {
components: { headerLayout },
data () {
@@ -35,7 +35,7 @@ export default {
},
mounted () {
this.itemContent = JSON.parse(this.$route.query.row)
- this.itemContent.content = unescape(this.itemContent.content)
+ this.itemContent.content = Base64.decode(this.itemContent.content)
},
methods: {
goBack () {