Merge branch 'master' of http://47.100.37.243:10080/ZHOU/yunsu

ys_vue/src/views/Home.vue

@@ -502,7 +502,7 @@
                 );
                 //本页面再点的话强制转移一下
                 var currentRoute = this.$route.path.split("/");
-                if (currentRoute.length == 3 && currentRoute[1] == "moldList") {
+                if (currentRoute.length == 4 && currentRoute[1] == "moldList") {
                     this.$router.go(0);
                 }
                 if (type == 0) {

ys_vue/src/views/Login.vue

@@ -2,7 +2,7 @@
     <div class="login-par">
         <el-form :model="ruleForm" :rules="rules" ref="ruleForm" label-position="left" label-width="0px" class="demo-ruleForm login-container">
             <div class="login-logo">
-                <img src="../assets/image/login_logo.png" style="width:80px;"/>
+                <img src="../assets/image/login_logo.png" style="width:80px;height:80px;"/>
             </div>
             <h3 class="title">云塑网后台管理系统</h3>
             <el-form-item class="login-input" prop="account">

ys_vue/src/views/map/map.vue

@@ -62,7 +62,7 @@
                                                 map.clearInfoWindow();
                                             },
                                             jumpToMold:function(id) {
-                                                _this.$router.push("/moldList/" + id);
+                                                _this.$router.push("/moldList/" + id + "/0");
                                             }
                                         }
                                     });

ys_vue/src/views/mold/moldDetail.vue

@@ -12,8 +12,11 @@
             </el-form-item>
             <el-form-item class="state">
                 当前状态：
-                <a style="color: #999999; cursor: pointer" @click="toDetection" v-if="moldDetail.state == 0">静止</a>
+                <a style="color: #909399; cursor: pointer" @click="toDetection" v-if="moldDetail.state == 0">静止</a>
                 <a style="color: #00CD66; cursor: pointer" @click="toDetection" v-if="moldDetail.state == 1">运行</a>
+                <a style="color: #F56C6C; cursor: pointer" @click="toDetection" v-if="moldDetail.state == 2">告警</a>
+                <a style="color: #909399; cursor: pointer" @click="toDetection" v-if="moldDetail.state == 3">待报废</a>
+                <a style="color: #909399; cursor: pointer" @click="toDetection" v-if="moldDetail.state == 4">已报废</a>
                 <span class="tips">（点击查看运行状态）</span>
             </el-form-item>
         </el-form>
@@ -191,7 +194,7 @@
                                     <el-button size="small" @click="dowloadfile(scope.row.id)">下载</el-button>
                                 </a>
                                 <el-button size="small" 
-                                    v-if="scope.row.uplodtorId == user.id && scope.row.state <= 0" 
+                                    v-if="(scope.row.uplodtorId == user.id && scope.row.state <= 0) || (scope.row.state == 3 && user.parentId == 1 && user.subordinateType == 0)" 
                                     @click="deleteFile(scope.row.id)" type="danger">删除</el-button>
                             </template>
                         </el-table-column>
@@ -249,9 +252,9 @@
                                 <!-- <el-button size="small" @click="dowloadfile(scope.row.id)" v-if="download == 1 && scope.row.state == 3 ">
                                     <a :href="scope.row.fileUrl" :download="scope.row.fileName">下载 </a>
                                 </el-button> -->
-                                <!-- <el-button size="small" 
-                                    v-if="scope.row.uplodtorId == user.id && scope.row.state <= 0" 
-                                    @click="deleteFile(scope.row.id)" type="danger">删除</el-button> -->
+                                <el-button size="small" 
+                                    v-if="scope.row.state == 3 && user.parentId == 1 && user.subordinateType == 0"  
+                                    @click="deleteFile(scope.row.id)" type="danger">删除</el-button>
                             </template>
                         </el-table-column>
                     </el-table>
@@ -289,7 +292,7 @@
                                     <el-button size="small" @click="dowloadfile(scope.row.id)">下载</el-button>
                                 </a>
                                 <el-button size="small"
-                                    v-if="scope.row.uplodtorId == user.id && scope.row.state <= 0" 
+                                    v-if="(scope.row.uplodtorId == user.id && scope.row.state <= 0) || (scope.row.state == 3 && user.parentId == 1 && user.subordinateType == 0)" 
                                     @click="deleteFile(scope.row.id)" type="danger">删除</el-button>
                             </template>
                         </el-table-column>
@@ -328,7 +331,7 @@
                                     <el-button size="small" @click="dowloadfile(scope.row.id)">下载</el-button>
                                 </a>
                                 <el-button size="small"
-                                    v-if="scope.row.uplodtorId == user.id && scope.row.state <= 0" 
+                                    v-if="(scope.row.uplodtorId == user.id && scope.row.state <= 0) || (scope.row.state == 3 && user.parentId == 1 && user.subordinateType == 0)" 
                                     @click="deleteFile(scope.row.id)" type="danger">删除</el-button>
                             </template>
                         </el-table-column>
@@ -410,7 +413,7 @@
                                     v-if="approve == 1 && (scope.row.state == 0 || (scope.row.state == 1 && user.subordinateType == 1) || (scope.row.state == 2 && user.subordinateType == 0))" 
                                     @click="checkOpen(scope.row)">审批</el-button>
                                 <el-button size="small"
-                                    v-if="scope.row.uplodtorId == user.id && scope.row.state <= 0"
+                                    v-if="(scope.row.uplodtorId == user.id && scope.row.state <= 0) || (scope.row.state == 3 && user.parentId == 1 && user.subordinateType == 0)" 
                                     @click="deleteFile(scope.row.id)" type="danger">删除</el-button>
                             </template>
                         </el-table-column>
@@ -1610,7 +1613,7 @@
                                     message: "更新成功",
                                     type: "success"
                                 });
-                                this.$router.push("/moldList/" + res.data.id );
+                                this.$router.push("/moldList/" + res.data.id + '/0');
                                 this.detailId = res.data.id;
                                 this.getDetail();
                             } else {

ys_vue/src/views/mold/moldDownload.vue

@@ -41,7 +41,7 @@
       <el-table-column type="index" width="60"></el-table-column>
       <el-table-column label="模具名称">
         <template slot-scope="scope">
-            <router-link :to="'/moldList/' + scope.row.id" tag="span" style="color: #409eff;cursor: pointer;">{{scope.row.modelName}}</router-link>
+            <router-link :to="'/moldList/' + scope.row.id + '/0'" tag="span" style="color: #409eff;cursor: pointer;">{{scope.row.modelName}}</router-link>
         </template>
       </el-table-column>
       <el-table-column width="250" label="模具3D图档">

ys_vue/src/views/mold/moldList.vue

@@ -79,10 +79,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" :inline="true" class="demo-form-inline">
                 <el-form-item label="模具名称" prop="modelName">
-                    <el-input v-model="addForm.modelName" autocomplete="off" placeholder="请输入模具名称"></el-input>
+                    <el-input v-model="addForm.modelName" autocomplete="off" placeholder="请输入模具名称" style="width:202px"></el-input>
                 </el-form-item>
                 <el-form-item label="模具编号" prop="modelNo">
-                    <el-input v-model="addForm.modelNo" autocomplete="off" placeholder="请输入模具编号"></el-input>
+                    <el-input v-model="addForm.modelNo" autocomplete="off" placeholder="请输入模具编号" style="width:202px"></el-input>
                 </el-form-item>
                 <el-form-item label="云模盒编号" prop="equipmentId">
                     <el-select v-model="addForm.equipmentId" clearable filterable placeholder="请选择云模盒编号" style="width:202px">
@@ -90,16 +90,16 @@
                     </el-select>
                 </el-form-item>
                 <el-form-item label="初始模次" prop="initialModulus">
-                    <el-input v-model="addForm.initialModulus" autocomplete="off" placeholder="请输入初始模次"></el-input>
+                    <el-input v-model="addForm.initialModulus" autocomplete="off" placeholder="请输入初始模次" style="width:202px"></el-input>
                 </el-form-item>
                 <el-form-item label="模次寿命" prop="settingLife">
-                    <el-input v-model="addForm.settingLife" autocomplete="off" placeholder="请输入模次寿命"></el-input>
+                    <el-input v-model="addForm.settingLife" autocomplete="off" placeholder="请输入模次寿命" style="width:202px"></el-input>
                 </el-form-item>
                 <el-form-item label="RIFD码" prop="rfid">
-                    <el-input v-model="addForm.rfid" autocomplete="off" placeholder="请输入RIFD码"></el-input>
+                    <el-input v-model="addForm.rfid" autocomplete="off" placeholder="请输入RIFD码" style="width:202px"></el-input>
                 </el-form-item>
                 <el-form-item label="穴数" prop="holes">
-                    <el-input v-model="addForm.holes" autocomplete="off" placeholder="请输入穴数"></el-input>
+                    <el-input v-model="addForm.holes" autocomplete="off" placeholder="请输入穴数" style="width:202px"></el-input>
                 </el-form-item>
                 <el-form-item label="所属生产方" prop="produceCompanyId">
                     <el-select v-model="addForm.produceCompanyId" clearable filterable placeholder="请选择所属生产方" style="width:202px">

ys_vue/src/views/project/projectDetail.vue

@@ -90,9 +90,11 @@
                         <template slot="title">
                             <el-col :span="24" class="title">项目文档
                                 <!-- update == 1 -->
-                                <el-upload v-if="user.id == proDetail.managerId" ref="upload" action="customize" :http-request="uploadFile" :show-file-list="false" :limit="1" style="float:right;margin-right:20px;">
-                                    <el-button size="mini" type="primary" :loading="upLoading">点击上传</el-button>
-                                </el-upload>
+                                <span @click='doSomething'>
+                                    <el-upload v-if="user.id == proDetail.managerId" ref="upload" action="customize" :http-request="uploadFile" :show-file-list="false" :limit="1" style="float:right;margin-right:20px;">
+                                        <el-button size="mini" type="primary" :loading="upLoading">点击上传</el-button>
+                                    </el-upload>
+                                </span>
                             </el-col>
                         </template>
                         <el-col :span="24" class="detail">
@@ -109,7 +111,8 @@
                                                 下载
                                             </el-button>
                                         </a>
-                                        <el-button size="small" type="danger" @click="fileDel(scope.row.id)" v-if="scope.row.uploaderId == user.id">删除</el-button>
+                                        <el-button size="small" type="danger" @click="fileDel(scope.row.id)"
+                                            v-if="scope.row.uploaderId == user.id">删除</el-button>
                                     </template>
                                     <template slot-scope="scope" v-else>
                                         -
@@ -151,7 +154,7 @@
                         <el-select v-model="editForm.modelIds" @change="companyChange" clearable filterable multiple placeholder="请选择项目模具" value-key='id' style="width:510px">
                             <el-option v-for="item in molds" :key="item.id" :label="item.modelName" :value="item">
                                 <span style="float: left">{{ item.modelName }}</span>
-                                <span style="float: right; color: #8492a6; font-size: 6px;margin-right:17px;">{{ item.produceCompanyName }}</span>
+                                <span style="float: right; color: #8492a6; font-size: 13px;margin-right:17px;">{{ item.produceCompanyName }}</span>
                             </el-option>
                         </el-select>
                     </el-form-item>
@@ -360,7 +363,7 @@
             },
 
             toMold(id) {
-                this.$router.push('/moldList/' + id);
+                this.$router.push('/moldList/' + id + "/0");
             },
             
             handleClick(tab, event) {
@@ -525,6 +528,10 @@
                 })
             },
 
+            doSomething(e){
+                e.stopPropagation();
+            },
+
             // 获取人员
             getStaff() {
                 // 获取人员