GaoYuPeng преди 3 години
родител
ревизия
10354fb0b0
променени са 6 файла, в които са добавени 127 реда и са изтрити 106 реда
  1. 0 1
      README.md
  2. 2 1
      public/index.html
  3. 93 93
      src/views/demo/dataQuery/index.vue
  4. BIN
      src/views/system/login/image/bg.png
  5. BIN
      src/views/system/login/image/logo.png
  6. 32 11
      src/views/system/login/page.vue

+ 0 - 1
README.md

@@ -1,7 +1,6 @@
1 1
 
2 2
 # numberWeb
3 3
 
4
-数量检测-前端
5 4
 [D2Admin](https://github.com/d2-projects/d2-admin) is a fully open source and free enterprise back-end product front-end integration solution, using the latest front-end technology stack, javascript files loading of local first screen less than 60kb, has prepared most of the project preparations, and with a lot of sample code to help the management system agile development.
6 5
 
7 6
 [中文](https://github.com/d2-projects/d2-admin-start-kit/blob/master/README.zh.md) | **English**

+ 2 - 1
public/index.html

@@ -47,7 +47,8 @@
47 47
           <a
48 48
             href="https://github.com/d2-projects/d2-admin"
49 49
             target="_blank">
50
-            https://github.com/d2-projects/d2-admin
50
+            <!-- https://github.com/d2-projects/d2-admin -->
51
+            紫光软件 数量检测系统
51 52
           </a>
52 53
         </div>
53 54
       </div>

+ 93 - 93
src/views/demo/dataQuery/index.vue

@@ -82,18 +82,18 @@
82 82
             <el-table-column prop="cfState" label="仓房状态" align="center">
83 83
             </el-table-column>
84 84
              <el-table-column prop="cfState" label="体积" align="center">
85
-            </el-table-column>  
85
+            </el-table-column>
86 86
              <el-table-column prop="cfState" label="重量" align="center">
87
-            </el-table-column>     
87
+            </el-table-column>
88 88
              <el-table-column
89 89
       fixed="right"
90 90
       label="操作"
91 91
       width="100">
92 92
       <template slot-scope="scope">
93 93
         <el-button @click="detail(scope.row)" type="text" size="small">详情</el-button>
94
-    
94
+
95 95
       </template>
96
-    </el-table-column>     
96
+    </el-table-column>
97 97
           </el-table>
98 98
           <el-pagination
99 99
             @size-change="handleSizeChange"
@@ -114,150 +114,150 @@
114 114
 </template>
115 115
 <script>
116 116
 export default {
117
-  name: "dataQuery",
118
-  data() {
117
+  name: 'dataQuery',
118
+  data () {
119 119
     return {
120
-      filterText: "",
121
-      //默认展开的节点
120
+      filterText: '',
121
+      // 默认展开的节点
122 122
       defaultProps: {
123
-        children: "children",
124
-        label: "label",
123
+        children: 'children',
124
+        label: 'label'
125 125
       },
126
-      //左侧树数据
126
+      // 左侧树数据
127 127
       leftList: [
128 128
         {
129 129
           id: 0,
130
-          label: "中储粮河南分公司",
131
-          icon: "el-icon-tickets",
130
+          label: '中储粮河南分公司',
131
+          icon: 'el-icon-tickets',
132 132
           children: [
133 133
             {
134 134
               id: 1,
135
-              label: "商丘直属库",
136
-              icon: "el-icon-paperclip",
135
+              label: '商丘直属库',
136
+              icon: 'el-icon-paperclip',
137 137
               children: [
138 138
                 {
139 139
                   id: 4,
140
-                  label: "宁陵粮油储备公司",
140
+                  label: '宁陵粮油储备公司',
141 141
                   children: [
142 142
                     {
143 143
                       id: 9,
144
-                      label: "1号仓",
144
+                      label: '1号仓'
145 145
                     },
146 146
                     {
147 147
                       id: 10,
148
-                      label: "2号仓",
149
-                    },
150
-                  ],
151
-                },
152
-              ],
148
+                      label: '2号仓'
149
+                    }
150
+                  ]
151
+                }
152
+              ]
153 153
             },
154 154
             {
155 155
               id: 2,
156
-              label: "郑州直属库",
157
-              icon: "el-icon-paperclip",
156
+              label: '郑州直属库',
157
+              icon: 'el-icon-paperclip',
158 158
               children: [
159 159
                 {
160 160
                   id: 5,
161
-                  label: "中牟粮油储备公司",
161
+                  label: '中牟粮油储备公司',
162 162
                   children: [
163 163
                     {
164 164
                       id: 8,
165
-                      label: "1号仓",
165
+                      label: '1号仓'
166 166
                     },
167 167
                     {
168 168
                       id: 9,
169
-                      label: "1号仓",
170
-                    },
171
-                  ],
172
-                },
173
-              ],
174
-            },
175
-          ],
176
-        },
169
+                      label: '1号仓'
170
+                    }
171
+                  ]
172
+                }
173
+              ]
174
+            }
175
+          ]
176
+        }
177 177
       ],
178 178
       // 日期插件
179 179
       //
180 180
       pickerOptions: {
181 181
         shortcuts: [
182 182
           {
183
-            text: "最近一周",
184
-            onClick(picker) {
185
-              const end = new Date();
186
-              const start = new Date();
187
-              start.setTime(start.getTime() - 3600 * 1000 * 24 * 7);
188
-              picker.$emit("pick", [start, end]);
189
-            },
183
+            text: '最近一周',
184
+            onClick (picker) {
185
+              const end = new Date()
186
+              const start = new Date()
187
+              start.setTime(start.getTime() - 3600 * 1000 * 24 * 7)
188
+              picker.$emit('pick', [start, end])
189
+            }
190 190
           },
191 191
           {
192
-            text: "最近一个月",
193
-            onClick(picker) {
194
-              const end = new Date();
195
-              const start = new Date();
196
-              start.setTime(start.getTime() - 3600 * 1000 * 24 * 30);
197
-              picker.$emit("pick", [start, end]);
198
-            },
192
+            text: '最近一个月',
193
+            onClick (picker) {
194
+              const end = new Date()
195
+              const start = new Date()
196
+              start.setTime(start.getTime() - 3600 * 1000 * 24 * 30)
197
+              picker.$emit('pick', [start, end])
198
+            }
199 199
           },
200 200
           {
201
-            text: "最近三个月",
202
-            onClick(picker) {
203
-              const end = new Date();
204
-              const start = new Date();
205
-              start.setTime(start.getTime() - 3600 * 1000 * 24 * 90);
206
-              picker.$emit("pick", [start, end]);
207
-            },
208
-          },
209
-        ],
201
+            text: '最近三个月',
202
+            onClick (picker) {
203
+              const end = new Date()
204
+              const start = new Date()
205
+              start.setTime(start.getTime() - 3600 * 1000 * 24 * 90)
206
+              picker.$emit('pick', [start, end])
207
+            }
208
+          }
209
+        ]
210 210
       },
211 211
       formInline: {
212
-        scanTime: "",
212
+        scanTime: ''
213 213
       },
214
-      //表格字段
214
+      // 表格字段
215 215
       dataSearchList: [
216 216
         {
217
-          directLibrary: "",
218
-          subTreasury: "",
219
-          cfName: "",
220
-          scanStart: "",
221
-          scanEnd: "",
217
+          directLibrary: '',
218
+          subTreasury: '',
219
+          cfName: '',
220
+          scanStart: '',
221
+          scanEnd: '',
222 222
 
223
-          cfState: "",
224
-        },
223
+          cfState: ''
224
+        }
225 225
       ],
226 226
 
227 227
       pagination: {
228
-        //每页显示的条数
228
+        // 每页显示的条数
229 229
         pageSize: 10,
230
-        //当前页
230
+        // 当前页
231 231
         curPage: 1,
232
-        //总数
232
+        // 总数
233 233
         total: 20
234
-      },
235
-    };
234
+      }
235
+    }
236 236
   },
237 237
   watch: {
238
-    filterTest(val) {
239
-      this.$refs.tree.filter(val);
240
-    },
238
+    filterTest (val) {
239
+      this.$refs.tree.filter(val)
240
+    }
241 241
   },
242 242
   methods: {
243
-    filterNode(value, data) {
244
-      if (!value) return true;
245
-      return data.label.indexOf(value) !== -1;
243
+    filterNode (value, data) {
244
+      if (!value) return true
245
+      return data.label.indexOf(value) !== -1
246 246
     },
247
-    search() {},
248
-    reset() {},
249
-    //每页条数改变
250
-    handleSizeChange(val) {
251
-      console.log(`每页 ${val} 条`);
247
+    search () {},
248
+    reset () {},
249
+    // 每页条数改变
250
+    handleSizeChange (val) {
251
+      console.log(`每页 ${val} 条`)
252 252
     },
253
-    //当前页改变
254
-    handleCurrentChange(val) {
253
+    // 当前页改变
254
+    handleCurrentChange (val) {
255 255
       // this.pagination.curPage = val;
256
-      console.log(`当前页: ${val}`);
256
+      console.log(`当前页: ${val}`)
257 257
     },
258
-    detail(){}
259
-  },
260
-};
258
+    detail () {}
259
+  }
260
+}
261 261
 </script>
262 262
 <style lang="scss" scoped>
263 263
 .main {
@@ -267,7 +267,7 @@ export default {
267 267
     width: 250px;
268 268
     height: 100%;
269 269
    background: #163d79;
270
-  
270
+
271 271
   }
272 272
   .right {
273 273
     margin-left: 20px;
@@ -275,7 +275,7 @@ export default {
275 275
     .nav {
276 276
       padding: 10px 0 10px 10px;
277 277
       color:#FFF;
278
-  
278
+
279 279
       background: #004a93;
280 280
     }
281 281
     .right_main{
@@ -289,11 +289,11 @@ export default {
289 289
     }
290 290
     .right_table{
291 291
        padding:20px;
292
-    
292
+
293 293
     }
294 294
     }
295
-   
295
+
296 296
   }
297 297
 }
298 298
 
299
-</style>
299
+</style>

BIN
src/views/system/login/image/bg.png


BIN
src/views/system/login/image/logo.png


+ 32 - 11
src/views/system/login/page.vue

@@ -15,15 +15,16 @@
15 15
         class="page-login--content"
16 16
         flex="dir:top main:justify cross:stretch box:justify">
17 17
         <div class="page-login--content-header">
18
-          <p class="page-login--content-header-motto">
18
+          <p class="page-login--content-header-motto" >
19 19
             时间是一切财富中最宝贵的财富
20
+            {{ tips }}
20 21
           </p>
21 22
         </div>
22 23
         <div
23 24
           class="page-login--content-main"
24 25
           flex="dir:top main:center cross:center">
25 26
           <!-- logo -->
26
-          <img class="page-login--logo" src="./image/logo@2x.png">
27
+          <img class="page-login--logo" src="./image/logo.png">
27 28
           <!-- form -->
28 29
           <div class="page-login--form">
29 30
             <el-card shadow="never">
@@ -49,7 +50,7 @@
49 50
                     <i slot="prepend" class="fa fa-keyboard-o"></i>
50 51
                   </el-input>
51 52
                 </el-form-item>
52
-                <el-form-item prop="code">
53
+                <!-- <el-form-item prop="code">
53 54
                   <el-input
54 55
                     type="text"
55 56
                     v-model="formLogin.code"
@@ -58,7 +59,7 @@
58 59
                       <img class="login-code" src="./image/login-code.png">
59 60
                     </template>
60 61
                   </el-input>
61
-                </el-form-item>
62
+                </el-form-item> -->
62 63
                 <el-button
63 64
                   size="default"
64 65
                   @click="submit"
@@ -76,25 +77,25 @@
76 77
             </p>
77 78
             <!-- quick login -->
78 79
             <el-button class="page-login--quick" size="default" type="info" @click="dialogVisible = true">
79
-              快速选择用户(测试功能)
80
+              快速选择用户<!-- (测试功能) -->
80 81
             </el-button>
81 82
           </div>
82 83
         </div>
83 84
         <div class="page-login--content-footer">
84
-          <p class="page-login--content-footer-locales">
85
+         <!--  <p class="page-login--content-footer-locales">
85 86
             <a
86 87
               v-for="language in $languages"
87 88
               :key="language.value"
88 89
               @click="onChangeLocale(language.value)">
89 90
               {{ language.label }}
90 91
             </a>
91
-          </p>
92
+          </p> -->
92 93
           <p class="page-login--content-footer-copyright">
93 94
             Copyright
94 95
             <d2-icon name="copyright"/>
95
-            2018 D2 Projects 开源组织出品
96
+            紫光软件 
96 97
             <a href="https://github.com/FairyEver">
97
-              @FairyEver
98
+              All&nbsp;Rights&nbsp;Reserved
98 99
             </a>
99 100
           </p>
100 101
           <p class="page-login--content-footer-options">
@@ -131,6 +132,7 @@ export default {
131 132
   ],
132 133
   data () {
133 134
     return {
135
+      tips: null,
134 136
       timeInterval: null,
135 137
       time: dayjs().format('HH:mm:ss'),
136 138
       // 快速选择用户
@@ -181,13 +183,24 @@ export default {
181 183
             trigger: 'blur'
182 184
           }
183 185
         ]
184
-      }
186
+      },
187
+      // 语录
188
+      tipsarr: [
189
+        '生活是不公平的,你要去适应它。',
190
+        '对生活充满热情,对未来充满信心。',
191
+        '功夫在平时,成功源于积累。',
192
+        '时间是一切财富中最宝贵的财富。',
193
+        
194
+      ]
185 195
     }
186 196
   },
187 197
   mounted () {
198
+    // eslint-disable-next-line no-unused-expressions
188 199
     this.timeInterval = setInterval(() => {
189 200
       this.refreshTime()
190
-    }, 1000)
201
+    // eslint-disable-next-line no-sequences
202
+    }, 1000),
203
+    this.tipsrandom()
191 204
   },
192 205
   beforeDestroy () {
193 206
     clearInterval(this.timeInterval)
@@ -231,6 +244,12 @@ export default {
231 244
           this.$message.error('表单校验失败,请检查')
232 245
         }
233 246
       })
247
+    },
248
+    // 随机语录
249
+    tipsrandom () {
250
+      var index
251
+      index = Math.floor(Math.random() * this.tipsarr.length)
252
+      this.tips = this.tipsarr[index]
234 253
     }
235 254
   }
236 255
 }
@@ -242,6 +261,8 @@ export default {
242 261
   $backgroundColor: #F0F2F5;
243 262
   // ---
244 263
   background-color: $backgroundColor;
264
+  background: url('./image/bg.png') center no-repeat ;
265
+  background-size:100% 100%;
245 266
   height: 100%;
246 267
   position: relative;
247 268
   // 层