From 2479b946b95e57bdd959c9d43b97921fc84be37b Mon Sep 17 00:00:00 2001
From: hailin <1356886193@qq.com>
Date: 星期二, 01 八月 2023 09:11:41 +0800
Subject: [PATCH] 标准库jack的第一次提交
---
src/components/view/standard.vue | 6
src/main.js | 26 +-
src/components/view/technical.vue | 265 +++++++++++++++++++++++++++++++++
src/App.vue | 49 ++++++
src/components/view/standard-table/technology.vue | 66 +++++++
src/view/index.vue | 2
README.md | 42 -----
src/assets/api/controller.js | 10 +
8 files changed, 406 insertions(+), 60 deletions(-)
diff --git a/README.md b/README.md
index fad88b5..60ad219 100644
--- a/README.md
+++ b/README.md
@@ -1,44 +1,3 @@
-<<<<<<< HEAD
-# 鍓嶇涓ぉ娴锋磱
-
-#### 浠嬬粛
-{**浠ヤ笅鏄� Gitee 骞冲彴璇存槑锛屾偍鍙互鏇挎崲姝ょ畝浠�**
-Gitee 鏄� OSCHINA 鎺ㄥ嚭鐨勫熀浜� Git 鐨勪唬鐮佹墭绠″钩鍙帮紙鍚屾椂鏀寔 SVN锛夈�備笓涓哄紑鍙戣�呮彁渚涚ǔ瀹氥�侀珮鏁堛�佸畨鍏ㄧ殑浜戠杞欢寮�鍙戝崗浣滃钩鍙�
-鏃犺鏄釜浜恒�佸洟闃熴�佹垨鏄紒涓氾紝閮借兘澶熺敤 Gitee 瀹炵幇浠ｇ爜鎵樼銆侀」鐩鐞嗐�佸崗浣滃紑鍙戙�備紒涓氶」鐩鐪� [https://gitee.com/enterprises](https://gitee.com/enterprises)}
-
-#### 杞欢鏋舵瀯
-杞欢鏋舵瀯璇存槑
-
-
-#### 瀹夎鏁欑▼
-
-1. xxxx
-2. xxxx
-3. xxxx
-
-#### 浣跨敤璇存槑
-
-1. xxxx
-2. xxxx
-3. xxxx
-
-#### 鍙備笌璐＄尞
-
-1. Fork 鏈粨搴�
-2. 鏂板缓 Feat_xxx 鍒嗘敮
-3. 鎻愪氦浠ｇ爜
-4. 鏂板缓 Pull Request
-
-
-#### 鐗规妧
-
-1. 浣跨敤 Readme\_XXX.md 鏉ユ敮鎸佷笉鍚岀殑璇█锛屼緥濡� Readme\_en.md, Readme\_zh.md
-2. Gitee 瀹樻柟鍗氬 [blog.gitee.com](https://blog.gitee.com)
-3. 浣犲彲浠� [https://gitee.com/explore](https://gitee.com/explore) 杩欎釜鍦板潃鏉ヤ簡瑙� Gitee 涓婄殑浼樼寮�婧愰」鐩�
-4. [GVP](https://gitee.com/gvp) 鍏ㄧО鏄� Gitee 鏈�鏈変环鍊煎紑婧愰」鐩紝鏄患鍚堣瘎瀹氬嚭鐨勪紭绉�寮�婧愰」鐩�
-5. Gitee 瀹樻柟鎻愪緵鐨勪娇鐢ㄦ墜鍐� [https://gitee.com/help](https://gitee.com/help)
-6. Gitee 灏侀潰浜虹墿鏄竴妗ｇ敤鏉ュ睍绀� Gitee 浼氬憳椋庨噰鐨勬爮鐩� [https://gitee.com/gitee-stars/](https://gitee.com/gitee-stars/)
-=======
# vue_model
> A Vue.js project
@@ -60,4 +19,3 @@
```
For a detailed explanation on how things work, check out the [guide](http://vuejs-templates.github.io/webpack/) and [docs for vue-loader](http://vuejs.github.io/vue-loader).
->>>>>>> c1c41a4 (棣栨鎻愪氦)
diff --git a/src/App.vue b/src/App.vue
index 4244c2c..7dba306 100644
--- a/src/App.vue
+++ b/src/App.vue
@@ -115,4 +115,53 @@
.el-popper .popper__arrow{
display: none ;
}
+ /**淇敼鍏ㄥ眬鐨勬粴鍔ㄦ潯*/
+/**婊氬姩鏉＄殑瀹藉害*/
+::-webkit-scrollbar {
+ width: 8px;
+
+}
+::-webkit-scrollbar-thumb {
+ background-color: #bdbfc4;
+ border-radius: 3px;
+}
+/* 鍏ㄥ眬琛ㄦ牸鏍峰紡 */
+ .el-table th.el-table__cell ,
+ .has-gutter .el-table__cell {
+ background-color: #F0F1F5 !important;
+ color: #333;
+ }
+ .has-gutter .el-table__cell .cell {
+ font-size: 16px;
+ font-weight: 500;
+ }
+ .cell {
+ color:rgb(51, 51, 51);
+ padding-left: 17px !important;
+ font-size: 14px;
+ }
+ .cell span{
+ font-size: 14px;
+ font-weight: 400;
+ }
+ .el-table th.el-table__cell>.cell{
+ font-size: 16px;
+ font-weight: 400;
+ color:rgb(51, 51, 51);
+ }
+/* 鍏ㄥ眬鍒嗛〉鍣ㄦ牱寮� */
+ .el-pager .number {
+ font-size: 14px;
+ border: 1px solid rgba(0, 0, 0, 0.2);
+ border-radius: 4px;
+ margin: 0 2px;
+ color: #999;
+ font-weight: 500;
+ }
+
+ .el-pager .number.active {
+ background-color: #004EA2;
+ color: #fff;
+ border: 0;
+ }
</style>
diff --git a/src/assets/api/controller.js b/src/assets/api/controller.js
index 1c840a8..a82f0be 100644
--- a/src/assets/api/controller.js
+++ b/src/assets/api/controller.js
@@ -1,8 +1,16 @@
+// 鎶�鏈鐞�-鏍囧噯Bom
+const standard = {
+ selectTreeByMaterial: "material/selectTreeByMaterial", //鏌ヨ鐗╂枡鐨勬爲
+
+}
+
+
const url = {
"enter": "user/enter", //鐧诲綍
- "selectTreeByMaterial": "material/selectTreeByMaterial" //鏌ヨ鐗╂枡鐨勬爲
+ ...standard
}
+
export default function(Vue) {
//娣诲姞鍏ㄥ眬API
Vue.prototype.$api = {
diff --git a/src/components/view/standard-table/technology.vue b/src/components/view/standard-table/technology.vue
index 3d980c1..d6ceb2d 100644
--- a/src/components/view/standard-table/technology.vue
+++ b/src/components/view/standard-table/technology.vue
@@ -37,17 +37,23 @@
.standard .el-table__body {
height: 100%;
}
+ .standard .el-table .el-table__row:not([class*="el-table__row--level-"]) td:nth-child(3){
+ padding-left: 23px !important;
+ }
</style>
<template>
<div class="standard">
- <el-table :data="tableData" border style="width: 100%" @selection-change="handleSelectionChange" row-key="id" border
+ <el-table :data="tableData" border style="width: 100%" @selection-change="handleSelectionChange" row-key="id"
default-expand-all :tree-props="{children: 'children', hasChildren: 'hasChildren'}">
<el-table-column type="selection" width="50">
</el-table-column>
- <el-table-column type="index" label="搴忓彿" width="75">
+ <el-table-column type="index" label="搴忓彿" width="78">
</el-table-column>
<el-table-column prop="date" label="椤圭洰" width="350">
+ <template slot-scope="scope">
+ <span> <el-tag size="mini" :type="scope.row.children? '':'success'" :style="{borderRadius: '40%',marginRight: '12px'}">{{ scope.row.children? '01':'02' }}</el-tag> {{scope.row.date}}</span>
+ </template>
</el-table-column>
<el-table-column prop="name" label="鍗曚綅" width="180">
</el-table-column>
@@ -94,7 +100,61 @@
date: '2016-05-03',
name: '鐜嬪皬铏�',
address: '涓婃捣甯傛櫘闄�鍖洪噾娌欐睙璺� 1516 寮�'
- }],
+ },{
+ id: 5,
+ date: '2016-05-03',
+ name: '鐜嬪皬铏�',
+ address: '涓婃捣甯傛櫘闄�鍖洪噾娌欐睙璺� 1516 寮�'
+ },
+ {
+ id: 6,
+ date: '2016-05-03',
+ name: '鐜嬪皬铏�',
+ address: '涓婃捣甯傛櫘闄�鍖洪噾娌欐睙璺� 1516 寮�'
+ },
+ {
+ id: 7,
+ date: '2016-05-03',
+ name: '鐜嬪皬铏�',
+ address: '涓婃捣甯傛櫘闄�鍖洪噾娌欐睙璺� 1516 寮�'
+ },
+ {
+ id: 8,
+ date: '2016-05-03',
+ name: '鐜嬪皬铏�',
+ address: '涓婃捣甯傛櫘闄�鍖洪噾娌欐睙璺� 1516 寮�'
+ },
+ {
+ id: 9,
+ date: '2016-05-03',
+ name: '鐜嬪皬铏�',
+ address: '涓婃捣甯傛櫘闄�鍖洪噾娌欐睙璺� 1516 寮�'
+ },
+ {
+ id: 10,
+ date: '2016-05-03',
+ name: '鐜嬪皬铏�',
+ address: '涓婃捣甯傛櫘闄�鍖洪噾娌欐睙璺� 1516 寮�'
+ },
+ {
+ id: 11,
+ date: '2016-05-03',
+ name: '鐜嬪皬铏�',
+ address: '涓婃捣甯傛櫘闄�鍖洪噾娌欐睙璺� 1516 寮�'
+ },
+ {
+ id: 12,
+ date: '2016-05-03',
+ name: '鐜嬪皬铏�',
+ address: '涓婃捣甯傛櫘闄�鍖洪噾娌欐睙璺� 1516 寮�'
+ }
+ ,{
+ id: 13,
+ date: '2016-05-03',
+ name: '鐜嬪皬铏�',
+ address: '涓婃捣甯傛櫘闄�鍖洪噾娌欐睙璺� 1516 寮�'
+ }
+ ],
tableData1: [{
id: 1,
date: '2016-05-02',
diff --git a/src/components/view/standard.vue b/src/components/view/standard.vue
index 853d4a2..1d34855 100644
--- a/src/components/view/standard.vue
+++ b/src/components/view/standard.vue
@@ -210,7 +210,13 @@
if (a.type == b.id) b.children = [a]
})
})
+ this.$nextTick().then(() => {
+ const firstNode = document.querySelector('.el-tree-node .el-tree-node__children .el-tree-node .el-tree-node__children .el-tree-node .el-tree-node__children .el-tree-node')
+ firstNode.click()
+ // console.log(firstNode)
+ })
})
+
}
}
}
diff --git a/src/components/view/technical.vue b/src/components/view/technical.vue
new file mode 100644
index 0000000..9d0d780
--- /dev/null
+++ b/src/components/view/technical.vue
@@ -0,0 +1,265 @@
+
+<style scoped>
+ .technical{
+ height: 100%;
+ width: 100%;
+ }
+ .technical .title .el-button {
+ height: 32px;
+ border: 1px solid rgba(190, 190, 190, 0.44);
+ box-shadow: 0px 2px 4px rgba(220, 220, 220, 0.41);
+ padding: 0 12px;
+ }
+
+ .technical .title {
+ margin-bottom: 10px;
+ padding: 0 20px;
+ }
+
+/* 鎼滅储澶撮儴鏍峰紡 */
+.search-header{
+ background: #fff;
+ padding: 24px 32px;
+}
+.search-header .el-form-item{
+ margin: 0px;
+ font-size: 14px;
+}
+.search-header .el-form-item:nth-child(1){
+ margin-right: 48px;
+}
+.search-header .el-form-item:nth-child(2){
+ margin-right: 24px;
+}
+/* 閲嶇疆鍜屾煡璇袱涓寜閽牱寮� */
+.search-header .el-form-item .el-button{
+width: 65px;
+height: 32px;
+box-sizing: border-box;
+background: rgb(255, 255, 255);
+border: 1px solid rgb(217, 217, 217);
+border-radius:2px;
+padding: 0;
+font-size: 14px;
+}
+.search-header .el-form-item .el-button:nth-child(2){
+/* Rectangle 77 */
+background: rgb(0, 78, 162);
+color: #fff;
+}
+/* 杈撳叆妗嗙殑鏍峰紡 */
+>>> .search-header .el-form-item .el-input .el-input__inner{
+width: 224px;
+height: 32px ;
+box-sizing: border-box;
+background: rgb(255, 255, 255);
+border: 1px solid rgb(217, 217, 217);
+border-radius:2px;
+}
+
+
+/* 鎶�鏈枃浠惰〃鏍兼牱寮� */
+.technical-table{
+ margin-top: 11px;
+ height: calc(100% - 140px);
+ background: #fff;
+ padding: 23px 21px ;
+ font-size: 14px;
+ box-sizing: border-box;
+ display: flex;
+ flex-direction: column;
+}
+/* .technical-table .el-table{
+ overflow-y:scroll;
+} */
+.technical-table .table-box {
+ flex: 1;
+ overflow-y: scroll;
+}
+.technical-table .el-pagination{
+ margin-top: 23px;
+ display: flex;
+ justify-content: end;
+}
+</style>
+
+
+<template>
+ <div class="technical">
+ <div class="title">
+ <el-row>
+ <el-col :span="12">鎶�鏈枃浠�</el-col>
+ <el-col :span="12" style="text-align: right;">
+ <el-button icon="el-icon-plus">鐢熸垚椤圭洰涔�</el-button>
+ </el-col>
+ </el-row>
+ </div>
+ <div class="search-header">
+ <el-form v-model="searchData" :inline="true">
+ <el-form-item label="璁㈠崟鍙�:">
+ <el-input v-model="searchData.number"></el-input>
+ </el-form-item>
+ <el-form-item label="涓嬪崟鏃ユ湡:">
+ <el-date-picker
+ v-model="searchData.date"
+ type="date"
+ placeholder="閫夋嫨鏃ユ湡">
+ </el-date-picker>
+ </el-form-item>
+ <el-form-item>
+ <el-button plain @click="resetBtn">閲� 缃�</el-button>
+ <el-button @click="filteredTableData">鏌� 璇�</el-button>
+ </el-form-item>
+ </el-form>
+ </div>
+ <div class="technical-table">
+ <div class="table-box">
+ <el-table
+ border style="width: 100%"
+ :data="technicalTable"
+ >
+ <el-table-column
+ type="selection"
+ width="78">
+ </el-table-column>
+ <el-table-column
+ prop="date"
+ label="璁㈠崟鍙�"
+ width="124">
+ </el-table-column>
+ <el-table-column
+ prop="name"
+ label="宸ョ▼鍚嶇О"
+ width="160">
+ </el-table-column>
+ <el-table-column
+ prop="address"
+ label="浜у搧缂栫爜"
+ width="168"
+ >
+ </el-table-column>
+ <el-table-column
+ prop="name"
+ label="浜у搧澶х被"
+ width="128">
+ </el-table-column>
+ <el-table-column
+ prop="address"
+ label="瑙勬牸鍨嬪彿"
+ width="170">
+ </el-table-column>
+ <el-table-column
+ prop="name"
+ label="鍗曚綅"
+ width="100">
+ </el-table-column>
+ <el-table-column
+ prop="address"
+ label="鏁伴噺"
+ width="118"
+ >
+ </el-table-column>
+ <el-table-column
+ prop="name"
+ label="涓嬪崟浜�"
+ width="114">
+ </el-table-column>
+ <el-table-column
+ prop="address"
+ label="涓嬪崟鏃ユ湡"
+ width="153"
+ >
+ </el-table-column>
+ <el-table-column
+ prop="address"
+ label="浜よ揣鏃ユ湡"
+ width="137">
+ </el-table-column>
+ <el-table-column
+ prop="address"
+ label="鐘舵��"
+ width="85"
+ >
+ </el-table-column>
+ <el-table-column
+ fixed="right"
+ label="鎿嶄綔"
+ width="194">
+ <template>
+ <el-button type="text" size="small">鏌ョ湅璇︽儏</el-button>
+ <el-button type="text" size="small">缂栬緫闄勪欢</el-button>
+ </template>
+ </el-table-column>
+ </el-table>
+ </div>
+
+
+ <el-pagination
+ :current-page="1"
+ :page-sizes="[100, 200, 300, 400]"
+ :page-size="100"
+ layout="total, sizes, prev, pager, next, jumper"
+ :total="400">
+ </el-pagination>
+ </div>
+ </div>
+</template>
+
+<script>
+export default {
+ data() {
+ return {
+ searchData:{
+ number:'',
+ date:''
+ },
+ technicalTable: [{
+ date: '2016-05-02',
+ name: '鐜嬪皬铏�',
+ address: '涓婃捣甯�'
+ }, {
+ date: '2016-05-04',
+ name: '鐜嬪皬铏�',
+ address: '涓婃捣甯�'
+ }, {
+ date: '2016-05-01',
+ name: '鐜嬪皬铏�',
+ address: '涓婃捣甯�'
+ }, {
+ date: '2016-05-03',
+ name: '鐜嬪皬铏�',
+ address: '涓婃捣甯�'
+ }, {
+ date: '2016-05-03',
+ name: '鐜嬪皬铏�',
+ address: '涓婃捣甯�'
+ }, {
+ date: '2016-05-03',
+ name: '鐜嬪皬铏�',
+ address: '涓婃捣甯�'
+ }, {
+ date: '2016-05-03',
+ name: '鐜嬪皬铏�',
+ address: '涓婃捣甯�'
+ }, {
+ date: '2016-05-03',
+ name: '鐜嬪皬铏�',
+ address: '涓婃捣甯�'
+ }, {
+ date: '2016-05-03',
+ name: '鐜嬪皬铏�',
+ address: '涓婃捣甯�'
+ }, {
+ date: '2016-05-03',
+ name: '鐜嬪皬铏�',
+ address: '涓婃捣甯�'
+ }, {
+ date: '2016-05-03',
+ name: '鐜嬪皬铏�',
+ address: '涓婃捣甯�'
+ }
+ ]
+ }
+ },
+}
+</script>
diff --git a/src/main.js b/src/main.js
index 24c069b..5724f71 100644
--- a/src/main.js
+++ b/src/main.js
@@ -20,7 +20,7 @@
Vue.use(qs);
Vue.use(api);
-const javaApi = 'http://localhost:8001/'
+const javaApi = 'http://192.168.110.167:8001/'
axios.defaults.baseURL = javaApi
axios.defaults.headers.post['Content-Type'] = 'application/x-www-form-urlencoded;charset=UTF-8'
@@ -89,18 +89,18 @@
})
// 璺敱鎷︽埅鍣�
-router.beforeEach((to, from, next) => {
- // 璺緞涓簆roduct鏃堕獙璇佹槸鍚︾櫥褰曪紝娌℃湁璺宠浆鑷崇櫥褰曢〉闈�
- if (to.path.indexOf('/') > -1 && to.path.indexOf('/enter') != 0) {
- if (sessionStorage.getItem('token') == null || sessionStorage.getItem('token') == '' || sessionStorage.getItem(
- 'token') == undefined) {
- next({
- path: '/enter'
- })
- }
- }
- next()
-});
+// router.beforeEach((to, from, next) => {
+// // 璺緞涓簆roduct鏃堕獙璇佹槸鍚︾櫥褰曪紝娌℃湁璺宠浆鑷崇櫥褰曢〉闈�
+// if (to.path.indexOf('/') > -1 && to.path.indexOf('/enter') != 0) {
+// if (sessionStorage.getItem('token') == null || sessionStorage.getItem('token') == '' || sessionStorage.getItem(
+// 'token') == undefined) {
+// next({
+// path: '/enter'
+// })
+// }
+// }
+// next()
+// });
new Vue({
el: '#app',
diff --git a/src/view/index.vue b/src/view/index.vue
index 15c476a..3745280 100644
--- a/src/view/index.vue
+++ b/src/view/index.vue
@@ -282,7 +282,7 @@
k: 2,
v: "鎶�鏈枃浠�",
i: "font icon-shouye",
- u: ""
+ u: "technical"
}]
}, {
k: 2,
--
Gitblit v1.9.3