用户名冲突+诱芯更换时间设置

bigdata2/src/components/UserManger.vue

@@ -82,7 +82,7 @@
             <el-button type="success" @click="edit(item)" plain size='small'
               >用户编辑</el-button
             >
-            <template v-if="(have_type == 0 || staff == 1 || have_type == 2) && (username != item.username)">
+            <template v-if="(have_type == 0 || staff == 1 || have_type == 2) && (currusername != item.username)">
                 <el-button
                 size='small'
                 v-if="item.user_have_type == '1' || item.user_have_type == '2'" 
@@ -323,7 +323,7 @@ export default {
       },
       have_type: "",
       staff: "",
-      username: "",
+      currusername: "",
     };
   },
   computed: {
@@ -338,7 +338,7 @@ export default {
     this.getList();
     this.have_type = localStorage.getItem("have_type"); // 0管理员  1用户
     this.staff = localStorage.getItem("staff"); // 1是admin
-    this.username = localStorage.getItem("username"); // 1是admin
+    this.currusername = localStorage.getItem("username"); // 1是admin
   },
   methods: {
     getList() {

bigdata2/src/pages/forecasting/xycb/xycb.vue

@@ -222,7 +222,7 @@
 		<!-- 设置诱芯更换时间配置弹框 -->
 		<el-dialog title="设置诱芯" :visible.sync="setTimeDialogVisible" width="420px">
 			<el-form ref="form" :model="xyform" label-width="130px">
-				<el-form-item label="监测害虫名称：">
+				<el-form-item label="诱芯更换时间：">
 					<el-date-picker v-model="xyform.core" value-format="yyyy-MM-dd" type="date" placeholder="选择日期"></el-date-picker>
 				</el-form-item>
 			</el-form>
@@ -612,7 +612,11 @@ export default {
 					obj.equip_name=item.equip_name
 					obj.upl_time=item.upl_time
 					obj.pest_name=item.pest_name
-					obj.core = item.core.substring(item.core.lastIndexOf("#")+1)
+					if(item.core){
+						obj.core = item.core.substring(item.core.lastIndexOf("#")+1)
+					}else{
+						obj.core = ''
+					} 
 					obj.is_online=Number(item.is_online)
 					return obj
 				})