common/setting.js
@@ -13,7 +13,7 @@ // devUrl: 'http://192.168.1.156:9528', // devUrl:'http://192.168.1.50:9528', // devUrl: 'http://192.168.0.102:9528', devUrl:'http://z4042833u6.wicp.vip', devUrl: 'https://srgdjczzxtpt.com:2080/api', minioBaseUrl: "http://60.220.177.113:9000/jczz/", // 数据中台接口url // dataCenterUrl: 'http://10.10.2.192/services', @@ -21,7 +21,7 @@ //洪水预报接口url hsybUrl: "https://sk.hubeishuiyi.cn/hsybApi/api/fh-admin", // 线上环境接口Url prodUrl: 'https://sk.hubeishuiyi.cn', prodUrl: 'https://srgdjczzxtpt.com:2080/api', // 后端数据的接收方式application/json;charset=UTF-8或者application/x-www-form-urlencoded;charset=UTF-8 contentType: 'application/json;charset=UTF-8', // 后端返回状态码 main.js
@@ -2,8 +2,8 @@ import App from './App' import store from '@/store'; import boxTitle from '@/components/boxTitle/index.vue'; Vue.component('box-title', boxTitle) // // import boxTitle from '@/components/boxTitle/index.vue'; // Vue.component('box-title', boxTitle) // Vue.config.productionTip = false;
@@ -1,6 +1,6 @@ { "name" : "基层自治", "appid" : "__UNI__EE88272", "appid" : "__UNI__3081001", "description" : "", "versionName" : "1.0.10", "versionCode" : 104, @@ -142,7 +142,7 @@ "quickapp" : {}, /* 小程序特有相关 */ "mp-weixin" : { "appid" : "wxdc5675f4df850da6", "appid" : "wx1ff4bbc24b343ef1", "setting" : { "urlCheck" : false, "minified" : true, subPackage/article/list.vue
@@ -5,7 +5,7 @@ :inactiveStyle="{color:'#999999'}" :activeStyle="{color:'#017BFC'}"></u-tabs> </view> <view class="list"> <view class="notic-list bgc-ff" v-for="(item,index) in noticeList" key="index" @click="navTo(item.id)"> <view class="notic-list bgc-ff" v-for="(item,index) in noticeList" :key="index" @click="navTo(item.id)"> <view class="f-28 mb-30"> {{item.title}} </view> subPackage/bs/components/my-select.vue
subPackage/bs/views/bsReport.vue
@@ -66,7 +66,7 @@ </template> <script> import mySelect from "@/components/my-components/my-select.vue" import mySelect from "@/subPackage/bs/components/my-select.vue" import uploadMixin from "@/mixin/uploadMixin"; export default { components: { subPackage/house/components/boxTitle/index2.vue
subPackage/house/member/householdLabel.vue
@@ -41,7 +41,8 @@ <u-radio-group class="mt-40" v-model="labelValue" placement="row"> <u-radio :customStyle="{marginBottom: '8px'}" v-for="(item, index) in labelList" :key="index" :label="item.name" :labelColor="item.color" :style="{color: item.color && '#fff'}" :name="item.name" :activeColor="item.color" @change="radioChange(item)"> :label="item.name" :labelColor="item.color" :style="{color: item.color && '#fff'}" :name="item.name" :activeColor="item.color" @change="radioChange(item)"> </u-radio> </u-radio-group> @@ -53,7 +54,7 @@ <script> import uploadMixin from "@/mixin/uploadMixin"; import newBoxTitle from '@/components/boxTitle/index2.vue' import newBoxTitle from '@/subPackage/house/components/boxTitle/index2.vue' import { getLabelListByParentId } from "@/api/label/label.js"; @@ -320,10 +321,12 @@ margin-top: 20rpx; padding: 30rpx; border-radius: 8rpx; .label-btn-box { display: flex; flex-direction: row; flex-wrap: wrap; &>view { margin: 0 20rpx 20rpx 0;
@@ -37,8 +37,9 @@ <newBoxTitle title="房屋标签"></newBoxTitle> <view class="list"> <view v-for="(item, index) in labelBtnList" :key="index"> <u-button size="mini" type="primary" :style="{background: item.color, color: item.color && '#fff'}" :plain="true" :text="item.name" @click="showLabelPopup(item)"></u-button> <u-button size="mini" type="primary" :style="{background: item.color, color: item.color && '#fff'}" :plain="true" :text="item.name" @click="showLabelPopup(item)"></u-button> </view> </view> </view> @@ -46,7 +47,8 @@ </view> <view class="edit-btn"> <u-button type="primary" color="linear-gradient(163deg, #01BDFC 0%, #017BFC 100%)" text="修改数据" @click="updateHouseInfo(item)"></u-button> <u-button type="primary" color="linear-gradient(163deg, #01BDFC 0%, #017BFC 100%)" text="修改数据" @click="updateHouseInfo(item)"></u-button> </view> </view> @@ -59,7 +61,8 @@ <u-radio-group v-model="" class="mt-40" v-model="labelValue" placement="row"> <u-radio :customStyle="{marginBottom: '8px'}" v-for="(item, index) in labelList" :key="index" :label="item.name" :labelColor="item.color" :name="item.name" :activeColor="item.color" @change="radioChange(item)"> :label="item.name" :labelColor="item.color" :name="item.name" :activeColor="item.color" @change="radioChange(item)"> </u-radio> </u-radio-group> @@ -77,10 +80,7 @@ <script> import uploadMixin from "@/mixin/uploadMixin"; import newBoxTitle from '@/components/boxTitle/index2.vue' import { uploadFile } from "@/api/doorplateAddress/doorplateAddress"; import newBoxTitle from '@/subPackage/house/components/boxTitle/index2.vue' import { getLabelListByParentId } from "@/api/label/label.js"; @@ -95,9 +95,6 @@ import { minioBaseUrl } from '@/common/setting' import { number } from "echarts"; export default { mixins: [uploadMixin], components: { @@ -432,15 +429,19 @@ margin-top: 20rpx; display: flex; flex-direction: column; .list { display: flex; flex-wrap: wrap; &>view { width: calc((100% - 80rpx) / 5); margin: 0 20rpx 20rpx 0; &:nth-child(5n) { margin-right: 0; } .u-button { padding: 6rpx 8rpx; border-width: 0 !important; subPackage/workbench/components/boxTitle/index.vue
subPackage/workbench/views/bailReportDetail.vue
@@ -17,8 +17,7 @@ <view class="item mt-30"> <u-form labelPosition="left" :model="info" ref="form" labelWidth="100" :labelStyle="{fontSize:'28rpx'}"> <u-form labelPosition="left" :model="info" ref="form" labelWidth="100" :labelStyle="{fontSize:'28rpx'}"> <u-form-item label="审核结果" prop="confirmFlag" borderBottom @click="showPicker()"> <u-input v-model="confirmFlag" disabled disabledColor="#ffffff" border="none" placeholder="请输入" placeholderClass="f-28 c-99" inputAlign="right"></u-input> @@ -26,7 +25,8 @@ </u-form-item> <u-form-item label="备注" borderBottom> <u--input type="textarea" v-model="info.confirmNotion" :disabled="isDisabled" disabledColor="#ffffff" placeholderClass="f-28 c-99" border="none" inputAlign="right"></u--input> disabledColor="#ffffff" placeholderClass="f-28 c-99" border="none" inputAlign="right"></u--input> </u-form-item> <u-form-item label="审核人员" prop="checkUserName" borderBottom > @@ -47,43 +47,37 @@ :labelStyle="{fontSize:'28rpx'}"> <view class="" v-if="tabIndex == 0"> <u-form-item label="当前时间" prop="checkUserName" borderBottom @click="showPickerDate"> <u-input v-model="goOutInfo.startTime" disabled disabledColor="#ffffff" border="none" placeholder="请获取当前时间" placeholderClass="f-28 c-99" inputAlign="right"></u-input> <u-input v-model="goOutInfo.startTime" disabled disabledColor="#ffffff" border="none" placeholder="请获取当前时间" placeholderClass="f-28 c-99" inputAlign="right"></u-input> <u-icon slot="right" name="arrow-right"></u-icon> </u-form-item> <u-form-item label="报备位置" prop="checkUserName" borderBottom @click="getLocation('startLocation')"> <u-input v-model="goOutInfo.startLocation" disabled disabledColor="#ffffff" border="none" placeholder="请获取当前位置" placeholderClass="f-28 c-99" inputAlign="right"></u-input> <u-input v-model="goOutInfo.startLocation" disabled disabledColor="#ffffff" border="none" placeholder="请获取当前位置" placeholderClass="f-28 c-99" inputAlign="right"></u-input> <u-icon slot="right" name="arrow-right"></u-icon> </u-form-item> </view> <view class="" v-if="tabIndex == 1"> <u-form-item label="到达时间" prop="reachTime" borderBottom @click="showPickerDate"> <u-input v-model="goOutInfo.reachTime" disabled disabledColor="#ffffff" border="none" placeholder="请获取当前时间" placeholderClass="f-28 c-99" inputAlign="right"></u-input> <u-input v-model="goOutInfo.reachTime" disabled disabledColor="#ffffff" border="none" placeholder="请获取当前时间" placeholderClass="f-28 c-99" inputAlign="right"></u-input> <u-icon slot="right" name="arrow-right"></u-icon> </u-form-item> <u-form-item label="到达位置" prop="reachLocation" borderBottom @click="getLocation('reachLocation')"> <u-input v-model="goOutInfo.reachLocation" disabled disabledColor="#ffffff" border="none" placeholder="请获取当前位置" placeholderClass="f-28 c-99" inputAlign="right"></u-input> <u-input v-model="goOutInfo.reachLocation" disabled disabledColor="#ffffff" border="none" placeholder="请获取当前位置" placeholderClass="f-28 c-99" inputAlign="right"></u-input> <u-icon slot="right" name="arrow-right"></u-icon> </u-form-item> </view> <view class="" v-if="tabIndex == 2"> <u-form-item label="返回时间" prop="returnTime" borderBottom @click="showPickerDate"> <u-input v-model="goOutInfo.returnTime" disabled disabledColor="#ffffff" border="none" placeholder="请获取返回时间" placeholderClass="f-28 c-99" inputAlign="right"></u-input> <u-input v-model="goOutInfo.returnTime" disabled disabledColor="#ffffff" border="none" placeholder="请获取返回时间" placeholderClass="f-28 c-99" inputAlign="right"></u-input> <u-icon slot="right" name="arrow-right"></u-icon> </u-form-item> <u-form-item label="返回位置" prop="returnLocation" borderBottom @click="getLocation('returnLocation')"> <u-input v-model="goOutInfo.returnLocation" disabled disabledColor="#ffffff" border="none" placeholder="请获取返回位置" placeholderClass="f-28 c-99" inputAlign="right"></u-input> <u-input v-model="goOutInfo.returnLocation" disabled disabledColor="#ffffff" border="none" placeholder="请获取返回位置" placeholderClass="f-28 c-99" inputAlign="right"></u-input> <u-icon slot="right" name="arrow-right"></u-icon> </u-form-item> </view> @@ -93,8 +87,8 @@ <view class="mt-20" v-if="tabIndex == 0"> <u-upload :fileList="startImageUrls" :previewFullImage="uploadConfig.previewFullImage" :accept="uploadConfig.acceptImg" :multiple="uploadConfig.multiple" :maxCount="uploadConfig.maxCount" :capture="uploadConfig.capture" @afterRead="afterReadImgs($event,'startImageUrls')" @delete="deletePic"> :maxCount="uploadConfig.maxCount" :capture="uploadConfig.capture" @afterRead="afterReadImgs($event,'startImageUrls')" @delete="deletePic"> <view class="upload-item upload-icon flex_base"> <u-icon name="/static/icon/upload.png" width="60rpx" height="60rpx"></u-icon> </view> @@ -103,8 +97,8 @@ <view class="mt-20" v-if="tabIndex == 1"> <u-upload :fileList="reachImageUrls" :previewFullImage="uploadConfig.previewFullImage" :accept="uploadConfig.acceptImg" :multiple="uploadConfig.multiple" :maxCount="uploadConfig.maxCount" :capture="uploadConfig.capture" @afterRead="afterReadImgs($event,'reachImageUrls')" @delete="deletePic"> :maxCount="uploadConfig.maxCount" :capture="uploadConfig.capture" @afterRead="afterReadImgs($event,'reachImageUrls')" @delete="deletePic"> <view class="upload-item upload-icon flex_base"> <u-icon name="/static/icon/upload.png" width="60rpx" height="60rpx"></u-icon> </view> @@ -113,8 +107,8 @@ <view class="mt-20" v-if="tabIndex == 2"> <u-upload :fileList="returnImageUrls" :previewFullImage="uploadConfig.previewFullImage" :accept="uploadConfig.acceptImg" :multiple="uploadConfig.multiple" :maxCount="uploadConfig.maxCount" :capture="uploadConfig.capture" @afterRead="afterReadImgs($event,'returnImageUrls')" @delete="deletePic"> :maxCount="uploadConfig.maxCount" :capture="uploadConfig.capture" @afterRead="afterReadImgs($event,'returnImageUrls')" @delete="deletePic"> <view class="upload-item upload-icon flex_base"> <u-icon name="/static/icon/upload.png" width="60rpx" height="60rpx"></u-icon> </view> @@ -138,7 +132,7 @@ </template> <script> import boxTitle from '@/components/boxTitle/index.vue' import boxTitle from "@/subPackage/workbench/components/boxTitle/index.vue" import lineItem from '../components/lineItem.vue' import uploadMixin from "@/mixin/uploadMixin"; import { @@ -476,10 +470,10 @@ } .upload-item { width: 140rpx; height: 140rpx; border: 1px solid #EEEEEE; } </style> subPackage/workbench/views/editExamine.vue
@@ -56,7 +56,7 @@ getPlaceDetail } from '@/api/placeExp/placeExp.js' import uploadMixin from "@/mixin/uploadMixin"; import boxTtitle from '@/components/boxTitle/index.vue' import boxTitle from "@/subPackage/workbench/components/boxTitle/index.vue" import formItem from '../components/formItem.vue' export default { mixins: [uploadMixin], subPackage/workbench/views/examine.vue
@@ -64,13 +64,14 @@ <view class="bottom-btn"> <u-button type="primary" @click="submit">提交审核</u-button> </view> <u-picker :defaultIndex="[this.defaultColumns]" :closeOnClickOverlay="true" @close="isPickerShow = false" :show="isPickerShow" ref="uPicker" :columns="columns" keyName="name" @cancel="isPickerShow = false" @confirm="handleConfirm"></u-picker> <u-picker :defaultIndex="[this.defaultColumns]" :closeOnClickOverlay="true" @close="isPickerShow = false" :show="isPickerShow" ref="uPicker" :columns="columns" keyName="name" @cancel="isPickerShow = false" @confirm="handleConfirm"></u-picker> </view> </template> <script> import boxTitle from '@/components/boxTitle/index.vue' import boxTitle from "@/subPackage/workbench/components/boxTitle/index.vue" import lineItem from '../components/lineItem.vue' import { checkPlaceExtData, subPackage/workbench/views/hotelReportDetail.vue
@@ -44,8 +44,8 @@ <view class="info"> <u-form labelWidth="70" :model="form" ref="form" class="form"> <u-form-item label="审核状态" @click="isPickerShow = true" class="form-item" :border-bottom="true"> <u--input v-model="form.confirmFlag" disabled disabledColor="#ffffff" placeholder="请选择审核状态" :border="false"></u--input> <u--input v-model="form.confirmFlag" disabled disabledColor="#ffffff" placeholder="请选择审核状态" :border="false"></u--input> <u-icon slot="right" name="arrow-right"></u-icon> </u-form-item> <u-form-item label="备注" class="form-item" v-if="selectStatus == 3"> @@ -63,7 +63,7 @@ </template> <script> import boxTitle from '@/components/boxTitle/index.vue' import boxTitle from "@/subPackage/workbench/components/boxTitle/index.vue" import lineItem from '../components/lineItem.vue' import { getHotelReportingDetail, @@ -256,22 +256,27 @@ <style lang="scss"> .container { padding:0 20rpx 130rpx; .box-title { margin-bottom: 15rpx; } .info { .title { font-size: 30rpx; padding-left: 10rpx; } .images-box { padding: 20rpx; min-height: 100rpx; background-color: #fff; } } .form { background-color: #fff; .form-item { padding: 0 20rpx;
@@ -27,8 +27,8 @@ <view class="info"> <u-form labelWidth="70" :model="form" ref="form" class="form"> <u-form-item label="审核状态" @click="isPickerShow = true" class="form-item" :border-bottom="true"> <u--input v-model="form.confirmFlag" disabled disabledColor="#ffffff" placeholder="请选择审核状态" :border="false"></u--input> <u--input v-model="form.confirmFlag" disabled disabledColor="#ffffff" placeholder="请选择审核状态" :border="false"></u--input> <u-icon slot="right" name="arrow-right"></u-icon> </u-form-item> <u-form-item label="备注" class="form-item" v-if="selectStatus == 3"> @@ -46,7 +46,7 @@ </template> <script> import boxTitle from '@/components/boxTitle/index.vue' import boxTitle from "@/subPackage/workbench/components/boxTitle/index.vue" import lineItem from '../components/lineItem.vue' import { getLabelReportingDetail, @@ -177,22 +177,27 @@ <style lang="scss"> .container { padding:0 20rpx 130rpx; .box-title { margin-bottom: 15rpx; } .info { .title { font-size: 30rpx; padding-left: 10rpx; } .images-box { padding: 20rpx; min-height: 100rpx; background-color: #fff; } } .form { background-color: #fff; .form-item { padding: 0 20rpx;
