Merge remote-tracking branch 'origin/master'

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>

ys_vue/src/views/base/comp.vue

@@ -58,25 +58,25 @@
         <!--新增界面-->
 		<el-dialog :title="addTitle" v-if="addFormVisible" :visible.sync="addFormVisible" :close-on-click-modal="false" customClass='customWidth'>
 			<el-form :model="addForm" label-width="100px" :rules="formRules" ref="addForm">
-				<el-form-item label="资产方名称" prop="companyName" v-if="addState">
+				<el-form-item label="资产方名称" prop="companyName" v-show="addState">
 					<el-input v-model="addForm.companyName" autocomplete="off" placeholder="请输入资产方地址"></el-input>
 				</el-form-item>
-                <el-form-item label="关联生产方" v-if="addState">
+                <el-form-item label="关联生产方" v-show="addState">
                     <el-select v-model="addForm.companyIds" clearable multiple filterable placeholder="请选择生产方" style="width:533px">
                         <el-option v-for="item in companys" :key="item.id" :label="item.companyName" :value="item.id">
                         </el-option>
                     </el-select>
 				</el-form-item>
-                <el-form-item label="资产方地址" prop="companyAddress" v-if="addState">
+                <el-form-item label="资产方地址" prop="companyAddress" v-show="addState">
 					<el-input v-model="addForm.companyAddress" autocomplete="off" placeholder="请输入资产方地址"></el-input>
 				</el-form-item>
-                <el-form-item label="姓名" prop="username" v-if="!addState">
+                <el-form-item label="姓名" prop="username" v-show="!addState">
 					<el-input v-model="addForm.username" autocomplete="off" placeholder="请输入姓名"></el-input>
 				</el-form-item>
-				<el-form-item label="手机号" prop="account" v-if="!addState">
+				<el-form-item label="手机号" prop="account" v-show="!addState">
 					<el-input v-model="addForm.account" autocomplete="off" placeholder="请输入手机号（登录账号）"></el-input>
 				</el-form-item>
-                <el-form-item label="角色" v-if="!addState">
+                <el-form-item label="角色" v-show="!addState">
                     <el-input v-model="addForm.roleName" autocomplete="off" placeholder="请输入角色名称"></el-input>
 				</el-form-item>
 			</el-form>
@@ -123,6 +123,7 @@
                     return callback(new Error('请输入联系方式'));
                 } else {
                     const reg = /^1[0-9]\d{9}$/
+                    console.log(reg.test(value));
                     if (reg.test(value)) {
                         callback();
                     } else {

ys_vue/src/views/base/factory.vue

@@ -54,10 +54,10 @@
         <!--新增界面-->
 		<el-dialog title="新增生产方" v-if="addFormVisible" :visible.sync="addFormVisible" :close-on-click-modal="false" customClass='customWidth'>
 			<el-form :model="addForm" label-width="100px" :rules="formRules" ref="addForm">
-				<el-form-item label="生产方名称" prop="companyName" v-if="addState">
+				<el-form-item label="生产方名称" prop="companyName" v-show="addState">
 					<el-input v-model="addForm.companyName" autocomplete="off" placeholder="请输入生产方名称"></el-input>
 				</el-form-item>
-                <el-form-item label="关联资产方" v-if="addState">
+                <el-form-item label="关联资产方" v-show="addState">
                     <el-select v-model="addForm.companyIds" clearable multiple filterable placeholder="请选择生产方" style="width:533px">
                         <el-option v-for="item in companys" :key="item.id" :label="item.companyName" :value="item.id">
                         </el-option>
@@ -66,14 +66,14 @@
                 <el-form-item label="生产方地址" prop="companyAddress" v-show="addState">
 					<el-input v-model.lazy="addForm.companyAddress" autocomplete="off" @change="changeFactoryArea('addContainer')" placeholder="请输入生产方地址"></el-input>
 				</el-form-item>
-                <div id="addContainer" class="formMap" v-if="addState"></div>
-                <el-form-item label="姓名" prop="username" v-if="!addState">
+                <div id="addContainer" class="formMap" v-show="addState"></div>
+                <el-form-item label="姓名" prop="username" v-show="!addState">
 					<el-input v-model="addForm.username" autocomplete="off" placeholder="请输入姓名"></el-input>
 				</el-form-item>
-				<el-form-item label="手机号" prop="account" v-if="!addState">
+				<el-form-item label="手机号" prop="account" v-show="!addState">
 					<el-input v-model="addForm.account" autocomplete="off" placeholder="请输入手机号（登录账号）"></el-input>
 				</el-form-item>
-                <el-form-item label="角色" v-if="!addState">
+                <el-form-item label="角色" v-show="!addState">
                     <el-input v-model="addForm.roleName" autocomplete="off" placeholder="请输入角色名称"></el-input>
 				</el-form-item>
 			</el-form>

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'}
                     ],
                 },
 
@@ -1242,7 +1258,7 @@
                             if (res.code == "ok") {
                                 this.editPortVisible = false;
                                 this.$message({
-                                    message: "新建成功",
+                                    message: "修改成功",
                                     type: "success"
                                 });
                                 this.getPartList();

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;

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" }