admin/zhgdyun
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix: 解决冲突

Browse Source
This commit is contained in:
kun 2024-05-27 08:58:59 +08:00
commit cfc3608816
3 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/store/index.js
View File

@ -55,6 +55,7 @@ export default new Vuex.Store({
UPLOADURL:'http://192.168.34.221:9111/upload/image/',// 郭圣雄本地 UPLOADURL:'http://192.168.34.221:9111/upload/image/',// 郭圣雄本地
FILEURL:'http://192.168.34.221:9111/image/',//郭圣雄本地 FILEURL:'http://192.168.34.221:9111/image/',//郭圣雄本地
WORKFLOWURL: "http://192.168.34.138:88/#/workspace/forms", //坤工作流地址(本地) WORKFLOWURL: "http://192.168.34.138:88/#/workspace/forms", //坤工作流地址(本地)
// WORKFLOWURL: "http://192.168.34.126:88/#/workspace/forms", //罗峰工作流地址(本地)
// UPLOADURL:'http://182.90.224.237:51234/upload/image/',// 郭圣雄远程 // UPLOADURL:'http://182.90.224.237:51234/upload/image/',// 郭圣雄远程
// FILEURL:'http://182.90.224.237:51234/image/',//郭圣雄远程 // FILEURL:'http://182.90.224.237:51234/image/',//郭圣雄远程
// UPLOADURL:'http://42.180.188.17:11211/upload/image',//测试 // UPLOADURL:'http://42.180.188.17:11211/upload/image',//测试

2
src/views/projectFront/emergencyDisposal/emergencyPush.vue
View File

@ -97,7 +97,7 @@
{{ emergencyTypeDetail.enterpriseName }} {{ emergencyTypeDetail.enterpriseName }}
</el-form-item> </el-form-item>
<el-form-item label="应急负责人：" :label-width="formLabelWidth" prop="enterpriseIdList"> <el-form-item label="应急负责人：" :label-width="formLabelWidth" prop="enterpriseIdList">
<el-select v-model="emergencyTypeDetail.enterpriseIdList" multiple collapse-tags <el-select v-model="emergencyTypeDetail.enterpriseIdList" filterable multiple collapse-tags
placeholder="请选择人员"> placeholder="请选择人员">
<el-option :label="item.workerName" :value="item.userId" <el-option :label="item.workerName" :value="item.userId"
v-for="(item, index) in responsibilityList" :key="index"> v-for="(item, index) in responsibilityList" :key="index">

2
src/views/projectFront/laborManage/safeWorkManage/safeWorkRules.vue
View File

@ -187,6 +187,7 @@
v-model="row.enterpriseId" v-model="row.enterpriseId"
placeholder="请选择" placeholder="请选择"
v-if="row.isEdit" v-if="row.isEdit"
filterable
@change="(e) => enterpriseChange(e, $index)" @change="(e) => enterpriseChange(e, $index)"
> >
<el-option <el-option
@ -205,6 +206,7 @@
v-model="row.userId" v-model="row.userId"
placeholder="请选择" placeholder="请选择"
multiple multiple
filterable
v-if="row.isEdit" v-if="row.isEdit"
> >
<el-option <el-option