diff --git a/src/views/resources/comps/left/bottom/1/index.js b/src/views/resources/comps/left/bottom/1/index.js
index fae26e0..b8bb6bf 100644
--- a/src/views/resources/comps/left/bottom/1/index.js
+++ b/src/views/resources/comps/left/bottom/1/index.js
@@ -3,8 +3,13 @@ import PannelTabs from '@/components/pannel-tabs/index.vue';
import Bar from '@/components/charts/bar/index.vue';
import { resourceOutsourcingAnalysis } from '../../../../api/index.js'
import { mapGetters } from 'vuex'
+import PopWindow from '@/components/pop-window/index.vue';
+import MyTable from './my-table/index.vue';
+
export default {
components: {
+ MyTable,
+ PopWindow,
Bar,
PannelTabs,
Pannel
@@ -28,6 +33,7 @@ export default {
},
data () {
return {
+ popIsOpen: false,
isLoad: false,
pannelTabData: [
{
@@ -47,8 +53,17 @@ export default {
mounted () {
},
methods: {
+ closePop () {
+ this.popIsOpen = false
+ },
titleCilck () {
- console.log(222);
+ this.popIsOpen = true
+ },
+ /**
+ * 打开弹窗
+ */
+ openPop () {
+
},
getData () {
if (this.year, this.deptId) {
diff --git a/src/views/resources/comps/left/bottom/1/my-table/index.html b/src/views/resources/comps/left/bottom/1/my-table/index.html
new file mode 100644
index 0000000..277dedd
--- /dev/null
+++ b/src/views/resources/comps/left/bottom/1/my-table/index.html
@@ -0,0 +1,20 @@
+
+
+
+
+
+
+ {{scope.row.resourceType | fmtresourceType}}
+
+
+
+
+
+
+
+
+ 查看
+
+
+
+
\ No newline at end of file
diff --git a/src/views/resources/comps/left/bottom/1/my-table/index.js b/src/views/resources/comps/left/bottom/1/my-table/index.js
new file mode 100644
index 0000000..e998dda
--- /dev/null
+++ b/src/views/resources/comps/left/bottom/1/my-table/index.js
@@ -0,0 +1,77 @@
+import { mapGetters } from 'vuex';
+import { ResourceList } from '../../../../../api/index.js';
+const map = {
+ '1': '农用地',
+ '2': '建设用地',
+ '3': '未利用地、林木'
+}
+export default {
+ components: {
+ },
+ computed: {
+ ...mapGetters(['year', 'deptId'])
+ },
+ watch: {
+ year: {
+ handler () {
+ this.getData();
+ },
+ immediate: true, // 立即执行
+ },
+ deptId: {
+ handler () {
+ this.getData();
+ },
+ immediate: true, // 立即执行
+ }
+ },
+ data () {
+ return {
+ tableData: [
+ {
+ date: '2016-05-02',
+ name: '王小虎',
+ address: '上海市普陀区金沙江路 1518 弄'
+ },
+ {
+ date: '2016-05-04',
+ name: '王小虎',
+ address: '上海市普陀区金沙江路 1517 弄'
+ },
+ {
+ date: '2016-05-01',
+ name: '王小虎',
+ address: '上海市普陀区金沙江路 1519 弄'
+ },
+ {
+ date: '2016-05-03',
+ name: '王小虎',
+ address: '上海市普陀区金沙江路 1516 弄'
+ }
+ ]
+ };
+ },
+ filters: {
+ fmtresourceType: function (val) {
+ return map[val]
+ }
+ },
+ methods: {
+ look (info) {
+ if (info.attachments) {
+ window.open(info.attachments.fileUrl)
+ } else {
+ return
+ }
+ },
+ getData () {
+ if (this.year, this.deptId) {
+ this.isLoad = false;
+ ResourceList(this.deptId, this.year).then(res => {
+ this.tableData = res.rows;
+ this.isLoad = true;
+ })
+ }
+ },
+ }
+};
diff --git a/src/views/resources/comps/left/bottom/1/my-table/index.scss b/src/views/resources/comps/left/bottom/1/my-table/index.scss
new file mode 100644
index 0000000..59f6d24
--- /dev/null
+++ b/src/views/resources/comps/left/bottom/1/my-table/index.scss
@@ -0,0 +1,53 @@
+.my_table {
+ // border: 1px solid red;
+ width: 100%;
+ height: 100%;
+}
+
+.look {
+ color: rgba(15, 252, 252, 1);
+}
+
+::v-deep .el-table__body-wrapper::-webkit-scrollbar {
+ display: none;
+ width: 0;
+ height: 0;
+}
+
+
+
+// 去掉el-table的所有背景颜色以及所有hover的颜色
+::v-deep .el-table,
+
+::v-deep .el-table--border {
+ background-color: transparent !important;
+ color: rgba(214, 234, 252, 1);
+ border: 0;
+}
+
+::v-deep .el-table .el-table__header-wrapper th {
+ background-color: rgba(44, 116, 223, 0.462) !important;
+ color: rgba(214, 234, 252, 1);
+ border: 0;
+}
+
+::v-deep .el-table tr,
+::v-deep .el-table__body tr:hover>td {
+ border: 0;
+ background-color: transparent !important;
+}
+
+::v-deep.el-table--striped .el-table__body tr.el-table__row--striped td {
+ border: 0;
+ // background-color: transparent !important;
+ background: rgba(49, 129, 246, 0.1);
+}
+
+::v-deep.el-table td,
+.el-table th.is-leaf {
+ border: 0;
+}
+
+::v-deep .my_table .el-table .el-table__header-wrapper {
+ background-color: rgba(44, 117, 223, 1) !important;
+}
\ No newline at end of file
diff --git a/src/views/resources/comps/left/bottom/1/my-table/index.vue b/src/views/resources/comps/left/bottom/1/my-table/index.vue
new file mode 100644
index 0000000..5ac9224
--- /dev/null
+++ b/src/views/resources/comps/left/bottom/1/my-table/index.vue
@@ -0,0 +1,4 @@
+
+
+