antissoft / NetworkInformation

Commit 89ab02030f3525caf7f27fec9187edfe3856ccc3

Authored by monkeyhouyi
1 parent d8af3866

修改个人信息弹框

Inline Side-by-side
Showing 11 changed files with 90 additions and 75 deletions
src/components/InfoForm/index.vue
  View file @89ab020
... ... @@ -324,22 +324,22 @@ export default {
324 324 systemClass: {
325 325 required: true,
326 326 message: "请输入系统分类",
327   - trigger: "change",
  327 + trigger: "blur",
328 328 },
329 329 systemType: {
330 330 required: true,
331 331 message: "请输入系统类型",
332   - trigger: "change",
  332 + trigger: "blur",
333 333 },
334 334 companyId: {
335 335 required: true,
336 336 message: "请输入主体企业",
337   - trigger: "change",
  337 + trigger: "blur",
338 338 },
339 339 areaId: {
340 340 required: true,
341 341 message: "请输入所属区县",
342   - trigger: "change",
  342 + trigger: "blur",
343 343 },
344 344 pincipalPhone: {
345 345 pattern: /^1[3|4|5|6|7|8|9][0-9]\d{8}$/,
... ...
src/utils/request.js
  View file @89ab020
... ... @@ -11,7 +11,7 @@ axios.defaults.headers['Content-Type'] = 'application/json;charset=utf-8'
11 11  
12 12 const service = axios.create({
13 13 // axios中请求配置有baseURL选项，表示请求URL公共部分
14   - baseURL: process.env.VUE_APP_BASE_API + '/api',
  14 + baseURL: '/api',
15 15 withCredentials: false,
16 16 // 超时
17 17 // timeout: define.timeout
... ...
src/views/DisposalSuggestions/Form.vue
  View file @89ab020
... ... @@ -261,7 +261,11 @@ export default {
261 261 dataFormSubmit() {
262 262 this.$refs["suggestionForm"].validate(async (valid) => {
263 263 if (valid) {
264   - let res = await disposalSuggestions(this.suggestionForm);
  264 + let obj = {
  265 + ...this.suggestionForm,
  266 + id: this.dataForm.id,
  267 + };
  268 + let res = await disposalSuggestions(obj);
265 269 this.$message({
266 270 message: res.msg,
267 271 type: "success",
... ...
src/views/DisposalSuggestions/index.vue
  View file @89ab020
... ... @@ -37,7 +37,7 @@
37 37 </el-row>
38 38 <div class="NCC-common-layout-main NCC-flex-main">
39 39 <NCC-table v-loading="listLoading" :data="list">
40   - <el-table-column show-overflow-tooltip prop="platformName" label="系统名称" align="left" />
  40 + <el-table-column show-overflow-tooltip prop="platformNameStr" label="系统名称" align="left" />
41 41 <el-table-column show-overflow-tooltip label="系统类型" prop="platformType" align="left">
42 42 <template slot-scope="scope">{{ scope.row.platformType | dynamicTextUP(systemTypeOptions) }}</template>
43 43 </el-table-column>
... ...
src/views/baseComapnyInfo/index.vue
  View file @89ab020
... ... @@ -45,27 +45,11 @@
45 45 </el-col>
46 46 </el-form>
47 47 <div class="NCC-common-search-box-right">
48   - <el-button
49   - type="primary"
50   - icon="el-icon-download"
51   - size="mini"
52   - @click="exportData()"
53   - >导出</el-button
54   - >
  48 + <el-button type="success" icon="el-icon-plus" @click="addOrUpdateHandle()" size="mini" >新增</el-button>
  49 + <el-button type="primary" icon="el-icon-download" size="mini" @click="exportData()">导出</el-button>
55 50 </div>
56 51 </el-row>
57 52 <div class="NCC-common-layout-main NCC-flex-main">
58   - <div class="NCC-common-head">
59   - <div>
60   - <el-button
61   - type="primary"
62   - icon="el-icon-plus"
63   - @click="addOrUpdateHandle()"
64   - size="mini"
65   - >新增</el-button
66   - >
67   - </div>
68   - </div>
69 53 <NCC-table v-loading="listLoading" :data="list">
70 54 <el-table-column prop="id" label="主键" align="left" />
71 55 <el-table-column
... ...
src/views/baseInspectionReport/index.vue
  View file @89ab020
... ... @@ -36,7 +36,7 @@
36 36 </el-row>
37 37 <div class="NCC-common-layout-main NCC-flex-main">
38 38 <NCC-table v-loading="listLoading" :data="list">
39   - <el-table-column show-overflow-tooltip prop="platformName" label="系统名称" align="left" />
  39 + <el-table-column show-overflow-tooltip prop="platformNameStr" label="系统名称" align="left" />
40 40 <el-table-column show-overflow-tooltip label="系统类型" prop="platformType" align="left">
41 41 <template slot-scope="scope">{{ scope.row.platformType | dynamicTextUP(systemTypeOptions) }}</template>
42 42 </el-table-column>
... ...
src/views/baseListHazardousSamples/index.vue
  View file @89ab020
... ... @@ -19,14 +19,14 @@
19 19 </el-date-picker>
20 20 </el-form-item>
21 21 </el-col> -->
22   - <el-col :span="6">
  22 + <!-- <el-col :span="6">
23 23 <el-form-item label="">
24 24 <el-input v-model="query.content" placeholder="请输入具体内容" />
25 25 </el-form-item>
26   - </el-col>
27   - <el-col :span="4">
  26 + </el-col> -->
  27 + <el-col :span="5">
28 28 <el-form-item label="">
29   - <el-select v-model="query.harmfulInformationTypes" placeholder="请选择有害类型" clearable>
  29 + <el-select v-model="query.source" placeholder="请选择来源" clearable>
30 30 <el-option
31 31 v-for="(item, index) in levelOptions"
32 32 :key="index"
... ... @@ -36,7 +36,7 @@
36 36 </el-select>
37 37 </el-form-item>
38 38 </el-col>
39   - <el-col :span="4">
  39 + <el-col :span="5">
40 40 <el-form-item label="">
41 41 <el-select
42 42 v-model="query.company"
... ... @@ -52,11 +52,11 @@
52 52 </el-select>
53 53 </el-form-item>
54 54 </el-col>
55   - <el-col :span="4">
  55 + <el-col :span="5">
56 56 <el-form-item label="">
57 57 <el-select
58 58 v-model="query.websitePlatform"
59   - placeholder="请选择系统"
  59 + placeholder="请选择网站平台"
60 60 clearable
61 61 >
62 62 <el-option
... ... @@ -82,13 +82,13 @@
82 82 <NCC-table v-loading="listLoading" :data="list">
83 83 <!-- <el-table-column prop="id" label="主键" align="left" show-overflow-tooltip/> -->
84 84 <el-table-column prop="inputTime" label="录入时间" align="left" :formatter="ncc.tableDateFormat" show-overflow-tooltip/>
85   - <el-table-column label="运营主体" prop="websitePlatformStr" align="left" show-overflow-tooltip />
  85 + <el-table-column label="运营主体" prop="companyStr" align="left" show-overflow-tooltip />
86 86 <el-table-column label="网站平台" prop="websitePlatformStr" align="left" show-overflow-tooltip />
87   - <el-table-column label="来源" prop="harmfulInformationTypes" align="left" show-overflow-tooltip />
88   - <el-table-column label="问题类型" prop="websitePlatformStr" align="left" show-overflow-tooltip />
89   - <el-table-column label="问题内容" prop="websitePlatformStr" align="left" show-overflow-tooltip />
90   - <el-table-column label="违法原因" prop="websitePlatformStr" align="left" show-overflow-tooltip />
91   - <el-table-column label="处罚内容" prop="content" align="left" show-overflow-tooltip/>
  87 + <el-table-column label="来源" prop="source" align="left" show-overflow-tooltip />
  88 + <el-table-column label="问题类型" prop="questionType" align="left" show-overflow-tooltip />
  89 + <el-table-column label="问题内容" prop="questionContent" align="left" show-overflow-tooltip />
  90 + <el-table-column label="违法原因" prop="illegalReasons" align="left" show-overflow-tooltip />
  91 + <el-table-column label="处罚内容" prop="punishmentContent" align="left" show-overflow-tooltip/>
92 92 <!-- <el-table-column prop="creatorUserId" label="创建用户" show-overflow-tooltip align="left"/> -->
93 93 <!-- <el-table-column prop="creatorTime" label="创建时间" align="left" show-overflow-tooltip :formatter="ncc.tableDateFormat"/> -->
94 94 <!-- <el-table-column prop="lastModifyUserId" label="修改用户" align="left" show-overflow-tooltip/> -->
... ...
src/views/baseSpecialAction/index.vue
  View file @89ab020
... ... @@ -57,7 +57,7 @@
57 57 <el-table-column label="操作" fixed="right" width="150">
58 58 <template slot-scope="scope">
59 59 <el-button type="text" @click="addOrUpdateHandle(scope.row)">修改</el-button>
60   - <el-button type="text" @click="toDetail(scope.row)" v-if="scope.row.state == '已发布并部署'">处理情况</el-button>
  60 + <el-button type="text" @click="toDetail(scope.row)" v-if="scope.row.state == '已发布并部署' && isSHILevel">处理情况</el-button>
61 61 </template>
62 62 </el-table-column>
63 63 </NCC-table>
... ...
src/views/baseSpecialhandle/index.vue
  View file @89ab020
... ... @@ -39,9 +39,9 @@
39 39 <el-tag :type="scope.row.state == '已填写' ? 'success' : 'warning'">{{ scope.row.state }}</el-tag>
40 40 </template>
41 41 </el-table-column>
42   - <el-table-column prop="deadline" label="截止日期" align="left" :formatter="ncc.tableDateFormat" show-overflow-tooltip>
  42 + <el-table-column prop="deadline" label="截止日期" align="left" :formatter="ncc.tableDateFormat" show-overflow-tooltip width="200">
43 43 <template slot-scope="scope">
44   - <el-tag v-if="scope.row.deadline" :type="ncc.timeDeadLine(scope.row.deadline)">{{ ncc.tableDateFormat(scope.row, 'deadline', scope.row.deadline) }}</el-tag>
  44 + <el-tag v-if="scope.row.deadline" :type="ncc.timeDeadLine(scope.row.deadline)">{{ncc.stateDeadLine(scope.row.deadline)}}{{ ncc.tableDateFormat(scope.row, 'deadline', scope.row.deadline) }}</el-tag>
45 45 </template>
46 46 </el-table-column>
47 47 <el-table-column label="操作" fixed="right" width="130">
... ...
src/views/baseSystemInfo/index.vue
  View file @89ab020
... ... @@ -78,10 +78,8 @@
78 78 </el-col>
79 79 </el-form>
80 80 <div class="NCC-common-search-box-right">
81   - <el-button type="success" icon="el-icon-upload2" size="mini"
82   - >导入</el-button
83   - >
84   - <el-button type="primary" icon="el-icon-download" size="mini" @click="toExport">导出</el-button>
  81 + <!-- <el-button type="success" icon="el-icon-upload2" size="mini">导入</el-button> -->
  82 + <!-- <el-button type="primary" icon="el-icon-download" size="mini" @click="toExport">导出</el-button> -->
85 83 </div>
86 84 </el-row>
87 85 <div class="NCC-common-layout-main NCC-flex-main">
... ... @@ -122,33 +120,13 @@
122 120 <el-table-column label="操作" width="250">
123 121 <!-- 查看，修改，归属地变更，上报 -->
124 122 <template slot-scope="scope">
125   - <infoForm
126   - class="btn_dialog"
127   - type="edit"
128   - :systemId="scope.row.Id"
129   - @reInit="search"
130   - >
  123 + <infoForm class="btn_dialog" type="edit" :systemId="scope.row.Id" @reInit="search">
131 124 <el-button size="mini" type="text">修改</el-button>
132 125 </infoForm>
133 126 <el-button size="mini" type="text" @click="toDetail(scope.row)">查看</el-button>
134   - <el-button
135   - size="mini"
136   - type="text"
137   - @click="toChangeArea(scope.row)"
138   - >归属地变更</el-button
139   - >
140   - <el-button
141   - size="mini"
142   - type="text"
143   - @click="toInspection(scope.row)"
144   - >上报</el-button
145   - >
146   - <!-- <el-button
147   - size="mini"
148   - type="text"
149   - @click="toChangeRecord(scope.row)"
150   - >整改清单</el-button
151   - > -->
  127 + <el-button size="mini" type="text" @click="toChangeArea(scope.row)" >归属地变更</el-button>
  128 + <el-button size="mini" type="text" @click="toInspection(scope.row)" >上报</el-button>
  129 + <!-- <el-button type="text" style="color: red;" @click="delNew(scope.row)">删除</el-button> -->
152 130 </template>
153 131 </el-table-column>
154 132 </NCC-table>
... ... @@ -413,9 +391,27 @@ export default {
413 391 });
414 392 },
415 393 toExport() {
416   - this.ExportBoxVisible = true;
417   - this.$nextTick(() => {
418   - this.$refs.ExportBox.init(this.columnList);
  394 + let _query = {
  395 + ...this.query,
  396 + };
  397 + let query = {};
  398 + for (let key in _query) {
  399 + if (Array.isArray(_query[key])) {
  400 + query[key] = _query[key].join();
  401 + } else {
  402 + query[key] = _query[key];
  403 + }
  404 + }
  405 + request({
  406 + url: `/Extend/basesysteminfo/Actions/Export`,
  407 + method: "POST",
  408 + data: query,
  409 + }).then((res) => {
  410 + const url = process.env.VUE_APP_BASE_API + res.data.url;
  411 + const link = document.createElement("a");
  412 + link.href = url;
  413 + link.download = res.data.name;
  414 + link.click();
419 415 });
420 416 },
421 417 download(data) {
... ... @@ -431,6 +427,24 @@ export default {
431 427 this.ExportBoxVisible = false;
432 428 });
433 429 },
  430 +
  431 + delNew(row) {
  432 + this.$confirm('此操作将永久删除该系统, 是否继续?', '提示', {
  433 + confirmButtonText: '确定',
  434 + cancelButtonText: '取消',
  435 + type: 'warning'
  436 + }).then(async () => {
  437 + let res = await request({
  438 + url: `/Extend/basesysteminfo/${row.Id}`,
  439 + method: "DELETE",
  440 + });
  441 + this.$message({
  442 + message: res.msg,
  443 + type: 'success'
  444 + });
  445 + this.initList();
  446 + });
  447 + },
434 448 },
435 449 };
436 450 </script>
... ...
src/views/homePage/components/Header.vue
  View file @89ab020
... ... @@ -13,7 +13,7 @@
13 13 {{ userInfo.userName }}（{{ userInfo.organizeName }}）
14 14 </div>
15 15 <el-dropdown-menu slot="dropdown" router>
16   - <el-dropdown-item>修改信息</el-dropdown-item>
  16 + <el-dropdown-item command="toUserInfo">修改信息</el-dropdown-item>
17 17 <passwordForm>
18 18 <el-dropdown-item>修改密码</el-dropdown-item>
19 19 </passwordForm>
... ... @@ -21,16 +21,20 @@
21 21 </el-dropdown-menu>
22 22 </el-dropdown>
23 23 </div>
  24 + <UserInfoPage ref="UserInfoPage" v-if="visbleUserInfo" @refresh="() => this.visbleUserInfo = false"/>
24 25 </header>
25 26 </template>
26 27  
27 28 <script>
  29 +import UserInfoPage from './UserInfoPage.vue'
28 30 export default {
29 31 name: "Header",
  32 + components: {UserInfoPage},
30 33 data() {
31 34 return {
32 35 userInfo: this.$store.state.user.userInfo,
33   - avatar: this.$store.state.user.avatar,
  36 + avatar: process.env.VUE_APP_BASE_API + this.$store.state.user.avatar,
  37 + visbleUserInfo: false,
34 38 };
35 39 },
36 40 mounted() {},
... ... @@ -39,6 +43,12 @@ export default {
39 43 await this.$store.dispatch("LogOut");
40 44 this.$router.push({ path: "/login" });
41 45 },
  46 + toUserInfo() {
  47 + this.visbleUserInfo = true;
  48 + this.$nextTick(() => {
  49 + this.$refs.UserInfoPage.init();
  50 + });
  51 + },
42 52 handleCommand(command) {
43 53 switch (command) {
44 54 case "logout":
... ... @@ -53,6 +63,9 @@ export default {
53 63 .catch(() => {});
54 64  
55 65 break;
  66 + case "toUserInfo":
  67 + this.toUserInfo();
  68 + break;
56 69  
57 70 default:
58 71 break;
... ...