sunyadv 5 years ago
parent
commit
f902c376d8

+ 1 - 1
ys_vue/src/port.js

@@ -44,7 +44,7 @@ export default {
         addMold: '/mould/addOrUpdate', //添加/修改模具设备
         molds: '/mould/list', //模具列表
         modelList: '/mould/modelList', //给项目分配模具获取该公司下的模具列表
-        delMold: '/mould/delMoule', //删除模具
+        delMold: '/mould/delMould', //删除模具
 
         moldDetail: '/mould/detail', //模具详情
         moldFileList: '/mouldfile/list', //获取模具文档

+ 2 - 0
ys_vue/src/views/base/allocation.vue

@@ -108,6 +108,7 @@
                         v-model="newAllocation.agent"
                         autocomplete="off"
                         placeholder="请填写代理商"
+                        style="width: 202px"
                     ></el-input>
                 </el-form-item>
             </el-form>
@@ -166,6 +167,7 @@
                         v-model="newAllocation.agent"
                         autocomplete="off"
                         placeholder="请填写代理商"
+                        style="width: 202px"
                     ></el-input>
                 </el-form-item>
             </el-form>

+ 2 - 2
ys_vue/src/views/map/map.vue

@@ -226,8 +226,8 @@
                             labelCtx.fillStyle = 'rgba(12 , 239 , 231 , 0.8)';//'#3366cc';
 
                             //绘制一个蓝色背景
-                            labelCtx.strokeStyle= "rgba(12 , 239 , 231 , 0.8)"
-                            labelCtx.fillStyle = 'rgba(12 , 239 , 231 , 0.8)';
+                            labelCtx.strokeStyle= "rgba(12 , 239 , 231 , 0.65)"
+                            labelCtx.fillStyle = 'rgba(12 , 239 , 231 , 0.65)';
                             
                             var radius = 0;
                             if(textMetrics.width > numMetrics.width) {

+ 12 - 3
ys_vue/src/views/mold/moldList.vue

@@ -233,7 +233,9 @@
                 //     });
                 // });
                 //新版获取公司
-                this.http.post(this.port.base.getInfo, {}, res => {
+                this.http.post(this.port.base.relationList, {
+                    companyType: 1
+                }, res => {
                     if (res.code == "ok") {
                         this.companys = res.data;
                     } else {
@@ -248,6 +250,9 @@
                         type: 'error'
                     });
                 });
+                
+            },
+            getPro() {
                 //获取项目
                 this.http.post( this.port.project.projects, {},
                 res => {
@@ -339,7 +344,7 @@
                                 message: '删除成功',
                                 type: 'success'
                             });
-                            this.getUsers();
+                            this.getMoldList();
                         } else {
                             this.$message({
                                 message: res.msg,
@@ -422,7 +427,11 @@
             };
         },
         mounted() {
-            this.getMsg();
+            var user = JSON.parse(sessionStorage.getItem("user"));
+            if(user.parentId == 1 && user.subordinateType == 0){
+                this.getMsg();
+            }
+            this.getPro()
             this.getMoldList();
         }
     };

+ 2 - 2
ys_vue/src/views/project/projectDetail.vue

@@ -227,8 +227,8 @@
                         </el-option>
                     </el-select>
 				</el-form-item>
-                <el-form-item label="角色">
-                    <el-input v-model="addForm.roleName" autocomplete="off" placeholder="请输入角色名称"></el-input>
+                <el-form-item label="备注">
+                    <el-input v-model="addForm.roleName" autocomplete="off" placeholder="请输入备注"></el-input>
 				</el-form-item>
 			</el-form>
 			<div slot="footer" class="dialog-footer">

+ 2 - 2
ys_vue/src/views/project/staff.vue

@@ -92,7 +92,7 @@
                     </el-select>
 				</el-form-item>
                 <el-form-item label="备注">
-                    <el-input v-model="addForm.roleName" autocomplete="off" placeholder="请输入备注名称"></el-input>
+                    <el-input v-model="addForm.roleName" autocomplete="off" placeholder="请输入备注"></el-input>
 				</el-form-item>
 			</el-form>
 			<div slot="footer" class="dialog-footer">
@@ -115,7 +115,7 @@
                     <el-input v-model="editForm.companyId" disabled autocomplete="off" placeholder="请选择所属公司"></el-input>
 				</el-form-item>
                 <el-form-item label="备注">
-                    <el-input v-model="editForm.roleName" autocomplete="off" placeholder="请输入备注名称"></el-input>
+                    <el-input v-model="editForm.roleName" autocomplete="off" placeholder="请输入备注"></el-input>
 				</el-form-item>
 			</el-form>
 			<div slot="footer" class="dialog-footer">