Browse Source

修改、404

sunyadv 5 years ago
parent
commit
85898afdb3

+ 51 - 1
ys_vue/src/views/404.vue

@@ -1,11 +1,61 @@
 <template>
-    <p class="page-container">404 page not found</p>
+    <div>
+        <div class="page-img">
+            <img src="../assets/image/404.png" />
+        </div>
+        <p class="page-container"><b>Error</b>  非常抱歉你访问的页面不存在!!!</p>
+        <div class="page-button">
+            <el-button type="primary" round @click="back" icon="el-icon-s-promotion">返回首页</el-button>
+        </div>
+    </div>
 </template>
 
+<script>
+    export default {
+		data() {
+			return {
+				
+			}
+		},
+		methods: {
+            back() {
+                this.$router.push('/map');
+            }
+        },
+        created() {
+           
+        },
+		mounted() {
+        }
+	}
+</script>
+
 <style lang="scss" scoped>
+    .page-img {
+        text-align: center;
+        padding: 100px 0 0 0 ;
+
+        img {
+            width: 600px;
+        }
+    }
+
     .page-container {
         font-size: 20px;
         text-align: center;
         color: rgb(192, 204, 218);
+        b {
+            margin-right: 30px;
+            font-size: 26px;
+        }
+    }
+
+    .page-button {
+        text-align: center;
+        margin-top: 40px;
+        .el-button.is-round {
+            width: 150px;
+            margin-right:80px;
+        }
     }
 </style>

File diff suppressed because it is too large
+ 683 - 683
ys_vue/src/views/Home.vue


+ 18 - 2
ys_vue/src/views/mold/moldDetail.vue

@@ -588,6 +588,21 @@
     import util from "../../common/js/util";
     export default {
         data() {
+            const checkLife = (rule, value, callback) => {
+                if (!value) {
+                    return callback(new Error('请输入零件寿命次数'));
+                } else {
+                    if((/^[+]{0,1}(\d+)$|^[+]{0,1}(\d+\.\d+)$/).test(value) == false){
+                        callback(new Error("请填写大于0的数字"));
+                    }else{
+                        if (value > 100000000) {
+                            callback(new Error("请填写小于等于1亿的数字"));
+                        }else{
+                            callback();
+                        }
+                    }
+                }
+            };
             return {
                 detailId: this.$route.params.id,
                 user: JSON.parse(sessionStorage.getItem("user")),
@@ -636,7 +651,8 @@
                         { required: true, message: "请输入零件名称", trigger: "blur" }
                     ],
                     life: [
-                        { required: true, message: "请输入零件寿命次数", trigger: "blur" }
+                        // { required: true, message: "请输入零件寿命次数", trigger: "blur" }
+                        { required: true, validator: checkLife, trigger: 'blur'}
                     ],
                 },
 
@@ -1239,7 +1255,7 @@
                             if (res.code == "ok") {
                                 this.editPortVisible = false;
                                 this.$message({
-                                    message: "新建成功",
+                                    message: "修改成功",
                                     type: "success"
                                 });
                                 this.getPartList();

+ 6 - 1
ys_vue/src/views/mold/moldDownload.vue

@@ -210,10 +210,15 @@ export default {
     },
     //具体的下载
     downloadPost(type) {
+        var user = sessionStorage.getItem('user') , token = "";
+        if(user != null){
+            token = JSON.parse(user).headImgurl
+        }
         this.http.get(
             this.port.mold.moldFileDowloadFile + 
                 "?ids="+ this.selectedArray.join(",") + 
-                "&dwgType=" + type
+                "&dwgType=" + type +
+                "&token=" + token
             ,
             res => {
                 this.listLoading = false;

+ 34 - 2
ys_vue/src/views/mold/moldList.vue

@@ -124,6 +124,36 @@
     import util from "../../common/js/util";
     export default {
         data() {
+            const checkInitialModulus = (rule, value, callback) => {
+                if (!value) {
+                    return callback(new Error('请输入初始模次'));
+                } else {
+                    if((/^[+]{0,1}(\d+)$|^[+]{0,1}(\d+\.\d+)$/).test(value) == false){
+                        callback(new Error("请填写大于0的数字"));
+                    }else{
+                        if (value > 100000000) {
+                            callback(new Error("请填写小于等于1亿的数字"));
+                        }else{
+                            callback();
+                        }
+                    }
+                }
+            };
+            const checkSettingLife = (rule, value, callback) => {
+                if (!value) {
+                    return callback(new Error('请输入模次寿命'));
+                } else {
+                    if((/^[+]{0,1}(\d+)$|^[+]{0,1}(\d+\.\d+)$/).test(value) == false){
+                        callback(new Error("请填写大于0的数字"));
+                    }else{
+                        if (value > 100000000) {
+                            callback(new Error("请填写小于等于1亿的数字"));
+                        }else{
+                            callback();
+                        }
+                    }
+                }
+            };
             return {
                 user: JSON.parse(sessionStorage.getItem("user")),
                 molds: [],
@@ -145,10 +175,12 @@
                         { required: true, message: "请选择云模盒编号", trigger: ["blur", "change"] }
                     ],
                     initialModulus: [
-                        { required: true, message: "请输入初始模次", trigger: "blur" }
+                        // { required: true, message: "请输入初始模次", trigger: "blur" }
+                        { required: true, validator: checkInitialModulus, trigger: 'blur'}
                     ],
                     settingLife: [
-                        { required: true, message: "请输入模次寿命", trigger: "blur" }
+                        // { required: true, message: "请输入模次寿命", trigger: "blur" }
+                        { required: true, validator: checkSettingLife, trigger: 'blur'}
                     ],
                     rfid: [
                         { required: true, message: "请输入RIFD码", trigger: "blur" }