修复已知问题

minggao/config/index.js

@@ -12,10 +12,10 @@ module.exports = {
     proxyTable: {
       '/api': {
         ws: false,
-        // target: 'http://192.168.1.52:12345', //翟毅飞
+        target: 'http://192.168.1.52:12345', //翟毅飞
         //  target: 'https://www.yhswjc.com', //线上
         // target: 'http://192.168.1.77:12345', //曹世祥
-        target: 'http://114.115.147.140:12345',
+        // target: 'http://114.115.147.140:12345',
         changeOrigin: true,
         pathRewrite: {
           '^/api': '/api' //重写接口

minggao/src/page/commandCenter/realTime.vue

@@ -405,11 +405,12 @@
       :modal="false"
       :close-on-press-escape="false"
       :visible.sync="videoNoticeDialogVisible"
+      @close="handleCloseNoticeDialog"
       width="500px"
     >
       <div style="padding:40px 20px;">{{ videoNoticeTitle }}</div>
       <span slot="footer" class="dialog-footer">
-        <el-button @click="cancleNoticeClik">取 消</el-button>
+        <el-button @click="handleCloseNoticeDialog">取 消</el-button>
         <el-button type="primary" @click="confrimNoticeClick">确 定</el-button>
       </span>
     </el-dialog>
@@ -513,7 +514,8 @@ export default {
       currentVideoCallUserID: '',
       videoNoticeTitle: '',
       videoNoticeDialogVisible: false,
-      currentVideoNoticeData: null
+      currentVideoNoticeData: null,
+      isNoticeDialogConfirm: false
     };
   },
   //监听属性 类似于data概念
@@ -948,7 +950,7 @@ export default {
         };
         this.websock.onmessage = event => {
           var data = JSON.parse(event.data);
-          console.log('WebSocket:消息---------------------------', data);
+          console.warn('WebSocket:消息---------------------------', data);
 
           if (data.action == 'none') {
             // 获取聊天记录
@@ -1002,6 +1004,8 @@ export default {
               this.websock.send(JSON.stringify(obj));
               return;
             }
+
+            this.updateTalkingStatus(true);
             // 获取当前点击用户的房间号以及登录房间所需的Token
             // console.log(JSON.parse(event.data));
             console.log(data);
@@ -1039,6 +1043,7 @@ export default {
             console.warn('recv_video---------------- response', data.data);
             if (this.isVideoCallRefused) {
               this.updateIsRefusedCall(false);
+              this.updateTalkingStatus(false);
               return;
             }
 
@@ -1114,7 +1119,9 @@ export default {
       }
     },
     confrimNoticeClick() {
+      this.isNoticeDialogConfirm = true;
       this.videoNoticeDialogVisible = false;
+
       if (!this.currentVideoNoticeData) {
         return;
       }
@@ -1123,9 +1130,16 @@ export default {
         '正在和' + this.currentVideoNoticeData.real_name + '视频通话';
       this.loginRoom();
     },
-    cancleNoticeClik() {
+    handleCloseNoticeDialog() {
+      console.warn('close notice dialog', this.isNoticeDialogConfirm);
       this.videoNoticeDialogVisible = false;
+      if (!this.isNoticeDialogConfirm) {
+        this.cancleNoticeClik();
+      }
 
+      this.isNoticeDialogConfirm = false;
+    },
+    cancleNoticeClik() {
       const socketData = {
         action: 'reject_video', // 动作标识，必填
         recv_user_id: this.currentVideoNoticeData.user_id, // 接收人用户id， 非必填
@@ -1134,7 +1148,7 @@ export default {
 
       console.warn('send reject_video', socketData);
       this.websock.send(JSON.stringify(socketData));
-
+      this.updateTalkingStatus(false);
       this.currentVideoNoticeData = null;
     },
     loginRoom() {
@@ -1415,6 +1429,8 @@ export default {
   }, //生命周期 - 销毁之前
   destroyed() {
     console.log('我进入到销毁里喽');
+    this.updateTalkingStatus(false);
+    this.updateIsRefusedCall(false);
     var that = this;
     clearTimeout(that.timeoutnum); // 清除重连
     clearTimeout(that.timeoutObj); // 清除心跳

minggao/src/page/recordForm/components/userSelect.vue

@@ -171,7 +171,8 @@ export default {
       const payload = _.assign(
         {
           pageNum: 1,
-          page_item: 10000000
+          page_item: 10000000,
+          is_self: '1'
           // mobile: this.phoneVal, //电话
           // org_id: this.org_id
         },
@@ -193,7 +194,7 @@ export default {
 
           if (!this.id) {
             console.log('this.id not found');
-            const firstUserInfo = first(this.userList);
+            const firstUserInfo = first(this.userList) || {};
             this.id = (firstUserInfo && firstUserInfo.user_id) || '';
             const org_id =
               (first(firstUserInfo.org_list) &&

minggao/src/page/recordForm/fieldSurveys.vue

@@ -82,7 +82,6 @@
           <el-table-column
             prop="inspect_name"
             label="踏查点名称"
-            fixed="left"
             width="120"
             show-overflow-tooltip
           ></el-table-column>
@@ -109,8 +108,8 @@
           </el-table-column>
           <el-table-column
             prop="inspect_area"
-            label="踏查点面积"
-            min-width="100"
+            label="踏查点面积(亩)"
+            width="120"
             show-overflow-tooltip
           >
           </el-table-column>
@@ -139,7 +138,8 @@
           </el-table-column>
           <el-table-column
             prop="occurs_area"
-            label="发生面积"
+            label="发生面积(亩)"
+            width="120"
             show-overflow-tooltip
           >
           </el-table-column>
@@ -151,7 +151,12 @@
             show-overflow-tooltip
           >
           </el-table-column>
-          <el-table-column prop="harm_num" label="危害株数"> </el-table-column>
+          <el-table-column
+            prop="harm_num"
+            label="危害株数"
+            show-overflow-tooltip
+          >
+          </el-table-column>
           <el-table-column
             prop="harm_place"
             label="危害部位"
@@ -160,7 +165,8 @@
           </el-table-column>
           <el-table-column
             prop="harm_rate"
-            label="危害率"
+            label="危害率(%)"
+            width="100"
             show-overflow-tooltip
           >
           </el-table-column>
@@ -322,7 +328,7 @@
         <el-form-item label="危害对象：" prop="harm_obj">
           <el-input v-model="baseForm.harm_obj"></el-input>
         </el-form-item>
-        <el-form-item label="发生面积：" prop="occurs_area">
+        <el-form-item label="发生面积(亩)：" prop="occurs_area">
           <!-- <el-input v-model="baseForm.occurs_area"
             ><template slot="append">亩</template></el-input
           > -->
@@ -351,6 +357,7 @@
                 v-model="baseForm.check_num"
                 :min="1"
                 :max="999999999"
+                :precision="0"
               ></el-input-number>
             </el-form-item>
           </el-col>
@@ -364,6 +371,7 @@
                 v-model="baseForm.harm_num"
                 :min="1"
                 :max="999999999"
+                :precision="0"
               ></el-input-number>
             </el-form-item>
           </el-col>
@@ -371,7 +379,7 @@
         <el-form-item label="危害部位：" prop="harm_place">
           <el-input v-model="baseForm.harm_place"></el-input>
         </el-form-item>
-        <el-form-item label="危害率：" prop="harm_rate">
+        <el-form-item label="危害率(%)：" prop="harm_rate">
           <!-- <el-input v-model="baseForm.harm_rate"></el-input> -->
           <el-input-number
             v-model="baseForm.harm_rate"
@@ -481,6 +489,12 @@ export default {
         inspect_area: [
           { required: true, message: '请输入踏查点面积', trigger: 'blur' }
         ],
+        harm_num: [
+          { required: true, message: '请输入危害株数', trigger: 'blur' }
+        ],
+        check_num: [
+          { required: true, message: '请输入调查株数', trigger: 'blur' }
+        ],
         pest_name: [
           { required: true, message: '请输入物种名称', trigger: 'blur' },
           { min: 1, max: 50, message: '长度在 1 到 50 个字符', trigger: 'blur' }

minggao/src/page/recordForm/sampleAppraisal.vue

@@ -152,6 +152,7 @@
             v-model="baseForm.num"
             :min="1"
             :max="999999999"
+            :precision="0"
             label="数量"
           ></el-input-number>
         </el-form-item>

minggao/src/page/recordForm/samplePlot.vue

@@ -63,7 +63,6 @@
           <el-table-column
             prop="sample_addr"
             label="标准样地地点"
-            fixed="left"
             width="120"
             show-overflow-tooltip
           ></el-table-column>
@@ -75,7 +74,8 @@
           ></el-table-column>
           <el-table-column
             prop="sample_area"
-            label="样地面积"
+            label="样地面积(亩)"
+            width="120"
             show-overflow-tooltip
           ></el-table-column>
           <el-table-column prop="lng" label="经度" show-overflow-tooltip>
@@ -84,7 +84,7 @@
           </el-table-column>
           <el-table-column prop="height" label="海拔" show-overflow-tooltip>
           </el-table-column>
-          <el-table-column prop="occurs" label="发生境" show-overflow-tooltip>
+          <el-table-column prop="occurs" label="发生生境" show-overflow-tooltip>
           </el-table-column>
           <el-table-column
             prop="pest_name"
@@ -120,7 +120,7 @@
           <el-table-column prop="is_gather" label="是否采集样本" width="120">
           </el-table-column>
           <el-table-column prop="user_name" label="调查人"> </el-table-column>
-          <el-table-column prop="check_time" label="调查时间" min-width="140">
+          <el-table-column prop="check_time" label="调查时间" min-width="200">
           </el-table-column>
 
           <el-table-column
@@ -426,7 +426,6 @@
                 <el-input-number
                   :precision="2"
                   :step="1"
-                  :min="0.1"
                   :max="999999999"
                   @change="value => handleInputChange(value, scope.row)"
                   v-model="scope.row.num_4"
@@ -453,7 +452,6 @@
                 <el-input-number
                   :precision="2"
                   :step="1"
-                  :min="0.1"
                   :max="999999999"
                   @change="value => handleInputChange(value, scope.row)"
                   v-model="scope.row.num_5"
@@ -1041,7 +1039,7 @@ export default {
       const index = rule.field.split('.')[1];
 
       if (!value) {
-        callback(new Error('请输入大于0的数'));
+        callback();
       } else {
         if (Number(value) > 0) {
           if (index - 0 === 2) {

minggao/src/page/recordForm/trapRecord.vue

@@ -63,7 +63,6 @@
           <el-table-column
             prop="sample_addr"
             label="标准样地地点"
-            fixed="left"
             width="120"
             show-overflow-tooltip
           ></el-table-column>
@@ -111,6 +110,9 @@
             label="入侵害虫种类"
             show-overflow-tooltip
           >
+            <template slot-scope="scope">
+              {{ (scope.row.pest_list && scope.row.pest_list.length) || 0 }}
+            </template>
           </el-table-column>
           <el-table-column prop="user_name" label="调查人"> </el-table-column>
           <el-table-column prop="check_time" label="提交时间" width="200">
@@ -150,7 +152,7 @@
     <el-dialog
       title="农业外来入侵病虫诱捕器调查记录表"
       :visible.sync="dialogVisible"
-      width="1000px"
+      width="1200px"
       :close-on-click-modal="false"
       :close-on-press-escape="false"
     >
@@ -259,7 +261,7 @@
           <el-table
             :data="baseForm.pest_list"
             border
-            style="margin-bottom:20px;"
+            style="margin-bottom:20px;width:100%;"
           >
             <el-table-column label="入侵害虫名称" align="center">
               <template slot-scope="scope">
@@ -301,7 +303,7 @@
                 </el-form-item>
               </template>
             </el-table-column>
-            <el-table-column label="合计" align="center" width="120">
+            <el-table-column label="合计" align="center" min-width="160">
               <template slot-scope="scope">
                 <el-form-item
                   :prop="'pest_list.' + scope.$index + '.pest_total'"
@@ -311,7 +313,7 @@
                 </el-form-item>
               </template>
             </el-table-column>
-            <el-table-column label="雌" align="center" width="120">
+            <el-table-column label="雌" align="center" min-width="160">
               <template slot-scope="scope">
                 <el-form-item
                   :prop="'pest_list.' + scope.$index + '.female_num'"
@@ -326,6 +328,7 @@
                     v-model="scope.row.female_num"
                     :min="1"
                     :max="999999999"
+                    :precision="0"
                   ></el-input-number>
                   <!-- <el-input
                     @change="value => handleInputChange(value, scope.row)"
@@ -335,7 +338,7 @@
                 </el-form-item>
               </template>
             </el-table-column>
-            <el-table-column label="雄" align="center" width="120">
+            <el-table-column label="雄" align="center" min-width="160">
               <template slot-scope="scope">
                 <el-form-item
                   :prop="'pest_list.' + scope.$index + '.male_num'"
@@ -349,6 +352,7 @@
                     v-model="scope.row.male_num"
                     :min="1"
                     :max="999999999"
+                    :precision="0"
                     @change="value => handleInputChange(value, scope.row)"
                   ></el-input-number>
                   <!-- <el-input
@@ -364,16 +368,12 @@
                 <el-form-item
                   :prop="'pest_list.' + scope.$index + '.remarks'"
                   label-width="0"
-                  :rules="{
-                    validator: validateSingleInputArea,
-                    trigger: 'change'
-                  }"
                 >
                   <el-input v-model="scope.row.remarks"></el-input>
                 </el-form-item>
               </template>
             </el-table-column>
-            <el-table-column label="操作" align="center">
+            <el-table-column label="操作" align="center" fixed="right">
               <template slot-scope="scope">
                 <el-form-item label-width="0">
                   <el-button
@@ -627,9 +627,9 @@ export default {
         pest_id: '', //害虫id
         pest_name: '', // 害虫名称
         harm_crop: '', // 危害农作物
-        pest_total: 0, // 害虫总数
-        male_num: 0, // 雄性数量
-        female_num: 0, // 雌性数量
+        pest_total: 2, // 害虫总数
+        male_num: 1, // 雄性数量
+        female_num: 1, // 雌性数量
         remarks: '' // 备注
       });
     },
@@ -684,6 +684,7 @@ export default {
 
         this.$nextTick(() => {
           this.$refs.gridTable.bodyWrapper.scrollTop = 0;
+          this.$refs.gridTable.doLayout();
         });
       });
     },
@@ -822,7 +823,7 @@ export default {
       if (!value) {
         callback(new Error('请输入/选择'));
       } else {
-        if (value.length > 1 && value.length < 51) {
+        if (value.length > 0 && value.length < 51) {
           callback();
         } else {
           callback(new Error('长度为1-50之间'));
@@ -833,7 +834,7 @@ export default {
       if (!value) {
         callback(new Error('请输入/选择'));
       } else {
-        if (value.length > 1 && value.length < 201) {
+        if (value.length > 0 && value.length < 201) {
           callback();
         } else {
           callback(new Error('长度为1-200之间'));