Merge pull request '问卷显示id' (#15) from liwei into develop

Reviewed-on: http://101.201.121.115:3000/leo/Saisiwei_WEB/pulls/15

.env.production

@@ -2,4 +2,7 @@
 VUE_APP_ENV = '物业'
 NODE_ENV = 'production'
 # base api
+# 正式环境
 VUE_APP_BASE_API = 'http://8.140.133.55:8096'
+# 测试环境
+# VUE_APP_BASE_API = 'http://8.140.133.55:8090'

src/views/login/index.vue

@@ -79,7 +79,7 @@ export default {
       loginForm: {
         userid: '',
         password: '',
-        pid: 100
+        pid: ""
       },
       loginRules: {
         pid: [{ required: true, trigger: 'blur', message: '不能为空' }],
@@ -123,7 +123,8 @@ export default {
     getPlants() {
       getCourts().then((res) => {
         if (res.code === 200) {
-          this.options = res.data
+          this.options = res.data || [];
+          this.loginForm.pid = this.options[0].cid || "";
           localStorage.setItem('cid', JSON.stringify(this.options))
         }
       })

src/views/questionnaire/survey.vue

@@ -17,6 +17,7 @@
       </el-form-item>
     </el-form>
     <el-table v-loading="loading" :data="dataList" border>
+      <el-table-column :label="getColumnName('surveysheetid')" align="center" prop="surveysheetid" width="120" />
       <el-table-column :label="getColumnName('descr')" align="center" prop="descr" width="120" show-overflow-tooltip />
       <el-table-column :label="getColumnName('surveyyear')" align="center" prop="surveyyear" width="100" />
       <el-table-column :label="getColumnName('surveydate')" prop="surveydate" align="center" width="100" />