修改提交

src/layout/components/Navbar.vue

@@ -46,7 +46,8 @@
         trigger="click"
       >
         <div class="avatar-wrapper">
-          <img :src="avatar" class="user-avatar" />
+          <!-- <img :src="avatar" class="user-avatar" /> -->
+          <span>{{ name }}</span>
           <i class="el-icon-caret-bottom" />
         </div>
         <el-dropdown-menu slot="dropdown">
@@ -86,10 +87,10 @@ export default {
     SizeSelect,
     Search,
     RuoYiGit,
-    RuoYiDoc,
+    RuoYiDoc
   },
   computed: {
-    ...mapGetters(['sidebar', 'avatar', 'device', 'redNum']),
+    ...mapGetters(['sidebar', 'avatar', 'name', 'device', 'redNum']),
     setting: {
       get() {
         return this.$store.state.settings.showSettings;
@@ -97,10 +98,10 @@ export default {
       set(val) {
         this.$store.dispatch('settings/changeSetting', {
           key: 'showSettings',
-          value: val,
+          value: val
         });
-      },
+      }
-    },
+    }
   },
   methods: {
     toggleSideBar() {
@@ -110,14 +111,14 @@ export default {
       this.$confirm('确定注销并退出系统吗？', '提示', {
         confirmButtonText: '确定',
         cancelButtonText: '取消',
-        type: 'warning',
+        type: 'warning'
       }).then(() => {
         this.$store.dispatch('LogOut').then(() => {
           location.href = '/index';
         });
       });
-    },
+    }
-  },
+  }
 };
 </script>
 
@@ -198,6 +199,11 @@ export default {
       margin-right: 30px;
 
       .avatar-wrapper {
+        span {
+          font-size: 14px;
+        }
+        display: flex;
+        align-items: center;
         margin-top: 5px;
         position: relative;
 
@@ -210,7 +216,8 @@ export default {
 
         .el-icon-caret-bottom {
           cursor: pointer;
-          position: absolute;
+          // position: absolute;
+          margin-left: 5px;
           right: -20px;
           top: 25px;
           font-size: 12px;

src/store/modules/user.js

@@ -72,7 +72,7 @@ const user = {
             } else {
               commit('SET_ROLES', ['ROLE_DEFAULT']);
             }
-            commit('SET_NAME', user.userName);
+            commit('SET_NAME', user.username);
             commit('SET_USER_ID', user.userId);
             commit('SET_AVATAR', avatar);
             resolve(res);
@@ -82,7 +82,7 @@ const user = {
           });
         getNoReadCount().then(({ data }) => {
           commit('SET_REDNUM', data);
-        })
+        });
       });
     },
 

src/views/customer/index.vue

@@ -14,7 +14,26 @@
           @submit.native.prevent
         >
           <el-form-item label="企业名称">
-            <el-input v-model="queryParams.companyName" placeholder="请输入" style="min-width:270px" />
+            <el-input
+              v-model="queryParams.companyName"
+              placeholder="请输入"
+              style="min-width:270px"
+            />
+          </el-form-item>
+          <el-form-item label="评估状态">
+            <el-select
+              v-model="queryParams.assessResult"
+              clearable
+              placeholder="请选择"
+            >
+              <el-option
+                v-for="item in statusOptions"
+                :key="item.value"
+                :label="item.label"
+                :value="item.value"
+              >
+              </el-option>
+            </el-select>
           </el-form-item>
           <el-form-item>
             <el-button type="primary" @click="handleSearchList" size="small">
@@ -27,7 +46,21 @@
     <el-card class="operate-container" shadow="never">
       <i class="el-icon-tickets"></i>
       <span>数据列表</span>
-      <el-button class="btn-add" @click="handlePage(null)" size="mini" type="primary">
+      <!-- <el-button
+        style="margin-left:10px"
+        class="btn-add"
+        @click="upload.open = true"
+        size="mini"
+        type="primary"
+      >
+        导入
+      </el-button> -->
+      <el-button
+        class="btn-add"
+        @click="handlePage(null)"
+        size="mini"
+        type="primary"
+      >
         添加企业
       </el-button>
     </el-card>
@@ -48,16 +81,13 @@
           }}</el-link>
         </template> -->
       </el-table-column>
-      <el-table-column
+      <el-table-column label="头像" align="center" prop="icon">
-        label="头像"
-        align="center"
-        prop="icon"
-      >
         <template slot-scope="scope">
           <el-image
             style="width: 100px; height: 100px"
             :src="scope.row.icon"
-          fit="cover">
+            fit="cover"
+          >
           </el-image>
         </template>
       </el-table-column>
@@ -87,6 +117,12 @@
         align="center"
         prop="username"
       ></el-table-column>
+      <el-table-column label="评估状态" align="center" prop="assessResult">
+        <template slot-scope="scope">
+          <el-tag v-if="scope.row.assess">已评估</el-tag>
+          <el-tag v-else type="info">未评估</el-tag>
+        </template>
+      </el-table-column>
       <el-table-column label="操作" align="center">
         <template slot-scope="scope">
           <el-button @click="handlePage(scope.row.id)" type="text" size="small"
@@ -112,6 +148,13 @@
             size="small"
             >删除</el-button
           >
+          <el-button
+            @click="handleDialog(scope.row)"
+            type="text"
+            size="small"
+            :disabled="!scope.row.assess ? true : false"
+            >评估结果</el-button
+          >
         </template>
       </el-table-column>
     </el-table>
@@ -122,6 +165,242 @@
       :limit.sync="queryParams.pageSize"
       @pagination="getList"
     />
+    <!-- 用户导入对话框 -->
+    <!-- <el-dialog
+      title="导入"
+      :visible.sync="upload.open"
+      width="400px"
+      append-to-body
+    >
+      <el-upload
+        ref="upload"
+        :limit="1"
+        accept=".xlsx, .xls"
+        :headers="upload.headers"
+        :action="upload.url"
+        :disabled="upload.isUploading"
+        :on-progress="handleFileUploadProgress"
+        :on-success="handleFileSuccess"
+        :auto-upload="false"
+        drag
+      >
+        <i class="el-icon-upload"></i>
+        <div class="el-upload__text">
+          将文件拖到此处，或
+          <em>点击上传</em>
+        </div>
+        <div class="el-upload__tip" slot="tip">
+          <el-link type="primary" style="font-size:12px" @click="importTemplate"
+            >下载模板</el-link
+          >
+        </div>
+        <div class="el-upload__tip" style="color:red" slot="tip">
+          提示：仅允许导入“xls”或“xlsx”格式文件！
+        </div>
+      </el-upload>
+      <div slot="footer" class="dialog-footer">
+        <el-button type="primary" @click="submitFileForm">确 定</el-button>
+        <el-button @click="upload.open = false">取 消</el-button>
+      </div>
+    </el-dialog> -->
+    <!-- 评估结果弹框 -->
+    <el-dialog
+      class="result-dialog"
+      title="评估结果"
+      :visible.sync="dialogVisible"
+      width="78%"
+    >
+      <el-row :gutter="20">
+        <el-col :span="24">
+          <el-card class="box-card">
+            <el-form ref="formA" :model="formA" disabled>
+              <h3>A 高企认定门槛</h3>
+              <section class="padding-left">
+                <h4>一、企业基本情况</h4>
+                <el-form-item label="企业名称">
+                  <el-input
+                    v-model.trim="formA.companyName"
+                    style="max-width: 420px"
+                  ></el-input>
+                </el-form-item>
+                <el-form-item label="成立时间">
+                  <el-date-picker
+                    v-model="formA.regTime"
+                    value-format="yyyy-MM-dd HH:mm:ss"
+                    type="datetime"
+                    placeholder="选择日期时间"
+                  >
+                  </el-date-picker>
+                </el-form-item>
+                <el-form-item label="所属领域">
+                  <el-col :span="6">
+                    <el-form-item>
+                      <el-select v-model="formA.territoryIName"> </el-select>
+                    </el-form-item>
+                  </el-col>
+                  <el-col :span="6">
+                    <el-form-item>
+                      <el-select v-model="formA.territoryIIName"> </el-select>
+                    </el-form-item>
+                  </el-col>
+                </el-form-item>
+                <el-form-item label="拥有在所属领域发挥核心作用的知识产权？">
+                  <el-select
+                    v-model="formA.hasIntellectualProperty"
+                    placeholder="请选择"
+                  >
+                    <el-option
+                      v-for="item in propertyOption"
+                      :key="item.value"
+                      :label="item.label"
+                      :value="item.value"
+                    >
+                    </el-option>
+                  </el-select>
+                </el-form-item>
+                <h4>二、财务数据（单位：万元）</h4>
+                <el-form-item label="上一年企业总收入">
+                  <el-input-number
+                    v-model="formA.lastYearTotalRevenue"
+                  ></el-input-number>
+                </el-form-item>
+                <el-form-item label="上一年主营业务部分收入">
+                  <el-input-number
+                    v-model="formA.lastYearBusinessRevenue"
+                  ></el-input-number>
+                </el-form-item>
+                <el-form-item label="上一年研发总支出">
+                  <el-input-number
+                    v-model="formA.lastYearResearchExpend"
+                  ></el-input-number>
+                </el-form-item>
+                <h4>三、人力资源</h4>
+                <el-form-item label="上一年企业总员工数">
+                  <el-input-number
+                    v-model="formA.totalEmployee"
+                  ></el-input-number>
+                </el-form-item>
+                <el-form-item label="上一年企业入职满183天的科技员工数">
+                  <el-input-number
+                    v-model="formA.scienceEmployee"
+                  ></el-input-number>
+                </el-form-item>
+                <h4>四、其他</h4>
+                <el-form-item
+                  label="企业上一年内未发生重大安全、重大质量事故或严重环境违法行为。 "
+                >
+                  <el-select v-model="formA.hasBad" placeholder="请选择">
+                    <el-option
+                      v-for="item in propertyOption"
+                      :key="item.value"
+                      :label="item.label"
+                      :value="item.value"
+                    >
+                    </el-option>
+                  </el-select>
+                </el-form-item>
+              </section>
+            </el-form>
+          </el-card>
+          <el-card class="box-card" style="margin-top:15px">
+            <el-form ref="formA" :model="formA" disabled>
+              <section class="padding-left">
+                <h3>B 创新指标评分</h3>
+                <h4>一、知识产权</h4>
+                <el-form-item
+                  label="自主研发的Ⅰ类（发明专利、植物新品种、国家新药、集成电路布图等）数量："
+                >
+                  <el-input-number
+                    class="w120"
+                    v-model="formA.propertyNumI"
+                  ></el-input-number>
+                  <!-- <el-input v-model="formA.name" class="w120"></el-input> -->
+                </el-form-item>
+                <el-form-item
+                  label="自主研发的Ⅱ类（实用新型专利、外观设计专利、软件著作权等（不含商标））数量："
+                >
+                  <el-input-number
+                    class="w120"
+                    v-model="formA.propertyNumII"
+                  ></el-input-number>
+                </el-form-item>
+                <el-form-item
+                  label="企业参与过编制国家标准、行业标准、检测方法、技术规范？"
+                >
+                  <el-select v-model="formA.hasStandard" placeholder="请选择">
+                    <el-option
+                      v-for="item in propertyOption"
+                      :key="item.value"
+                      :label="item.label"
+                      :value="item.value"
+                    >
+                    </el-option>
+                  </el-select>
+                </el-form-item>
+                <h4>二、科技成果转化</h4>
+                <el-form-item label="近三年年均成果转化数量：">
+                  <el-input-number
+                    class="w120"
+                    v-model="formA.achievementNum"
+                  ></el-input-number>
+                </el-form-item>
+                <h4>三、组织管理水平（多选）</h4>
+                <el-checkbox-group v-model="formA.management">
+                  <el-checkbox :label="1">
+                    制定了企业研究开发的组织管理制度，建立了研发投入核算体系，编制了研发费用辅助账。
+                  </el-checkbox>
+                  <el-checkbox :label="2">
+                    设立了内部科学技术研究开发机构并具备相应的科研条件，与国内外研究开发机构开展多种形式产学研合作
+                  </el-checkbox>
+                  <el-checkbox :label="3">
+                    建立了科技成果转化的组织实施与激励奖励制度，建立开放式的创新创业平台。
+                  </el-checkbox>
+                  <el-checkbox :label="4">
+                    建立了科技人员的培养进修、职工技能培训、优秀人才引进，以及人才绩效评价奖励制度。
+                  </el-checkbox>
+                  <br />
+                  <el-checkbox :label="5">
+                    以上选项都不匹配。
+                  </el-checkbox>
+                </el-checkbox-group>
+                <h4>四、企业成长性</h4>
+                <el-form-item
+                  label="净资产增长率赋值（其中合肥市高新区企业，政策兑现要求上一年度净资产达40万元以上） "
+                >
+                  <el-select
+                    style="max-width: 95px"
+                    v-model="formA.assetGrowth"
+                    placeholder="请选择"
+                  >
+                    <el-option
+                      v-for="item in assetOption"
+                      :key="item.value"
+                      :label="item.label"
+                      :value="item.value"
+                    >
+                    </el-option>
+                  </el-select>
+                </el-form-item>
+                <el-form-item label="销售收入增长率赋值">
+                  <el-select v-model="formA.sellGrowth" placeholder="请选择">
+                    <el-option
+                      v-for="item in assetOption"
+                      :key="item.value"
+                      :label="item.label"
+                      :value="item.value"
+                    >
+                    </el-option>
+                  </el-select>
+                </el-form-item>
+              </section>
+            </el-form>
+          </el-card>
+        </el-col>
+        <!-- <el-col :span="14">
+          
+        </el-col> -->
+      </el-row>
+    </el-dialog>
   </div>
 </template>
 <script>
@@ -131,6 +410,8 @@ import {
   deleteCompanyUser,
   resetPw
 } from '@/api/customer';
+import { parseTime } from '@/utils/ruoyi';
+import { getToken } from '@/utils/auth';
 export default {
   data() {
     return {
@@ -140,6 +421,19 @@ export default {
       },
       total: 0,
       unscrambleList: [],
+      // 用户导入参数
+      upload: {
+        // 是否显示弹出层（用户导入）
+        open: false,
+        // 弹出层标题（用户导入）
+        title: '',
+        // 是否禁用上传
+        isUploading: false,
+        // 设置上传的请求头部
+        headers: { Authorization: 'Bearer ' + getToken() },
+        // 上传的地址
+        url: process.env.VUE_APP_BASE_API + '/system/user/importData'
+      },
       optionList1: [
         {
           value: '2',
@@ -153,6 +447,56 @@ export default {
           value: '4',
           label: '其它'
         }
+      ],
+      statusOptions: [
+        {
+          value: 1,
+          label: '已评估'
+        },
+        {
+          value: 0,
+          label: '未评估'
+        }
+      ],
+      dialogVisible: false,
+      formA: {},
+      oneMenuList: [], // 所属领域一级菜单
+      twoMenuList: [], // 所属领域二级菜单
+      propertyOption: [
+        {
+          value: 0,
+          label: '否'
+        },
+        {
+          value: 1,
+          label: '是'
+        }
+      ], // 核心领域发挥作用知识产权 0->否 1->是   和   四、其他
+      assetOption: [
+        {
+          value: 35,
+          label: '>=35%'
+        },
+        {
+          value: 25,
+          label: '>=25%'
+        },
+        {
+          value: 15,
+          label: '>=15%'
+        },
+        {
+          value: 5,
+          label: '>=5%'
+        },
+        {
+          value: 1,
+          label: '>0%'
+        },
+        {
+          value: 0,
+          label: '<=0%'
+        }
       ]
     };
   },
@@ -192,9 +536,58 @@ export default {
           this.msgSuccess('删除成功');
         });
     },
+    handleDialog(row) {
+      if (!row.assess || row.assess == '') return this.msgError('暂未评估');
+      this.dialogVisible = true;
+      const data = JSON.parse(row.assess);
+      data.regTime = parseTime(data.regTime);
+      this.formA = data;
+    },
+    /** 下载模板操作 */
+    importTemplate() {
+      // importTemplate().then(response => {
+      //   this.download(response.msg);
+      // });
+    },
+    // 文件上传中处理
+    handleFileUploadProgress(event, file, fileList) {
+      this.upload.isUploading = true;
+    },
+    // 文件上传成功处理
+    handleFileSuccess(response, file, fileList) {
+      this.upload.open = false;
+      this.upload.isUploading = false;
+      this.$refs.upload.clearFiles();
+      this.$alert(response.msg, '导入结果', { dangerouslyUseHTMLString: true });
+      this.getList();
+    },
+    // 提交上传文件
+    submitFileForm() {
+      this.$refs.upload.submit();
+    }
   },
   created() {
     this.getList();
   }
 };
 </script>
+<style lang="scss" scoped>
+.w120 {
+  width: 120px;
+}
+@media screen and (min-width: 1440px) {
+  /deep/.el-dialog {
+    width: 55% !important;
+    .el-form-item {
+      margin-bottom: 12px;
+    }
+  }
+}
+// /deep/.el-checkbox__inner {
+//   background-color: black !important;
+//   border-color: black !important;
+//   &::after {
+//     border-color: white !important;
+//   }
+// }
+</style>

src/views/service/index.vue

@@ -113,6 +113,7 @@
 
 <script>
 import { mapGetters } from 'vuex';
+import store from '@/store';
 import { getUsers, readMsg, getChatRecords, sendMsg } from '@/api/service';
 export default {
   data() {
@@ -286,6 +287,8 @@ export default {
       return time;
     },
     active(item) {
+      console.log(item);
+      store.commit('SET_REDNUM', 0); // 点击后把当前用户的未读数传过去减掉
       this.customerText = '';
       this.activeId = item.id;
       this.info = [];