Commit c9104042 authored by liangjingpeng's avatar liangjingpeng

细节修改

parent e0943c49
...@@ -74,7 +74,6 @@ body { ...@@ -74,7 +74,6 @@ body {
} }
*/ */
/* 基本重置 */ /* 基本重置 */
body{ body{
margin: 0; margin: 0;
......
...@@ -155,4 +155,3 @@ export function transformDept(data) { ...@@ -155,4 +155,3 @@ export function transformDept(data) {
}) })
} }
...@@ -2,7 +2,6 @@ ...@@ -2,7 +2,6 @@
@font-face { @font-face {
font-family: 'PingFangSC-Regular', 'PingFang SC'; font-family: 'PingFangSC-Regular', 'PingFang SC';
src: src:
url('../assets/fonts/PingFangSC-Regular.woff2') format('woff2'),
url('../assets/fonts/PingFangSC-Regular.woff') format('woff'); url('../assets/fonts/PingFangSC-Regular.woff') format('woff');
font-weight: 500; font-weight: 500;
font-style: normal; font-style: normal;
...@@ -12,7 +11,6 @@ ...@@ -12,7 +11,6 @@
@font-face { @font-face {
font-family: 'PingFangSC-Medium'; font-family: 'PingFangSC-Medium';
src: src:
url('../assets/fonts/PingFangSC-Medium.woff2') format('woff2'),
url('../assets/fonts/PingFangSC-Medium.woff') format('woff'); url('../assets/fonts/PingFangSC-Medium.woff') format('woff');
font-weight: 500; font-weight: 500;
font-style: normal; font-style: normal;
...@@ -22,7 +20,6 @@ ...@@ -22,7 +20,6 @@
@font-face { @font-face {
font-family: 'PingFangSC-Semibold'; font-family: 'PingFangSC-Semibold';
src: src:
url('../assets/fonts/PingFangSC-Semibold.woff2') format('woff2'),
url('../assets/fonts/PingFangSC-Semibold.woff') format('woff'); url('../assets/fonts/PingFangSC-Semibold.woff') format('woff');
font-weight: 500; font-weight: 500;
font-style: normal; font-style: normal;
......
...@@ -282,12 +282,12 @@ ...@@ -282,12 +282,12 @@
<span class="TechnicalExpertiseP1">{{ ArchitectureCapabilityP1 }}</span> <span class="TechnicalExpertiseP1">{{ ArchitectureCapabilityP1 }}</span>
<span class="TechnicalExpertiseP2">{{ ArchitectureCapabilityP2 }}</span> <span class="TechnicalExpertiseP2">{{ ArchitectureCapabilityP2 }}</span>
</p> </p>
<p class="text-three" > <p class="text-three">
<span class="TechnicalExpertiseP1">{{ coreTechnologyP1 }}</span> <span class="TechnicalExpertiseP1">{{ coreTechnologyP1 }}</span>
<span class="TechnicalExpertiseP2">{{ coreTechnologyP2 }}</span> <span class="TechnicalExpertiseP2">{{ coreTechnologyP2 }}</span>
</p> </p>
<img class="jishujingzhuan-ITOService" src="@/assets/icons/BusinessServices-icons/yewujngtong.png"> <img class="jishujingzhuan-ITOService" src="@/assets/icons/BusinessServices-icons/yewujngtong.png">
<P class="ProficientIn-Business">{{ ProficientInBusiness }}</P> <P class="ProficientIn-Business">{{ ProficientInBusiness }}</P>
</div> </div>
......
...@@ -31,7 +31,7 @@ ...@@ -31,7 +31,7 @@
</div> </div>
<div class="module-three"> <div class="module-three">
<div class="module-three-card1"> <div class="module-three-card1">
<div class="module-three-icon1"/> <div class="module-three-icon1" />
<div> <div>
<div class="module-three-card-title1"><span>专业设置</span></div> <div class="module-three-card-title1"><span>专业设置</span></div>
<div class="module-three-card-title2"> <div class="module-three-card-title2">
...@@ -529,7 +529,7 @@ export default { ...@@ -529,7 +529,7 @@ export default {
} }
.module-three-card1:hover { .module-three-card1:hover {
background-color: #f0f0f0; //background-color: #f0f0f0;
transform: scale(1.05); transform: scale(1.05);
} }
...@@ -568,7 +568,7 @@ export default { ...@@ -568,7 +568,7 @@ export default {
} }
.module-three-card2:hover { .module-three-card2:hover {
background-color: #f0f0f0; //background-color: #f0f0f0;
transform: scale(1.05); transform: scale(1.05);
} }
...@@ -607,7 +607,7 @@ export default { ...@@ -607,7 +607,7 @@ export default {
} }
.module-three-card3:hover { .module-three-card3:hover {
background-color: #f0f0f0; //background-color: #f0f0f0;
transform: scale(1.05); transform: scale(1.05);
} }
...@@ -644,7 +644,7 @@ export default { ...@@ -644,7 +644,7 @@ export default {
} }
.module-three-card4:hover { .module-three-card4:hover {
background-color: #f0f0f0; //background-color: #f0f0f0;
transform: scale(1.05); transform: scale(1.05);
} }
......
...@@ -16,7 +16,8 @@ ...@@ -16,7 +16,8 @@
<img <img
class="img-class" class="img-class"
src="../../assets/icons/logo1.png" src="../../assets/icons/logo1.png"
@click="logoClick"> @click="logoClick"
>
</router-link> </router-link>
</el-menu-item> </el-menu-item>
<el-menu-item index="1" class="header-title" style="border-bottom: none;"> <el-menu-item index="1" class="header-title" style="border-bottom: none;">
...@@ -240,9 +241,6 @@ export default { ...@@ -240,9 +241,6 @@ export default {
margin-top: 90px; /* 让页面内容避开导航栏 */ margin-top: 90px; /* 让页面内容避开导航栏 */
} }
.container { .container {
width: 100%; width: 100%;
} }
...@@ -381,7 +379,6 @@ export default { ...@@ -381,7 +379,6 @@ export default {
align-items: center; /* 垂直居中对齐内容 */ align-items: center; /* 垂直居中对齐内容 */
} }
.mobile_menu { .mobile_menu {
background-color: transparent; /* 设置背景色为完全透明 */ background-color: transparent; /* 设置背景色为完全透明 */
} }
......
...@@ -5,9 +5,9 @@ ...@@ -5,9 +5,9 @@
<i slot="suffix" class="el-icon-search el-input__icon" /> <i slot="suffix" class="el-icon-search el-input__icon" />
</el-input> </el-input>
<div class="icon-list"> <div class="icon-list">
<div class="icon__single" v-for="(item, index) in iconList" :key="index" @click="selectedIcon(item)"> <div v-for="(item, index) in iconList" :key="index" class="icon__single" @click="selectedIcon(item)">
<svg-icon :icon-class="item" style="height: 30px;width: 16px;display: block;margin-right: 5px" /> <svg-icon :icon-class="item" style="height: 30px;width: 16px;display: block;margin-right: 5px" />
<div :title="item" class="icon__single__text" style="width: calc(100% - 30px)">{{item}}</div> <div :title="item" class="icon__single__text" style="width: calc(100% - 30px)">{{ item }}</div>
</div> </div>
</div> </div>
</div> </div>
...@@ -23,6 +23,8 @@ export default { ...@@ -23,6 +23,8 @@ export default {
iconList: icons iconList: icons
} }
}, },
mounted() {
},
methods: { methods: {
filterIcons() { filterIcons() {
this.iconList = icons this.iconList = icons
...@@ -38,8 +40,6 @@ export default { ...@@ -38,8 +40,6 @@ export default {
this.name = '' this.name = ''
this.iconList = icons this.iconList = icons
} }
},
mounted() {
} }
} }
</script> </script>
......
...@@ -21,7 +21,7 @@ export default { ...@@ -21,7 +21,7 @@ export default {
name: 'Pagination', name: 'Pagination',
props: { props: {
total: { total: {
required: true, required: true
// type: Number // type: Number
}, },
page: { page: {
......
...@@ -187,7 +187,7 @@ export default { ...@@ -187,7 +187,7 @@ export default {
showRefresh: true, showRefresh: true,
transitionLeft: '', transitionLeft: '',
transitionWidth: '', transitionWidth: '',
isFlag: false, isFlag: false
} }
}, },
computed: { computed: {
......
...@@ -3,9 +3,9 @@ import CryptoJS from 'crypto-js' ...@@ -3,9 +3,9 @@ import CryptoJS from 'crypto-js'
* @word 要加密的内容 * @word 要加密的内容
* @keyWord String 服务器随机返回的关键字 * @keyWord String 服务器随机返回的关键字
* */ * */
export function aesEncrypt(word, keyWord = "XwKsGlMcdPMEhR1B") { export function aesEncrypt(word, keyWord = 'XwKsGlMcdPMEhR1B') {
var key = CryptoJS.enc.Utf8.parse(keyWord); var key = CryptoJS.enc.Utf8.parse(keyWord)
var srcs = CryptoJS.enc.Utf8.parse(word); var srcs = CryptoJS.enc.Utf8.parse(word)
var encrypted = CryptoJS.AES.encrypt(srcs, key, { mode: CryptoJS.mode.ECB, padding: CryptoJS.pad.Pkcs7 }); var encrypted = CryptoJS.AES.encrypt(srcs, key, { mode: CryptoJS.mode.ECB, padding: CryptoJS.pad.Pkcs7 })
return encrypted.toString(); return encrypted.toString()
} }
export function resetSize(vm) { export function resetSize(vm) {
var img_width, img_height, bar_width, bar_height; //图片的宽度、高度,移动条的宽度、高度 var img_width, img_height, bar_width, bar_height // 图片的宽度、高度,移动条的宽度、高度
var parentWidth = vm.$el.parentNode.offsetWidth || window.offsetWidth var parentWidth = vm.$el.parentNode.offsetWidth || window.offsetWidth
var parentHeight = vm.$el.parentNode.offsetHeight || window.offsetHeight var parentHeight = vm.$el.parentNode.offsetHeight || window.offsetHeight
if (vm.imgSize.width.indexOf('%') != -1) { if (vm.imgSize.width.indexOf('%') != -1) {
img_width = parseInt(this.imgSize.width) / 100 * parentWidth + 'px' img_width = parseInt(this.imgSize.width) / 100 * parentWidth + 'px'
} else { } else {
img_width = this.imgSize.width; img_width = this.imgSize.width
} }
if (vm.imgSize.height.indexOf('%') != -1) { if (vm.imgSize.height.indexOf('%') != -1) {
img_height = parseInt(this.imgSize.height) / 100 * parentHeight + 'px' img_height = parseInt(this.imgSize.height) / 100 * parentHeight + 'px'
} else { } else {
img_height = this.imgSize.height img_height = this.imgSize.height
} }
if (vm.barSize.width.indexOf('%') != -1) { if (vm.barSize.width.indexOf('%') != -1) {
bar_width = parseInt(this.barSize.width) / 100 * parentWidth + 'px' bar_width = parseInt(this.barSize.width) / 100 * parentWidth + 'px'
} else { } else {
bar_width = this.barSize.width bar_width = this.barSize.width
} }
if (vm.barSize.height.indexOf('%') != -1) { if (vm.barSize.height.indexOf('%') != -1) {
bar_height = parseInt(this.barSize.height) / 100 * parentHeight + 'px' bar_height = parseInt(this.barSize.height) / 100 * parentHeight + 'px'
} else { } else {
bar_height = this.barSize.height bar_height = this.barSize.height
} }
return { imgWidth: img_width, imgHeight: img_height, barWidth: bar_width, barHeight: bar_height } return { imgWidth: img_width, imgHeight: img_height, barWidth: bar_width, barHeight: bar_height }
} }
export const _code_chars = [1, 2, 3, 4, 5, 6, 7, 8, 9, 'a', 'b', 'c', 'd', 'e', 'f', 'g', 'h', 'i', 'j', 'k', 'l', 'm', 'n', 'o', 'p', 'q', 'r', 's', 't', 'u', 'v', 'w', 'x', 'y', 'z', 'A', 'B', 'C', 'D', 'E', 'F', 'G', 'H', 'I', 'J', 'K', 'L', 'M', 'N', 'O', 'P', 'Q', 'R', 'S', 'T', 'U', 'V', 'W', 'X', 'Y', 'Z'] export const _code_chars = [1, 2, 3, 4, 5, 6, 7, 8, 9, 'a', 'b', 'c', 'd', 'e', 'f', 'g', 'h', 'i', 'j', 'k', 'l', 'm', 'n', 'o', 'p', 'q', 'r', 's', 't', 'u', 'v', 'w', 'x', 'y', 'z', 'A', 'B', 'C', 'D', 'E', 'F', 'G', 'H', 'I', 'J', 'K', 'L', 'M', 'N', 'O', 'P', 'Q', 'R', 'S', 'T', 'U', 'V', 'W', 'X', 'Y', 'Z']
export const _code_color1 = ['#fffff0', '#f0ffff', '#f0fff0', '#fff0f0'] export const _code_color1 = ['#fffff0', '#f0ffff', '#f0fff0', '#fff0f0']
export const _code_color2 = ['#FF0033', '#006699', '#993366', '#FF9900', '#66CC66', '#FF33CC'] export const _code_color2 = ['#FF0033', '#006699', '#993366', '#FF9900', '#66CC66', '#FF33CC']
\ No newline at end of file
...@@ -63,7 +63,7 @@ export default { ...@@ -63,7 +63,7 @@ export default {
deleteCommentAuthorOnly: true, deleteCommentAuthorOnly: true,
editCommentAuthorOnly: true, editCommentAuthorOnly: true,
protect: true, protect: true,
review: option.isEdit, review: option.isEdit
} }
}, },
......
...@@ -6,12 +6,10 @@ ...@@ -6,12 +6,10 @@
key="collapse" key="collapse"
class="sidebar-logo-link" class="sidebar-logo-link"
to="/" to="/"
> />
</router-link>
<router-link v-else key="expand" class="sidebar-logo-link" to="/"> <router-link v-else key="expand" class="sidebar-logo-link" to="/">
<div class="sidebar-logoTitle"> <div class="sidebar-logoTitle">
<div class="sidebar-logoRow"> <div class="sidebar-logoRow" />
</div>
<div class="sidebar-title">{{ title }}</div> <div class="sidebar-title">{{ title }}</div>
</div> </div>
</router-link> </router-link>
......
...@@ -45,7 +45,7 @@ export default { ...@@ -45,7 +45,7 @@ export default {
// eslint-disable-next-line vue/return-in-computed-property // eslint-disable-next-line vue/return-in-computed-property
variables() { variables() {
// 根据选择的风格变量决定引用哪套variables变量文件 // 根据选择的风格变量决定引用哪套variables变量文件
return variables return variables
}, },
isCollapse() { isCollapse() {
return !this.sidebar.opened return !this.sidebar.opened
......
...@@ -151,7 +151,7 @@ export default { ...@@ -151,7 +151,7 @@ export default {
}, },
closeSelectedTag(view) { closeSelectedTag(view) {
// 关闭标签页清除存储的筛选条件数据 // 关闭标签页清除存储的筛选条件数据
this.$store.dispatch('searchSave/clearOneParams',this.$route.path) this.$store.dispatch('searchSave/clearOneParams', this.$route.path)
this.$store.dispatch('tagsView/delView', view).then(({ visitedViews }) => { this.$store.dispatch('tagsView/delView', view).then(({ visitedViews }) => {
if (this.isActive(view)) { if (this.isActive(view)) {
this.toLastView(visitedViews, view) this.toLastView(visitedViews, view)
......
...@@ -2,9 +2,9 @@ ...@@ -2,9 +2,9 @@
<div <div
v-if=" v-if="
currentPath === '' || currentPath === '' ||
currentPath === null || currentPath === null ||
currentPath === 'R' || currentPath === 'R' ||
currentPath === 'G' currentPath === 'G'
" "
:class="classObj" :class="classObj"
class="app-wrapper" class="app-wrapper"
...@@ -21,7 +21,7 @@ ...@@ -21,7 +21,7 @@
</div> </div>
<div class="nav-container-two"> <div class="nav-container-two">
<div class="placeholder" /> <div class="placeholder" />
<tags-view v-if="themeType && themeType !== '8'" /> <tags-view v-if="themeType && themeType !== '8'" />
<navbar v-if="themeType && themeType !== '8'" /> <navbar v-if="themeType && themeType !== '8'" />
</div> </div>
<el-card v-if="themeType && themeType === '8'" style="margin:.75rem"> <el-card v-if="themeType && themeType === '8'" style="margin:.75rem">
......
This diff is collapsed.
<template> <template>
<router-view></router-view> <router-view />
</template> </template>
<script> <script>
export default { export default {
......
<template> <template>
<section class="forget-pwd-content"> <section class="forget-pwd-content">
<!-- <page-divider />--> <!-- <page-divider />-->
<div class="title">修改密码</div> <div class="title">修改密码</div>
<el-form <el-form
ref="pwdForm" ref="pwdForm"
......
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