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

ys_vue/build/webpack.dev.conf.js

@@ -29,7 +29,8 @@ module.exports = merge(baseWebpackConfig, {
     new HtmlWebpackPlugin({
       filename: 'index.html',
       template: 'index.html',
-      inject: true
+      inject: true,
+      favicon: './favicon.ico'
     }),
     new FriendlyErrorsPlugin()
   ]

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', //获取模具文档

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>

ys_vue/src/views/base/factory.vue

@@ -54,7 +54,7 @@
         <!--新增界面-->
 		<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="factoryName" v-if="addState">
+				<el-form-item label="生产方名称" prop="companyName" v-if="addState">
 					<el-input v-model="addForm.companyName" autocomplete="off" placeholder="请输入生产方名称"></el-input>
 				</el-form-item>
                 <el-form-item label="关联资产方" v-if="addState">
@@ -63,7 +63,7 @@
                         </el-option>
                     </el-select>
 				</el-form-item>
-                <el-form-item label="生产方地址" prop="factoryArea" v-show="addState">
+                <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>
@@ -89,7 +89,7 @@
 		<!--编辑界面-->
 		<el-dialog title="编辑生产方" v-if="editFormVisible" :visible.sync="editFormVisible" :close-on-click-modal="false" customClass='customWidth'>
 			<el-form :model="editForm" label-width="100px" :rules="formRules" ref="editForm">
-				<el-form-item label="生产方名称" prop="factoryName">
+				<el-form-item label="生产方名称" prop="companyName">
 					<el-input v-model="editForm.companyName" autocomplete="off" placeholder="请输入生产方名称"></el-input>
 				</el-form-item>
                 <el-form-item label="关联资产方">
@@ -98,7 +98,7 @@
                         </el-option>
                     </el-select>
 				</el-form-item>
-                <el-form-item label="生产方地址" prop="factoryArea">
+                <el-form-item label="生产方地址" prop="companyAddress">
 					<el-input v-model="editForm.companyAddress" autocomplete="off" :change="changeFactoryArea('editContainer')" placeholder="请输入生产方地址"></el-input>
 				</el-form-item>
                 <div id="editContainer" class="formMap"></div>

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) {

ys_vue/src/views/mold/moldDetail.vue

@@ -699,6 +699,7 @@
                 this.getOperationRecord(this.activeTab);
             },
 
+            //意义不明的获取资产方公司的设备列表
             getMsg() {
                 this.http.post( this.port.base.moulds, {
                     belongCompanyId: this.user.companyId,
@@ -1537,7 +1538,7 @@
             };
         },
         mounted() {
-            this.getMsg();
+            // this.getMsg();
             this.getDetail();
         }
     };

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();
         }
     };

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

ys_vue/src/views/project/staff.vue

@@ -41,7 +41,7 @@
                 <template slot-scope="scope">
                     <span class="info" v-for="(item, index) in scope.row.projects">
                         {{item.projectName}}
-                        <span v-if="index != scope.row.projects.length-1">、</span>
+                        <span v-if="scope.row.projects != null && index != scope.row.projects.length-1">、</span>
                     </span>
                 </template>
 			</el-table-column>
@@ -52,7 +52,7 @@
 				<template slot-scope="scope" v-if="user.id == scope.row.parentId || user.isManager == 1 || (user.parentId == 1 && user.subordinateType == 0)">
 					<el-button size="small" @click="handleEdit(scope.$index, scope.row)">编辑</el-button>
 					<el-button type="danger" size="small" @click="handleDel(scope.$index, scope.row)">删除</el-button>
-                    <el-button type="primary" size="small" @click="invite(scope.$index, scope.row)" v-if="user.id != 1 && scope.row.projects.length == 1">邀请</el-button>
+                    <el-button type="primary" size="small" @click="invite(scope.$index, scope.row)" v-if="user.id != 1 && scope.row.projects != null && scope.row.projects.length == 1">邀请</el-button>
 				</template>
 			</el-table-column>
 		</el-table>
@@ -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">