浏览代码

修改问题

tangning 3 年之前
父节点
当前提交
4d108543b6
共有 4 个文件被更改,包括 14 次插入11 次删除
  1. 3 3
      src/assets/style/public.scss
  2. 4 4
      src/request/config.js
  3. 5 2
      src/view/user/index.vue
  4. 2 2
      vue.config.js

+ 3 - 3
src/assets/style/public.scss

@@ -376,10 +376,10 @@ body {
 
 .el-popper:not(.el-cascader__dropdown,.el-picker__popper,.el-dropdown__popper)  {
   max-width: 500px;
-  background: #EFEFEF;
-  box-shadow: 0px 2px 4px 0px #e4e4e4;
+  // background: #EFEFEF;
+  // box-shadow: 0px 2px 4px 0px #e4e4e4;
   border-radius: 2px;
-  border: 1px solid #D7D7D7;
+  // border: 1px solid #D7D7D7;
   padding: 2px 6px;
   word-break: break-all;
 }

+ 4 - 4
src/request/config.js

@@ -139,10 +139,10 @@ export const fireSetPsw = '/web/fireProject/updateRandomCode'
 // 获取火调详情
 export const fireDetail = '/web/fireProject/getProjectDetail'
 // 获取火调详情
-// export const fireDetailByPsw = '/web/fireProject/getDetailWithoutAuth'
+export const fireDetailByPsw = '/web/fireProject/getDetailWithoutAuth'
 
 // 获取火调详情
-export const fireDetailByPsw = '/web/fireProject/wxAnonGetDetail'
+// export const fireDetailByPsw = '/web/fireProject/wxAnonGetDetail'
 /** ------------------------------------------ */
 
 
@@ -156,9 +156,9 @@ export const insertMessage = '/web/message/addNew'
 /** ----------------火调附件---------------- */
 // 获取火调列表
 export const getAttachList = '/web/attachment/getListByProject'
-// export const getAttachListByPsw = '/web/attachment/getListByAnon'
 
-export const getAttachListByPsw = '/web/attachment/wxAnonGetList'
+export const getAttachListByPsw = '/web/attachment/getListByAnon'
+// export const getAttachListByPsw = '/web/attachment/wxAnonGetList'
 
 // 新增火调
 export const insertAttach = '/web/attachment/addNew'

+ 5 - 2
src/view/user/index.vue

@@ -4,7 +4,7 @@
       <el-form-item label="用户账户:">
         <el-input v-model="search.state.userName" placeholder="请输入手机号"></el-input>
       </el-form-item>
-      <el-form-item label="用户名:">
+      <el-form-item label="用户名:">
         <el-input v-model="search.state.nickName" placeholder="请输入"></el-input>
       </el-form-item>
       <el-form-item label="所属架构:">
@@ -41,7 +41,7 @@
         <div style="text-align: center">{{ pag.state.size * (pag.state.currPage - 1) + $index + 1 }}</div>
       </el-table-column>
       <el-table-column label="手机号(账号)" prop="userName"></el-table-column>
-      <el-table-column label="用户名" prop="nickName"></el-table-column>
+      <el-table-column label="用户名" prop="nickName"></el-table-column>
       <el-table-column label="所属架构" prop="departmentName"></el-table-column>
       <el-table-column label="角色" prop="roleName"></el-table-column>
       <el-table-column label="状态" v-slot:default="{ row }">
@@ -74,6 +74,9 @@
     width="540"
   >
     <el-form ref="form" :model="form" label-width="90px" class="user-from">
+      <el-form-item label="用户姓名:" class="roleName">
+        <el-input v-model="oper.state.nickName" placeholder="请输入"></el-input>
+      </el-form-item>
       <el-form-item label="所属架构:" class="mandatory"  v-show="operRoleId">
         <com-company v-model="oper.state.departmentId" @update:data="({level}) => (oper.state.roleId = level)" style="width: 100%" hideAll />
       </el-form-item>

+ 2 - 2
vue.config.js

@@ -18,8 +18,8 @@ module.exports = {
     // 设置代理proxy
     proxy: {
       '/__api': {
-        target: 'http://192.168.0.135:8585/',
-        // target: 'https://testxfhd.4dkankan.com/',
+        // target: 'http://192.168.0.135:8585/',
+        target: 'https://testhuodiao.4dkankan.com/',
         changeOrigin: true,  
         pathRewrite: {      
           ['^/__api']: ''