Commit 77e1ac7211f9375f72a24ef95b5cb2db65c1849c

Authored by monkeyhouyi
1 parent f0d64cc9

优化

src/components/Generator/components/Upload/UploadFz.vue
@@ -15,7 +15,7 @@ @@ -15,7 +15,7 @@
15 :key="file.fileId"> 15 :key="file.fileId">
16 <el-tooltip class="item" effect="dark" placement="left"> 16 <el-tooltip class="item" effect="dark" placement="left">
17 <div slot="content"> 17 <div slot="content">
18 - <img class="avatar" :src="define.comUrl + file.url"> 18 + <img class="avatar" :src="define.comUrl + file.url" style="max-width: 400px; max-height: 400px;">
19 </div> 19 </div>
20 <a class="el-upload-list__item-name" @click="handleClick(file)" style="flex: 1;"> 20 <a class="el-upload-list__item-name" @click="handleClick(file)" style="flex: 1;">
21 <i class="el-icon-download"></i>{{file.name}} 21 <i class="el-icon-download"></i>{{file.name}}
src/components/PasswordForm/index.vue
@@ -14,9 +14,9 @@ @@ -14,9 +14,9 @@
14 class="NCC-dialog NCC-dialog_center dialog-box" 14 class="NCC-dialog NCC-dialog_center dialog-box"
15 destroy-on-close 15 destroy-on-close
16 > 16 >
17 - <div class="NCC-common-title mb-20"> 17 + <!-- <div class="NCC-common-title mb-20">
18 <h4 class="bold">修改密码</h4> 18 <h4 class="bold">修改密码</h4>
19 - </div> 19 + </div> -->
20 <el-row> 20 <el-row>
21 <el-col :span="16"> 21 <el-col :span="16">
22 <el-form 22 <el-form
@@ -46,7 +46,7 @@ @@ -46,7 +46,7 @@
46 show-password 46 show-password
47 /> 47 />
48 </el-form-item> 48 </el-form-item>
49 - <el-form-item label="验证码" prop="code"> 49 + <!-- <el-form-item label="验证码" prop="code">
50 <el-col :span="17"> 50 <el-col :span="17">
51 <el-input v-model="dataForm.code" placeholder="验证码"> 51 <el-input v-model="dataForm.code" placeholder="验证码">
52 </el-input> 52 </el-input>
@@ -60,7 +60,7 @@ @@ -60,7 +60,7 @@
60 @click="changeImg" 60 @click="changeImg"
61 /> 61 />
62 </el-col> 62 </el-col>
63 - </el-form-item> 63 + </el-form-item> -->
64 <el-form-item> 64 <el-form-item>
65 <el-button type="primary" @click="dataFormSubmit()">保 存</el-button> 65 <el-button type="primary" @click="dataFormSubmit()">保 存</el-button>
66 </el-form-item> 66 </el-form-item>
@@ -114,7 +114,7 @@ export default { @@ -114,7 +114,7 @@ export default {
114 { required: true, message: "重复密码不能为空", trigger: "blur" }, 114 { required: true, message: "重复密码不能为空", trigger: "blur" },
115 { validator: validatePass2, trigger: "blur" }, 115 { validator: validatePass2, trigger: "blur" },
116 ], 116 ],
117 - code: [{ required: true, message: "验证码不能为空", trigger: "blur" }], 117 + // code: [{ required: true, message: "验证码不能为空", trigger: "blur" }],
118 }, 118 },
119 }; 119 };
120 }, 120 },
@@ -123,7 +123,7 @@ export default { @@ -123,7 +123,7 @@ export default {
123 openDialog() { 123 openDialog() {
124 this.visible = true; 124 this.visible = true;
125 this.$nextTick(() => { 125 this.$nextTick(() => {
126 - this.changeImg(); 126 + // this.changeImg();
127 this.$refs["dataForm"].resetFields(); 127 this.$refs["dataForm"].resetFields();
128 }); 128 });
129 }, 129 },
@@ -133,24 +133,24 @@ export default { @@ -133,24 +133,24 @@ export default {
133 let query = { 133 let query = {
134 oldPassword: md5(this.dataForm.oldPassword), 134 oldPassword: md5(this.dataForm.oldPassword),
135 password: md5(this.dataForm.password), 135 password: md5(this.dataForm.password),
136 - code: this.dataForm.code,  
137 - timestamp: this.timestamp, 136 + // code: this.dataForm.code,
  137 + // timestamp: this.timestamp,
138 }; 138 };
139 UpdatePassword(query) 139 UpdatePassword(query)
140 .then((res) => { 140 .then((res) => {
141 this.$message({ 141 this.$message({
142 - message: res.msg, 142 + message: res.msg + ',请重新登录!',
143 type: "success", 143 type: "success",
144 duration: 1500, 144 duration: 1500,
145 onClose: () => { 145 onClose: () => {
146 - this.$store.dispatch("user/resetToken").then(() => { 146 + this.$store.dispatch("resetToken").then(() => {
147 this.$router.push(`/login`); 147 this.$router.push(`/login`);
148 }); 148 });
149 }, 149 },
150 }); 150 });
151 }) 151 })
152 .catch(() => { 152 .catch(() => {
153 - this.changeImg(); 153 + // this.changeImg();
154 }); 154 });
155 } 155 }
156 }); 156 });
src/store/modules/user.js
@@ -233,6 +233,7 @@ const user = { @@ -233,6 +233,7 @@ const user = {
233 return new Promise(resolve => { 233 return new Promise(resolve => {
234 commit('SET_TOKEN', '') 234 commit('SET_TOKEN', '')
235 commit('SET_MENULIST', []) 235 commit('SET_MENULIST', [])
  236 + commit('SET_ROLES', [])
236 commit('SET_USERINFO', {}) 237 commit('SET_USERINFO', {})
237 commit('SET_LOGIN_LOADING', false) 238 commit('SET_LOGIN_LOADING', false)
238 removeToken() 239 removeToken()
src/views/baseCaseHandling/Form.vue
@@ -64,14 +64,14 @@ @@ -64,14 +64,14 @@
64 </el-form-item> 64 </el-form-item>
65 </el-col> 65 </el-col>
66 <el-col :span="24"> 66 <el-col :span="24">
67 - <el-form-item label="案件名称" prop="systemName"> 67 + <el-form-item label="应用名称" prop="systemName">
68 <el-select 68 <el-select
69 ref="select" 69 ref="select"
70 v-model="dataForm.systemName" 70 v-model="dataForm.systemName"
71 filterable 71 filterable
72 remote 72 remote
73 reserve-keyword 73 reserve-keyword
74 - placeholder="请输入案件名称" 74 + placeholder="请输入应用名称"
75 @blur.native.capture="selectBlur" 75 @blur.native.capture="selectBlur"
76 @visible-change="visibleNameChange" 76 @visible-change="visibleNameChange"
77 @change="(val) => platformNameChange(val, 'change')" 77 @change="(val) => platformNameChange(val, 'change')"
@@ -228,7 +228,7 @@ @@ -228,7 +228,7 @@
228 <div class="text">{{ dataForm.sourceRegistration || '--' }}</div> 228 <div class="text">{{ dataForm.sourceRegistration || '--' }}</div>
229 </el-col> 229 </el-col>
230 <el-col class="form-item"> 230 <el-col class="form-item">
231 - <div class="label w-180">案件名称:</div> 231 + <div class="label w-180">应用名称:</div>
232 <div class="text">{{ dataForm.systemNameStr || '--' }}</div> 232 <div class="text">{{ dataForm.systemNameStr || '--' }}</div>
233 </el-col> 233 </el-col>
234 <el-col class="form-item"> 234 <el-col class="form-item">
src/views/baseComapnyInfo/index.vue
@@ -59,7 +59,7 @@ @@ -59,7 +59,7 @@
59 <el-table-column prop="companyName" label="运营主体名称" show-overflow-tooltip align="left"/> 59 <el-table-column prop="companyName" label="运营主体名称" show-overflow-tooltip align="left"/>
60 <el-table-column prop="socialCreditAgency" label="社会信用代码" show-overflow-tooltip align="left"/> 60 <el-table-column prop="socialCreditAgency" label="社会信用代码" show-overflow-tooltip align="left"/>
61 <el-table-column prop="legalPerson" label="运营主体法人" show-overflow-tooltip align="left"/> 61 <el-table-column prop="legalPerson" label="运营主体法人" show-overflow-tooltip align="left"/>
62 - <el-table-column prop="address" label="公司地址" align="left" /> 62 + <el-table-column prop="address" label="运营主体地址" align="left" />
63 <el-table-column prop="contactPhone" show-overflow-tooltip label="联系电话" align="left"/> 63 <el-table-column prop="contactPhone" show-overflow-tooltip label="联系电话" align="left"/>
64 <el-table-column label="所属区(市)县" prop="areaId" align="left" show-overflow-tooltip> 64 <el-table-column label="所属区(市)县" prop="areaId" align="left" show-overflow-tooltip>
65 <template slot-scope="scope">{{ scope.row.areaId | dynamicText(areaOptions) }}</template> 65 <template slot-scope="scope">{{ scope.row.areaId | dynamicText(areaOptions) }}</template>
src/views/homePage/components/Header.vue
@@ -41,6 +41,9 @@ export default { @@ -41,6 +41,9 @@ export default {
41 methods: { 41 methods: {
42 visbleUserInfoRefresh() { 42 visbleUserInfoRefresh() {
43 this.avatar = process.env.VUE_APP_BASE_API + this.$store.state.user.avatar; 43 this.avatar = process.env.VUE_APP_BASE_API + this.$store.state.user.avatar;
  44 + // this.$store.dispatch("resetToken").then(() => {
  45 + // this.$router.push(`/login`);
  46 + // });
44 this.visbleUserInfo = false; 47 this.visbleUserInfo = false;
45 }, 48 },
46 async logout() { 49 async logout() {
src/views/overView/msgForm.vue
@@ -89,12 +89,14 @@ @@ -89,12 +89,14 @@
89 > 89 >
90 <div class="msg-title">{{ dataForm.title }}</div> 90 <div class="msg-title">{{ dataForm.title }}</div>
91 <div class="content" v-html="dataForm.bodyContent"></div> 91 <div class="content" v-html="dataForm.bodyContent"></div>
92 - <div class="files" v-if="isSHILevel"> 92 + <div class="files">
93 <h4>附件</h4> 93 <h4>附件</h4>
94 <div style="margin-bottom: 10px;"> 94 <div style="margin-bottom: 10px;">
95 <NCC-UploadFz v-if="dataForm.imgUrl && dataForm.imgUrl.length" v-model="dataForm.imgUrl" :fileSize="5" sizeUnit="MB" :limit="9" buttonText="点击上传" disabled/> 95 <NCC-UploadFz v-if="dataForm.imgUrl && dataForm.imgUrl.length" v-model="dataForm.imgUrl" :fileSize="5" sizeUnit="MB" :limit="9" buttonText="点击上传" disabled/>
96 <div style="margin-top: 10px;" v-else>无附件</div> 96 <div style="margin-top: 10px;" v-else>无附件</div>
97 </div> 97 </div>
  98 + </div>
  99 + <div class="files" v-if="isSHILevel">
98 <h4>查看情况</h4> 100 <h4>查看情况</h4>
99 <div style="font-size: 12px; margin: 8px;"> 101 <div style="font-size: 12px; margin: 8px;">
100 注:<el-tag type="success" size="mini">区县</el-tag>表示 【已查看】 的区县, <el-tag type="danger" size="mini">区县</el-tag>表示 【未查看】 的区县 102 注:<el-tag type="success" size="mini">区县</el-tag>表示 【已查看】 的区县, <el-tag type="danger" size="mini">区县</el-tag>表示 【未查看】 的区县