diff --git a/src/api/index.js b/src/api/index.js index c3a0d689..f06b3b93 100644 --- a/src/api/index.js +++ b/src/api/index.js @@ -34,6 +34,7 @@ function sendGetRequest(url, data) { }) }); } + function sendUploadRequest(url, data) { // 一个状态为resolve（包裹的是数据） // 或者状态为reject （包裹的是错误信息） @@ -743,4 +744,50 @@ getIccid(data){ code_getplant(data){ return sendGetRequest(`/code/getplant`, data) }, + + //官网接口 + // 轮播图 + website_getows(data){ + return sendGetRequest(`/website/getowsManagement`, data) + }, + website_addows(data){ + return sendPostRequest(`/website/addows`, data) + }, + website_updateows(data){ + return sendPutRequest(`/website/updateows`, data) + }, + website_delows(data){ + return sendDelRequest(`/website/delows`, data) + }, + + //产品展示 + website_getowp(data){ + return sendGetRequest(`/website/getowp`, data) + }, + website_getowpManagement(data){ + return sendGetRequest(`/website/getowpManagement`, data) + }, + // 综合 产品/案例/新闻列表 + website_getowpabyowpidMan(data){ + return sendGetRequest(`/website/getowpabyowpidMan`, data) + }, + website_addops(data){ + return sendPostRequest(`/website/addops`, data) + }, + website_updateops(data){ + return sendPutRequest(`/website/updateops`, data) + }, + website_delops(data){ + return sendDelRequest(`/website/delops`, data) + }, + + //案例介绍 + website_getcaseintroduction(data){ + return sendGetRequest(`/website/getcaseintroduction`, data) + }, + //管理官网页面上传图片 + websiteUploadImage(data) { + return sendUploadRequest(`/website/uploadows`, data) + }, + }; diff --git a/src/assets/css/main.css b/src/assets/css/main.css index ec89ba52..b0f5f6e4 100644 --- a/src/assets/css/main.css +++ b/src/assets/css/main.css @@ -20,6 +20,7 @@ cursor: pointer; background: #0294E2; border: 3px solid #013769; + color: #0077b1; } .scroll::-webkit-scrollbar-thumb:hover, .el-dropdown-menu::-webkit-scrollbar-thumb:hover, .index .index-content > .left::-webkit-scrollbar-thumb:hover, .index .index-content > .right.right-page .page-content::-webkit-scrollbar-thumb:hover, .formula .page-content::-webkit-scrollbar-thumb:hover, .realTime::-webkit-scrollbar-thumb:hover, .realTime .page-content .realTime-bottom.weather .left-view-new::-webkit-scrollbar-thumb:hover, .history .page-content .el-table--scrollable-x .el-table__body-wrapper::-webkit-scrollbar-thumb:hover, .vrcode-model .el-dialog::-webkit-scrollbar-thumb:hover, .el-table .el-table__body-wrapper::-webkit-scrollbar-thumb:hover { @@ -3292,6 +3293,34 @@ textarea { color: #92B1D0; } +.m-t-34 { + margin-top: 34px; +} + +.manage-textarea { + width: 100%; +} + +.manage-textarea .input-title { + font-family: Microsoft YaHei; + font-weight: 400; + font-size: 16px; + color: #FFFFFF; + margin-bottom: 10px; +} + +.manage-textarea textarea { + width: 100%; + padding: 10px; + height: 110px; + background: rgba(0, 186, 255, 0.15); + border: 2px solid rgba(0, 186, 255, 0.4); + padding-left: 15px; + font-family: Microsoft YaHei; + font-weight: 400; + color: #FFFFFF; +} + .vrcode-input-sel { margin-right: 30px; margin-bottom: 15px; @@ -3482,6 +3511,10 @@ textarea { position: relative; background: rgba(0, 132, 255, 0.15); border: 2px solid rgba(0, 132, 255, 0.35); + min-height: 200px; + display: flex; + align-items: center; + justify-content: center; padding: 10px; } @@ -3491,6 +3524,13 @@ textarea { min-height: 200px; } +.vrcode-model.manage-model .manage-right .manage-img .upload-img { + width: 100px; + height: 100px; + min-height: unset; + cursor: pointer; +} + .vrcode-model.manage-model .manage-right .manage-img #sel-img { width: 0; height: 0; diff --git a/src/assets/css/main.scss b/src/assets/css/main.scss index af842dcb..e7299138 100644 --- a/src/assets/css/main.scss +++ b/src/assets/css/main.scss @@ -21,6 +21,7 @@ cursor: pointer; background: #0294E2; border: 3px solid #013769; + color: #0077b1; } &::-webkit-scrollbar-thumb:hover { @@ -3493,6 +3494,30 @@ textarea{ } } } +.m-t-34{ + margin-top: 34px; +} +.manage-textarea{ + width: 100%; + .input-title { + font-family: Microsoft YaHei; + font-weight: 400; + font-size: 16px; + color: #FFFFFF; + margin-bottom: 10px; +} +textarea{ + width: 100%; + padding:10px; + height: 110px; + background: rgba(0, 186, 255, 0.15); + border: 2px solid rgba(0, 186, 255, 0.4); + padding-left: 15px; + font-family: Microsoft YaHei; + font-weight: 400; + color: #FFFFFF; +} +} .vrcode-input-sel { margin-right: 30px; @@ -3682,13 +3707,21 @@ textarea{ // height: 290px; background: rgba(0, 132, 255, 0.15); border: 2px solid rgba(0, 132, 255, 0.35); - + min-height: 200px; + display: flex; + align-items: center; + justify-content: center; img { width: 360px; height: auto; min-height: 200px; } - + .upload-img{ + width: 100px; + height: 100px; + min-height: unset; + cursor: pointer; + } padding: 10px; #sel-img { @@ -3715,7 +3748,7 @@ textarea{ font-size: 14px; color: #00C0F7; } - + .manage-img-small { width: 240px; height: 160px; diff --git a/src/assets/img/upload-img.png b/src/assets/img/upload-img.png new file mode 100644 index 00000000..c8dc1282 Binary files /dev/null and b/src/assets/img/upload-img.png differ diff --git a/src/router/index.js b/src/router/index.js index 83d75883..5413a89f 100644 --- a/src/router/index.js +++ b/src/router/index.js @@ -96,7 +96,7 @@ const routes = [ path: '/systemManage', name: 'systemManage', component: () => import('../views/page/systemManage.vue') - },{ + },{//管理页面 path: '/manage', name: 'manage', component: () => import('../views/manage/index.vue'), @@ -137,7 +137,20 @@ const routes = [ path: '/videoManage', name: 'videoManage', component: () => import('../views/manage/videoManage.vue') - },] + }, + // 官网修改 + { + path: '/officialWebsiteBanner', + name: 'officialWebsiteBanner', + component: () => import('../views/officialWebsite/banner.vue') + }, + // 官网修改 + { + path: '/officialWebsiteCase', + name: 'officialWebsiteCase', + component: () => import('../views/officialWebsite/case.vue') + }, + ] }, { path: '/control', diff --git a/src/views/index.vue b/src/views/index.vue index 373403c2..7811c175 100644 --- a/src/views/index.vue +++ b/src/views/index.vue @@ -104,7 +104,7 @@ export default { // { name: '设备菜单', router: '', routerList: [], img: require('../assets/image/header-img5.png') }, //systemManage systemManage // manage - { name: '管理', router: 'manage', routerList: ['manage','dataDevice','deviceStatusSet','deviceSet','deviceInfoManage','weatherData','mobileControl','userInfoControl','deviceManage','videoManage'], img: require('../assets/image/header-img6.png') }, + { name: '管理', router: 'manage', routerList: ['manage','dataDevice','deviceStatusSet','officialWebsiteBanner','officialWebsiteCase','deviceSet','deviceInfoManage','weatherData','mobileControl','userInfoControl','deviceManage','videoManage'], img: require('../assets/image/header-img6.png') }, { name: '大数据', router: 'largeScreen', routerList: ['largeScreen'], img: require('../assets/image/header-img8.png') } ], @@ -137,8 +137,10 @@ export default { 'dataDevice', 'mobileControl', 'userInfoControl', +'officialWebsiteCase', 'deviceManage', -'videoManage',], +'videoManage', +'officialWebsiteBanner',], activeNames1: [3,2], routerNow: 'realTime', deviceName: 1, @@ -404,6 +406,8 @@ export default { { name: '管理员管理', routerList: [''], img: require('../assets/image/left-img0.png'), list: [ {deviceTypeName:'用户信息管理',router:'userInfoControl',index:6}, {deviceTypeName:'设备管理',router:'deviceManage',index:7}, + {deviceTypeName:'官网顶部轮播图管理',router:'officialWebsiteBanner',index:8}, + {deviceTypeName:'官网案例管理',router:'officialWebsiteCase',index:9}, // {deviceTypeName:'摄像头信息管理',router:'videoManage',index:8}, ] }, ] diff --git a/src/views/officialWebsite/banner.vue b/src/views/officialWebsite/banner.vue new file mode 100644 index 00000000..abe065d9 --- /dev/null +++ b/src/views/officialWebsite/banner.vue @@ -0,0 +1,297 @@ + + + \ No newline at end of file diff --git a/src/views/officialWebsite/case.vue b/src/views/officialWebsite/case.vue new file mode 100644 index 00000000..2f1b8dee --- /dev/null +++ b/src/views/officialWebsite/case.vue @@ -0,0 +1,284 @@ + + + \ No newline at end of file diff --git a/src/views/officialWebsite/new.vue b/src/views/officialWebsite/new.vue new file mode 100644 index 00000000..2f1b8dee --- /dev/null +++ b/src/views/officialWebsite/new.vue @@ -0,0 +1,284 @@ + + + \ No newline at end of file diff --git a/src/views/officialWebsite/productList.vue b/src/views/officialWebsite/productList.vue new file mode 100644 index 00000000..2f1b8dee --- /dev/null +++ b/src/views/officialWebsite/productList.vue @@ -0,0 +1,284 @@ + + + \ No newline at end of file diff --git a/vue.config.js b/vue.config.js index 2debc61b..ada31900 100644 --- a/vue.config.js +++ b/vue.config.js @@ -41,8 +41,10 @@ module.exports = { // https:true, proxy: { "/api": { - target: 'https://api.lihe-control.com', //地址 + // target: 'https://api.lihe-control.com', //地址 // target: 'http://jiaxingtest.a1.luyouxia.net:21114', //地址 + target: 'http://jiaxingtest.a1.luyouxia.net:25762', //地址 + changeOrigin: true, pathRewrite: { "^/api": "",