lizhichao
/
hitap-chat
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

合并

Browse Source
main
zhangqun 11 months ago
parent 9474184eb9 e160cd3d80
commit 97392a9096
5 changed files with 462 additions and 531 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 14
      pages/investigation/components/investigation-item.vue
  2. 136
      pages/investigation/components/investigation-item2.vue
  3. 2
      pages/investigation/components/problem-box.vue
  4. 17
      pages/investigation/task.vue
  5. 12
      pages/map/index.vue

14
pages/investigation/components/investigation-item.vue
Unescape View File

@ -18,7 +18,7 @@
<view class="detail-item" v-if="item.type === 'number' || item.type === '1'">
<uni-forms-item :label="item.name" label-width="450rpx"
style="display: flex;align-items: center">
<u-input placeholder="请输入" border="none" v-model="item.standar" inputAlign="right"
<u-input :disabled="type=='view'" placeholder="请输入" border="none" v-model="item.standar" inputAlign="right"
type="number">
<u-text :text="item.unit" slot="suffix" margin="0 3px 0 0" type="tips"></u-text>
</u-input>
@ -27,20 +27,20 @@
<view class="detail-item" v-else-if="item.type === 'text' || item.type === '2'">
<uni-forms-item :label="item.name" label-width="450rpx"
style="display: flex;align-items: center">
<u-input placeholder="请输入" border="none" v-model="item.standar" inputAlign="right" />
<u-input :disabled="type=='view'" placeholder="请输入" border="none" v-model="item.standar" inputAlign="right" />
</uni-forms-item>
</view>
<view class="detail-item" v-else-if="item.type === 'check' || item.type === '3'">
<uni-forms-item :label="item.name" label-width="450rpx"
style="display: flex;align-items: center">
<u-checkbox v-model="item.standar" :customStyle="{justifyContent: 'space-between'}"
<u-checkbox :disabled="type=='view'" v-model="item.standar" :customStyle="{justifyContent: 'space-between'}"
:name="'sdfs'" />
</uni-forms-item>
</view>
<view class="detail-item" v-else-if="item.type === 'upload' || item.type === '4'">
<uni-forms-item :label="item.name" label-position="top" label-width="450rpx"
style="display: flex;align-items: center; min-height: 100rpx;" />
<u-upload :fileList="item.fileList" @afterRead="(e) => afterRead(e, item)"
<u-upload :disabled="type=='view'" :fileList="item.fileList" @afterRead="(e) => afterRead(e, item)"
@delete="(e) => deletePic(e, item)" name="1" :maxCount="1"></u-upload>
</view>
</view>
@ -58,7 +58,11 @@
sid: {
type: String,
default: '01'
}
},
type: {
type: String,
default: "edit",
},
},
data() {
return {

136
pages/investigation/components/investigation-item2.vue
Unescape View File

@ -6,131 +6,51 @@
<view class="right" @click="investigationDetailHandle">确认</view>
</view>
<view class="box" style="max-height: 800rpx; overflow-y: auto">
<view
class="investigation-item"
v-for="(item, index) in investigationDetailList"
:key="index"
style="width: 96%; padding: 0"
>
<view
class="detail-item"
v-if="item.type === 'number' || item.type === '1'"
>
<uni-forms-item
:label="item.name"
label-width="450rpx"
style="display: flex; align-items: center"
>
<u-input
placeholder="请输入"
border="none"
v-model="item.standar"
inputAlign="right"
type="number"
>
<u-text
:text="item.unit"
slot="suffix"
margin="0 3px 0 0"
type="tips"
></u-text>
<view class="investigation-item" v-for="(item, index) in investigationDetailList" :key="index"
style="width: 96%; padding: 0">
<view class="detail-item" v-if="item.type === 'number' || item.type === '1'">
<uni-forms-item :label="item.name" label-width="450rpx" style="display: flex; align-items: center">
<u-input :disabled="type=='view'" placeholder="请输入" border="none" v-model="item.standar" inputAlign="right"
type="number">
<u-text :text="item.unit" slot="suffix" margin="0 3px 0 0" type="tips"></u-text>
</u-input>
</uni-forms-item>
</view>
<view
class="detail-item"
v-else-if="item.type === 'text' || item.type === '2'"
>
<uni-forms-item
:label="item.name"
label-width="450rpx"
style="display: flex; align-items: center"
>
<u-input
placeholder="请输入"
border="none"
v-model="item.standar"
inputAlign="right"
/>
<view class="detail-item" v-else-if="item.type === 'text' || item.type === '2'">
<uni-forms-item :label="item.name" label-width="450rpx" style="display: flex; align-items: center">
<u-input :disabled="type=='view'" placeholder="请输入" border="none" v-model="item.standar" inputAlign="right" />
</uni-forms-item>
</view>
<view
class="detail-item"
v-else-if="item.type === 'check' || item.type === '3'"
>
<uni-forms-item
:label="item.name"
label-width="450rpx"
style="display: flex; align-items: center"
>
<u-checkbox
v-model="item.standar"
:customStyle="{ justifyContent: 'space-between' }"
:name="'sdfs'"
/>
<view class="detail-item" v-else-if="item.type === 'check' || item.type === '3'">
<uni-forms-item :label="item.name" label-width="450rpx" style="display: flex; align-items: center">
<u-checkbox :disabled="type=='view'" v-model="item.standar" :customStyle="{ justifyContent: 'space-between' }"
:name="'sdfs'" />
</uni-forms-item>
</view>
<view
class="detail-item"
v-else-if="item.type === 'upload' || item.type === '4'"
>
<uni-forms-item
:label="item.name"
label-position="top"
label-width="450rpx"
style="display: flex; align-items: center"
/>
<u-upload
:fileList="item.fileList"
@afterRead="(e) => afterRead(e, item)"
@delete="(e) => deletePic(e, item)"
name="1"
:maxCount="1"
></u-upload>
<view class="detail-item" v-else-if="item.type === 'upload' || item.type === '4'">
<uni-forms-item :label="item.name" label-position="top" label-width="450rpx"
style="display: flex; align-items: center" />
<u-upload :disabled="type=='view'" :fileList="item.fileList" @afterRead="(e) => afterRead(e, item)"
@delete="(e) => deletePic(e, item)" name="1" :maxCount="1"></u-upload>
</view>
</view>
<view class="investigation-item" style="width: 96%; padding: 0">
<view class="detail-item">
<uni-forms-item
label="隐患描述"
label-position="top"
label-width="200px"
/>
<u-textarea
placeholder="请输入"
border="none"
v-model="formData.hdDesc"
/>
<uni-forms-item label="隐患描述" label-position="top" label-width="200px" />
<u-textarea placeholder="请输入" :disabled="type=='view'" border="none" v-model="formData.hdDesc" />
</view>
</view>
<view class="investigation-item" style="width: 96%; padding: 0">
<view class="detail-item">
<uni-forms-item
label="隐患图片"
label-position="top"
label-width="200px"
/>
<u-upload
:fileList="fileList"
@afterRead="(e) => afterRead2(e, 'fileList')"
@delete="(e) => deletePic2(e, 'fileList')"
name="1"
:maxCount="1"
></u-upload>
<uni-forms-item label="隐患图片" label-position="top" label-width="200px" />
<u-upload :fileList="fileList" :disabled="type=='view'" @afterRead="(e) => afterRead2(e, 'fileList')"
@delete="(e) => deletePic2(e, 'fileList')" name="1" :maxCount="1"></u-upload>
</view>
</view>
<view class="investigation-item" style="width: 96%; padding: 0">
<view class="detail-item">
<uni-forms-item
label="补充信息"
label-position="top"
label-width="200px"
/>
<u-textarea
placeholder="请输入"
border="none"
v-model="formData.hdInfo"
/>
<uni-forms-item label="补充信息" label-position="top" label-width="200px" />
<u-textarea :disabled="type=='view'" placeholder="请输入" border="none" v-model="formData.hdInfo" />
</view>
</view>
</view>
@ -147,6 +67,10 @@ export default {
type: String,
default: "01",
},
type: {
type: String,
default: "edit",
},
json: {
type: Object,
default: {},

2
pages/investigation/components/problem-box.vue
Unescape View File

@ -29,7 +29,7 @@
></u-upload>
</view>
<view class="detail-item">
<uni-forms-item label="补充信息" label-position="top" label-width="200px"/>
<uni-forms-item label="需采集补充信息" label-position="top" label-width="200px"/>
<u-textarea
placeholder="请输入"
border="none"

17
pages/investigation/task.vue
Unescape View File

@ -180,10 +180,10 @@
style="padding: 8px 12px;"></u-checkbox>
</u-checkbox-group>
<u-popup :show="showInvestigation" @close="showInvestigation = false">
<InvestigationItem @select="select2"></InvestigationItem>
<InvestigationItem :type="type" @select="select2"></InvestigationItem>
</u-popup>
<u-popup :show="showInvestigation2" @close="showInvestigation2 = false">
<InvestigationItem2 :json="showInvestigation2Item" :businessId="this.businessId"
<InvestigationItem2 :type="type" :json="showInvestigation2Item" :businessId="this.businessId"
@show="showInvestigation2 = false" @select="select3"></InvestigationItem2>
</u-popup>
<!-- <u-popup :show="showInvestigation" @close="showInvestigation = false">
@ -312,17 +312,17 @@
</view>
<view class="detail-item">
<uni-forms-item label="隐患描述" label-position="top" label-width="200px" />
<u-textarea placeholder="请输入" border="none" v-model="describe.hdDesc" />
<u-textarea :disabled="true" placeholder="请输入" border="none" v-model="describe.hdDesc" />
</view>
<view class="detail-item">
<uni-forms-item label="隐患图片" label-position="top" label-width="200px" />
<u-upload :fileList="fileList" @afterRead="(e) => afterRead(e, 'fileList')"
@delete="(e) => deletePic(e, 'fileList')" name="1"></u-upload>
<u-upload :disabled="true" :fileList="fileList" @afterRead="(e) => afterRead(e, 'fileList')"
@delete="(e) => deletePic(e, 'fileList')" name="1" :maxCount="1"></u-upload>
</view>
<view class="detail-item">
<uni-forms-item label="补充信息" label-position="top" label-width="200px" />
<u-textarea placeholder="请输入" border="none" v-model="describe.hdInfo" />
<u-textarea :disabled="true" placeholder="请输入" border="none" v-model="describe.hdInfo" />
</view>
</view>
<view class="blank" />
@ -561,7 +561,7 @@
extraConfigs: [],
describeArr: [],
temporary: '',
type: ''
type: 'edit'
};
},
methods: {
@ -725,6 +725,9 @@
this.fileList = [];
},
addFL() {
if(this.type == 'add'){
return false
}
this.showProblemTreeSelect = true;
this.showProblem = false;
// this.describe = {

12
pages/map/index.vue
Unescape View File

@ -35,8 +35,8 @@
</view>
</view>
<view class="btn-box">
<view @click="handleCheck(1)" class="btn btn1" v-show="type=='edit'"> 智能排查 </view>
<view @click="show2 = true" class="btn btn2" v-show="type=='edit'"> 人工排查 </view>
<view @click="handleCheck(1)" class="btn btn1" v-show="type!='view'"> 智能排查 </view>
<view @click="handleCheck(2)" class="btn btn2" v-show="type!='view'"> 人工排查 </view>
<view @click="handleCheck(2)" class="btn btn8" v-show="type=='view'"> 查看排查详情 </view>
</view>
</view>
@ -44,9 +44,9 @@
<view class="two-f1">根据当前定位信息，您要排查的是这条路吗？</view>
<view class="two-f2">{{ rname }}</view>
<view class="btn-box">
<view @click="onJump(3)" class="btn btn3" v-show="type=='edit'"> 更换 </view>
<view @click="handleCheck(1)" class="btn btn4" v-show="type=='edit'"> 智能排查 </view>
<view @click="show2 = true" class="btn btn5" v-show="type=='edit'"> 人工排查 </view>
<view @click="onJump(3)" class="btn btn3" v-show="type!='view'"> 更换 </view>
<view @click="handleCheck(1)" class="btn btn4" v-show="type!='view'"> 智能排查 </view>
<view @click="handleCheck(2)" class="btn btn5" v-show="type!='view'"> 人工排查 </view>
<view @click="handleCheck(2)" class="btn btn8" v-show="type=='view'"> 查看排查详情 </view>
</view>
</view>
@ -225,7 +225,7 @@ export default {
name3: "",
name4: "",
show: false,
type:'',
type:'edit',
show2: false,
};
},

Write Preview
Loading…
Cancel
Save