Commit 4ec5c2df authored by 乐宝呗666's avatar 乐宝呗666

添加base64解码功能

parent e03cde52
...@@ -11066,10 +11066,9 @@ ...@@ -11066,10 +11066,9 @@
} }
}, },
"js-base64": { "js-base64": {
"version": "2.5.2", "version": "3.6.1",
"resolved": "https://registry.npmjs.org/js-base64/-/js-base64-2.5.2.tgz", "resolved": "https://registry.npmjs.org/js-base64/-/js-base64-3.6.1.tgz",
"integrity": "sha512-Vg8czh0Q7sFBSUMWWArX/miJeBWYBPpdU/3M/DKSaekLMqrqVPaedp+5mZhie/r0lgrcaYBfwXatEew6gwgiQQ==", "integrity": "sha512-Frdq2+tRRGLQUIQOgsIGSCd1VePCS2fsddTG5dTCqR0JHgltXWfsxnY0gIXPoMeRmdom6Oyq+UMOFg5suduOjQ=="
"dev": true
}, },
"js-beautify": { "js-beautify": {
"version": "1.11.0", "version": "1.11.0",
...@@ -15621,6 +15620,14 @@ ...@@ -15621,6 +15620,14 @@
"js-base64": "^2.1.9", "js-base64": "^2.1.9",
"source-map": "^0.5.6", "source-map": "^0.5.6",
"supports-color": "^3.2.3" "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": { "strip-ansi": {
......
...@@ -25,6 +25,7 @@ ...@@ -25,6 +25,7 @@
"flex.css": "^1.1.7", "flex.css": "^1.1.7",
"fuse.js": "^5.2.3", "fuse.js": "^5.2.3",
"hotkeys-js": "^3.7.3", "hotkeys-js": "^3.7.3",
"js-base64": "^3.6.1",
"js-cookie": "^2.2.1", "js-cookie": "^2.2.1",
"lib-flexible": "^0.3.2", "lib-flexible": "^0.3.2",
"lodash": "^4.17.15", "lodash": "^4.17.15",
......
...@@ -63,12 +63,11 @@ ...@@ -63,12 +63,11 @@
v-model="state" v-model="state"
size="mini" size="mini"
clearable clearable
prefix-icon="el-icon-search"
:fetch-suggestions="querySearch" :fetch-suggestions="querySearch"
placeholder="请输入公司名称" placeholder="请输入公司名称"
:trigger-on-focus="false"
@select="handleSelect" @select="handleSelect"
></el-autocomplete> ></el-autocomplete>
<el-button class="searchBtn" type="text">搜索</el-button>
</div> </div>
</div> </div>
<div class="searchMsg d-flex flex-column"> <div class="searchMsg d-flex flex-column">
...@@ -191,11 +190,11 @@ export default { ...@@ -191,11 +190,11 @@ export default {
clientAnalysis: {}, // 客户分析 clientAnalysis: {}, // 客户分析
state: '', state: '',
companyInfo: {}, companyInfo: {},
selectYear: '1', // 选中重要客户项 selectYear: '2', // 选中重要客户项
yearList: [ yearList: [
{ id: '1', name: '综合' },
{ id: '2', name: '按资金' }, { id: '2', name: '按资金' },
{ id: '3', name: '按项目' } { id: '3', name: '按项目' },
{ id: '1', name: '综合' }
], // 重要客户下拉框 ], // 重要客户下拉框
customerList: [], // 重要客户 customerList: [], // 重要客户
partnerList: [] // 合作伙伴 partnerList: [] // 合作伙伴
...@@ -301,5 +300,8 @@ export default { ...@@ -301,5 +300,8 @@ export default {
@import '~@/assets/style/business.scss'; @import '~@/assets/style/business.scss';
@import '~@/assets/style/client.scss'; @import '~@/assets/style/client.scss';
</style> </style>
<style lang="scss"> <style lang="scss" scoped>
.search .el-autocomplete {
width:100%;
}
</style> </style>
...@@ -7,12 +7,12 @@ ...@@ -7,12 +7,12 @@
v-model="input" v-model="input"
size="mini" size="mini"
clearable clearable
prefix-icon="el-icon-search"
:fetch-suggestions="querySearch" :fetch-suggestions="querySearch"
placeholder="请输入员工名称" placeholder="请输入员工名称"
:trigger-on-focus="false"
@select="handleSelect" @select="handleSelect"
></el-autocomplete> ></el-autocomplete>
<el-button class="searchBtn" type="text">搜索</el-button> <!-- <el-button class="searchBtn" type="text">搜索</el-button> -->
</div> </div>
</div> </div>
<div class="tab-box"> <div class="tab-box">
...@@ -174,6 +174,9 @@ export default { ...@@ -174,6 +174,9 @@ export default {
<style lang="scss" scoped> <style lang="scss" scoped>
.staff-box { .staff-box {
font-size: .12rem; font-size: .12rem;
.search .el-autocomplete {
width:100%;
}
.tab-box { .tab-box {
text-align: center; text-align: center;
padding: .2rem .24rem 0; padding: .2rem .24rem 0;
......
...@@ -25,7 +25,7 @@ import 'quill/dist/quill.snow.css' ...@@ -25,7 +25,7 @@ import 'quill/dist/quill.snow.css'
import 'quill/dist/quill.bubble.css' import 'quill/dist/quill.bubble.css'
import headerLayout from '@/components/headerLayout/index' // 公共头部 import headerLayout from '@/components/headerLayout/index' // 公共头部
import * as API_BASIC from '@/api/sys.basic.js' import * as API_BASIC from '@/api/sys.basic.js'
const Base64 = require('js-base64').Base64
export default { export default {
components: { headerLayout }, components: { headerLayout },
data () { data () {
...@@ -60,7 +60,7 @@ export default { ...@@ -60,7 +60,7 @@ export default {
async getIntroductionById () { async getIntroductionById () {
const _data = await API_BASIC.getIntroductionById({ id: 1 }) const _data = await API_BASIC.getIntroductionById({ id: 1 })
this.contentData = _data.data this.contentData = _data.data
this.contentData.content = unescape(this.contentData.content) this.contentData.content = Base64.decode(this.contentData.content)
}, },
async getCertificationList () { async getCertificationList () {
const _data = await API_BASIC.getCertificationList() const _data = await API_BASIC.getCertificationList()
...@@ -70,17 +70,17 @@ export default { ...@@ -70,17 +70,17 @@ export default {
async getMainBusinessById () { async getMainBusinessById () {
const _data = await API_BASIC.getMainBusinessById({ id: 1 }) const _data = await API_BASIC.getMainBusinessById({ id: 1 })
this.contentData = _data.data this.contentData = _data.data
this.contentData.content = unescape(this.contentData.content) this.contentData.content = Base64.decode(this.contentData.content)
}, },
async getGloryById () { async getGloryById () {
const _data = await API_BASIC.getGloryById({ id: 1 }) const _data = await API_BASIC.getGloryById({ id: 1 })
this.contentData = _data.data this.contentData = _data.data
this.contentData.content = unescape(this.contentData.content) this.contentData.content = Base64.decode(this.contentData.content)
}, },
async getCultureById () { async getCultureById () {
const _data = await API_BASIC.getCultureById({ id: 1 }) const _data = await API_BASIC.getCultureById({ id: 1 })
this.contentData = _data.data this.contentData = _data.data
this.contentData.content = unescape(this.contentData.content) this.contentData.content = Base64.decode(this.contentData.content)
}, },
goBack () { goBack () {
this.$router.back(-1) this.$router.back(-1)
......
...@@ -27,12 +27,11 @@ ...@@ -27,12 +27,11 @@
v-model="state" v-model="state"
size="mini" size="mini"
clearable clearable
prefix-icon="el-icon-search"
:fetch-suggestions="querySearch" :fetch-suggestions="querySearch"
placeholder="请输入" placeholder="请输入"
:trigger-on-focus="false"
@select="handleSelectChild" @select="handleSelectChild"
></el-autocomplete> ></el-autocomplete>
<el-button class="searchBtn" type="text">搜索</el-button>
</div> </div>
</div> </div>
<h3>关系筛选</h3> <h3>关系筛选</h3>
......
...@@ -17,12 +17,11 @@ ...@@ -17,12 +17,11 @@
v-model="state" v-model="state"
size="mini" size="mini"
clearable clearable
prefix-icon="el-icon-search"
:fetch-suggestions="querySearch" :fetch-suggestions="querySearch"
placeholder="请输入名称" placeholder="请输入名称"
:trigger-on-focus="false"
@select="handleSelect" @select="handleSelect"
></el-autocomplete> ></el-autocomplete>
<el-button class="searchBtn" type="text">搜索</el-button>
</div> </div>
</div> </div>
...@@ -149,6 +148,9 @@ export default { ...@@ -149,6 +148,9 @@ export default {
.search{ .search{
width: calc(100% - 1.6rem); width: calc(100% - 1.6rem);
margin-left: .2rem; margin-left: .2rem;
.el-autocomplete {
width: 100%;
}
} }
#topology{ #topology{
height: calc(100% - 1.12rem); height: calc(100% - 1.12rem);
......
...@@ -25,7 +25,7 @@ ...@@ -25,7 +25,7 @@
<script> <script>
import headerLayout from '@/components/headerLayout/index' // 公共头部 import headerLayout from '@/components/headerLayout/index' // 公共头部
const Base64 = require('js-base64').Base64
export default { export default {
components: { headerLayout }, components: { headerLayout },
data () { data () {
...@@ -35,7 +35,7 @@ export default { ...@@ -35,7 +35,7 @@ export default {
}, },
mounted () { mounted () {
this.itemContent = JSON.parse(this.$route.query.row) this.itemContent = JSON.parse(this.$route.query.row)
this.itemContent.content = unescape(this.itemContent.content) this.itemContent.content = Base64.decode(this.itemContent.content)
}, },
methods: { methods: {
goBack () { goBack () {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment