diff --git a/components/uni-drawer/uni-drawer.vue b/components/uni-drawer/uni-drawer.vue
new file mode 100644
index 0000000..ab92a3d
--- /dev/null
+++ b/components/uni-drawer/uni-drawer.vue
@@ -0,0 +1,166 @@
+<template>
+ <view v-if="visibleSync" :class="{ 'uni-drawer--visible': showDrawer }" class="uni-drawer" @touchmove.stop.prevent="clear">
+ <view class="uni-drawer__mask" :class="{ 'uni-drawer__mask--visible': showDrawer && mask }" @tap="close('mask')" />
+ <view class="uni-drawer__content" :class="{'uni-drawer--right': rightMode,'uni-drawer--left': !rightMode, 'uni-drawer__content--visible': showDrawer}" :style="[{width:drawerWidth+'px'},{top:StatusBar + 'px'}]">
+ <slot />
+ </view>
+ </view>
+</template>
+
+<script>
+ /**
+ * Drawer 抽屉
+ * @description 抽屉侧滑菜单
+ * @tutorial https://ext.dcloud.net.cn/plugin?id=26
+ * @property {Boolean} mask = [true | false] 是否显示遮罩
+ * @property {Boolean} maskClick = [true | false] 点击遮罩是否关闭
+ * @property {Boolean} mode = [left | right] Drawer 滑出位置
+ * @value left 从左侧滑出
+ * @value right 从右侧侧滑出
+ * @property {Number} width 抽屉的宽度 ，仅 vue 页面生效
+ * @event {Function} close 组件关闭时触发事件
+ */
+ export default {
+ name: 'UniDrawer',
+ props: {
+ /**
+ * 显示模式（左、右），只在初始化生效
+ */
+ mode: {
+ type: String,
+ default: ''
+ },
+ /**
+ * 蒙层显示状态
+ */
+ mask: {
+ type: Boolean,
+ default: true
+ },
+ /**
+ * 遮罩是否可点击关闭
+ */
+ maskClick: {
+ type: Boolean,
+ default: true
+ },
+ /**
+ * 抽屉宽度
+ */
+ width: {
+ type: Number,
+ default: 300
+ }
+ },
+ data() {
+ return {
+ StatusBar: this.StatusBar,
+ visibleSync: false,
+ showDrawer: false,
+ rightMode: false,
+ watchTimer: null,
+ drawerWidth: 300
+ }
+ },
+ created() {
+ // #ifndef APP-NVUE
+ this.drawerWidth = this.width
+ // #endif
+ this.rightMode = this.mode === 'right'
+ },
+ methods: {
+ clear() {},
+ close(type) {
+ // fixed by mehaotian 抽屉尚未完全关闭或遮罩禁止点击时不触发以下逻辑
+ if ((type === 'mask' && !this.maskClick) || !this.visibleSync) return
+ this._change('showDrawer', 'visibleSync', false)
+ },
+ open() {
+ // fixed by mehaotian 处理重复点击打开的事件
+ if (this.visibleSync) return
+ this._change('visibleSync', 'showDrawer', true)
+ },
+ _change(param1, param2, status) {
+ this[param1] = status
+ if (this.watchTimer) {
+ clearTimeout(this.watchTimer)
+ }
+ this.watchTimer = setTimeout(() => {
+ this[param2] = status
+ this.$emit('change', status)
+ }, status ? 50 : 300)
+ }
+ }
+ }
+</script>
+
+<style scoped>
+ .uni-drawer {
+ /* #ifndef APP-NVUE */
+ display: block;
+ /* #endif */
+ position: fixed;
+ top: 0;
+ left: 0;
+ right: 0;
+ bottom: 0;
+ overflow: hidden;
+ z-index: 999;
+ }
+
+ .uni-drawer__content {
+ /* #ifndef APP-NVUE */
+ display: block;
+ /* #endif */
+ position: absolute;
+ /* top: 0; */
+ bottom: 0;
+ background-color: #ffffff;
+ transition: transform 0.3s ease;
+ }
+
+ .uni-drawer--left {
+ left: 0;
+ /* #ifdef APP-NVUE */
+ transform: translateX(-220px);
+ /* #endif */
+ /* #ifndef APP-NVUE */
+ transform: translateX(-100%);
+ /* #endif */
+ }
+
+ .uni-drawer--right {
+ right: 0;
+ /* #ifdef APP-NVUE */
+ transform: translateX(220px);
+ /* #endif */
+ /* #ifndef APP-NVUE */
+ transform: translateX(100%);
+ /* #endif */
+ }
+
+ .uni-drawer__content--visible {
+ transform: translateX(0px);
+ }
+
+ .uni-drawer__mask {
+ /* #ifndef APP-NVUE */
+ display: block;
+ /* #endif */
+ opacity: 0;
+ position: absolute;
+ top: 0;
+ left: 0;
+ bottom: 0;
+ right: 0;
+ background-color: rgba(0, 0, 0, 0.4);
+ transition: opacity 0.3s;
+ }
+
+ .uni-drawer__mask--visible {
+ /* #ifndef APP-NVUE */
+ display: block;
+ /* #endif */
+ opacity: 1;
+ }
+</style>
diff --git a/package-lock.json b/package-lock.json
index 9cc1336..015c0eb 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -60,6 +60,15 @@
"resolved": "https://registry.npmjs.org/vue/-/vue-2.6.14.tgz",
"integrity": "sha512-x2284lgYvjOMj3Za7kqzRcUSxBboHqtgRE2zlos1qWaOye5yUmHn42LB1250NJBLRwEcdrB0JRwyPTEPhfQjiQ=="
},
+ "node_modules/vuex": {
+ "version": "3.6.2",
+ "resolved": "https://registry.npmjs.org/vuex/-/vuex-3.6.2.tgz",
+ "integrity": "sha512-ETW44IqCgBpVomy520DT5jf8n0zoCac+sxWnn+hMe/CzaSejb/eVw2YToiXYX+Ex/AuHHia28vWTq4goAexFbw==",
+ "peer": true,
+ "peerDependencies": {
+ "vue": "^2.0.0"
+ }
+ },
"node_modules/vuex-persistedstate": {
"version": "3.2.1",
"resolved": "https://registry.npmjs.org/vuex-persistedstate/-/vuex-persistedstate-3.2.1.tgz",
@@ -111,6 +120,13 @@
"resolved": "https://registry.npmjs.org/vue/-/vue-2.6.14.tgz",
"integrity": "sha512-x2284lgYvjOMj3Za7kqzRcUSxBboHqtgRE2zlos1qWaOye5yUmHn42LB1250NJBLRwEcdrB0JRwyPTEPhfQjiQ=="
},
+ "vuex": {
+ "version": "3.6.2",
+ "resolved": "https://registry.npmjs.org/vuex/-/vuex-3.6.2.tgz",
+ "integrity": "sha512-ETW44IqCgBpVomy520DT5jf8n0zoCac+sxWnn+hMe/CzaSejb/eVw2YToiXYX+Ex/AuHHia28vWTq4goAexFbw==",
+ "peer": true,
+ "requires": {}
+ },
"vuex-persistedstate": {
"version": "3.2.1",
"resolved": "https://registry.npmjs.org/vuex-persistedstate/-/vuex-persistedstate-3.2.1.tgz",
diff --git a/pages/branch-information-management/branch-information/detail.vue b/pages/branch-information-management/branch-information/detail.vue
index 60fdbea..d970c87 100644
--- a/pages/branch-information-management/branch-information/detail.vue
+++ b/pages/branch-information-management/branch-information/detail.vue
@@ -143,7 +143,7 @@
<view class="flex-between mt-10 subtitle">
<text>证书编号：{{ item.NUMBER }}</text>
</view>
- <view class="flex-end mt-10">
+ <view class="flex-end mt-10 see_btn">
<u-button type="primary" text="查看" size="mini" class="bth-mini"
@click="fnNavigatorDetail(item.QUALIFICATIONS_ID,'','/pages/branch-information-management/branch-information/qualification')"></u-button>
</view>
@@ -185,7 +185,7 @@
<view class="flex-between mt-10 subtitle">
<text>有效期：{{ item.TERMOFVALIDITY }}</text>
</view>
- <view class="flex-end mt-10">
+ <view class="flex-end mt-10 w100 see_btn">
<u-button type="primary" text="查看" size="mini" class="bth-mini"
@click="fnNavigatorDetail('',item.INFOR_ID,'/pages/branch-information-management/branch-information/personnel')"></u-button>
</view>
@@ -265,6 +265,9 @@ export default {
}
</script>
-<style scoped>
-
+<style scoped lang="scss">
+.see_btn{
+ width: 100rpx;
+float: right;
+}
</style>
diff --git a/pages/branch-information-management/branch-information/list.vue b/pages/branch-information-management/branch-information/list.vue
index 687f986..c85756d 100644
--- a/pages/branch-information-management/branch-information/list.vue
+++ b/pages/branch-information-management/branch-information/list.vue
@@ -9,7 +9,10 @@
clearable
shape="circle"
></u--input>
- <u-button class="bth-mini ml-10" type="success" text="确定" @click="resetList"></u-button>
+ <view class="bth-mini ml-10">
+ <u-button type="success" text="确定" @click="resetList"></u-button>
+ </view>
+
</view>
<u-list @scrolltolower="scrolltolower" v-if="list.length > 0">
<u-list-item v-for="(item, index) in list" :key="index">
@@ -36,7 +39,7 @@
<view class="flex-between mt-10 subtitle">
<text>地址：{{item.ADDRESS_BUSINESS}}</text>
</view>
- <view class="flex-end mt-10">
+ <view class="flex-end mt-10 btn">
<u-button type="primary" text="查看" size="mini" class="bth-mini" @click="fnNavigatorDetail(item.CORPINFO_ID)"></u-button>
</view>
</view>
@@ -100,6 +103,20 @@ export default {
}
</script>
-<style scoped>
+<style scoped lang="scss">
+ .search{
+ display: flex;
+ .ml-10{
+ margin-left: 10rpx;
+ }
+ .bth-mini{
+ width: 100rpx;
+ }
+
+ }
+ .btn{
+ width: 100rpx;
+ float: right;
+ }
</style>
diff --git a/pages/branch-information-management/branch-office/detail.vue b/pages/branch-information-management/branch-office/detail.vue
index 1512956..3eccee3 100644
--- a/pages/branch-information-management/branch-office/detail.vue
+++ b/pages/branch-information-management/branch-office/detail.vue
@@ -9,7 +9,10 @@
clearable
shape="circle"
></u--input>
- <u-button class="bth-mini ml-10" type="success" text="确定" @click="getData"></u-button>
+ <view class="ml-10">
+ <u-button class="bth-mini ml-10" type="success" text="确定" @click="getData"></u-button>
+ </view>
+
</view>
<u-popup :show="popupShow" @close="popupShow = false" mode="right" :customStyle="{width:'85vw'}">
<view class="card">
@@ -136,6 +139,16 @@ export default {
}
</script>
-<style scoped>
+<style scoped lang="scss">
+.search{
+ display: flex;
+ .ml-10{
+ margin-left: 10rpx;
+ }
+ .bth-mini{
+ width: 100rpx;
+ }
+
+}
</style>
diff --git a/pages/branch-information-management/branch-office/list.vue b/pages/branch-information-management/branch-office/list.vue
index 6430f06..cf79ee7 100644
--- a/pages/branch-information-management/branch-office/list.vue
+++ b/pages/branch-information-management/branch-office/list.vue
@@ -9,7 +9,9 @@
clearable
shape="circle"
></u--input>
- <u-button class="bth-mini ml-10" type="success" text="确定" @click="resetList"></u-button>
+ <view class="bth-mini ml-10">
+ <u-button type="success" text="确定" @click="resetList"></u-button>
+ </view>
</view>
<u-list @scrolltolower="scrolltolower" v-if="list.length > 0">
<u-list-item v-for="(item, index) in list" :key="index">
@@ -36,7 +38,7 @@
<view class="flex-between mt-10 subtitle">
<text>地址：{{item.ADDRESS_BUSINESS}}</text>
</view>
- <view class="flex-end mt-10">
+ <view class="flex-end mt-10 btn" >
<u-button type="primary" text="查看" size="mini" class="bth-mini" @click="fnNavigatorDetail(item.CORPINFO_ID)"></u-button>
</view>
</view>
@@ -45,7 +47,6 @@
<empty v-else></empty>
</view>
</template>
-
<script>
import {getCorpInfoList} from "../../../api";
@@ -100,6 +101,20 @@ export default {
}
</script>
-<style scoped>
+<style scoped lang="scss">
+.search{
+ display: flex;
+ .ml-10{
+ margin-left: 10rpx;
+ }
+ .bth-mini{
+ width: 100rpx;
+ }
+
+}
+.btn{
+ width: 100rpx;
+ float: right;
+}
</style>
diff --git a/pages/branch-information-management/branch-staff/detail-list.vue b/pages/branch-information-management/branch-staff/detail-list.vue
index d28779a..ddd7fad 100644
--- a/pages/branch-information-management/branch-staff/detail-list.vue
+++ b/pages/branch-information-management/branch-staff/detail-list.vue
@@ -9,7 +9,8 @@
clearable
shape="circle"
></u--input>
- <u-button class="bth-mini ml-10" type="success" text="确定" @click="resetList"></u-button>
+ <view class="ml-10"> <u-button class="bth-mini ml-10" type="success" text="确定" @click="resetList"></u-button></view>
+
</view>
<u-list @scrolltolower="scrolltolower" v-if="list.length > 0">
<u-list-item v-for="(item, index) in list" :key="index">
@@ -29,7 +30,7 @@
<text>是否确认人：{{item.DEPTNAME}}</text>
<text>人员类型：{{item.DEPTNAME}}</text>
</view>
- <view class="flex-end mt-10">
+ <view class="flex-end mt-10 see_btn">
<u-button type="primary" text="查看" size="mini" class="bth-mini"
@click="fnNavigatorDetail(item.USER_ID)"></u-button>
</view>
@@ -96,7 +97,20 @@ export default {
}
}
</script>
+<style scoped lang="scss">
+.search{
+ display: flex;
+ .ml-10{
+ margin-left: 10rpx;
+ }
+ .bth-mini{
+ width: 100rpx;
+ }
-<style scoped>
+}
+.see_btn{
+ width: 100rpx;
+ float: right;
+}
</style>
diff --git a/pages/branch-information-management/branch-staff/list.vue b/pages/branch-information-management/branch-staff/list.vue
index 1dcd0aa..05c7c9d 100644
--- a/pages/branch-information-management/branch-staff/list.vue
+++ b/pages/branch-information-management/branch-staff/list.vue
@@ -9,7 +9,10 @@
clearable
shape="circle"
></u--input>
- <u-button class="bth-mini ml-10" type="success" text="确定" @click="resetList"></u-button>
+
+ <view class="bth-mini ml-10">
+ <u-button type="success" text="确定" @click="resetList"></u-button>
+ </view>
</view>
<u-list @scrolltolower="scrolltolower" v-if="list.length > 0">
<u-list-item v-for="(item, index) in list" :key="index">
@@ -36,7 +39,7 @@
<view class="flex-between mt-10 subtitle">
<text>地址：{{item.ADDRESS_BUSINESS}}</text>
</view>
- <view class="flex-end mt-10">
+ <view class="flex-end mt-10 btn">
<u-button type="primary" text="查看" size="mini" class="bth-mini" @click="fnNavigatorDetail(item.CORPINFO_ID)"></u-button>
</view>
</view>
@@ -100,6 +103,19 @@ export default {
}
</script>
-<style scoped>
+<style scoped lang="scss">
+.search{
+ display: flex;
+ .ml-10{
+ margin-left: 10rpx;
+ }
+ .bth-mini{
+ width: 100rpx;
+ }
+}
+.btn{
+ width: 100rpx;
+ float: right;
+}
</style>
diff --git a/pages/branch-self-report/index/index.vue b/pages/branch-self-report/index/index.vue
index 762515e..132208b 100644
--- a/pages/branch-self-report/index/index.vue
+++ b/pages/branch-self-report/index/index.vue
@@ -9,7 +9,8 @@
clearable
shape="circle"
></u--input>
- <u-button class="bth-mini ml-10" type="success" text="确定" @click="resetList"></u-button>
+ <view class="ml-10"> <u-button class="bth-mini ml-10" type="success" text="确定" @click="resetList"></u-button></view>
+
</view>
<u-list @scrolltolower="scrolltolower" v-if="list.length > 0">
<u-list-item v-for="(item, index) in list" :key="index">
@@ -37,6 +38,9 @@
</view>
<view class="flex-between mt-10 subtitle">
<text>重大隐患：{{item.zdCount}}</text>
+
+ </view>
+ <view class="see_btn">
<u-button type="primary" text="查看" size="mini" class="bth-mini" @click="fnNavigatorDetail(item.CORPINFO_ID)"></u-button>
</view>
</view>
@@ -100,6 +104,20 @@ export default {
}
</script>
-<style scoped>
+<style scoped lang="scss">
+.search{
+ display: flex;
+ .ml-10{
+ margin-left: 10rpx;
+ }
+ .bth-mini{
+ width: 100rpx;
+ }
+
+}
+.see_btn{
+ width: 100rpx;
+ float: right;
+}
</style>
diff --git a/pages/branch-self-report/index/inspection-records-detail-list.vue b/pages/branch-self-report/index/inspection-records-detail-list.vue
index 0916d1e..5fbb911 100644
--- a/pages/branch-self-report/index/inspection-records-detail-list.vue
+++ b/pages/branch-self-report/index/inspection-records-detail-list.vue
@@ -1,9 +1,9 @@
<template>
<view class="content">
<u-tabs
- lineWidth="336upx"
+ lineWidth="336rpx"
:list="tabsList"
- itemStyle="height:80upx;padding-bottom:10upx;background-color: #fff;"
+ itemStyle="height:80rpx;padding-bottom:10rpx;background-color: #fff;"
@click="tabsClick"
></u-tabs>
<view class="search card">
@@ -15,7 +15,10 @@
clearable
shape="circle"
></u--input>
- <u-button class="bth-mini ml-10" type="success" text="确定" @click="resetList"></u-button>
+ <view class="ml-10">
+ <u-button class="bth-mini ml-10" type="success" text="确定" @click="resetList"></u-button>
+ </view>
+
</view>
<u-list @scrolltolower="scrolltolower" v-if="list.length > 0">
<u-list-item v-for="(item, index) in list" :key="index">
@@ -37,7 +40,7 @@
<text>清单类型：{{ item.TYPE }}</text>
<text>清单周期：{{ item.PERIODNAME }}</text>
</view>
- <view class="flex-end mt-10" v-show="TYPE === 1">
+ <view class="flex-end mt-10 see_btn" v-show="TYPE === 1">
<u-button type="primary" text="查看" size="mini" class="bth-mini"
@click="fnNavigatorDetail(item.CHECKRECORD_ID,item.CORPINFO_ID)"></u-button>
</view>
@@ -109,6 +112,20 @@ export default {
}
</script>
-<style scoped>
+<style scoped lang="scss">
+.search{
+ display: flex;
+ .ml-10{
+ margin-left: 10rpx;
+ }
+ .bth-mini{
+ width: 100rpx;
+ }
+
+}
+.see_btn{
+ width: 100rpx;
+ float: right;
+}
</style>
diff --git a/pages/branch-self-report/index/inspection-records-detail.vue b/pages/branch-self-report/index/inspection-records-detail.vue
index 2dae020..f214c16 100644
--- a/pages/branch-self-report/index/inspection-records-detail.vue
+++ b/pages/branch-self-report/index/inspection-records-detail.vue
@@ -2,7 +2,7 @@
<view class="content">
<view class="card">
<web-view id="webview" v-if="mapUrl" :src="mapUrl"
- style="width: calc(100% - 40upx); height: 300px;margin-left: 20upx;margin-right: 20upx;" :scale="scale"
+ style="width: calc(100% - 40rpx); height: 300px;margin-left: 20rpx;margin-right: 20rpx;" :scale="scale"
:latitude="latitude" :longitude="longitude" :markers="covers"></web-view>
</view>
<view :style="{position: 'absolute',width: '100%',top: (statusBarHeight + 300) + 'px'}">
diff --git a/pages/branch-self-report/index/inspection-records.vue b/pages/branch-self-report/index/inspection-records.vue
index d9a3ffe..e73c314 100644
--- a/pages/branch-self-report/index/inspection-records.vue
+++ b/pages/branch-self-report/index/inspection-records.vue
@@ -9,7 +9,8 @@
clearable
shape="circle"
></u--input>
- <u-button class="bth-mini ml-10" type="success" text="确定" @click="resetList"></u-button>
+ <view class="ml-10"> <u-button class="bth-mini ml-10" type="success" text="确定" @click="resetList"></u-button></view>
+
</view>
<u-popup :show="popupShow" @close="popupShow = false" mode="right" :customStyle="{width:'85vw'}">
<view class="card">
@@ -91,7 +92,7 @@
<text>检查次数：{{item.count}}</text>
<text>超期未检查次数：{{item.OVERTIMENUM}}</text>
</view>
- <view class="flex-end mt-10">
+ <view class="flex-end mt-10 see_btn">
<u-button type="primary" text="查看" size="mini" class="bth-mini" @click="fnNavigatorDetail(item.LISTMANAGER_ID)"></u-button>
</view>
</view>
@@ -260,6 +261,20 @@ export default {
}
</script>
-<style scoped>
+<style scoped lang="scss">
+.search{
+ display: flex;
+ .ml-10{
+ margin-left: 10rpx;
+ }
+ .bth-mini{
+ width: 100rpx;
+ }
+
+}
+.see_btn{
+ width: 100rpx;
+ float: right;
+}
</style>
diff --git a/pages/general-hidden-management/general-hidden/detail-list.vue b/pages/general-hidden-management/general-hidden/detail-list.vue
index 14f0983..af137ad 100644
--- a/pages/general-hidden-management/general-hidden/detail-list.vue
+++ b/pages/general-hidden-management/general-hidden/detail-list.vue
@@ -10,7 +10,10 @@
clearable
shape="circle"
></u--input>
- <u-button class="bth-mini ml-10" type="success" text="确定" @click="resetList"></u-button>
+ <view class="ml-10">
+ <u-button class="bth-mini ml-10" type="success" text="确定" @click="resetList"></u-button>
+ </view>
+
</view>
<u-popup :show="popupShow" @close="popupShow = false" mode="right" :customStyle="{width:'85vw'}">
<view class="card">
@@ -92,6 +95,9 @@
</view>
<view class="flex-between mt-10 subtitle">
<text>隐患确认人：{{ item.CONFIRM_USER }}</text>
+
+ </view>
+ <view class="see_btn">
<u-button type="primary" text="查看" size="mini" class="bth-mini"
@click="fnNavigatorDetail(item.HIDDEN_ID)"></u-button>
</view>
@@ -240,6 +246,20 @@ export default {
}
</script>
-<style scoped>
+<style scoped lang="scss">
+.search{
+ display: flex;
+ .ml-10{
+ margin-left: 10rpx;
+ }
+ .bth-mini{
+ width: 100rpx;
+ }
+
+}
+.see_btn{
+ width: 100rpx;
+ float: right;
+}
</style>
diff --git a/pages/general-hidden-management/general-hidden/detail.vue b/pages/general-hidden-management/general-hidden/detail.vue
index 417ec16..d78d30e 100644
--- a/pages/general-hidden-management/general-hidden/detail.vue
+++ b/pages/general-hidden-management/general-hidden/detail.vue
@@ -145,7 +145,34 @@
</u-cell>
</u-cell-group>
</view>
- <view class="card" v-for="(item,index) in hiddenExamineList" :key="index">
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ <view class="card" v-for="(item,index) in hiddenExamineList" :key="index">
<view class="view-title">
<u--text text="确认信息" bold v-if="item.TYPE === 4"></u--text>
<u--text text="延期信息" bold v-else-if="item.TYPE === 2"></u--text>
@@ -251,7 +278,39 @@
</u-cell>
</u-cell-group>
</view>
- <view class="card" v-if="form.STATE ==2 || form.STATE ==4 || form.STATE == 10">
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ <view class="card" v-if="form.STATE ==2 || form.STATE ==4 || form.STATE == 10">
<view class="view-title">
<u--text text="整改信息" bold></u--text>
</view>
@@ -349,7 +408,36 @@
</template>
</u-cell-group>
</view>
- <view class="card" v-if="form.STATE ==4">
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ <view class="card" v-if="form.STATE ==4">
<view class="view-title">
<u--text text="验收信息" bold></u--text>
</view>
@@ -382,9 +470,9 @@
<view slot="title" class="title">验收图片：</view>
<view slot="value" class="mt-10">
<u-row>
- <u-col span="3" v-for="(item,index) in cImgs" :key="index">
- <u--image :showLoading="true" :src="item" width="80px" height="80px"
- @click="previewImage(cImgs,item)"></u--image>
+ <u-col span="3" v-for="(item1,index1) in cImgs" :key="index1">
+ <u--image :showLoading="true" :src="item1" width="80px" height="80px"
+ @click="previewImage(cImgs,item1)"></u--image>
</u-col>
</u-row>
</view>
diff --git a/pages/general-hidden-management/general-hidden/list.vue b/pages/general-hidden-management/general-hidden/list.vue
index 2c67314..cb644fe 100644
--- a/pages/general-hidden-management/general-hidden/list.vue
+++ b/pages/general-hidden-management/general-hidden/list.vue
@@ -9,7 +9,10 @@
clearable
shape="circle"
></u--input>
- <u-button class="bth-mini ml-10" type="success" text="确定" @click="resetList"></u-button>
+ <view class="ml-10">
+ <u-button class="bth-mini ml-10" type="success" text="确定" @click="resetList"></u-button>
+ </view>
+
</view>
<u-list @scrolltolower="scrolltolower" v-if="list.length > 0">
<u-list-item v-for="(item, index) in list" :key="index">
@@ -28,7 +31,7 @@
<text>轻微隐患：{{item.xwCount}}</text>
<text>一般隐患：{{item.qwCount}}</text>
</view>
- <view class="flex-end mt-10">
+ <view class="flex-end mt-10 see_btn">
<u-button type="primary" text="查看" size="mini" class="bth-mini" @click="fnNavigatorDetail(item.CORPINFO_ID)"></u-button>
</view>
</view>
@@ -86,6 +89,20 @@ export default {
}
</script>
-<style scoped>
+<style scoped lang="scss">
+.search{
+ display: flex;
+ .ml-10{
+ margin-left: 10rpx;
+ }
+ .bth-mini{
+ width: 100rpx;
+ }
+
+}
+.see_btn{
+ width: 100rpx;
+ float: right;
+}
</style>
diff --git a/pages/general-hidden-management/ignore-hidden/detail-list.vue b/pages/general-hidden-management/ignore-hidden/detail-list.vue
index cebcdc6..38adb74 100644
--- a/pages/general-hidden-management/ignore-hidden/detail-list.vue
+++ b/pages/general-hidden-management/ignore-hidden/detail-list.vue
@@ -10,7 +10,10 @@
clearable
shape="circle"
></u--input>
- <u-button class="bth-mini ml-10" type="success" text="确定" @click="resetList"></u-button>
+ <view class="ml-10">
+ <u-button class="bth-mini ml-10" type="success" text="确定" @click="resetList"></u-button>
+ </view>
+
</view>
<u-popup :show="popupShow" @close="popupShow = false" mode="right" :customStyle="{width:'85vw'}">
<view class="card">
@@ -89,6 +92,9 @@
</view>
<view class="flex-between mt-10 subtitle">
<text>隐患确认人：{{ item.CONFIRM_USER }}</text>
+
+ </view>
+ <view class="see_btn">
<u-button type="primary" text="查看" size="mini" class="bth-mini"
@click="fnNavigatorDetail(item.HIDDEN_ID)"></u-button>
</view>
@@ -220,6 +226,20 @@ export default {
}
</script>
-<style scoped>
+<style scoped lang="scss">
+.search{
+ display: flex;
+ .ml-10{
+ margin-left: 10rpx;
+ }
+ .bth-mini{
+ width: 100rpx;
+ }
+
+}
+.see_btn{
+ width: 100rpx;
+ float: right;
+}
</style>
diff --git a/pages/general-hidden-management/ignore-hidden/list.vue b/pages/general-hidden-management/ignore-hidden/list.vue
index 009bade..c0f9db0 100644
--- a/pages/general-hidden-management/ignore-hidden/list.vue
+++ b/pages/general-hidden-management/ignore-hidden/list.vue
@@ -9,7 +9,10 @@
clearable
shape="circle"
></u--input>
- <u-button class="bth-mini ml-10" type="success" text="确定" @click="resetList"></u-button>
+ <view class="ml-10">
+ <u-button class="bth-mini ml-10" type="success" text="确定" @click="resetList"></u-button>
+ </view>
+
</view>
<u-list @scrolltolower="scrolltolower" v-if="list.length > 0">
<u-list-item v-for="(item, index) in list" :key="index">
@@ -30,6 +33,9 @@
</view>
<view class="flex-between mt-10 subtitle">
<text>忽略隐患数：{{item.hlCount}}</text>
+
+ </view>
+ <view class="see_btn">
<u-button type="primary" text="查看" size="mini" class="bth-mini" @click="fnNavigatorDetail(item.CORPINFO_ID)"></u-button>
</view>
</view>
@@ -93,6 +99,20 @@ export default {
}
</script>
-<style scoped>
+<style scoped lang="scss">
+.search{
+ display: flex;
+ .ml-10{
+ margin-left: 10rpx;
+ }
+ .bth-mini{
+ width: 100rpx;
+ }
+
+}
+.see_btn{
+ width: 100rpx;
+ float: right;
+}
</style>
diff --git a/pages/general-hidden-management/special-hidden/detail-list.vue b/pages/general-hidden-management/special-hidden/detail-list.vue
index 9632df5..89dc78d 100644
--- a/pages/general-hidden-management/special-hidden/detail-list.vue
+++ b/pages/general-hidden-management/special-hidden/detail-list.vue
@@ -10,7 +10,8 @@
clearable
shape="circle"
></u--input>
- <u-button class="bth-mini ml-10" type="success" text="确定" @click="resetList"></u-button>
+ <view class="ml-10"> <u-button class="bth-mini ml-10" type="success" text="确定" @click="resetList"></u-button></view>
+
</view>
<u-popup :show="popupShow" @close="popupShow = false" mode="right" :customStyle="{width:'85vw'}">
<view class="card">
@@ -92,6 +93,9 @@
</view>
<view class="flex-between mt-10 subtitle">
<text>隐患确认人：{{ item.CONFIRM_USER }}</text>
+
+ </view>
+ <view class="see_btn">
<u-button type="primary" text="查看" size="mini" class="bth-mini"
@click="fnNavigatorDetail(item.HIDDEN_ID)"></u-button>
</view>
@@ -241,6 +245,20 @@ export default {
}
</script>
-<style scoped>
+<style scoped lang="scss">
+.search{
+ display: flex;
+ .ml-10{
+ margin-left: 10rpx;
+ }
+ .bth-mini{
+ width: 100rpx;
+ }
+
+}
+.see_btn{
+ width: 100rpx;
+ float: right;
+}
</style>
diff --git a/pages/general-hidden-management/special-hidden/list.vue b/pages/general-hidden-management/special-hidden/list.vue
index 7e1c9d9..4d17bd9 100644
--- a/pages/general-hidden-management/special-hidden/list.vue
+++ b/pages/general-hidden-management/special-hidden/list.vue
@@ -9,7 +9,10 @@
clearable
shape="circle"
></u--input>
- <u-button class="bth-mini ml-10" type="success" text="确定" @click="resetList"></u-button>
+ <view class="ml-10">
+ <u-button class="bth-mini ml-10" type="success" text="确定" @click="resetList"></u-button>
+ </view>
+
</view>
<u-list @scrolltolower="scrolltolower" v-if="list.length > 0">
<u-list-item v-for="(item, index) in list" :key="index">
@@ -26,6 +29,9 @@
</view>
<view class="flex-between mt-10 subtitle">
<text>特殊处置隐患数：{{ item.qwCount + item.xwCount }}</text>
+
+ </view>
+ <view class="see_btn">
<u-button type="primary" text="查看" size="mini" class="bth-mini" @click="fnNavigatorDetail(item.CORPINFO_ID)"></u-button>
</view>
</view>
@@ -83,6 +89,20 @@ export default {
}
</script>
-<style scoped>
+<style scoped lang="scss">
+.search{
+ display: flex;
+ .ml-10{
+ margin-left: 10rpx;
+ }
+ .bth-mini{
+ width: 100rpx;
+ }
+
+}
+.see_btn{
+ width: 100rpx;
+ float: right;
+}
</style>
diff --git a/pages/index/index.vue b/pages/index/index.vue
index 2889083..4c74163 100644
--- a/pages/index/index.vue
+++ b/pages/index/index.vue
@@ -302,13 +302,10 @@
font-size: 32rpx;
font-weight: bold;
}
-
.phone {
color: #999999;
font-size: 26rpx;
}
-
-
}
}
}
diff --git a/pages/information/index/detail.vue b/pages/information/index/detail.vue
index 7329c0f..90a2b5d 100644
--- a/pages/information/index/detail.vue
+++ b/pages/information/index/detail.vue
@@ -53,7 +53,7 @@ export default {
text-align: center;
}
.data{
- font-size: 24upx;
+ font-size: 24rpx;
text-align: center;
}
</style>
diff --git a/pages/information/index/index.vue b/pages/information/index/index.vue
index 0cd4b8c..3db383b 100644
--- a/pages/information/index/index.vue
+++ b/pages/information/index/index.vue
@@ -1,9 +1,9 @@
<template>
<view class="page">
<u-tabs
- lineWidth="336upx"
+ lineWidth="336rpx"
:list="tabsList"
- itemStyle="height:80upx;padding-bottom:10upx;background-color: #fff;"
+ itemStyle="height:80rpx;padding-bottom:10rpx;background-color: #fff;"
@click="tabsClick"
></u-tabs>
<view class="message_list">
diff --git a/pages/key-project-management/AI-warning/list.vue b/pages/key-project-management/AI-warning/list.vue
index 15ff358..8715db3 100644
--- a/pages/key-project-management/AI-warning/list.vue
+++ b/pages/key-project-management/AI-warning/list.vue
@@ -1,9 +1,9 @@
<template>
<view class="content">
<u-tabs
- lineWidth="336upx"
+ lineWidth="336rpx"
:list="tabsList"
- itemStyle="height:80upx;padding-bottom:10upx;background-color: #fff;"
+ itemStyle="height:80rpx;padding-bottom:10rpx;background-color: #fff;"
@click="tabsClick"
></u-tabs>
<u-list @scrolltolower="scrolltolower" v-if="list.length > 0">
diff --git a/pages/key-project-management/hidden-management/list.vue b/pages/key-project-management/hidden-management/list.vue
index de59467..2bfc333 100644
--- a/pages/key-project-management/hidden-management/list.vue
+++ b/pages/key-project-management/hidden-management/list.vue
@@ -1,9 +1,9 @@
<template>
<view class="content">
<u-tabs
- lineWidth="336upx"
+ lineWidth="336rpx"
:list="tabsList"
- itemStyle="height:80upx;padding-bottom:10upx;background-color: #fff;"
+ itemStyle="height:80rpx;padding-bottom:10rpx;background-color: #fff;"
@click="tabsClick"
></u-tabs>
<u-list @scrolltolower="scrolltolower" v-if="list.length > 0">
@@ -39,21 +39,22 @@
<text>是否处罚：{{ item.ISPUNISH && (item.ISPUNISH === "1" ? "是" : "否") }}</text>
</view>
<view class="flex-end mt-10 subtitle">
- <u-button
- v-if="item.CREATOR == userInfo.USER_ID
- && tabsType === '1'
- "
- type="primary" text="验收" size="mini" class="bth-mini" @click="fnNavigatorDetail(item.HIDDEN_ID,'acceptance')"></u-button>
- <u-button
- type="primary" text="查看" size="mini" class="bth-mini ml-10" @click="fnNavigatorDetail(item.HIDDEN_ID,'view')"></u-button>
- <!-- <u-button
- v-if="item.ISPUNISH !== '2'
+ <view v-if="item.CREATOR == userInfo.USER_ID && tabsType === '1'">
+ <u-button type="primary" text="验收" size="mini" class="bth-mini" @click="fnNavigatorDetail(item.HIDDEN_ID,'acceptance')"></u-button>
+ </view>
+ <view>
+ <u-button type="primary" text="查看" size="mini" class="bth-mini ml-10" @click="fnNavigatorDetail(item.HIDDEN_ID,'view')"></u-button>
+ </view>
+
+
+ <!-- <u-button
+ v-if="item.ISPUNISH !== '2'
&& !item.KEYPROJECTPUNISH_ID
&& item.PUNISH_THE_PERSON
&& item.PUNISH_THE_PERSON.includes(userInfo.USER_ID )
"
- color="linear-gradient(to right, #ff6034, #ee0a24)"
- text="处罚" size="mini" class="bth-mini ml-10"
+ color="linear-gradient(to right, #ff6034, #ee0a24)"
+ text="处罚" size="mini" class="bth-mini ml-10"
@click="fnModalShow(item)"></u-button> -->
<view></view>
</view>
@@ -69,7 +70,7 @@
<radio-group @change="changeRadioGroup($event)">
<label class="radio"><radio value="1" :checked="punishForm.ISPUNISH === '1'" :disabled="TabCur == 2" />是</label>
<label class="radio"><radio value="2" :checked="punishForm.ISPUNISH === '2'" :disabled="TabCur == 2" />否</label>
- </radio-group>
+ </radio-group>
</view>
<view v-if="punishForm.ISPUNISH==1">
<u-cell>
@@ -166,8 +167,8 @@ export default {
onShow() {
this.resetList()
},
- onLoad() {
- this.CORPINFO_ID = this.$route.query.CORPINFO_ID
+ onLoad(e) {
+ this.CORPINFO_ID = e.CORPINFO_ID
},
computed: {
userInfo() {
@@ -197,7 +198,7 @@ export default {
url: '/pages/key-project-management/hidden-management/view',
params: {
HIDDEN_ID,
- type: type
+ type: type
}
})
},
diff --git a/pages/key-project-management/index/index.vue b/pages/key-project-management/index/index.vue
index ab6e43f..7ff9461 100644
--- a/pages/key-project-management/index/index.vue
+++ b/pages/key-project-management/index/index.vue
@@ -24,8 +24,8 @@
baseList: []
}
},
- onLoad() {
- this.CORPINFO_ID = this.$route.query.CORPINFO_ID
+ onLoad(e) {
+ this.CORPINFO_ID = e.CORPINFO_ID
},
onShow(event) {
@@ -57,6 +57,7 @@
fnNavigator(e) {
console.log(this.CORPINFO_ID)
uni.$u.route({
+ CORPINFO_ID:this.CORPINFO_ID,
url: this.baseList[e].url+'?CORPINFO_ID'+this.CORPINFO_ID
})
diff --git a/pages/key-project-management/key-project-out/list.vue b/pages/key-project-management/key-project-out/list.vue
index d676d63..0f72183 100644
--- a/pages/key-project-management/key-project-out/list.vue
+++ b/pages/key-project-management/key-project-out/list.vue
@@ -9,7 +9,10 @@
clearable
shape="circle"
></u--input>
- <u-button class="bth-mini ml-10" type="success" text="确定" @click="resetList"></u-button>
+ <view class="ml-10">
+ <u-button class="bth-mini ml-10" type="success" text="确定" @click="resetList"></u-button>
+ </view>
+
</view>
<u-list @scrolltolower="scrolltolower" v-if="list.length > 0">
<u-list-item v-for="(item, index) in list" :key="index">
@@ -28,6 +31,9 @@
</view>
<view class="flex-between mt-10 subtitle">
<text>重点工程数：{{item.OUTSOURCED_COUNT}}</text>
+
+ </view>
+ <view class="see_btn">
<u-button type="primary" text="进入" size="mini" class="bth-mini" @click="fnNavigatorDetail(item.CORPINFO_ID)"/>
</view>
<!-- <view class="flex-between mt-10 subtitle">-->
@@ -108,7 +114,11 @@ export default {
}
</script>
-<style scoped>
+<style scoped lang="scss">
+.see_btn{
+ width: 200rpx;
+ float: right;
+}
.btn-corner-label::before,
.btn-corner-label::after {
content: attr(data-label); /* 使用 attr 获取按钮的 data-label 属性的值作为角标内容 */
diff --git a/pages/key-project-management/penalty-management/list.vue b/pages/key-project-management/penalty-management/list.vue
index 77e0bcd..e502c23 100644
--- a/pages/key-project-management/penalty-management/list.vue
+++ b/pages/key-project-management/penalty-management/list.vue
@@ -1,9 +1,9 @@
<template>
<view class="content">
<u-tabs
- lineWidth="336upx"
+ lineWidth="336rpx"
:list="tabsList"
- itemStyle="height:80upx;padding-bottom:10upx;background-color: #fff;"
+ itemStyle="height:80rpx;padding-bottom:10rpx;background-color: #fff;"
@click="tabsClick"
></u-tabs>
<u-list @scrolltolower="scrolltolower" v-if="list.length > 0">
@@ -27,14 +27,18 @@
</view>
<view class="flex-between mt-10 subtitle">
<text>处罚处理状态：{{ item.ISPUNISH == "2" ? "不处罚":item.HANDLED == "1" ?"已完成":item.ISPUNISH == "1" ? "待反馈" : "待处罚" }}</text>
- <view class="flex-between">
- <u-button
- v-if="!item.ISPUNISH"
- color="linear-gradient(to right, #ff6034, #ee0a24)"
- text="处罚" size="mini" class="bth-mini ml-10"
- @click="fnModalShow(item)"></u-button>
- <u-button style="margin-left: 20upx;" type="primary" text="查看" size="mini" class="bth-mini" @click="fnNavigatorDetail(item.HIDDEN_ID)"></u-button>
- </view>
+
+ </view>
+ <view class="flex-end">
+ <view class="wrap" v-if="!item.ISPUNISH">
+ <u-button
+ color="linear-gradient(to right, #ff6034, #ee0a24)"
+ text="处罚" size="mini" class="bth-mini ml-10"
+ @click="fnModalShow(item)"></u-button>
+ </view>
+ <view class="wrap"> <u-button style="margin-left: 20rpx;" type="primary" text="查看" size="mini" class="bth-mini" @click="fnNavigatorDetail(item.HIDDEN_ID)"></u-button></view>
+
+
</view>
</view>
</u-list-item>
@@ -48,7 +52,7 @@
<radio-group @change="changeRadioGroup($event)">
<label class="radio"><radio value="1" :checked="punishForm.ISPUNISH === '1'" :disabled="TabCur == 2" />是</label>
<label class="radio"><radio value="2" :checked="punishForm.ISPUNISH === '2'" :disabled="TabCur == 2" />否</label>
- </radio-group>
+ </radio-group>
</view>
<view v-if="punishForm.ISPUNISH==1">
<u-cell>
@@ -129,8 +133,8 @@ export default {
onShow() {
this.resetList()
},
- onLoad() {
- this.CORPINFO_ID = this.$route.query.CORPINFO_ID
+ onLoad(e) {
+ this.CORPINFO_ID = e.CORPINFO_ID
},
computed: {
userInfo() {
@@ -231,6 +235,10 @@ export default {
}
</script>
-<style scoped>
+<style scoped lang="scss">
+.wrap{
+ width: 200rpx;
+ margin: 0 10rpx;
+}
</style>
diff --git a/pages/key-project-management/safety-environmental-inspection/detail-list.vue b/pages/key-project-management/safety-environmental-inspection/detail-list.vue
index 815434b..ce9ef73 100644
--- a/pages/key-project-management/safety-environmental-inspection/detail-list.vue
+++ b/pages/key-project-management/safety-environmental-inspection/detail-list.vue
@@ -9,7 +9,10 @@
clearable
shape="circle"
></u--input>
- <u-button class="bth-mini ml-10" type="success" text="确定" @click="resetList"></u-button>
+ <view class="ml-10">
+ <u-button class="bth-mini ml-10" type="success" text="确定" @click="resetList"></u-button>
+ </view>
+
</view>
<u-list @scrolltolower="scrolltolower" v-if="list.length > 0">
<u-list-item v-for="(item, index) in list" :key="index">
@@ -36,6 +39,9 @@
</view>
<view class="flex-between mt-10 subtitle">
<text>检查隐患数：{{item.HIDDEN_COUNT}}</text>
+
+ </view>
+ <view class="see_btn">
<u-button type="primary" text="查看" size="mini" class="bth-mini" @click="fnNavigatorDetail(item.KEYPROJECTCHECK_ID,'view')"></u-button>
</view>
</view>
@@ -115,6 +121,10 @@ export default {
}
</script>
-<style scoped>
+<style scoped lang="scss">
+.see_btn{
+ width: 200rpx;
+ float: right;
+}
</style>
diff --git a/pages/key-project-management/safety-environmental-inspection/detail.vue b/pages/key-project-management/safety-environmental-inspection/detail.vue
index af08122..3dbdf27 100644
--- a/pages/key-project-management/safety-environmental-inspection/detail.vue
+++ b/pages/key-project-management/safety-environmental-inspection/detail.vue
@@ -78,7 +78,7 @@
</view>
</u-cell>
<u-cell class="flex-none">
- <view slot="value">
+ <view slot="value" style="width: 100%">
<view class="pr mt-10" v-for="(item,index) in form.situationList" :key="item.id">
<u--textarea v-model="item.SITUATION" placeholder="请输入检查情况" :disabled="disabled"></u--textarea>
<u-badge value="X" type="error" :offset="[-9,-10]" absolute
@@ -88,8 +88,9 @@
</u-cell>
<u-cell class="flex-none">
<view slot="title" class="title required">检查人员：</view>
- <view slot="value" class="mt-10">
- <u--textarea v-model="form.INSPECTION_USERS" placeholder="请输入检查人员" :disabled="disabled"></u--textarea>
+ <view slot="value" class="mt-10" >
+ <view>{{form.INSPECTION_USERS}}</view>
+<!-- <u--textarea v-model="form.INSPECTION_USERS" placeholder="请输入检查人员" :disabled="disabled" ></u--textarea>-->
</view>
</u-cell>
<u-cell>
@@ -100,7 +101,7 @@
</view>
</u-cell>
<u-cell class="title-none">
- <view slot="value" style="flex: 1">
+ <view slot="value" style="width: 100%">
<uni-table border stripe emptyText="暂无更多数据">
<uni-tr>
<uni-th align="center">序号</uni-th>
@@ -398,7 +399,7 @@ export default {
async onLoad(event) {
this.KEYPROJECTCHECK_ID = event.KEYPROJECTCHECK_ID
this.OUTSOURCED_ID = event.OUTSOURCED_ID
-
+
this.disabled = !(event.type === 'add' || event.type === 'edit');
if (this.KEYPROJECTCHECK_ID) {
await this.fnGetKeyProjectsCheckView()
@@ -648,7 +649,7 @@ export default {
TYPE: 102,
CORPINFO_ID: this.userInfo.CORPINFO_ID,
// CORPINFO_ID: this.CORPINFO_ID,
-
+
},
loading:false
})
diff --git a/pages/key-project-management/safety-environmental-inspection/list.vue b/pages/key-project-management/safety-environmental-inspection/list.vue
index 8a04426..a455e39 100644
--- a/pages/key-project-management/safety-environmental-inspection/list.vue
+++ b/pages/key-project-management/safety-environmental-inspection/list.vue
@@ -9,7 +9,10 @@
clearable
shape="circle"
></u--input>
- <u-button class="bth-mini ml-10" type="success" text="确定" @click="resetList"></u-button>
+ <view class="ml-10">
+ <u-button class="bth-mini ml-10" type="success" text="确定" @click="resetList"></u-button>
+ </view>
+
</view>
<u-list @scrolltolower="scrolltolower" v-if="list.length > 0">
<u-list-item v-for="(item, index) in list" :key="index">
@@ -43,6 +46,9 @@
</view>
<view class="flex-between mt-10 subtitle">
<text>安全环保检查次数：{{item.CHECK_COUNT}}</text>
+
+ </view>
+ <view class="see_btn">
<u-button type="primary" text="进入" size="mini" class="bth-mini" @click="fnNavigatorDetail(item.OUTSOURCED_ID)"></u-button>
</view>
</view>
@@ -66,8 +72,8 @@ export default {
list: [],
}
},
- onLoad() {
- this.CORPINFO_ID = this.$route.query.CORPINFO_ID
+ onLoad(e) {
+ this.CORPINFO_ID = e.CORPINFO_ID
},
onShow() {
this.resetList()
@@ -113,6 +119,10 @@ export default {
}
</script>
-<style scoped>
+<style scoped lang="scss">
+.see_btn{
+ width: 200rpx;
+ float: right;
+}
</style>
diff --git a/pages/larger-major-hidden-management/larger-hidden-management/detail-list.vue b/pages/larger-major-hidden-management/larger-hidden-management/detail-list.vue
index 9590774..3baaf8e 100644
--- a/pages/larger-major-hidden-management/larger-hidden-management/detail-list.vue
+++ b/pages/larger-major-hidden-management/larger-hidden-management/detail-list.vue
@@ -10,7 +10,8 @@
clearable
shape="circle"
></u--input>
- <u-button class="bth-mini ml-10" type="success" text="确定" @click="resetList"></u-button>
+ <view class="ml-10"><u-button class="bth-mini ml-10" type="success" text="确定" @click="resetList"></u-button></view>
+
</view>
<u-list @scrolltolower="scrolltolower" v-if="list.length > 0">
<u-list-item v-for="(item, index) in list" :key="index">
@@ -30,6 +31,9 @@
</view>
<view class="flex-between mt-10 subtitle">
<text>隐患级别：{{item.NAME}}</text>
+
+ </view>
+ <view class="see_btn">
<u-button type="primary" text="查看" size="mini" class="bth-mini"
@click="fnNavigatorDetail(item.HIDDEN_ID)"></u-button>
</view>
@@ -94,6 +98,20 @@ export default {
}
</script>
-<style scoped>
+<style scoped lang="scss">
+.search{
+ display: flex;
+ .ml-10{
+ margin-left: 10rpx;
+ }
+ .bth-mini{
+ width: 100rpx;
+ }
+
+}
+.see_btn{
+ width: 100rpx;
+ float: right;
+}
</style>
diff --git a/pages/larger-major-hidden-management/larger-hidden-management/list.vue b/pages/larger-major-hidden-management/larger-hidden-management/list.vue
index ac9b20a..0eb0add 100644
--- a/pages/larger-major-hidden-management/larger-hidden-management/list.vue
+++ b/pages/larger-major-hidden-management/larger-hidden-management/list.vue
@@ -9,7 +9,10 @@
clearable
shape="circle"
></u--input>
- <u-button class="bth-mini ml-10" type="success" text="确定" @click="resetList"></u-button>
+ <view class="ml-10">
+ <u-button class="bth-mini ml-10" type="success" text="确定" @click="resetList"></u-button>
+ </view>
+
</view>
<u-list @scrolltolower="scrolltolower" v-if="list.length > 0">
<u-list-item v-for="(item, index) in list" :key="index">
@@ -26,8 +29,11 @@
</view>
<view class="flex-between mt-10 subtitle">
<text>较大隐患数：{{item.jdCount}}</text>
- <u-button type="primary" text="查看" size="mini" class="bth-mini" @click="fnNavigatorDetail(item.CORPINFO_ID)"></u-button>
+
</view>
+ <view class="see_btn">
+ <u-button type="primary" text="查看" size="mini" class="bth-mini" @click="fnNavigatorDetail(item.CORPINFO_ID)"></u-button>
+ </view>
</view>
</u-list-item>
</u-list>
@@ -83,6 +89,20 @@ export default {
}
</script>
-<style scoped>
+<style scoped lang="scss">
+.search{
+ display: flex;
+ .ml-10{
+ margin-left: 10rpx;
+ }
+ .bth-mini{
+ width: 100rpx;
+ }
+
+}
+.see_btn{
+ width: 100rpx;
+ float: right;
+}
</style>
diff --git a/pages/larger-major-hidden-management/major-hidden-management/detail-list.vue b/pages/larger-major-hidden-management/major-hidden-management/detail-list.vue
index b6e5a66..a5be150 100644
--- a/pages/larger-major-hidden-management/major-hidden-management/detail-list.vue
+++ b/pages/larger-major-hidden-management/major-hidden-management/detail-list.vue
@@ -10,7 +10,9 @@
clearable
shape="circle"
></u--input>
- <u-button class="bth-mini ml-10" type="success" text="确定" @click="resetList"></u-button>
+ <view class="ml-10">
+ <u-button class="bth-mini ml-10" type="success" text="确定" @click="resetList"></u-button>
+ </view>
</view>
<u-list @scrolltolower="scrolltolower" v-if="list.length > 0">
<u-list-item v-for="(item, index) in list" :key="index">
@@ -30,6 +32,9 @@
</view>
<view class="flex-between mt-10 subtitle">
<text>隐患级别：{{ item.NAME }}</text>
+
+ </view>
+ <view class="see_btn">
<u-button type="primary" text="查看" size="mini" class="bth-mini"
@click="fnNavigatorDetail(item.HIDDEN_ID)"></u-button>
</view>
@@ -94,6 +99,20 @@ export default {
}
</script>
-<style scoped>
+<style scoped lang="scss">
+.search{
+ display: flex;
+ .ml-10{
+ margin-left: 10rpx;
+ }
+ .bth-mini{
+ width: 100rpx;
+ }
+
+}
+.see_btn{
+ width: 100rpx;
+ float: right;
+}
</style>
diff --git a/pages/larger-major-hidden-management/major-hidden-management/list.vue b/pages/larger-major-hidden-management/major-hidden-management/list.vue
index c8b53ef..ec7fa5c 100644
--- a/pages/larger-major-hidden-management/major-hidden-management/list.vue
+++ b/pages/larger-major-hidden-management/major-hidden-management/list.vue
@@ -9,7 +9,10 @@
clearable
shape="circle"
></u--input>
- <u-button class="bth-mini ml-10" type="success" text="确定" @click="resetList"></u-button>
+ <view class="ml-10">
+ <u-button class="bth-mini ml-10" type="success" text="确定" @click="resetList"></u-button>
+ </view>
+
</view>
<u-list @scrolltolower="scrolltolower" v-if="list.length > 0">
<u-list-item v-for="(item, index) in list" :key="index">
@@ -26,6 +29,9 @@
</view>
<view class="flex-between mt-10 subtitle">
<text>重大隐患数：{{item.zdCount}}</text>
+
+ </view>
+ <view class="see_btn">
<u-button type="primary" text="查看" size="mini" class="bth-mini" @click="fnNavigatorDetail(item.CORPINFO_ID)"></u-button>
</view>
</view>
@@ -83,6 +89,20 @@ export default {
}
</script>
-<style scoped>
+<style scoped lang="scss">
+.search{
+ display: flex;
+ .ml-10{
+ margin-left: 10rpx;
+ }
+ .bth-mini{
+ width: 100rpx;
+ }
+
+}
+.see_btn{
+ width: 100rpx;
+ float: right;
+}
</style>
diff --git a/pages/login/login.vue b/pages/login/login.vue
index c02483c..3a2c91d 100644
--- a/pages/login/login.vue
+++ b/pages/login/login.vue
@@ -1,18 +1,25 @@
<template>
<view class="wui_login">
+ <view class="bg_img">
+ <image src="/static/bg-login.png" mode=""></image>
+
+ </view>
<view class="login-title">
- <text @click="updateToolPath()" ><button style=" opacity:0;height: 50px; width: 50px;"></button></text>
+ <text @click="updateToolPath()" ><button style=" opacity:0;height: 50rpx; width: 50rpx;"></button></text>
</view>
<view class="form">
- <u--form labelPosition="top" :model="form" labelWidth="140upx" >
+ <u--form labelPosition="top" :model="form" labelWidth="140rpx" >
<u-form-item label="账号" borderBottom>
<u--input v-model="form.userName" border="none" placeholder="请输入账号..." ></u--input>
</u-form-item>
<u-form-item label="密码" borderBottom>
<u--input v-model="form.userPwd" type="password" border="none" placeholder="请输入密码..." ></u--input>
</u-form-item>
+ <u-form-item >
+ <u-button type="primary" text="登 录" @click="$u.debounce(fnLogin, 1000,true)"></u-button>
+ </u-form-item>
</u--form>
- <u-button type="primary" text="登 录" @click="$u.debounce(fnLogin, 1000,true)"></u-button>
+
</view>
<u-modal :show="updateVersion.modalShow" title="温馨提示" :showConfirmButton="updateVersion.showConfirmButton"
:showCancelButton="updateVersion.showCancelButton" :confirmText="updateVersion.confirmText" :cancelText="updateVersion.cancelText"
@@ -56,7 +63,6 @@ export default {
uni.navigateTo({
url: '/pages/login/updateTool/forget',
});
-
}
},
async fnLogin() {
@@ -109,14 +115,27 @@ export default {
background-color: #058cf5;
position: relative;
overflow: hidden;
+ .bg_img{
+ position: absolute;
+ left: 0;
+ top: 0;
+ right: 0;
+ bottom: 0;
+ width: 100%;
+ height: 100%;
+ image{
+ width: 100%;
+ height: 100%;
+ }
+ }
.title{
color: #fff;
- font-size: 44upx;
+ font-size: 44rpx;
font-weight: 500;
display: flex;
flex-direction: column;
- padding-top: 106upx;
- padding-left: 46upx;
+ padding-top: 106rpx;
+ padding-left: 46rpx;
line-height: 1.6;
}
.form{
@@ -125,22 +144,22 @@ export default {
top: 49%;
left: 50%;
background-color: #fff;
- border-radius: 20upx;
- padding: 30upx 9%;
+ border-radius: 20rpx;
+ padding: 30rpx 9%;
transform: translate(-50%, -50%);
}
button{
- margin-top: 40upx;
- margin-bottom: 60upx;
+ margin-top: 40rpx;
+ margin-bottom: 60rpx;
background-color: #0b80e7;
color: #fff;
font-weight: bold;
border: none;
- border-radius: 10upx;
+ border-radius: 10rpx;
}
::v-deep{
.u-button__text{
- font-size: 32upx !important;
+ font-size: 32rpx !important;
}
}
}
diff --git a/pages/login/updateTool/forget.vue b/pages/login/updateTool/forget.vue
index 390365a..35dcc32 100644
--- a/pages/login/updateTool/forget.vue
+++ b/pages/login/updateTool/forget.vue
@@ -11,7 +11,7 @@
</view>
</view>
</view>
- <view class="cu-bar btn-group" style="margin-top: 30upx;">
+ <view class="cu-bar btn-group" style="margin-top: 30rpx;">
<button class="cu-btn bg-blue margin-tb-sm lg" @click="goSubmit()">提交</button>
<button class="cu-btn bg-green margin-tb-sm lg" @click="goback()">返回</button>
</view>
diff --git a/pages/mine/agreement/version.vue b/pages/mine/agreement/version.vue
index 0f1480d..4a85885 100644
--- a/pages/mine/agreement/version.vue
+++ b/pages/mine/agreement/version.vue
@@ -51,12 +51,12 @@
display: flex;
flex-direction: column;
align-items: center;
- padding: 120upx 0;
+ padding: 120rpx 0;
}
.about-img {
- width: 120upx;
- height: 120upx;
+ width: 120rpx;
+ height: 120rpx;
}
.about-img image {
@@ -65,6 +65,6 @@
}
.cu-list.menu>.cu-item {
- min-height: 80upx;
+ min-height: 80rpx;
}
</style>
diff --git a/pages/mine/change-password/change-password.vue b/pages/mine/change-password/change-password.vue
index 5a50e5b..6df97fe 100644
--- a/pages/mine/change-password/change-password.vue
+++ b/pages/mine/change-password/change-password.vue
@@ -2,7 +2,7 @@
<view class="content1">
<view class="change-password">
<u--form labelPosition="top" :model="form" :rules="rules" ref="form" labelWidth="100%"
- :labelStyle="{color:'#333', fontSize:'34upx', fontWeight:'bold'}">
+ :labelStyle="{color:'#333', fontSize:'34rpx', fontWeight:'bold'}">
<u-form-item label="原密码" prop="oldPwd" borderBottom>
<u--input v-model="form.oldPwd" type="password" border="none"></u--input>
</u-form-item>
@@ -117,7 +117,7 @@
<style lang="scss" scoped>
.change-password {
background-color: #fff;
- border-radius: 20upx;
- padding: 40upx;
+ border-radius: 20rpx;
+ padding: 40rpx;
}
</style>
diff --git a/pages/mine/feedback/feedback.vue b/pages/mine/feedback/feedback.vue
index d599e74..e440e72 100644
--- a/pages/mine/feedback/feedback.vue
+++ b/pages/mine/feedback/feedback.vue
@@ -5,9 +5,9 @@
<view class="feedback-type">
<view class="item" v-for="(item, index) in feedbackType" :key="index"
:class="{active:item.value === form.FEEDBACK_TYPE}" @click="form.FEEDBACK_TYPE = item.value">
- <u--image :src="item.img" width="40upx" height="38upx"
- style="margin-left: 70upx; margin-top: 20upx;"></u--image>
- <view style="margin-top: -40upx;">{{item.label}}</view>
+ <u--image :src="item.img" width="40rpx" height="38rpx"
+ style="margin-left: 70rpx; margin-top: 20rpx;"></u--image>
+ <view style="margin-top: -40rpx;">{{item.label}}</view>
</view>
</view>
<view class="title">我要反馈</view>
@@ -128,15 +128,15 @@ import {setFeedbackAdd, setFeedbackUpload} from "../../../api";
<style lang="scss" scoped>
.feedback {
- padding: 40upx;
+ padding: 40rpx;
background-color: #fff;
.title {
font-weight: bold;
- margin-top: 20upx;
- margin-bottom: 20upx;
+ margin-top: 20rpx;
+ margin-bottom: 20rpx;
color: $uni-text-color-placeholder;
- font-size: 30upx;
+ font-size: 30rpx;
&:irst-child {
margin-top: 0;
@@ -146,24 +146,24 @@ import {setFeedbackAdd, setFeedbackUpload} from "../../../api";
.feedback-type {
display: flex;
flex-wrap: wrap;
- margin-bottom: 20upx;
- margin-top: 20upx;
+ margin-bottom: 20rpx;
+ margin-top: 20rpx;
.item {
- padding: 10upx;
- border-radius: 10upx;
- margin-top: 10upx;
- margin-right: 10upx;
- margin-bottom: 10upx;
+ padding: 10rpx;
+ border-radius: 10rpx;
+ margin-top: 10rpx;
+ margin-right: 10rpx;
+ margin-bottom: 10rpx;
background-color: #f6f7fb;
text-align: center;
- font-size: 30upx;
+ font-size: 30rpx;
color: #9fa7bc;
- width: 207upx;
- height: 143upx;
+ width: 207rpx;
+ height: 143rpx;
box-sizing: border-box;
- line-height: 143upx;
+ line-height: 143rpx;
text-align: center;
&.active {
@@ -175,14 +175,14 @@ import {setFeedbackAdd, setFeedbackUpload} from "../../../api";
::v-deep {
.u-upload__wrap__preview__image {
- width: 146upx !important;
- height: 146upx !important;
+ width: 146rpx !important;
+ height: 146rpx !important;
}
}
}
.title {
- font-size: 32upx;
+ font-size: 32rpx;
color: #333;
}
</style>
diff --git a/pages/mine/index/index.vue b/pages/mine/index/index.vue
index b7d672b..29364dd 100644
--- a/pages/mine/index/index.vue
+++ b/pages/mine/index/index.vue
@@ -21,7 +21,7 @@
<view class="my_main_info">
<view class="my_main_info_wrap" v-for="item in list" :key="item.name" @click="clickItem(item.name)">
<view class="my_main_info_wrap_img">
- <u--image :src="item.img" width="40upx" height="40upx"></u--image>
+ <u--image :src="item.img" width="40rpx" height="40rpx"></u--image>
</view>
<view class="my_main_info_wrap_info">
<view class="my_main_info_wrap_info_lable">
@@ -73,10 +73,12 @@ export default {
img: require('../../../static/images/my_ico4.png'),
name:'修改密码',
},
+ // #ifdef APP-PLUS
{
img: require('../../../static/images/my_ico5.png'),
name:'版本更新',
},
+ // #endif
{
img: require('../../../static/images/my_ico6.png'),
name:'关于我们',
@@ -140,7 +142,9 @@ export default {
if(name === '问题反馈') this.feedbackclick()
if(name === '安全承诺') this.promiseclick()
if(name === '修改密码') this.pwdclick()
+ // #ifdef APP-PLUS
if(name === '版本更新') this.fnUpdateVersion()
+ // #endif
if(name === '关于我们') this.aboutcick()
}
}
@@ -154,50 +158,50 @@ export default {
.mytop {
width: 100%;
background: url(/static/images/mybannerbg.png);
- height: 400upx;
+ height: 400rpx;
background-size: 100% 100%;
- padding: 20upx;
+ padding: 20rpx;
box-sizing: border-box;
.mytop_main_info {
width: 80%;
margin: 0 auto;
- margin-top: 150upx;
+ margin-top: 150rpx;
display: flex;
align-items: center;
.mytop_main_info_tx {
- margin-right: 20upx;
+ margin-right: 20rpx;
}
.mytop_main_test_name {
color: #fff;
- font-size: 36upx;
+ font-size: 36rpx;
font-weight: 600;
}
.mytop_main_test_p {
color: #fff;
- font-size: 26upx;
+ font-size: 26rpx;
opacity: 0.6;
- margin-top: 5upx;
+ margin-top: 5rpx;
}
}
}
.my_main {
width: 100%;
- padding: 40upx;
- margin-top: -120upx;
+ padding: 40rpx;
+ margin-top: -120rpx;
box-sizing: border-box;
.my_main_info {
width: 100%;
background: #fff;
- padding: 20upx 40upx;
+ padding: 20rpx 40rpx;
box-sizing: border-box;
- border-radius: 10upx;
- box-shadow: 0 0 20upx #eee;
+ border-radius: 10rpx;
+ box-shadow: 0 0 20rpx #eee;
.my_main_info_wrap {
width: 100%;
@@ -205,19 +209,19 @@ export default {
align-items: center;
.my_main_info_wrap_img {
- width: 50upx;
- height: 50upx;
- margin-top: 10upx;
+ width: 50rpx;
+ height: 50rpx;
+ margin-top: 10rpx;
}
.my_main_info_wrap_info {
flex: 1;
- border-bottom: 1upx solid #eee;
+ border-bottom: 1rpx solid #eee;
display: flex;
justify-content: space-between;
align-items: center;
- padding: 30upx 0upx;
- padding-left: 10upx;
+ padding: 30rpx 0rpx;
+ padding-left: 10rpx;
.my_main_info_wrap_info_lable {
@@ -235,18 +239,18 @@ export default {
.layout_btner {
width: 100%;
text-align: center;
- padding: 0upx 40upx;
+ padding: 0rpx 40rpx;
box-sizing: border-box;
.layout_btn {
width: 100%;
text-align: center;
- padding: 20upx;
+ padding: 20rpx;
background: #e72f2f;
box-sizing: border-box;
color: #fff;
- box-shadow: 0 0 20upx #eee;
+ box-shadow: 0 0 20rpx #eee;
border-radius: 10rpx;
}
}
diff --git a/pages/mine/promise/detail.vue b/pages/mine/promise/detail.vue
index 4c75ae1..85a16ce 100644
--- a/pages/mine/promise/detail.vue
+++ b/pages/mine/promise/detail.vue
@@ -35,7 +35,7 @@
{{ info.TYPE === '0' ? '主要负责人签字' : '受状人' }}：
</text>
<u--image :showLoading="true" :src="$store.state.filePath + info.FILEPATH"
- width="200upx" height="100px" mode="scaleToFill"></u--image>
+ width="200rpx" height="100px" mode="scaleToFill"></u--image>
</view>
<!-- <view class="time">-->
<!-- {{ info.SIGNTIME && info.SIGNTIME.substring(0,10) }}-->
@@ -87,24 +87,24 @@ export default {
<style scoped lang="scss">
.title {
text-align: center;
- font-size: 40upx;
+ font-size: 40rpx;
font-weight: bold;
}
.text {
- text-indent: 60upx;
- letter-spacing: 4upx;
+ text-indent: 60rpx;
+ letter-spacing: 4rpx;
text-align: justify;
}
.collateral {
- text-indent: 60upx;
- letter-spacing: 4upx;
+ text-indent: 60rpx;
+ letter-spacing: 4rpx;
text-align: justify;
}
.respondent, .hairdresser {
- margin-top: 60upx;
+ margin-top: 60rpx;
text-align: right;
.promiser {
display: flex;
@@ -114,8 +114,8 @@ export default {
.time {
text-align: right;
- margin-top: 30upx;
- margin-left: 110upx;
+ margin-top: 30rpx;
+ margin-left: 110rpx;
}
}
</style>
diff --git a/pages/mine/promise/promise.vue b/pages/mine/promise/promise.vue
index 8377272..e1501d7 100644
--- a/pages/mine/promise/promise.vue
+++ b/pages/mine/promise/promise.vue
@@ -1,59 +1,59 @@
<template>
<view class="page">
<u-tabs
- lineWidth="336upx"
+ lineWidth="336rpx"
:list="tabsList"
- itemStyle="height:80upx;padding-bottom:10upx;background-color: #fff;"
+ itemStyle="height:80rpx;padding-bottom:10rpx;background-color: #fff;"
@click="tabsClick"
></u-tabs>
- <view class="container">
- <u-sticky offset-top="200">
- <u-button type="primary" text="高级搜索" @click="popupOpen" style="height: 30px;"></u-button>
- </u-sticky>
- </view>
- <u-popup :show="popupShow" mode="right" :overlay="true" customStyle='width: 300px;' :safeAreaInsetTop="true" @close="popupClose" @open="popupOpen">
- <view>
- <u-datetime-picker
- :show="addStartPickBarShow"
- v-model="addTimeStart"
- mode="date"
- @close="addPickBarOnClose('start')"
- @cancel="addPickBarOnCancel('start')"
- @confirm="addPickBarOnConfirm"
- ></u-datetime-picker>
- <u-button @click="addStartPickBarShow = true">起始时间：{{ addTimeStartStr == '' ? '请选择起始时间...' : addTimeStartStr }}</u-button>
- <u-datetime-picker
- :show="addEndPickBarShow"
- v-model="addTimeEnd"
- mode="date"
- @close="addPickBarOnClose('end')"
- @cancel="addPickBarOnCancel('end')"
- @confirm="addPickBarOnConfirm"
- ></u-datetime-picker>
- <u-button @click="addEndPickBarShow = true">结束时间：{{ addTimeEndStr == '' ? '请选择结束时间...' : addTimeEndStr }}</u-button>
- <u-toast ref="uToast"></u-toast>
- <view class="u-page">
- <view class="u-demo-block">
- <view class="u-demo-block__content">
- <u-row customStyle="margin-bottom: 10px">
- <u-col span="6">
- <view class="demo-layout bg-purple-light">
- <u-button @click="resetAdvancedParam">重置</u-button>
- </view>
- </u-col>
- <u-col span="6">
- <view class="demo-layout bg-purple">
- <u-button @click="advancedSearch">搜索</u-button>
- </view>
- </u-col>
- </u-row>
+ <view class="container">
+ <u-sticky offset-top="200">
+ <u-button type="primary" text="高级搜索" @click="popupOpen" style="height: 30px;"></u-button>
+ </u-sticky>
+ </view>
+ <u-popup :show="popupShow" mode="right" :overlay="true" customStyle='width: 300px;' :safeAreaInsetTop="true" @close="popupClose" @open="popupOpen">
+ <view>
+ <u-datetime-picker
+ :show="addStartPickBarShow"
+ v-model="addTimeStart"
+ mode="date"
+ @close="addPickBarOnClose('start')"
+ @cancel="addPickBarOnCancel('start')"
+ @confirm="addPickBarOnConfirm"
+ ></u-datetime-picker>
+ <u-button @click="addStartPickBarShow = true">起始时间：{{ addTimeStartStr == '' ? '请选择起始时间...' : addTimeStartStr }}</u-button>
+ <u-datetime-picker
+ :show="addEndPickBarShow"
+ v-model="addTimeEnd"
+ mode="date"
+ @close="addPickBarOnClose('end')"
+ @cancel="addPickBarOnCancel('end')"
+ @confirm="addPickBarOnConfirm"
+ ></u-datetime-picker>
+ <u-button @click="addEndPickBarShow = true">结束时间：{{ addTimeEndStr == '' ? '请选择结束时间...' : addTimeEndStr }}</u-button>
+ <u-toast ref="uToast"></u-toast>
+ <view class="u-page">
+ <view class="u-demo-block">
+ <view class="u-demo-block__content">
+ <u-row customStyle="margin-bottom: 10px">
+ <u-col span="6">
+ <view class="demo-layout bg-purple-light">
+ <u-button @click="resetAdvancedParam">重置</u-button>
+ </view>
+ </u-col>
+ <u-col span="6">
+ <view class="demo-layout bg-purple">
+ <u-button @click="advancedSearch">搜索</u-button>
+ </view>
+ </u-col>
+ </u-row>
- </view>
- </view>
- </view>
+ </view>
+ </view>
+ </view>
- </view>
- </u-popup>
+ </view>
+ </u-popup>
<view class="message_list">
<u-list @scrolltolower="scrolltolower" v-if="list.length > 0">
<u-list-item v-for="(item, index) in list" :key="index">
@@ -99,13 +99,13 @@ export default {
currentPage: 1,
totalPage: 0,
list: [],
- popupShow: false, // 高级搜索弹窗
- addStartPickBarShow: false, // 起始日期选择器
- addEndPickBarShow: false, // 结束日期选择器
- addTimeStart: Number(new Date()), // 承诺书添加时间-起始
- addTimeEnd: Number(new Date()), // 承诺书添加时间-结束
- addTimeStartStr: '', // 承诺书添加时间-起始-字符串
- addTimeEndStr: '', // 承诺书添加时间-结束-字符串
+ popupShow: false, // 高级搜索弹窗
+ addStartPickBarShow: false, // 起始日期选择器
+ addEndPickBarShow: false, // 结束日期选择器
+ addTimeStart: Number(new Date()), // 承诺书添加时间-起始
+ addTimeEnd: Number(new Date()), // 承诺书添加时间-结束
+ addTimeStartStr: '', // 承诺书添加时间-起始-字符串
+ addTimeEndStr: '', // 承诺书添加时间-结束-字符串
}
},
computed: {
@@ -122,8 +122,8 @@ export default {
USER_ID: this.userInfo.USER_ID,
showCount: this.pageSize,
currentPage: this.currentPage,
- ADDSTART: this.addTimeStartStr,
- ADDEND: this.addTimeEndStr
+ ADDSTART: this.addTimeStartStr,
+ ADDEND: this.addTimeEndStr
})
this.list = [...this.list, ...resData.varList]
this.totalPage = resData.page.totalPage
@@ -133,8 +133,8 @@ export default {
USER_ID: this.userInfo.USER_ID,
showCount: this.pageSize,
currentPage: this.currentPage,
- ADDSTART: this.addTimeStartStr,
- ADDEND: this.addTimeEndStr
+ ADDSTART: this.addTimeStartStr,
+ ADDEND: this.addTimeEndStr
})
this.list = [...this.list, ...resData.varList]
},
@@ -154,7 +154,7 @@ export default {
},
tabsClick(e) {
this.TYPE = e.id
- this.resetAllAddTime()
+ this.resetAllAddTime()
this.resetList()
},
fnNavigator(item) {
@@ -167,80 +167,80 @@ export default {
}
})
},
- // 高级搜索弹窗弹出函数
- popupOpen() {
- this.popupShow = true
+ // 高级搜索弹窗弹出函数
+ popupOpen() {
+ this.popupShow = true
- },
- // 高级搜索弹窗关闭函数
- popupClose() {
- this.popupShow = false
+ },
+ // 高级搜索弹窗关闭函数
+ popupClose() {
+ this.popupShow = false
- },
- // 高级搜索日期选择器关闭回调
- addPickBarOnClose(type) {
- switch (type) {
- case 'start':
- this.addStartPickBarShow = false;
- break;
- case 'end':
- this.addEndPickBarShow = false;
- break;
- default:
- this.$refs.uToast.show({message:'日期选择参数错误',duration:1000})
- }
- },
- // 高级搜索日期选择器取消回调
- addPickBarOnCancel(type) {
- this.addPickBarOnClose(type)
- },
- // 高级搜索日期选择器确认回调
- addPickBarOnConfirm(value) {
- // alert(value.value)
- switch (this.addStartPickBarShow) {
- case true:
- // start type
- this.addTimeStartStr = uni.$u.timeFormat(value.value, 'yyyy-mm-dd')
- this.addPickBarOnClose('start')
- break;
- case false:
- // end type
- this.addTimeEndStr = uni.$u.timeFormat(value.value, 'yyyy-mm-dd')
- this.addPickBarOnClose('end')
- break;
- default:
- this.$refs.uToast.show({message:'日期选择参数错误',duration:1000})
- }
- },
- // 清除高级搜索内的起始日期、结束日期组件绑定的时间属性（时间戳类型）；清除根据时间戳格式化的文本日期
- resetAllAddTime() {
- this.addTimeStart = Number(new Date())
- this.addTimeEnd = Number(new Date())
- this.addTimeStartStr = ''
- this.addTimeEndStr = ''
- },
- // 重置高级搜索条件
- resetAdvancedParam() {
- this.resetAllAddTime()
- this.resetList()
- },
- // 高级搜索
- advancedSearch(){
- const toast = uni.$u.toast
- // 日期合法判定
- if (this.addTimeStartStr > this.addTimeEndStr){
- // 包含两种case：case1 开始时间 > 结束时间；case2 开始时间有值，结束时间为空
- this.$refs.uToast.show({message:'日期不合法',duration:1000})
- return
- }
- if (this.addTimeEndStr != '' && this.addTimeStartStr == ''){
- // 结束时间有值，开始时间为空
- this.$refs.uToast.show({message:'日期不合法',duration:1000})
- return
- }
- this.resetList()
- this.popupClose()
- }
+ },
+ // 高级搜索日期选择器关闭回调
+ addPickBarOnClose(type) {
+ switch (type) {
+ case 'start':
+ this.addStartPickBarShow = false;
+ break;
+ case 'end':
+ this.addEndPickBarShow = false;
+ break;
+ default:
+ this.$refs.uToast.show({message:'日期选择参数错误',duration:1000})
+ }
+ },
+ // 高级搜索日期选择器取消回调
+ addPickBarOnCancel(type) {
+ this.addPickBarOnClose(type)
+ },
+ // 高级搜索日期选择器确认回调
+ addPickBarOnConfirm(value) {
+ // alert(value.value)
+ switch (this.addStartPickBarShow) {
+ case true:
+ // start type
+ this.addTimeStartStr = uni.$u.timeFormat(value.value, 'yyyy-mm-dd')
+ this.addPickBarOnClose('start')
+ break;
+ case false:
+ // end type
+ this.addTimeEndStr = uni.$u.timeFormat(value.value, 'yyyy-mm-dd')
+ this.addPickBarOnClose('end')
+ break;
+ default:
+ this.$refs.uToast.show({message:'日期选择参数错误',duration:1000})
+ }
+ },
+ // 清除高级搜索内的起始日期、结束日期组件绑定的时间属性（时间戳类型）；清除根据时间戳格式化的文本日期
+ resetAllAddTime() {
+ this.addTimeStart = Number(new Date())
+ this.addTimeEnd = Number(new Date())
+ this.addTimeStartStr = ''
+ this.addTimeEndStr = ''
+ },
+ // 重置高级搜索条件
+ resetAdvancedParam() {
+ this.resetAllAddTime()
+ this.resetList()
+ },
+ // 高级搜索
+ advancedSearch(){
+ const toast = uni.$u.toast
+ // 日期合法判定
+ if (this.addTimeStartStr > this.addTimeEndStr){
+ // 包含两种case：case1 开始时间 > 结束时间；case2 开始时间有值，结束时间为空
+ this.$refs.uToast.show({message:'日期不合法',duration:1000})
+ return
+ }
+ if (this.addTimeEndStr != '' && this.addTimeStartStr == ''){
+ // 结束时间有值，开始时间为空
+ this.$refs.uToast.show({message:'日期不合法',duration:1000})
+ return
+ }
+ this.resetList()
+ this.popupClose()
+ }
}
}
@@ -252,23 +252,23 @@ export default {
height: 100vh;
}
.wrap {
- padding: 12px;
+ padding: 12px;
}
.demo-layout {
- height: 25px;
- border-radius: 4px;
+ height: 25px;
+ border-radius: 4px;
}
.bg-purple {
- background: #CED7E1;
+ background: #CED7E1;
}
.bg-purple-light {
- background: #e5e9f2;
+ background: #e5e9f2;
}
.bg-purple-dark {
- background: #99a9bf;
+ background: #99a9bf;
}
</style>
diff --git a/pages/mine/promise/sign.vue b/pages/mine/promise/sign.vue
index 93d3bdd..a07be9f 100644
--- a/pages/mine/promise/sign.vue
+++ b/pages/mine/promise/sign.vue
@@ -35,7 +35,7 @@
{{ info.TYPE === '0' ? '主要负责人签字' : '受状人' }}：
</text>
<u--image v-if="info.FILEPATH" :showLoading="true" :src="info.FILEPATH"
- width="200upx" height="100px" mode="scaleToFill"></u--image>
+ width="200rpx" height="100px" mode="scaleToFill"></u--image>
<u-button type="primary" :text="info.FILEPATH ? '重签' : '手写签字'" size="mini" class="bth-mini" @click="signShow = true"></u-button>
</view>
<!-- <view class="time">-->
@@ -117,24 +117,24 @@ export default {
<style scoped lang="scss">
.title {
text-align: center;
- font-size: 40upx;
+ font-size: 40rpx;
font-weight: bold;
}
.text {
- text-indent: 60upx;
- letter-spacing: 4upx;
+ text-indent: 60rpx;
+ letter-spacing: 4rpx;
text-align: justify;
}
.collateral {
- text-indent: 60upx;
- letter-spacing: 4upx;
+ text-indent: 60rpx;
+ letter-spacing: 4rpx;
text-align: justify;
}
.respondent, .hairdresser {
- margin-top: 60upx;
+ margin-top: 60rpx;
text-align: right;
.promiser {
display: flex;
@@ -144,8 +144,8 @@ export default {
.time {
text-align: right;
- margin-top: 30upx;
- margin-left: 110upx;
+ margin-top: 30rpx;
+ margin-left: 110rpx;
}
}
</style>
diff --git a/pages/risk-level-control/risk-four-color-map/list.vue b/pages/risk-level-control/risk-four-color-map/list.vue
index 7eed114..f69b106 100644
--- a/pages/risk-level-control/risk-four-color-map/list.vue
+++ b/pages/risk-level-control/risk-four-color-map/list.vue
@@ -9,7 +9,8 @@
clearable
shape="circle"
></u--input>
- <u-button class="bth-mini ml-10" type="success" text="确定" @click="resetList"></u-button>
+ <view class="ml-10"><u-button class="bth-mini ml-10" type="success" text="确定" @click="resetList"></u-button></view>
+
</view>
<u-list @scrolltolower="scrolltolower" v-if="list.length > 0">
<u-list-item v-for="(item, index) in list" :key="index">
@@ -34,7 +35,7 @@
<view class="flex-between mt-10 subtitle">
<text>风险四色图数：{{item.fourCount}}</text>
</view>
- <view class="flex-end mt-10">
+ <view class="flex-end mt-10 see_btn">
<u-button type="primary" text="查看" size="mini" class="bth-mini" @click="fnNavigatorDetail(item.CORPINFO_ID)"></u-button>
</view>
</view>
@@ -98,6 +99,20 @@ export default {
}
</script>
-<style scoped>
+<style scoped lang="scss">
+.search{
+ display: flex;
+ .ml-10{
+ margin-left: 10rpx;
+ }
+ .bth-mini{
+ width: 100rpx;
+ }
+
+}
+.see_btn{
+ width: 100rpx;
+ float: right;
+}
</style>
diff --git a/pages/risk-level-control/risk-management/detail-list.vue b/pages/risk-level-control/risk-management/detail-list.vue
index 15a0b30..0613040 100644
--- a/pages/risk-level-control/risk-management/detail-list.vue
+++ b/pages/risk-level-control/risk-management/detail-list.vue
@@ -10,7 +10,8 @@
clearable
shape="circle"
></u--input>
- <u-button class="bth-mini ml-10" type="success" text="确定" @click="resetList"></u-button>
+ <view class="ml-10"><u-button class="bth-mini ml-10" type="success" text="确定" @click="resetList"></u-button></view>
+
</view>
<u-popup :show="popupShow" @close="popupShow = false" mode="right" :customStyle="{width:'85vw'}">
<view class="card">
@@ -53,6 +54,9 @@
</view>
<view class="flex-between mt-10 subtitle">
<text>管控部门：{{ item.DEPT_NAME }}</text>
+
+ </view>
+ <view class="see_btn">
<u-button type="primary" text="查看" size="mini" class="bth-mini"
@click="fnNavigatorDetail(item.RISKPOINT_ID,item.DEPARTMENT_ID)"></u-button>
</view>
@@ -183,6 +187,20 @@ export default {
}
</script>
-<style scoped>
+<style scoped lang="scss">
+.search{
+ display: flex;
+ .ml-10{
+ margin-left: 10rpx;
+ }
+ .bth-mini{
+ width: 100rpx;
+ }
+
+}
+.see_btn{
+ width: 100rpx;
+ float: right;
+}
</style>
diff --git a/pages/risk-level-control/risk-management/detail.vue b/pages/risk-level-control/risk-management/detail.vue
index 7f79b43..4baa370 100644
--- a/pages/risk-level-control/risk-management/detail.vue
+++ b/pages/risk-level-control/risk-management/detail.vue
@@ -1,6 +1,7 @@
<template>
<view class="content">
<view class="card">
+
<u-cell-group :border="false" class="mt-10">
<u-cell>
<view slot="title" class="title">风险点名称：</view>
@@ -10,14 +11,16 @@
<view slot="title" class="title">辨识部位名称：</view>
<view slot="value">{{ form.PARTSNAME }}</view>
</u-cell>
- <u-cell>
- <view slot="title" class="title">存在风险</view>
- <view slot="value">{{ form.RISK_DESCR }}</view>
- </u-cell>
- <u-cell>
- <view slot="title" class="title">主要管控措施</view>
- <view slot="value">{{ form.MEASURES }}</view>
- </u-cell>
+
+ <view class="mt-10 flex">
+ <view class="title1">存在风险</view>
+ <view class="main">{{ form.RISK_DESCR }}</view>
+ </view>
+ <view class="mt-10 flex">
+ <view class="title1">主要管控措施</view>
+ <view class="main">{{ form.MEASURES }}</view>
+ </view>
+
<u-cell>
<view slot="title" class="title">管控部门</view>
<view slot="value">{{ form.DEPT_NAME }}</view>
@@ -79,6 +82,19 @@ export default {
}
</script>
-<style scoped>
+<style scoped lang="scss">
+.flex{
+ color: #222222;
+ font-size: 30rpx;
+ border-bottom: 1px solid #eeeeee;
+ .title1{
+ font-weight: bold;
+ padding-left: 30rpx;
+ font-size: 28rpx;
+ }
+ .main{
+ padding: 40rpx;
+ }
+}
</style>
diff --git a/pages/risk-level-control/risk-management/list.vue b/pages/risk-level-control/risk-management/list.vue
index df9d6e9..13e7dbf 100644
--- a/pages/risk-level-control/risk-management/list.vue
+++ b/pages/risk-level-control/risk-management/list.vue
@@ -10,7 +10,10 @@
clearable
shape="circle"
></u--input>
- <u-button class="bth-mini ml-10" type="success" text="确定" @click="resetList"></u-button>
+ <view class="ml-10">
+ <u-button class="bth-mini ml-10" type="success" text="确定" @click="resetList"></u-button>
+ </view>
+
</view>
<u-list @scrolltolower="scrolltolower" v-if="list.length > 0">
<u-list-item v-for="(item, index) in list" :key="index">
@@ -32,7 +35,7 @@
<text>辨识部位：{{ item.idCount }}</text>
<text>存在风险：{{ item.pointCount }}</text>
</view>
- <view class="flex-end mt-10">
+ <view class="flex-end mt-10 see_btn">
<u-button type="primary" text="查看" size="mini" class="bth-mini"
@click="fnNavigatorDetail(item.CORPINFO_ID)"></u-button>
</view>
@@ -91,6 +94,20 @@ export default {
}
</script>
-<style scoped>
+<style scoped lang="scss">
+.search{
+ display: flex;
+ .ml-10{
+ margin-left: 10rpx;
+ }
+ .bth-mini{
+ width: 100rpx;
+ }
+
+}
+.see_btn{
+ width: 100rpx;
+ float: right;
+}
</style>
diff --git a/pages/safety-environmental-inspection/defense-record/list.vue b/pages/safety-environmental-inspection/defense-record/list.vue
index 6837fbc..59ec431 100644
--- a/pages/safety-environmental-inspection/defense-record/list.vue
+++ b/pages/safety-environmental-inspection/defense-record/list.vue
@@ -10,7 +10,8 @@
clearable
shape="circle"
></u--input>
- <u-button class="bth-mini ml-10" type="success" text="确定" @click="resetList"></u-button>
+ <view class="ml-10"><u-button class="bth-mini ml-10" type="success" text="确定" @click="resetList"></u-button></view>
+
</view>
<u-list @scrolltolower="scrolltolower" v-if="list.length > 0">
<u-list-item v-for="(item, index) in list" :key="index">
@@ -40,8 +41,9 @@
<template v-else-if="item.INSPECTION_STATUS == '-1'">检查人核实打回</template>
<template v-else-if="item.INSPECTION_STATUS == '-2'">被检查人申辩</template>
</text>
- <u-button type="primary" text="申辩记录" size="mini" class="bth-mini ml-10" @click="fnNavigatorPlead(item.INSPECTION_ID)"></u-button>
+
</view>
+ <view class="see_btn"> <u-button type="primary" text="申辩记录" size="mini" class="bth-mini ml-10" @click="fnNavigatorPlead(item.INSPECTION_ID)"></u-button></view>
</view>
</u-list-item>
</u-list>
@@ -106,6 +108,20 @@ export default {
}
</script>
-<style scoped>
+<style scoped lang="scss">
+.search{
+ display: flex;
+ .ml-10{
+ margin-left: 10rpx;
+ }
+ .bth-mini{
+ width: 100rpx;
+ }
+
+}
+.see_btn{
+ width: 200rpx;
+ float: right;
+}
</style>
diff --git a/pages/safety-environmental-inspection/initiate/detail.vue b/pages/safety-environmental-inspection/initiate/detail.vue
index 5be1a19..23e640c 100644
--- a/pages/safety-environmental-inspection/initiate/detail.vue
+++ b/pages/safety-environmental-inspection/initiate/detail.vue
@@ -92,7 +92,7 @@
</view>
</u-cell>
<u-cell class="title-none">
- <view slot="value" style="flex: 1">
+ <view slot="value" style="width: 100%">
<view class="pr mt-10" v-for="(item,index) in form.inspectorList" :key="item.id">
<u-cell-group :border="false" class="border">
<u-cell class="title-show">
@@ -126,7 +126,7 @@
</view>
</u-cell>
<u-cell class="title-none">
- <view slot="value" style="flex: 1">
+ <view slot="value" style="width: 100%">
<uni-table border stripe emptyText="暂无更多数据">
<uni-tr>
<uni-th align="center">序号</uni-th>
diff --git a/pages/safety-environmental-inspection/initiate/list.vue b/pages/safety-environmental-inspection/initiate/list.vue
index eb441d1..e7fcc30 100644
--- a/pages/safety-environmental-inspection/initiate/list.vue
+++ b/pages/safety-environmental-inspection/initiate/list.vue
@@ -11,7 +11,10 @@
clearable
shape="circle"
></u--input>
- <u-button class="bth-mini ml-10" type="success" text="确定" @click="resetList"></u-button>
+ <view class="ml-10">
+ <u-button class="bth-mini ml-10" type="success" text="确定" @click="resetList"></u-button>
+ </view>
+
</view>
<u-picker :show="show" :columns="columns" keyName="name" @cancel="show = false" @confirm="confirmPicker"></u-picker>
<u-list @scrolltolower="scrolltolower" v-if="list.length > 0">
@@ -43,16 +46,22 @@
<template v-else-if="item.INSPECTION_STATUS == '-2'">被检查人申辩</template>
</text>
</view>
- <view class="flex-end mt-10">
- <u-button type="primary" text="查看" size="mini" class="bth-mini"
- @click="fnNavigatorDetail(item.INSPECTION_ID, 'view')"></u-button>
- <u-button type="primary" text="流程图" size="mini" class="bth-mini ml-10"
- @click="showFlowChart(item.INSPECTION_ID)"></u-button>
- <u-button type="primary" text="编辑" size="mini" class="bth-mini ml-10"
- v-show="item.INSPECTION_STATUS === '-1'"
- @click="fnNavigatorDetail(item.INSPECTION_ID,'edit')"></u-button>
- <u-button type="primary" text="申辩处理" size="mini" class="bth-mini ml-10"
- v-show="item.INSPECTION_STATUS === '-2'" @click="fnNavigatorPlead(item.INSPECTION_ID)"></u-button>
+ <view class="mt-10 see_btn">
+ <view class="wrap">
+ <u-button type="primary" text="查看" size="mini" class="bth-mini"
+ @click="fnNavigatorDetail(item.INSPECTION_ID, 'view')"></u-button>
+ </view>
+ <view class="wrap"> <u-button type="primary" text="流程图" size="mini" class="bth-mini ml-10"
+ @click="showFlowChart(item.INSPECTION_ID)"></u-button></view>
+ <view class="wrap" v-if="item.INSPECTION_STATUS === '-1'"><u-button type="primary" text="编辑" size="mini" class="bth-mini ml-10"
+
+ @click="fnNavigatorDetail(item.INSPECTION_ID,'edit')"></u-button></view>
+ <view class="wrap" v-if="item.INSPECTION_STATUS === '-2'"> <u-button type="primary" text="申辩处理" size="mini" class="bth-mini ml-10"
+ @click="fnNavigatorPlead(item.INSPECTION_ID)"></u-button></view>
+
+
+
+
</view>
</view>
</u-list-item>
@@ -163,6 +172,30 @@ export default {
}
</script>
-<style scoped>
+<style scoped lang="scss">
+.ml-10{
+ margin-left: 10rpx;
+}
+.search{
+ display: flex;
+ .ml-10{
+ margin-left: 10rpx;
+ }
+ .bth-mini{
+ width: 100rpx;
+ }
+
+}
+.see_btn{
+ display: flex;
+ justify-content: flex-end;
+
+ .wrap{
+ width: 200rpx;
+ margin: 0 10rpx;
+ }
+
+
+}
</style>
diff --git a/pages/safety-environmental-inspection/inspector-archives/acceptance.vue b/pages/safety-environmental-inspection/inspector-archives/acceptance.vue
index 97f7c7a..d5f6192 100644
--- a/pages/safety-environmental-inspection/inspector-archives/acceptance.vue
+++ b/pages/safety-environmental-inspection/inspector-archives/acceptance.vue
@@ -125,6 +125,10 @@
</u-cell>
</u-cell-group>
</view>
+
+
+
+
<view class="card" v-for="(item,index) in hiddenExamineList" :key="index">
<view class="view-title">
<u--text text="确认信息" bold v-if="item.TYPE === 4"></u--text>
@@ -376,7 +380,7 @@
<view slot="title" class="title">验收图片：</view>
<view slot="value" class="mt-10">
<u-row>
- <u-col span="3" v-for="(items,index) in item.cImgs" :key="index">
+ <u-col span="3" v-for="(items,index1) in item.cImgs" :key="index1">
<u--image :showLoading="true" :src="filePath + '/' +items.FILEPATH" width="80px" height="80px"
@click="previewImages(item.cImgs,items)"></u--image>
</u-col>
diff --git a/pages/safety-environmental-inspection/inspector-archives/detail.vue b/pages/safety-environmental-inspection/inspector-archives/detail.vue
index a77c272..9fcb445 100644
--- a/pages/safety-environmental-inspection/inspector-archives/detail.vue
+++ b/pages/safety-environmental-inspection/inspector-archives/detail.vue
@@ -69,7 +69,7 @@
<view slot="title" class="title">检查人员：</view>
</u-cell>
<u-cell class="title-none">
- <view slot="value" style="flex: 1">
+ <view slot="value" style="width: 100%">
<view class="pr mt-10" v-for="(item,index) in form.inspectorList" :key="item.id">
<u-cell-group :border="false" class="border">
<u-cell class="title-show">
@@ -92,7 +92,7 @@
<view slot="title" class="title">发现问题：</view>
</u-cell>
<u-cell class="title-none">
- <view slot="value" style="flex: 1">
+ <view slot="value" style="width: 100%">
<uni-table border stripe emptyText="暂无更多数据">
<uni-tr>
<uni-th align="center">序号</uni-th>
diff --git a/pages/safety-environmental-inspection/inspector-archives/list.vue b/pages/safety-environmental-inspection/inspector-archives/list.vue
index f9a85a6..128c45d 100644
--- a/pages/safety-environmental-inspection/inspector-archives/list.vue
+++ b/pages/safety-environmental-inspection/inspector-archives/list.vue
@@ -9,7 +9,10 @@
clearable
shape="circle"
></u--input>
- <u-button class="bth-mini ml-10" type="success" text="确定" @click="resetList"></u-button>
+ <div class="ml-10">
+ <u-button class="bth-mini ml-10" type="success" text="确定" @click="resetList"></u-button>
+ </div>
+
</view>
<u-list @scrolltolower="scrolltolower" v-if="list.length > 0">
<u-list-item v-for="(item, index) in list" :key="index">
@@ -41,8 +44,8 @@
</text>
</view>
<view class="flex-end mt-10">
- <u-button type="primary" text="查看" size="mini" class="bth-mini" @click="fnNavigatorDetail(item.INSPECTION_ID)"></u-button>
- <u-button v-show="(item.INSPECTION_STATUS === '6' ||item.INSPECTION_STATUS === '5'||item.INSPECTION_STATUS === '7') && item.checkout === 1" type="primary" text="验收" size="mini" class="bth-mini ml-10" @click="fnNavigatorAcceptance(item.INSPECTION_ID)"></u-button>
+ <view class="see_btn"> <u-button type="primary" text="查看" size="mini" class="bth-mini" @click="fnNavigatorDetail(item.INSPECTION_ID)"></u-button></view>
+ <view class="see_btn" v-if="(item.INSPECTION_STATUS === '6' ||item.INSPECTION_STATUS === '5'||item.INSPECTION_STATUS === '7') && item.checkout === 1"> <u-button type="primary" text="验收" size="mini" class="bth-mini ml-10" @click="fnNavigatorAcceptance(item.INSPECTION_ID)"></u-button></view>
</view>
</view>
</u-list-item>
@@ -115,6 +118,20 @@ export default {
}
</script>
-<style scoped>
+<style scoped lang="scss">
+.search{
+ display: flex;
+ .ml-10{
+ margin-left: 10rpx;
+ }
+ .bth-mini{
+ width: 100rpx;
+ }
+
+}
+.see_btn{
+ width: 200rpx;
+ margin: 0 5rpx;
+}
</style>
diff --git a/pages/safety-environmental-inspection/inspector-confirms/detail.vue b/pages/safety-environmental-inspection/inspector-confirms/detail.vue
index 4527eb1..5a6b466 100644
--- a/pages/safety-environmental-inspection/inspector-confirms/detail.vue
+++ b/pages/safety-environmental-inspection/inspector-confirms/detail.vue
@@ -69,7 +69,7 @@
<view slot="title" class="title">检查人员：</view>
</u-cell>
<u-cell class="title-none">
- <view slot="value" style="flex: 1">
+ <view slot="value" style="width: 100%">
<view class="pr mt-10" v-for="(item,index) in form.inspectorList" :key="item.id">
<u-cell-group :border="false" class="border">
<u-cell class="title-show">
@@ -92,7 +92,7 @@
<view slot="title" class="title">发现问题：</view>
</u-cell>
<u-cell class="title-none">
- <view slot="value" style="flex: 1">
+ <view slot="value" style="width: 100%">
<uni-table border stripe emptyText="暂无更多数据">
<uni-tr>
<uni-th align="center">序号</uni-th>
diff --git a/pages/safety-environmental-inspection/inspector-confirms/list.vue b/pages/safety-environmental-inspection/inspector-confirms/list.vue
index 4e7fbf7..55e7451 100644
--- a/pages/safety-environmental-inspection/inspector-confirms/list.vue
+++ b/pages/safety-environmental-inspection/inspector-confirms/list.vue
@@ -9,7 +9,8 @@
clearable
shape="circle"
></u--input>
- <u-button class="bth-mini ml-10" type="success" text="确定" @click="resetList"></u-button>
+ <div class="ml-10"> <u-button class="bth-mini ml-10" type="success" text="确定" @click="resetList"></u-button></div>
+
</view>
<u-list @scrolltolower="scrolltolower" v-if="list.length > 0">
<u-list-item v-for="(item, index) in list" :key="index">
@@ -41,8 +42,9 @@
</text>
</view>
<view class="flex-end mt-10">
- <u-button type="primary" text="查看" size="mini" class="bth-mini" @click="fnNavigatorDetail(item.INSPECTION_ID,item.INSPECTION_USER_ID,item.INSPECTION_INSPECTOR_ID,'view')"></u-button>
- <u-button v-if="!validStr(item.INSPECTION_USER_SIGN_TIME) && (item.INSPECTION_STATUS == '0' || item.INSPECTION_STATUS == '1')" type="primary" text="核实" size="mini" class="bth-mini ml-10" @click="fnNavigatorDetail(item.INSPECTION_ID,item.INSPECTION_USER_ID,item.INSPECTION_INSPECTOR_ID,'verify')"></u-button>
+ <view class="see_btn"> <u-button type="primary" text="查看" size="mini" class="bth-mini" @click="fnNavigatorDetail(item.INSPECTION_ID,item.INSPECTION_USER_ID,item.INSPECTION_INSPECTOR_ID,'view')"></u-button></view>
+ <view class="see_btn" v-if="!validStr(item.INSPECTION_USER_SIGN_TIME) && (item.INSPECTION_STATUS == '0' || item.INSPECTION_STATUS == '1')"> <u-button type="primary" text="核实" size="mini" class="bth-mini ml-10" @click="fnNavigatorDetail(item.INSPECTION_ID,item.INSPECTION_USER_ID,item.INSPECTION_INSPECTOR_ID,'verify')"></u-button></view>
+
</view>
</view>
</u-list-item>
@@ -113,6 +115,20 @@ export default {
}
</script>
-<style scoped>
+<style scoped lang="scss">
+.search{
+ display: flex;
+ .ml-10{
+ margin-left: 10rpx;
+ }
+ .bth-mini{
+ width: 100rpx;
+ }
+
+}
+.see_btn{
+ width: 200rpx;
+margin: 0 5rpx;
+}
</style>
diff --git a/pages/super-hot/safety-director/list.vue b/pages/super-hot/safety-director/list.vue
index 85ec7ba..714dce0 100644
--- a/pages/super-hot/safety-director/list.vue
+++ b/pages/super-hot/safety-director/list.vue
@@ -9,7 +9,8 @@
clearable
shape="circle"
></u--input>
- <u-button class="bth-mini ml-10" type="success" text="确定" @click="getList"></u-button>
+ <view class="ml-10"><u-button class="bth-mini ml-10" type="success" text="确定" @click="getList"></u-button></view>
+
</view>
<u-list @scrolltolower="scrolltolower" v-if="list.length > 0">
<u-list-item v-for="(item, index) in list" :key="index">
@@ -25,10 +26,10 @@
<view class="flex-between mt-10 subtitle">
<text>特级动火申请审核状态：（港股安委办主任）安全总监签发</text>
</view>
- <view class="flex-end mt-10">
- <u-button type="primary" text="流程图" size="mini" class="bth-mini" @click="fnNavigatorSteps(item.HOTWORKAPPLICATION_ID)"></u-button>
- <u-button type="primary" text="签批" size="mini" class="bth-mini ml-10" @click="fnNavigatorDetail(item.HOTWORKAPPLICATION_ID, 2)"></u-button>
- <u-button type="primary" text="查看" size="mini" class="bth-mini ml-10" @click="fnNavigatorDetail(item.HOTWORKAPPLICATION_ID, 1)"></u-button>
+ <view class="flex-end mt-10 see_btn">
+ <view class="wrap"> <u-button type="primary" text="流程图" size="mini" class="bth-mini" @click="fnNavigatorSteps(item.HOTWORKAPPLICATION_ID)"></u-button></view>
+ <view class="wrap"> <u-button type="primary" text="签批" size="mini" class="bth-mini ml-10" @click="fnNavigatorDetail(item.HOTWORKAPPLICATION_ID, 2)"></u-button></view>
+ <view class="wrap"><u-button type="primary" text="查看" size="mini" class="bth-mini ml-10" @click="fnNavigatorDetail(item.HOTWORKAPPLICATION_ID, 1)"></u-button></view>
</view>
</view>
</u-list-item>
@@ -96,6 +97,15 @@ export default {
}
</script>
-<style scoped>
+
+<style scoped lang="scss">
+.see_btn{
+ display: flex;
+ justify-content: flex-end;
+ .wrap{
+ width: 200rpx;
+ margin: 0 10rpx;
+ }
+}
</style>
diff --git a/pages/super-hot/security-committee/list.vue b/pages/super-hot/security-committee/list.vue
index 18bc5db..a6e10f6 100644
--- a/pages/super-hot/security-committee/list.vue
+++ b/pages/super-hot/security-committee/list.vue
@@ -9,7 +9,10 @@
clearable
shape="circle"
></u--input>
- <u-button class="bth-mini ml-10" type="success" text="确定" @click="getList"></u-button>
+ <view class="ml-10">
+ <u-button class="bth-mini ml-10" type="success" text="确定" @click="getList"></u-button>
+ </view>
+
</view>
<u-list @scrolltolower="scrolltolower" v-if="list.length > 0">
<u-list-item v-for="(item, index) in list" :key="index">
@@ -25,9 +28,10 @@
<view class="flex-between mt-10 subtitle">
<text>特级动火申请审核状态：（港股）安委会办公室审批</text>
</view>
- <view class="flex-end mt-10">
- <u-button type="primary" text="流程图" size="mini" class="bth-mini" @click="fnNavigatorSteps(item.HOTWORKAPPLICATION_ID)"></u-button>
- <u-button type="primary" text="审批" size="mini" class="bth-mini ml-10" @click="fnNavigatorDetail(item.HOTWORKAPPLICATION_ID)"></u-button>
+ <view class="flex-end mt-10 see_btn">
+ <view class="wrap"> <u-button type="primary" text="流程图" size="mini" class="bth-mini" @click="fnNavigatorSteps(item.HOTWORKAPPLICATION_ID)"></u-button></view>
+<view class="wrap"> <u-button type="primary" text="审批" size="mini" class="bth-mini ml-10" @click="fnNavigatorDetail(item.HOTWORKAPPLICATION_ID)"></u-button></view>
+
</view>
</view>
</u-list-item>
@@ -93,6 +97,14 @@ export default {
}
</script>
-<style scoped>
+<style scoped lang="scss">
+.see_btn{
+ display: flex;
+ justify-content: flex-end;
+ .wrap{
+ width: 200rpx;
+ margin: 0 10rpx;
+ }
+}
</style>
diff --git a/pages/super-hot/supervision-department/list.vue b/pages/super-hot/supervision-department/list.vue
index cd05505..23b188b 100644
--- a/pages/super-hot/supervision-department/list.vue
+++ b/pages/super-hot/supervision-department/list.vue
@@ -9,7 +9,8 @@
clearable
shape="circle"
></u--input>
- <u-button class="bth-mini ml-10" type="success" text="确定" @click="getList"></u-button>
+ <view class="ml-10"><u-button class="bth-mini ml-10" type="success" text="确定" @click="getList"></u-button></view>
+
</view>
<u-list @scrolltolower="scrolltolower" v-if="list.length > 0">
<u-list-item v-for="(item, index) in list" :key="index">
@@ -25,9 +26,9 @@
<view class="flex-between mt-10 subtitle">
<text>特级动火申请审核状态：（港股）安全监督部初审</text>
</view>
- <view class="flex-end mt-10">
- <u-button type="primary" text="流程图" size="mini" class="bth-mini" @click="fnNavigatorSteps(item.HOTWORKAPPLICATION_ID)"></u-button>
- <u-button type="primary" text="初审" size="mini" class="bth-mini ml-10" @click="fnNavigatorDetail(item.HOTWORKAPPLICATION_ID)"></u-button>
+ <view class="flex-end mt-10 see_btn">
+ <view class="wrap"> <u-button type="primary" text="流程图" size="mini" class="bth-mini" @click="fnNavigatorSteps(item.HOTWORKAPPLICATION_ID)"></u-button></view>
+ <view class="wrap"><u-button type="primary" text="初审" size="mini" class="bth-mini ml-10" @click="fnNavigatorDetail(item.HOTWORKAPPLICATION_ID)"></u-button></view>
</view>
</view>
</u-list-item>
@@ -95,6 +96,16 @@ export default {
}
</script>
-<style scoped>
+<style scoped lang="scss" >
+.see_btn{
+ display: flex;
+ justify-content: flex-end;
+ .wrap{
+ width: 200rpx;
+ margin: 0 10rpx;
+ }
+
+}
+
</style>
diff --git a/utils/request.js b/utils/request.js
index cfb1482..21b18a2 100644
--- a/utils/request.js
+++ b/utils/request.js
@@ -1,6 +1,6 @@
// let requestPath = 'http://192.168.0.45:8092/';
// let requestPath = 'http://192.168.0.31:8992/qa-regulatory-gwj/'; // 后台请求地址https://skqhdg.porthebei.com:9004/qa-prevention-gwj/
-export var requestPath = 'https://skqhdg.porthebei.com:9005/qa-regulatory-gwj/'; // 后台请求地址
+export var requestPath = 'http://192.168.0.29:8092/'; // 后台请求地址
function post(url, data) {
return new Promise((resolve, reject) => {
if (data && data.loading !== false) {