解决冲突

.env.development

@@ -4,6 +4,8 @@ OUT_PUT_DIR=dist/jp-housekeeper-portal
 VUE_APP_BACKEND_URL=http://127.0.0.1:8086/jp-housekeeper-server
 #VUE_APP_BACKEND_URL=http://ykt-test.xiaoxinda.com/jp-housekeeper-server
 #VUE_APP_BACKEND_URL=http://xpgjapi.xiaoxinda.com
+#VUE_APP_BACKEND_URL=http://mirror.xiaoxinda.com/xpgjapi/
+
 
 #手机企业版
 VUE_APP_COMPANY_HEALTH_WECHAT_QY_URL=http://wisdomhousewechat.sudaonline.net/prevention/motemwall.html 

.env.production

@@ -1,6 +1,7 @@
 OUT_PUT_DIR=dist/xpgj-admin
 
 VUE_APP_BACKEND_URL=https://xpgjapi.xiaoxinda.com/
+#VUE_APP_BACKEND_URL=https://mirror.xiaoxinda.com/xpgjapi/
 
 #手机企业版
 VUE_APP_COMPANY_HEALTH_WECHAT_QY_URL=https://xpgjapi.xiaoxinda.com/healthPublicity

src/api/base/personHealthLedger.js

@@ -77,6 +77,10 @@ function healthLedgerDateCompanyNumExportXls() {
   return request.post(constant.serverUrl + "/base/personHealthLedger/healthLedgerDateCompanyNumExportXls");
 }
 
+function pageListNew(formData) {
+  return request.post(constant.serverUrl + "/base/personHealthLedger/pageListNew", formData);
+}
+
 export default {
-  pageList, create, edit, add, update, remove, batchRemove, exportXls, pageListAll,exportXlsAll,gpsHistoryList,exportXlsWC,exportXlsTWYC,exportXlsZZYC,healthLedgerDateExportXls,healthLedgerDateCompanyNumExportXls
+  pageList, create, edit, add, update, remove, batchRemove, exportXls, pageListAll,exportXlsAll,gpsHistoryList,exportXlsWC,exportXlsTWYC,exportXlsZZYC,healthLedgerDateExportXls,pageListNew,healthLedgerDateCompanyNumExportXls
 }

src/components/MenuTreeItem/index.vue

@@ -4,7 +4,7 @@
     <el-scrollbar style="height:100%">
     <template v-for="item in routes">
       <template v-if="item.children==null || item.children.length==0">     
-        <el-menu-item :index="item.menuUrl" :key="item.id">
+        <el-menu-item :index="item.menuUrl + ',' + item.menuName" :key="item.id">
             <i :class="item.icon"></i>
           <span>{{item.menuName}}</span>
         </el-menu-item>

src/routers/modules/base.js

@@ -628,7 +628,7 @@ var routers = [
                 component: () => import('@/views/base/personApplication-list.vue'),
                 meta: {
                         roles: ["admin"],
-                        title: '审批人员管理'
+                        title: '注册人员管理'
                 }
         },
 ]

src/store/modules/tagsView.js

@@ -1,24 +1,29 @@
 const state = {
   visitedViews: [],
-  cachedViews: []
+  cachedViews: [],
+  menuDict: {}
 }
 
 const mutations = {
+  SELECT_MENU: (state,menu)=> {
+    state.menuDict[menu.url] = menu.title;
+  },
   ADD_VISITED_VIEW: (state, view) => {
     console.log("ADD_VISITED_VIEW");
     console.log(view.path);
+    console.log(state.menuDict[view.path] );
 
     if (state.visitedViews.some(v => v.path === view.path)) return
 
-    var newView =  Object.assign({}, view, {
-      title: view.meta.title || 'no-name'
-    });
+    // var newView =  Object.assign({}, view, {
+    //   title: state.menuDict[view.path] || view.meta.title || 'no-name'
+    // });
 
-    console.log(newView);
+    // console.log(newView);
 
     state.visitedViews.push({
       path : view.path,
-      title: view.meta.title || 'no-name',
+      title: state.menuDict[view.path] || view.meta.title || 'no-name',
       meta: view.meta,
       name: view.name,
       fullPath: view.fullPath
@@ -84,6 +89,9 @@ const mutations = {
 }
 
 const actions = {
+  selectMenu({commit},menu) {
+    commit('SELECT_MENU', menu)
+  },
   addView({ dispatch }, view) {
     console.log("addView");
 
@@ -96,7 +104,6 @@ const actions = {
   addCachedView({ commit }, view) {
     commit('ADD_CACHED_VIEW', view)
   },
-
   delView({ dispatch, state }, view) {
     return new Promise(resolve => {
       dispatch('delVisitedView', view)

src/views/base/companyInfo-detail.vue

@@ -159,9 +159,42 @@
             </el-form-item>
           </el-col>
         </el-row>
+        <el-row v-show="formModel.unitType=='1'">
+          <el-col :span="12">
+            <el-form-item label="健康打卡提醒" prop="healthyReportNoticeEnable">
+              <el-switch v-model="formModel.healthyReportNoticeEnable"
+                active-color="#13ce66"
+                active-text="开"
+                inactive-text="关">
+              </el-switch>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row v-show="formModel.unitType=='1'">
+          <el-col :span="12">
+            <el-form-item label="打卡提醒时间" prop="healthyReportNoticeTime">
+              <el-time-picker
+                v-model="formModel.healthyReportNoticeTime"
+                class="date-box"
+                format="HH:mm"
+                value-format="HH:mm"
+              ></el-time-picker>
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="通知打卡时间" prop="healthyReportSubmitTime">
+              <el-time-picker
+                v-model="formModel.healthyReportSubmitTime"
+                class="date-box"
+                format="HH:mm"
+                value-format="HH:mm"
+              ></el-time-picker>
+            </el-form-item>
+          </el-col>
+        </el-row>
         <el-row>
           <el-col :span="24">
-            <el-form-item label="备注" prop="remark">
+            <el-form-item label="单位备注" prop="remark">
               <el-input
                 type="textarea"
                 v-model="formModel.remark"

src/views/base/companyInfo-list.vue

@@ -62,6 +62,23 @@
           ></el-option>
         </el-select>
       </el-form-item>
+      <el-form-item label="单位性质" prop="unitType">
+              <el-select
+                v-model="queryModel.unitType"
+                filterable
+                clearable
+                placeholder="请选择"
+                style="width: 110px"
+                size="mini"
+              >
+                <el-option
+                  v-for="result in typeData"
+                  :key="result.id"
+                  :label="result.name"
+                  :value="result.value"
+                ></el-option>
+              </el-select>
+            </el-form-item>
       <!-- <el-form-item label="服务场景" prop="type">
         <el-select
           v-model="queryModel.type"
@@ -150,6 +167,11 @@
         label="全称"
         width="120"
       ></el-table-column>
+      <el-table-column
+        prop="unitTypeName"
+        label="单位性质"
+        width="120"
+      ></el-table-column>
       <el-table-column
         prop="sceneName"
         label="场景值"
@@ -310,6 +332,7 @@ import Constant from "@/constant";
 import companyInfoDetail from "./companyInfo-detail";
 import companyDeviceRelationList from "./companyDeviceRelation-list";
 import companyInfoApi from "@/api/base/companyInfo";
+import dataDictionaryApi from "@/api/sys/dataDictionary";
 import sceneInfoApi from "@/api/base/sceneInfo";
 import SelectTree from "@/components/SelectTree";
 import QRCode from "qrcodejs2";
@@ -330,6 +353,7 @@ export default {
         subordinate: false,
         sceneId: "",
         type: "",
+        unitType:""
       },
       loading: false,
       tableData: [],
@@ -368,6 +392,7 @@ export default {
       },
       xlsLoading: false,
       sceneData: [],
+      typeData:[]
     };
   },
   created() {
@@ -385,6 +410,13 @@ export default {
       }
     });
 
+    var formData = new FormData();
+    formData.append("catalogName", "单位性质");
+    dataDictionaryApi.findByCatalogName(formData).then((response) => {
+      var jsonData = response.data;
+      this.typeData = jsonData.data;
+    });
+
     this.changePage(1);
     this.loadTree();
   },
@@ -446,6 +478,8 @@ export default {
         formData.append("sceneId", self.queryModel.sceneId);
       }
 
+      formData.append("unitType", self.queryModel.unitType);
+
       // if (self.queryModel.type != null) {
       //   formData.append("type", self.queryModel.type);
       // }

src/views/base/personHealthLedger-list.vue

@@ -46,22 +46,36 @@
         <el-form-item label="姓名" prop="personName">
           <el-input type="text" size="mini" v-model="queryModel.personName"></el-input>
         </el-form-item>
-        <!-- <el-form-item label="健康情况" prop="healthStatus">
+        <el-form-item label="上报情况" prop="isReport">
           <el-select
-            v-model="queryModel.healthStatus"
+            v-model="queryModel.isReport"
+            size="mini"
+            filterable
+            placeholder="请选择"
+            style="width: 100px"
+          >
+            <el-option value="9" label="全部"></el-option>
+            <el-option value="0" label="未上报"></el-option>
+            <el-option value="1" label="已上报"></el-option>
+          </el-select>
+        </el-form-item>
+        <el-form-item label="打卡位置" prop="address">
+          <el-select
+            v-model="queryModel.address"
+            size="mini"
             filterable
             placeholder="请选择"
-            style="width:50%"
+            style="width: 100px"
           >
-            <el-option
-              size="mini"
-              v-for="result in healthData"
-              :key="result.id"
-              :label="result.name"
-              :value="result.value"
-            ></el-option>
+            <el-option value label="全部"></el-option>
+            <el-option value="0" label="市内"></el-option>
+            <el-option value="1" label="市外省内"></el-option>
+            <el-option value="2" label="省外"></el-option>
           </el-select>
-        </el-form-item> -->
+        </el-form-item>
+        <el-form-item label="" prop="fever">
+          <el-checkbox v-model="queryModel.fever">是否体温异常</el-checkbox>
+        </el-form-item>
         <el-form-item>
           <el-button
             type="primary"
@@ -237,7 +251,7 @@ import personHealthLedgerListDetalExport from "./personHealthLedger-list-detalEx
 import VehicleHistoryList from './vehicleHistory-list';
 
 export default {
-  name: 'basePersonHealthLedgerListAll',
+  name: 'basePersonHealthLedgerList',
   data() {
     var self = this;
 
@@ -251,7 +265,10 @@ export default {
         healthStatus: "",
         companyId: "",
         subordinate: true,
-        queryTime: ""
+        queryTime: "",
+        address:"",
+        fever:false,
+        isReport:"9"
       },
       loading: false,
       tableData: [],
@@ -384,6 +401,9 @@ export default {
       formData.append("companyId", self.queryModel.companyId);
       formData.append("subordinate", self.queryModel.subordinate);
       formData.append("queryTime", self.queryModel.queryTime);
+      formData.append("address", self.queryModel.address);
+      formData.append("fever", self.queryModel.fever);
+      formData.append("isReport", self.queryModel.isReport);
 
       if (this.field != null) {
         formData.append("field", this.field);
@@ -394,7 +414,7 @@ export default {
       }
 
       personHealthLedgerApi
-        .pageList(formData)
+        .pageListNew(formData)
         .then(function(response) {
           self.loading = false;
 

src/views/base/personInfo-list.vue

@@ -146,6 +146,8 @@
             <el-option :value="false" label="否"></el-option>
           </el-select>
         </el-form-item>
+        </div>
+      <div>
         <el-form-item label="允许审核注册用户" prop="enableRegisterExamine">
           <el-select
             v-model="queryModel.enableRegisterExamine"
@@ -158,6 +160,21 @@
             <el-option :value="false" label="否"></el-option>
           </el-select>
         </el-form-item>
+        <el-form-item label="健康码" prop="healthyCode">
+          <el-select
+            v-model="queryModel.healthyCode"
+            size="mini"
+            placeholder="请选择"
+            style="width:100px"
+          >
+          <el-option
+              v-for="item in healthyCodeList"
+              :key="item.value"
+              :label="item.name"
+              :value="item.value"
+          ></el-option>
+          </el-select>
+        </el-form-item>
       </div>
       <!-- <div>
         <el-form-item v-if="position1Show" :label="position1" prop="position1">
@@ -774,6 +791,7 @@ import personRoleInfoApi from "@/api/base/personRoleInfo";
 import companyPositionApi from "@/api/base/companyPosition";
 import deviceInfoApi from "@/api/base/deviceInfo";
 import personDeviceRelationApi from "@/api/base/personDeviceRelation";
+import dataDictionaryApi from "@/api/sys/dataDictionary";
 import SelectTree from "@/components/SelectTree";
 import LifeRecordList from "./lifeRecord-list";
 
@@ -806,7 +824,8 @@ export default {
         parkId: "",
         roleId:"",
         enableAttendance: null,
-        enableRegisterExamine: null
+        enableRegisterExamine: null,
+        healthyCode:"",
       },
       loading: false,
       tableData: [],
@@ -870,6 +889,7 @@ export default {
       parkList: [],
       showRoleModal: false,
       roleResult:[],
+      healthyCodeList:[],
     };
   },
   watch: {
@@ -919,6 +939,13 @@ export default {
       }
     });
 
+    var formData = new FormData();
+    formData.append("catalogName", "健康码");
+    dataDictionaryApi.findByCatalogName(formData).then(response => {
+      var jsonData = response.data;
+      this.healthyCodeList = jsonData.data;
+    });
+
     // companyInfoApi.list({ type: "3" }).then((response) => {
     //   var jsonData = response.data;
     //   this.parkList = jsonData.data;
@@ -1049,6 +1076,8 @@ export default {
         formData.append("direction", this.direction);
       }
 
+      formData.append("healthyCode", self.queryModel.healthyCode);
+
       personInfoApi
         .pageList(formData)
         .then(function (response) {

src/views/layout/TagsView/index.vue

@@ -82,7 +82,7 @@ export default {
             path: tagPath,
             name: route.name,
             meta: { ...route.meta }
-          })
+          }) 
         }
         if (route.children) {
           const tempTags = this.filterAffixTags(route.children, route.path)
@@ -103,9 +103,10 @@ export default {
       }
     },
     addTags() {
-      console.log("addTags");
+      const { name,meta } = this.$route
 
-      const { name } = this.$route
+      console.log("addTags:" + name + "," + meta.title);
+      
       if (name) {
         this.$store.dispatch('tagsView/addView', this.$route)
       }

src/views/layout/index.vue

@@ -173,8 +173,16 @@ export default {
       console.log(key, keyPath);
     },
     handleSelect(key, keyPath) {
-      //console.log(key, keyPath);
-      this.$router.push({ path: key });
+      //console.log("select:", key, keyPath);
+      var arr = key.split(",");
+
+      //在store保存
+      this.$store.dispatch('tagsView/selectMenu', {
+        url: arr[0],
+        title: arr[1]
+      })
+
+      this.$router.push({ path: arr[0]});
     },
     logout() {
       this.$store.dispatch("user/logout").then(() => {