diff --git a/src/components/upload.vue b/src/components/upload.vue
new file mode 100644
index 0000000..2e041da
--- /dev/null
+++ b/src/components/upload.vue
@@ -0,0 +1,483 @@
+
+
+
+
+
+ {{ tips }}
+ {{ tips2 }}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/src/main.js b/src/main.js
index 174f751..9a4957a 100644
--- a/src/main.js
+++ b/src/main.js
@@ -5,8 +5,10 @@ import 'element-ui/lib/theme-chalk/index.css';
import router from './router'
import store from './store'
import Message from './components/message';
+import erupload from "./components/upload";
Vue.use(ElementUI);
Vue.use(Message)
+Vue.component('erupload', erupload)
const vm = new Vue({
el: '#app',
diff --git a/src/utils/request.js b/src/utils/request.js
index 030db14..5e601f9 100644
--- a/src/utils/request.js
+++ b/src/utils/request.js
@@ -4,7 +4,8 @@ import vm from "../main";
import { getToken } from '@/utils/auth'
axios.defaults.headers['Content-Type'] = 'application/json;charset=utf-8'
const request = axios.create({
- baseURL: 'http://172.18.113.50:8080/zhapi',
+ //baseURL: 'http://172.18.113.50:8080/zhapi',
+ baseURL: 'http://192.168.0.188:8118/zhapi',
//baseURL: `http://${window.location.host}/zhapi`,
timeout: 50000,
headers: { 'content-type': 'application/json' },
diff --git a/src/views/archives/fangke.vue b/src/views/archives/fangke.vue
index ca0067c..e13f3f0 100644
--- a/src/views/archives/fangke.vue
+++ b/src/views/archives/fangke.vue
@@ -14,7 +14,7 @@
- 搜索
+ 搜索
{
this.tableData = res.data
this.total = res.total
diff --git a/src/views/systemManagement/companyList/components/companyDataDialog.vue b/src/views/systemManagement/companyList/components/companyDataDialog.vue
index 88ae0af..b786031 100644
--- a/src/views/systemManagement/companyList/components/companyDataDialog.vue
+++ b/src/views/systemManagement/companyList/components/companyDataDialog.vue
@@ -1,22 +1,12 @@
-
+
企业工商信息
-
+
@@ -45,43 +35,27 @@
-
-
+
+
+
+
-
+
- {{ item.label }}
+ {{ item.label }}
@@ -93,11 +67,7 @@
企业联系人信息
-
+
@@ -109,82 +79,35 @@
企业位置信息
-
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
@@ -196,11 +119,7 @@
-
+
@@ -208,25 +127,14 @@
管辖区信息
-
+
-
-
+
+
@@ -308,7 +216,7 @@ export default {
belongingArea: "",
},
imageUrl: "",
- upUrl: `http://172.18.113.50:8080/zhapi/safety/system/enterpriseList`, // 图片上传地址
+ upUrl: `http://192.168.0.188:8118/zhapi/safety/system/enterpriseList`, // 图片上传地址
upheaders: {
Authorization: localStorage.getItem("AuthorizationToken"),
},
@@ -450,6 +358,10 @@ export default {
.toString();
}
},
+ upSuccess(val) {
+ console.log(val, '图片上传成功回调参数');
+ this.form.picUrl = val
+ },
// 确定数据
saveFormData() {
const params = this.form;
@@ -517,6 +429,15 @@ export default {
color: #fff;
text-shadow: 0 0 9px rgba(21, 255, 198, 0.64);
}
+
+ .el-upload__tip {
+ margin: 5px 0 5px 17px;
+ padding: 0;
+ }
+
+ .el-upload__tip:last-child {
+ font-size: 12px;
+ }
}
.el-button {
@@ -595,9 +516,11 @@ export default {
background: url("~@/assets/companyFile/242112.png") no-repeat !important;
background-size: 100% 100% !important;
}
+
.commerceMessage {
margin-top: -17px;
}
+
/* 为适应上传图片表单布局把企业工商表单拆分 */
.commerceMessage_one {
display: flex;
@@ -717,8 +640,10 @@ export default {
}
}
}
+
.el-form-item.companyAddress_text {
width: 870px !important;
+
.el-form-item__content {
.el-input__inner {
width: 762px;
diff --git a/src/views/systemManagement/correlationEquipment/components/equipmentTable.vue b/src/views/systemManagement/correlationEquipment/components/equipmentTable.vue
index 15a27c1..3671fee 100644
--- a/src/views/systemManagement/correlationEquipment/components/equipmentTable.vue
+++ b/src/views/systemManagement/correlationEquipment/components/equipmentTable.vue
@@ -6,24 +6,15 @@
-
+
-
+
-
+
搜索
@@ -36,17 +27,11 @@
-
+
-
+
@@ -59,59 +44,30 @@
-
+
- {{ item.label }}
+ {{ item.label }}
-
+
-
+
- 编辑
+ 编辑
- 详情
+ 详情
@@ -248,7 +204,7 @@ export default {
this.pushTableData = res.rows;
});
},
- // 视频搜索重置
+ // 视频搜索重置
resetVideo() {
(this.search.channel_code = ""),
(this.search.equipemnt_ip = ""),
@@ -312,13 +268,13 @@ export default {
this.only_params.pageNum = val
console.log('this.only_params', this.only_params);
if (this.table_title === "视频监控设备列表") {
- getVideoList(this.only_params).then((res) => {
- this.pushTableData = res.rows;
- });
+ getVideoList(this.only_params).then((res) => {
+ this.pushTableData = res.rows;
+ });
} else if (this.table_title === "智能感知设备列表") {
getPerceptionList(this.only_params).then((res) => {
- this.pushTableData = res.rows;
- });
+ this.pushTableData = res.rows;
+ });
}
},
},
@@ -334,11 +290,13 @@ export default {
.equipment_data_search {
margin-left: 12px;
+
/deep/.el-input__inner {
border-radius: 0px 0px 0px 0px;
background: #3c4b4a;
color: #fff;
}
+
.el-button {
width: 100%;
border: 1px solid #4a6072;
@@ -346,6 +304,7 @@ export default {
border-radius: 0px !important;
background: #323f43;
}
+
.el-button:focus,
.el-button:hover {
border: 1px solid#34e1b3;
@@ -353,8 +312,10 @@ export default {
background-size: 100% 100% !important;
}
}
+
.equipment_data_btn {
margin-left: 12px;
+
.el-button {
width: 90px;
height: 5vh;
@@ -364,6 +325,7 @@ export default {
background: url("~@/assets/companyFile/btn1.png") no-repeat !important;
background-size: 100% 100% !important;
}
+
.el-button:focus,
.el-button:hover {
filter: brightness(200%);
@@ -381,20 +343,39 @@ export default {
.el-table__expanded-cell {
color: #fff;
background-color: transparent;
+
}
/deep/.el-table {
- height: 27vh;
+ .el-table__body-wrapper {
+
+ overflow: auto;
+
+ &::-webkit-scrollbar {
+ width: 3px;
+ }
+
+ // 滚动条里面默认的小方块,自定义样式
+ &::-webkit-scrollbar-thumb {
+ background: #4CF993;
+ border-radius: 2px;
+ }
+
+ // 滚动条里面的轨道
+ &::-webkit-scrollbar-track {
+ background: transparent;
+ }
+
+ }
+
thead {
text-align: center;
color: #fff;
font-weight: 500;
- background: linear-gradient(
- to right,
- #284f49,
- #2f6363,
- #233b38
- ) !important;
+ background: linear-gradient(to right,
+ #284f49,
+ #2f6363,
+ #233b38) !important;
& th {
background-color: transparent;
@@ -404,6 +385,7 @@ export default {
background-color: transparent;
}
}
+
tr {
background: #233438;
}
@@ -416,6 +398,7 @@ export default {
width: 100%;
height: 0px;
}
+
/deep/.el-button.operation {
width: 40px;
height: 30px;
@@ -423,6 +406,7 @@ export default {
border: 0px;
color: #fff;
}
+
/deep/.el-button.operation:hover,
.el-button.operation:focus {
width: 40px;
@@ -436,30 +420,36 @@ export default {
.el-pagination {
margin-left: 50%;
+
/deep/.el-pagination__total {
color: #fff;
}
+
/deep/.el-input__inner {
border-radius: 0px;
background: #3c4b4a;
color: #fff;
}
+
/deep/.btn-prev {
border-radius: 0px;
background: #3c4b4a;
color: #fff;
}
+
/deep/ul {
li {
background: #3c4b4a;
color: #fff;
}
}
+
/deep/.btn-next {
border-radius: 0px;
background: #3c4b4a;
color: #fff;
}
+
/deep/ .el-pager {
li {
background: #3c4b4a !important;