diff --git a/src/App.vue b/src/App.vue
index f40d1fc3d..5429787eb 100644
--- a/src/App.vue
+++ b/src/App.vue
@@ -214,6 +214,8 @@ export default {
width: 100%;
height: 100%;
overflow-y: auto;
+ background: url('~@/assets/images/shangqi/home/BG.png') no-repeat;
+ background-size: 100%;
& > div{
position: absolute;
top: 0;
diff --git a/src/assets/styles/common.less b/src/assets/styles/common.less
index 74d7a5d70..d9ddaa1f4 100644
--- a/src/assets/styles/common.less
+++ b/src/assets/styles/common.less
@@ -50,7 +50,7 @@
#app{
&.theme-one {
//background: url('~@/assets/images/shangqi/home/home-bg.png') no-repeat;
- background: url('~@/assets/images/shangqi/home/BG.png') no-repeat;
+ //background: url('~@/assets/images/shangqi/home/BG.png') no-repeat;
background-size: cover;
}
input:focus{
diff --git a/src/components/personalCenter/index.vue b/src/components/personalCenter/index.vue
index b108ee49d..7dbe3eecf 100644
--- a/src/components/personalCenter/index.vue
+++ b/src/components/personalCenter/index.vue
@@ -101,7 +101,7 @@ export default {
display: inline-block;
width: 160px;
height: 61px;
- background: url("~@/assets/images/shangqi/home/logo-bg.png") no-repeat;
+ background: url("~@/assets/images/shangqi/home/logo2.png") no-repeat;
background-size: cover;
cursor: pointer;
}
diff --git a/src/pages/home1/components/navMenu/index.vue b/src/pages/home1/components/navMenu/index.vue
index 8baa1966d..f7aa3702f 100644
--- a/src/pages/home1/components/navMenu/index.vue
+++ b/src/pages/home1/components/navMenu/index.vue
@@ -3,8 +3,8 @@
@@ -115,9 +115,8 @@
:label="selectIndex === 'stand'||'bussstand' ? $t('m.standStateShow') : (selectIndex === 'laws' ? $t('m.fileStatus') : $t('m.enterpriseStandardStatus'))"
width="200">
-
- {{ scope.row.standstateshow }}
-
+ {{ getLawsState(scope.row.statecode) }}
+ {{ scope.row.standstateshow }}
@@ -366,6 +365,7 @@ export default {
resultLoading: false,
saveAllSortOptions: [],
saveAllFineOptions: [],
+ lawssStateOptions: [],
page: 1,
pageAll: 1,
total: 0,
@@ -404,7 +404,7 @@ export default {
})
}
break
- // 企标
+ // 企标
case 'bussstand':
if (this.$hasPermission('YJUHC32R7G')) {
let routeUrl2 = this.$router.resolve({
@@ -422,7 +422,7 @@ export default {
})
}
break
- // 政策
+ // 政策
case 'laws':
if (this.$hasPermission('A2HDHMEA6W')) {
let routeUrl3 = this.$router.resolve({
@@ -457,7 +457,7 @@ export default {
})
}
break
- // 动态资料------3个值（INLAND_MSG FOREIGN_MSG RESOURCE_MSG）
+ // 动态资料------3个值（INLAND_MSG FOREIGN_MSG RESOURCE_MSG）
case 'FOREIGN':
let routeUrl5 = this.$router.resolve({
name:'OtherStandardDetails',
@@ -478,7 +478,7 @@ export default {
})
window.open(routeUrl4.href, '_blank')
break
- // 数据化条目
+ // 数据化条目
case 'items':
this.itemsToPage(item)
break
@@ -496,7 +496,7 @@ export default {
})
window.open(routeUrl.href, '_blank')
break
- // 企标
+ // 企标
case 'BUS':
let routeUrl2 = this.$router.resolve({
name: 'OtherBussStandardDetails',
@@ -507,7 +507,7 @@ export default {
})
window.open(routeUrl2.href, '_blank')
break
- // 政策
+ // 政策
case 'LAWS':
let routeUrl3 = this.$router.resolve({
name: 'OtherLawsDetails',
@@ -637,10 +637,10 @@ export default {
})
},
/**
- * @description: 条件查询选项checkbox
- * @author: chenxiaoxi
- * @date: 2018/12/19 11:38:21
- */
+ * @description: 条件查询选项checkbox
+ * @author: chenxiaoxi
+ * @date: 2018/12/19 11:38:21
+ */
optChecked (key, value) {
if (value === 'All') {
this.AllCheck = true
@@ -909,10 +909,10 @@ export default {
this.searchSarByInputKey()
},
/**
- * @description: 查询选项
- * @author: chenxiaoxi
- * @date: 2018/12/19 13:51:31
- */
+ * @description: 查询选项
+ * @author: chenxiaoxi
+ * @date: 2018/12/19 13:51:31
+ */
queryOptions () {
this.$http.get('sys/dictype/getDicTypeListCode', '', {
_this: this,
@@ -1005,16 +1005,17 @@ export default {
this.searchOriginOptions = this.searchOptions
this.saveAllSortOptions = res.data.STANDCLASSIFY
this.saveAllFineOptions = res.data.BUSSFINECLASSSHOW
+ this.lawssStateOptions = res.data.LAWSSTATE // 文本状态数组
this.filterOptions(this.selectIndex)
}
}, e => {})
},
/**
- * @description: 选项过滤(根据资源类型过滤条件)
- * @author: chenxiaoxi
- * @date: 2018/12/20 11:34:36
- */
+ * @description: 选项过滤(根据资源类型过滤条件)
+ * @author: chenxiaoxi
+ * @date: 2018/12/20 11:34:36
+ */
filterOptions (resType) {
return new Promise((resolve, reject) => {
let filterOptions = {}
@@ -1059,7 +1060,7 @@ export default {
filterOptions.ZRLX.title = '准入类型'
filterOptions.ZRLX.index = 3
// 我司参与状态
- filterOptions.CYSD = originOptions.CYSD
+ filterOptions.CYSD = originOptions.SHIFOU
filterOptions.CYSD.title = '我司是否参与'
filterOptions.CYSD.index = 4
break
@@ -1074,9 +1075,9 @@ export default {
filterOptions.standState.title = '标准状态'
filterOptions.standState.index = 2
// 我司参与状态
- filterOptions.CYSD = originOptions.CYSD
- filterOptions.CYSD.title = '我司参与深度'
- filterOptions.CYSD.index = 3
+ // filterOptions.CYSD = originOptions.CYSD
+ // filterOptions.CYSD.title = '我司参与深度'
+ // filterOptions.CYSD.index = 3
// 监管类型
filterOptions.ZRLX = originOptions.ZRLX
filterOptions.ZRLX.title = '监管类型'
@@ -1085,8 +1086,8 @@ export default {
filterOptions.CLLX = originOptions.CLLX
filterOptions.CLLX.index = 5
// 采标程度
- filterOptions.CBCD = originOptions.CBCD
- filterOptions.CBCD.index = 6
+ // filterOptions.CBCD = originOptions.CBCD
+ // filterOptions.CBCD.index = 6
break
// 企业标准
case 'enterprise':
@@ -1142,11 +1143,11 @@ export default {
* @Description: 根据搜索条件搜索
* @author zmf
* @date 2021/3/2
- */
+ */
searchSarByInputKeyByCondition(){
- this.pageAll = 1
- this.page = 1
- this.searchSarByInputKey()
+ this.pageAll = 1
+ this.page = 1
+ this.searchSarByInputKey()
},
/**
@@ -1289,10 +1290,10 @@ export default {
window.open('/api/search/searchCenter/exportSearchCenterDatas?exportDatas=' + searchInfoEO + '&searchType=' + this.selectIndex)
},
/**
- * @description: 获取key值
- * @author: chenxiaoxi
- * @date: 2018/12/20 15:43:51
- */
+ * @description: 获取key值
+ * @author: chenxiaoxi
+ * @date: 2018/12/20 15:43:51
+ */
getKey (key) {
switch (key) {
case 'SARPROPERTY':
@@ -1329,10 +1330,10 @@ export default {
},
/**
- * @description: 获取表格标题
- * @author: chenxiaoxi
- * @date: 2018/12/21 09:27:50
- */
+ * @description: 获取表格标题
+ * @author: chenxiaoxi
+ * @date: 2018/12/21 09:27:50
+ */
getResultColumns () {
const resultColumns = {
index: {
@@ -1525,21 +1526,21 @@ export default {
}
}, this.$t('m.More')),
h('DropdownMenu', {// 创建一个和a标签同级的标签
- slot: 'list' // iview组件内部的属性定义在其标签的对象里
- },
- this.dropdownItemsCollect.map(function (type) { // 把map看作循环,type看作循环的每一项
- return h('DropdownItem', {
- props: {
- name: type.val
- },
- directives: [
- {
- name: 'btn-permission',
- value: type.val === '分享' ? 'NG1592AYR5' : (type.val === '取消收藏' ? 'FB3R3TVALD' : '')
- }
- ]
- }, type.val)
- })
+ slot: 'list' // iview组件内部的属性定义在其标签的对象里
+ },
+ this.dropdownItemsCollect.map(function (type) { // 把map看作循环,type看作循环的每一项
+ return h('DropdownItem', {
+ props: {
+ name: type.val
+ },
+ directives: [
+ {
+ name: 'btn-permission',
+ value: type.val === '分享' ? 'NG1592AYR5' : (type.val === '取消收藏' ? 'FB3R3TVALD' : '')
+ }
+ ]
+ }, type.val)
+ })
)
])
])
@@ -1584,21 +1585,21 @@ export default {
}
}, this.$t('m.More')),
h('DropdownMenu', {// 创建一个和a标签同级的标签
- slot: 'list' // iview组件内部的属性定义在其标签的对象里
- },
- this.dropdownItems.map(function (type) { // 把map看作循环,type看作循环的每一项
- return h('DropdownItem', {
- props: {
- name: type.val
- },
- directives: [
- {
- name: 'btn-permission',
- value: type.val === '分享' ? 'NG1592AYR5' : (type.val === '收藏' ? 'FB3R3TVALD' : '')
- }
- ]
- }, type.val)
- })
+ slot: 'list' // iview组件内部的属性定义在其标签的对象里
+ },
+ this.dropdownItems.map(function (type) { // 把map看作循环,type看作循环的每一项
+ return h('DropdownItem', {
+ props: {
+ name: type.val
+ },
+ directives: [
+ {
+ name: 'btn-permission',
+ value: type.val === '分享' ? 'NG1592AYR5' : (type.val === '收藏' ? 'FB3R3TVALD' : '')
+ }
+ ]
+ }, type.val)
+ })
)
])
])
@@ -1708,27 +1709,27 @@ export default {
},
/**
- * @description: 页码切换
- * @author: chenxiaoxi
- * @date: 2018/12/21 10:20:28
- */
+ * @description: 页码切换
+ * @author: chenxiaoxi
+ * @date: 2018/12/21 10:20:28
+ */
pageChange (page) {
this.page = page
this.searchSarBykey()
},
/**
- * @description: 每页条数切换
- * @author: chenxiaoxi
- * @date: 2018/12/21 10:20:56
- */
+ * @description: 每页条数切换
+ * @author: chenxiaoxi
+ * @date: 2018/12/21 10:20:56
+ */
pageSizeChange (pageSize) {
this.searchSarBykey()
},
/**
- *@desc:点击全部-分页
- *@author: zhangRui
- *@time: 2020/10/18 16:13:14
- */
+ *@desc:点击全部-分页
+ *@author: zhangRui
+ *@time: 2020/10/18 16:13:14
+ */
pageChangeAll (page) {
this.pageAll = page
this.searchSarByInputKey()
@@ -1850,10 +1851,10 @@ export default {
},
/**
- * @description: 页面滚动
- * @author: chenxiaoxi
- * @date: 2018/12/21 10:39:11
- */
+ * @description: 页面滚动
+ * @author: chenxiaoxi
+ * @date: 2018/12/21 10:39:11
+ */
handleScrollHeader () {
const top = document.documentElement.scrollTop
if (top > 100) {
@@ -2264,11 +2265,11 @@ export default {
pagetype = 'FOREIGN_STAND'
}
}else {
- this.$message({
- message: '无权访问',
- type: 'warning'
- })
- }
+ this.$message({
+ message: '无权访问',
+ type: 'warning'
+ })
+ }
} else if (item.type === 'laws') {
if (this.$hasPermission('A2HDHMEA6W') && this.$hasPermission('HK36LHK9444NPN8X634W')){
routername = 'OtherLawsDetails'
@@ -2365,6 +2366,17 @@ export default {
handleSearchReset() {
this.resultKeyword = ''
this.searchSarByInputKey()
+ },
+ // 回显政策状态
+ getLawsState (val) {
+ if (!val) {
+ val = ''
+ }
+ let lawsStateName = this.lawssStateOptions.filter(item => {
+ return val.indexOf(item.value) > -1
+ }).map(item => item.label)
+
+ return lawsStateName.join(',')
}
},
components: {
@@ -2482,559 +2494,572 @@ export default {
}
-
diff --git a/src/sysConfig/index.js b/src/sysConfig/index.js
index efa7258d3..eb8f863a6 100644
--- a/src/sysConfig/index.js
+++ b/src/sysConfig/index.js
@@ -6,7 +6,7 @@
// 服务器地址
// const devIp = '39.98.140.126'
// const devInterfacePORT = '10005'
-const devIp = '192.168.10.47'
+const devIp = '192.168.10.178'
const devInterfacePORT = '9999'
// 云端端口号
const DEV_CLOUD_RES_INTERFACE_PORT = '7777'