This commit is contained in:
linfso 2024-05-07 18:04:40 +08:00
parent 3467abd06f
commit 89c4636080
6 changed files with 15 additions and 8 deletions

View File

@ -6,4 +6,4 @@ ENV = 'production'
# 管理系统/生产环境 # 管理系统/生产环境
VUE_APP_PDOMAIN = 'tanex56' VUE_APP_PDOMAIN = 'tanex56'
VUE_APP_BASE_API = 'http://api.emis.tanex56.com/api/bizsvr' VUE_APP_BASE_API = 'https://api.emis.tanex56.com/api/bizsvr'

View File

@ -83,6 +83,9 @@ npm install @antv/x6 --save
``` ```
``` ```
npm i fingerprintjs2 -S
npm install @antv/x6 --save npm install @antv/x6 --save
npm install --save @antv/g6 npm install --save @antv/g6
``` ```

View File

@ -55,6 +55,7 @@
"element-ui": "2.15.6", "element-ui": "2.15.6",
"exceljs": "^4.3.0", "exceljs": "^4.3.0",
"file-saver": "^2.0.5", "file-saver": "^2.0.5",
"fingerprintjs2": "^2.1.4",
"font-awesome": "^4.7.0", "font-awesome": "^4.7.0",
"fuse.js": "6.4.3", "fuse.js": "6.4.3",
"highlight.js": "^9.18.5", "highlight.js": "^9.18.5",

View File

@ -99,7 +99,7 @@
size="mini" size="mini"
@click="handleAdd" @click="handleAdd"
v-hasPermi="['emis:emisSite:add']" v-hasPermi="['emis:emisSite:add']"
>新增</el-button> >新增网点</el-button>
</el-col> </el-col>
<!-- <!--
<el-col :span="1.5"> <el-col :span="1.5">
@ -113,7 +113,7 @@
v-hasPermi="['emis:emisSite:edit']" v-hasPermi="['emis:emisSite:edit']"
>修改</el-button> >修改</el-button>
</el-col> --> </el-col> -->
<el-col :span="1.5"> <!-- <el-col :span="1.5">
<el-button <el-button
type="danger" type="danger"
plain plain
@ -123,7 +123,7 @@
@click="handleDelete" @click="handleDelete"
v-hasPermi="['emis:emisSite:remove']" v-hasPermi="['emis:emisSite:remove']"
>删除</el-button> >删除</el-button>
</el-col> </el-col> -->
<!-- <el-col :span="1.5"> <!-- <el-col :span="1.5">
<el-button <el-button
type="warning" type="warning"

View File

@ -9,7 +9,9 @@
</el-col> </el-col>
<el-col :span="8"> <el-col :span="8">
<el-form-item label="员工名称" prop="empName"> <el-form-item label="员工名称" prop="empName">
<el-input v-model="form.empName" placeholder="" maxlength="30" disabled="form.userId == undefined" /> <el-input v-if="form.userId == undefined" v-model="form.empName" placeholder="" maxlength="30" />
<el-input v-else v-model="form.empName" placeholder="" maxlength="30" disabled />
</el-form-item> </el-form-item>
</el-col> </el-col>
@ -21,7 +23,9 @@
<el-col :span="8"> <el-col :span="8">
<el-form-item label="归属站点" prop="ownerSiteCode"> <el-form-item label="归属站点" prop="ownerSiteCode">
<EmisSiteSimplePicker :placeholder="$t('服务网点')" v-model="form.ownerSiteCode" :countryCode="form.countryCode" @onChange="onSiteCodeChange" disabled="form.userId == undefined"></EmisSiteSimplePicker> <EmisSiteSimplePicker v-if="form.userId == undefined" :placeholder="$t('服务网点')" v-model="form.ownerSiteCode" :countryCode="form.countryCode" @onChange="onSiteCodeChange"></EmisSiteSimplePicker>
<EmisSiteSimplePicker v-else :placeholder="$t('服务网点')" v-model="form.ownerSiteCode" :countryCode="form.countryCode" @onChange="onSiteCodeChange" disabled></EmisSiteSimplePicker>
</el-form-item> </el-form-item>
</el-col> </el-col>

View File

@ -500,7 +500,6 @@ export default {
/** 修改按钮操作 */ /** 修改按钮操作 */
handleUpdate(row) { handleUpdate(row) {
this.currentId= row.userId || this.ids[0]; this.currentId= row.userId || this.ids[0];
// this.currentId= row.userId;
this.openForm = true; this.openForm = true;
this.titleForm = "修改用户"; this.titleForm = "修改用户";
}, },
@ -528,7 +527,7 @@ export default {
/** 删除按钮操作 */ /** 删除按钮操作 */
handleDelete(row) { handleDelete(row) {
const userIds = row.userId || this.ids; const userIds = row.userId || this.ids;
this.$modal.confirm('是否确认删除用户编号为"' + userIds + '"的数据项?').then(function() { this.$modal.confirm('注意:确认是否删除?').then(function() {
return delUser(userIds); return delUser(userIds);
}).then(() => { }).then(() => {
this.getList(); this.getList();