Skip to content

T
total-platform
提交 c7708c82 authored 作者: 宋雄's avatar 宋雄
浏览文件
操作

修改bug

上级 2dba51bb
隐藏空白字符变更
内嵌 并排
正在显示 包含 50 行增加 和 22 行删除
.env.development
浏览文件 @ c7708c82
NODE_ENV=development
# VUE_APP_API_BASE_URL='http://192.168.0.119:9999'
# VUE_APP_API_BASE_URL='http://192.168.0.108:9999'
VUE_APP_API_BASE_URL='http://220.203.25.212:9999'
VUE_APP_API_BASE_URL='http://192.168.0.102:9999'
# VUE_APP_API_BASE_URL='http://220.203.25.212:9999'
VUE_APP_CAS_BASE_URL=http://cas.example.org:8443/cas
VUE_APP_ONLINE_BASE_URL=http://fileview.jeecg.com/onlinePreview
......
src/components/jeecgbiz/modal/JSelectDepartModal.vue
浏览文件 @ c7708c82
......@@ -29,9 +29,9 @@
</a-tree>
</a-spin>
<!--底部父子关联操作和确认取消按钮-->
<template slot="footer" v-if="treeOpera && multi">
<template slot="footer">
<div class="drawer-bootom-button">
<a-dropdown style="float: left" :trigger="['click']" placement="topCenter">
<a-dropdown v-if="treeOpera && multi" style="float: left" :trigger="['click']" placement="topCenter">
<a-menu slot="overlay">
<a-menu-item key="1" @click="switchCheckStrictly(1)">父子关联</a-menu-item>
<a-menu-item key="2" @click="switchCheckStrictly(2)">取消关联</a-menu-item>
......
src/views/advertisement/adsLlist.vue
浏览文件 @ c7708c82
......@@ -14,6 +14,8 @@
<a-select style="width: 100%" v-model="queryParam.status" placeholder="请选择广告状态">
<a-select-option v-for="item in dictOptions" :key="item.value"
:value="item.value">{{item.label}}</a-select-option>
<a-select-option value="onShelf">上架</a-select-option>
<a-select-option value="offShelf">下架</a-select-option>
</a-select>
</a-form-item>
</a-col>
......@@ -93,7 +95,7 @@
</template>
<script>
import { getPropertyAdvEditApi, getDictItemsFromCache } from '@/api/api'
import { getPropertyAdvEditApi, getDictItemsFromCache, ajaxGetDictItems } from '@/api/api'
import '@/assets/less/TableExpand.less'
import { mixinDevice } from '@/utils/mixin'
import { JeecgListMixin } from '@/mixins/JeecgListMixin'
......@@ -199,11 +201,7 @@ export default {
},
created() {
//备份model原始值
let dictOptions = getDictItemsFromCache('advStatus')
this.dictOptions = dictOptions.push(
{label: '上架', value: 'onShelf'},
{label: '下架', value: 'offShelf'}
)
this.dictOptions = getDictItemsFromCache('advStatus')
},
methods: {
handleAShelves(id, type) {
......
src/views/settled/PropertyDetails.vue
浏览文件 @ c7708c82
......@@ -117,7 +117,7 @@
<a-input v-model="model.adminPassword" placeholder="请输入管理员密码"></a-input>
</a-form-model-item>
</a-col>
<a-col :span="12">
<a-col :span="12" style="position:relative">
<a-form-model-item label="访问域名前缀" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="accessAddress"
v-if="pageType=='add' || pageType=='edit'">
<a-input v-model="model.accessAddress" placeholder="请输入访问域名前缀"
......@@ -127,6 +127,7 @@
:disabled="false" v-else>
<p v-if="model.accessAddress">{{ model.accessAddress }}.property.hjxbc.cn</p>
</a-form-model-item>
<a @click="onCopyLink" v-if="model.accessAddress" style="position:absolute;top:0;right:-10px;line-height:40px;z-index:999;pointer-events:auto;">复制</a>
</a-col>
</a-row>
</a-card>
......@@ -453,6 +454,15 @@ export default {
city
)
},
onCopyLink() {
let txa = document.createElement("textarea");
txa.value = this.model.accessAddress + '.property.hjxbc.cn'
document.body.appendChild(txa);
txa.select();
document.execCommand("copy");
document.body.removeChild(txa);
this.$message.success("复制成功!");
},
submitForm() {
const that = this
// 触发表单验证
......
src/views/settled/community/communityDetails.vue
浏览文件 @ c7708c82
......@@ -103,7 +103,7 @@
<a-input v-model="model.adminPassword" placeholder="请输入管理员密码"></a-input>
</a-form-model-item>
</a-col>
<a-col :span="12">
<a-col :span="12" style="position:relative">
<a-form-model-item label="访问域名前缀" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="accessAddress"
v-if="pageType=='add' || pageType=='edit'">
<a-input v-model="model.accessAddress" placeholder="请输入访问域名前缀"
......@@ -113,6 +113,7 @@
:disabled="false" v-else>
<p v-if="model.accessAddress">{{ model.accessAddress }}.councils.hjxbc.cn</p>
</a-form-model-item>
<a @click="onCopyLink" v-if="model.accessAddress" style="position:absolute;top:0;right:-10px;line-height:40px;z-index:999;pointer-events:auto;">复制</a>
</a-col>
</a-row>
</a-card>
......@@ -425,6 +426,15 @@ export default {
city
)
},
onCopyLink() {
let txa = document.createElement("textarea");
txa.value = this.model.accessAddress + '.councils.hjxbc.cn'
document.body.appendChild(txa);
txa.select();
document.execCommand("copy");
document.body.removeChild(txa);
this.$message.success("复制成功!");
},
submitForm() {
const that = this
// 触发表单验证
......
src/views/system/UserList.vue
浏览文件 @ c7708c82
......@@ -26,8 +26,8 @@
<template v-if="toggleSearchStatus">
<a-col :md="6" :sm="8">
<a-form-item label="真实名字">
<a-input placeholder="请输入真实名字" v-model="queryParam.realname"></a-input>
<a-form-item label="用户姓名">
<a-input placeholder="请输入用户姓名" v-model="queryParam.realname"></a-input>
</a-form-item>
</a-col>
......
src/views/system/modules/UserModal.vue
浏览文件 @ c7708c82
......@@ -26,7 +26,7 @@
<a-input placeholder="请输入用户账号" v-model="model.username" :readOnly="!!model.id" :disabled="disableSubmit"/>
</a-form-model-item>
<template v-if="!model.id">
<!-- <template v-if="!model.id">
<a-form-model-item label="登录密码" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="password" >
<a-input type="password" placeholder="请输入登录密码" v-model="model.password" />
</a-form-model-item>
......@@ -34,7 +34,7 @@
<a-form-model-item label="确认密码" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="confirmpassword" >
<a-input type="password" @blur="handleConfirmBlur" placeholder="请重新输入登录密码" v-model="model.confirmpassword"/>
</a-form-model-item>
</template>
</template> -->
<a-form-model-item label="用户姓名" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="realname">
<a-input placeholder="请输入用户姓名" v-model="model.realname" :disabled="disableSubmit"/>
......@@ -53,17 +53,25 @@
</a-form-model-item> -->
<a-form-model-item label="角色分配" :labelCol="labelCol" :wrapperCol="wrapperCol" v-show="!roleDisabled" >
<j-multi-select-tag
<!-- <j-multi-select-tag
:disabled="disableSubmit"
v-model="model.selectedroles"
:options="rolesOptions"
placeholder="请选择角色">
</j-multi-select-tag>
</j-multi-select-tag> -->
<a-select v-model="model.selectedroles">
<a-select-option
v-for="(item,index) in rolesOptions"
:key="index"
:value="item.value">
{{ item.text || item.label }}
</a-select-option>
</a-select>
</a-form-model-item>
<!--部门分配-->
<a-form-model-item label="部门分配" :labelCol="labelCol" :wrapperCol="wrapperCol" v-show="!departDisabled">
<j-select-depart :disabled="disableSubmit" v-model="model.selecteddeparts" :multi="true" @back="backDepartInfo" :backDepart="true" :treeOpera="true">></j-select-depart>
<j-select-depart :disabled="disableSubmit" v-model="model.selecteddeparts" :multi="true" @back="backDepartInfo" :backDepart="true" :treeOpera="false"></j-select-depart>
</a-form-model-item>
<!--租户分配-->
......@@ -82,14 +90,14 @@
<a-radio :value="2">上级</a-radio>
</a-radio-group>
</a-form-model-item> -->
<a-form-model-item label="负责部门" :labelCol="labelCol" :wrapperCol="wrapperCol" v-show="departIdShow==true">
<!-- <a-form-model-item label="负责部门" :labelCol="labelCol" :wrapperCol="wrapperCol" v-show="departIdShow==true">
<j-multi-select-tag
:disabled="disableSubmit"
v-model="model.departIds"
:options="nextDepartOptions"
placeholder="请选择负责部门">
</j-multi-select-tag>
</a-form-model-item>
</a-form-model-item> -->
<a-form-model-item label="头像" :labelCol="labelCol" :wrapperCol="wrapperCol">
<j-image-upload class="avatar-uploader" text="上传" v-model="model.avatar" :disabled="disableSubmit"></j-image-upload>
......@@ -311,6 +319,8 @@
})
},
backDepartInfo(info) {
console.log(info)
return
this.model.departIds = this.model.selecteddeparts;
this.nextDepartOptions = info.map((item,index,arr)=>{
let c = {label:item.text, value: item.value+""}
......
src/views/user/LoginAccount.vue
浏览文件 @ c7708c82
......@@ -2,7 +2,7 @@
<div>
<a-form-model ref="form" :model="model" :rules="validatorRules">
<a-form-model-item required prop="username">
<a-input v-model="model.username" size="large" placeholder="请输入帐户">
<a-input v-model="model.username" size="large" placeholder="请输入帐号">
<a-icon slot="prefix" type="user" :style="{ color: 'rgba(0,0,0,.25)' }"/>
</a-input>
</a-form-model-item>
......
Markdown 格式
0% 或
您添加了 0 人 到此讨论。请谨慎行事。
请先完成此评论的编辑！
请 注册 或者 后发表评论