zcdsj
/
factory_web
5
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

去除文件追踪

This commit is contained in:
曹前明 2022-08-23 17:15:06 +08:00
parent 55f821cc03
commit d709b41bf1
13 changed files with 47 additions and 41 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
.env.development
View File

@ -1,17 +0,0 @@
# 本地环境
NODE_ENV = development
# 标题
VUE_APP_TITLE = '曲阳金隅安全智能管控平台'
# 接口地址
#VUE_APP_API_BASEURL = http://1.203.161.103:2800/api
#VUE_APP_WS_API = 'ws://localhost:8000'
VUE_APP_API_BASEURL = http://127.0.0.1:8000/api
#VUE_APP_BASEURL = http://127.0.0.1:8000
# 本地端口
VUE_APP_PORT = 2800
# 是否开启代理
VUE_APP_PROXY = true

9
.env.production
View File

@ -1,9 +0,0 @@
# 生产环境
NODE_ENV = production
# 标题
VUE_APP_TITLE = '曲阳金隅安全智能管控平台'
# 接口地址
VUE_APP_API_BASEURL = http://10.99.5.79:20309/api
VUE_APP_BASEURL = http://10.99.5.79:20309

2
.gitignore vendored
View File

@ -5,6 +5,8 @@ node_modules
# local env files
.env.local
.env.*.local
.env.production
.env.development
# Log files
npm-debug.log*

2
src/api/model/system.js
View File

@ -165,7 +165,7 @@ export default {
}
},
delete: {
name: "删除菜单权限",
name: "删除角色",
req: async function(id){
return await http.delete(`${config.API_URL}/system/role/${id}/`);
}

2
src/components/scTable/index.vue
View File

@ -306,7 +306,9 @@ export default {
this.total = response.total || 0;
this.summary = response.summary || {};
this.loading = false;
if(!this.hidePagination){
this.$refs.scTable.setScrollTop(0);
}
this.$emit("dataChange", res, this.tableData);
} catch (error) {
this.loading = false;

4
src/views/am/em1.vue
View File

@ -55,7 +55,7 @@
></el-table-column>
<el-table-column label="通道状态" prop="stat" min-width="80">
<template #default="scope">
<span v-if="scope.row.stat === 0">不启用</span>
<span v-if="scope.row.stat === 0" style="color:red">未启用</span>
<span v-else>启用</span>
</template>
</el-table-column>
@ -162,7 +162,7 @@ export default {
},
async syncData() {
this.syncLoading = true;
var res = await this.$API.third.tdevice.vchannelSync.req({});
var res = await this.$API.third.tdevice.dchannelSync.req({});
this.syncLoading = false;
},
},

2
src/views/am/monitor.vue
View File

@ -56,7 +56,7 @@
></el-table-column>
<el-table-column label="通道状态" prop="stat" min-width="80">
<template #default="scope">
<span v-if="scope.row.stat === 0">不启用</span>
<span v-if="scope.row.stat === 0">未启用</span>
<span v-else>启用</span>
</template>
</el-table-column>

21
src/views/hrm/ep_form.vue
View File

@ -17,6 +17,11 @@
label-width="120px"
>
<el-row>
<el-col :md="24" :sm="24">
<el-form-item label="人员类型" prop="type">
<span>{{epTypes[form.type]}}</span>
</el-form-item>
</el-col>
<el-col :md="12" :sm="24">
<el-form-item label="姓名" prop="name">
<el-input v-model="form.name" placeholder="请输入真实姓名" clearable></el-input>
@ -50,7 +55,7 @@
</el-cascader>
</el-form-item>
</el-col>
<el-col :md="12" :sm="24">
<el-col :md="12" :sm="24" v-if="form.type=='employee'">
<el-form-item label="在职状态">
<el-select v-model="form.job_state" style="width: 100%">
<el-option
@ -101,6 +106,7 @@
</el-radio-group>
</el-form-item>
</el-col>
<el-row>
<el-col :md="12" :sm="24">
<el-form-item label="证件照">
<sc-upload v-model="form.photo" :modelValue="form.photo" title="证件照"></sc-upload>
@ -112,6 +118,7 @@
</el-form-item>
</el-col>
</el-row>
</el-row>
</el-form>
</el-main>
<el-footer v-if="mode!=='show'">
@ -154,9 +161,9 @@
loading: false,
mode: "add",
titleMap: {
add: '新增员工',
edit: '员工信息编辑',
show: '员工信息查看'
add: '新增人员',
edit: '人员信息编辑',
show: '人员信息查看'
},
job_states: [
{id: 10, name: "在职"},
@ -165,7 +172,11 @@
visible: false,
isSaveing: false,
form: defaultForm,
epTypes: {
'employee': "企业员工",
"remployee": "相关方",
"visitor": "访客"
},
//验证规则
rules: {
phone: [

1
src/views/rpm/rpj_form.vue
View File

@ -76,6 +76,7 @@
label: 'label', //
value: 'value', //
emitPath: false, // 在选中节点改变时，是否返回由该节点所在的各级菜单的值所组成的数组，若设置 false，则只返回该节点的值
checkStrictly: true
}"
clearable
style="width: 100%;">

1
src/views/rpm/rpjadd.vue
View File

@ -80,6 +80,7 @@
label: 'label', //
value: 'value', //
emitPath: false, // 在选中节点改变时，是否返回由该节点所在的各级菜单的值所组成的数组，若设置 false，则只返回该节点的值
checkStrictly: true
}"
clearable
style="width: 100%"

1
src/views/sys/dept.vue
View File

@ -76,6 +76,7 @@
type="danger"
size="small"
v-auth="'dept.delete'"
v-if="!scope.row.children"
>删除</el-button
>
</template>

21
src/views/sys/post.vue
View File

@ -1,6 +1,6 @@
<template>
<el-container>
<el-aside width="40%">
<el-aside width="45%">
<el-container>
<el-header>
<div class="left-panel">
@ -28,12 +28,12 @@
<el-table-column
label="名称"
prop="name"
width="120"
width="130"
></el-table-column>
<el-table-column
label="标识"
prop="code"
width="60"
width="100"
></el-table-column>
<el-table-column
label="最短在岗(h)"
@ -51,10 +51,18 @@
type="warning"
link
size="small"
@click="table_edit(scope.row)"
@click.stop="table_edit(scope.row)"
v-auth="'post.update'"
>编辑
</el-button>
<el-button
type="danger"
link
size="small"
@click.stop="table_del(scope.row)"
v-auth="'post.delete'"
>删除
</el-button>
</template>
</el-table-column>
</scTable>
@ -183,6 +191,11 @@ export default {
this.$refs.saveDialog.open("edit").setData(row);
});
},
table_del(row) {
this.$API.system.post.delete.req(row.id).then(res=>{
this.$refs.table.refresh()
})
},
//批量删除
async batch_del() {
var confirmRes = await this.$confirm(

1
src/views/sys/role.vue
View File

@ -136,6 +136,7 @@
//添加角色
roleAdd(){
this.limitedVisible = true;
this.type = "add";
this.$nextTick(()=>{
this.$refs.menu.setCheckedKeys([])
})