Merge remote-tracking branch 'origin/master'

zh-baseversion-web/src/layout/components/Navbar.vue

@@ -90,6 +90,13 @@ export default {
       xiaohidden:false,
       receivedList:[],
       routerPath:"",
+      // 查询参数
+      queryParams: {
+        pageNum: 1,
+        pageSize: 100,
+        status:5,
+        enterpriseId:""
+      },
     }
   },
   computed: {

zh-baseversion-web/src/utils/mapClass/map.js

@@ -1125,7 +1125,7 @@ export class EditorMap {
     const pipe = this.createPipeLine({
       id:id,
       path: eval(path),
-      strokeWeight: objData.strokeWeight || 4,
+      strokeWeight: objData.strokeWeight || 2,
       strokeColor: color,
       extData: objData,
       cursor: "pointer",

zh-baseversion-web/src/views/specialist/behInfo/index.vue

@@ -203,7 +203,7 @@ export default {
       title: "",
       // 是否显示弹出层
       open: false,
-      // 申报状态：1 已上报，2 未上报，3 已通过，4未通过 字典
+      // 申报状态：1 已上报，2 未上报 字典
       fRepStatusOptions: [],
       // 查询参数
       queryParams: {
@@ -232,7 +232,7 @@ export default {
   },
   created() {
     this.getList();
-    this.getDicts("t_rep_status").then(response => {
+    this.getDicts("t_expert_rep_status").then(response => {
       this.fRepStatusOptions = response.data;
     });
   },

zh-baseversion-web/src/views/specialist/info/index.vue

@@ -138,6 +138,7 @@
           icon="el-icon-download"
           size="mini"
 		      :loading="exportLoading"
+          @click="handleExport"
         >导出</el-button>
       </el-col>
       <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
@@ -379,7 +380,12 @@
 
           <el-col :span="12">
             <el-form-item label="从事专业工作年限" prop="fMajorLife">
-              <el-input v-model="form.fMajorLife" placeholder="请输入从事专业工作年限" />
+              <el-input-number 
+                  :style="{width: '320px'}"
+                  controls-position="right"
+                  :min="0"
+                  v-model="form.fMajorLife"  
+                  placeholder="请输入从事专业工作年限" />
             </el-form-item>
           </el-col>
 
@@ -528,7 +534,7 @@ export default {
       fThisProvinceFlagOptions: [],
       // 是否有效：0 有效，1 无效字典
       fValidTypeOptions: [],
-      //1 已上报，2 未上报，3 已通过，4未通过
+      //1 已上报，2 未上报
       repStatusOptions: [],
       // 查询参数
       queryParams: {
@@ -649,7 +655,7 @@ export default {
     this.getDicts("t_valid_type").then(response => {
       this.fValidTypeOptions = response.data;
     });
-    this.getDicts("t_rep_status").then(response => {
+    this.getDicts("t_expert_rep_status").then(response => {
         this.repStatusOptions = response.data;
     });
   },
@@ -691,6 +697,9 @@ export default {
       this.open = false;
       this.reset();
     },
+    filterNum(value){
+      this.form.fMajorLife = Math.abs(this.value)    //去除中文输入下的负号和 this.value是字符时00开头等乱输        
+    },
     // 表单重置
     reset() {
       this.form = {
@@ -838,3 +847,10 @@ export default {
   }
 };
 </script>
+
+<style>
+
+.el-input-number .el-input__inner{
+  text-align: left;
+}
+</style>
\ No newline at end of file