sunyadv 5 years ago
parent
commit
05fc030e34
2 changed files with 6 additions and 5 deletions
  1. 2 1
      ys_vue/build/webpack.dev.conf.js
  2. 4 4
      ys_vue/src/views/base/factory.vue

+ 2 - 1
ys_vue/build/webpack.dev.conf.js

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

+ 4 - 4
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-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 :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-input v-model="addForm.companyName" autocomplete="off" placeholder="请输入生产方名称"></el-input>
 				</el-form-item>
 				</el-form-item>
                 <el-form-item label="关联资产方" v-if="addState">
                 <el-form-item label="关联资产方" v-if="addState">
@@ -63,7 +63,7 @@
                         </el-option>
                         </el-option>
                     </el-select>
                     </el-select>
 				</el-form-item>
 				</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-input v-model.lazy="addForm.companyAddress" autocomplete="off" @change="changeFactoryArea('addContainer')" placeholder="请输入生产方地址"></el-input>
 				</el-form-item>
 				</el-form-item>
                 <div id="addContainer" class="formMap" v-if="addState"></div>
                 <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-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 :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-input v-model="editForm.companyName" autocomplete="off" placeholder="请输入生产方名称"></el-input>
 				</el-form-item>
 				</el-form-item>
                 <el-form-item label="关联资产方">
                 <el-form-item label="关联资产方">
@@ -98,7 +98,7 @@
                         </el-option>
                         </el-option>
                     </el-select>
                     </el-select>
 				</el-form-item>
 				</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-input v-model="editForm.companyAddress" autocomplete="off" :change="changeFactoryArea('editContainer')" placeholder="请输入生产方地址"></el-input>
 				</el-form-item>
 				</el-form-item>
                 <div id="editContainer" class="formMap"></div>
                 <div id="editContainer" class="formMap"></div>