1
0

4 Commits 4548e45a64 ... 46c5f0a418

Autor SHA1 Mensagem Data
  bobo04052021@163.com 46c5f0a418 文件中心模块样式优化 há 7 horas atrás
  bobo04052021@163.com d926310987 代码推送 há 15 horas atrás
  bobo04052021@163.com 848d4ed8a8 个人中心页面样式优化 há 15 horas atrás
  bobo04052021@163.com a2bd599fbe app导航栏样式优化 há 1 dia atrás

+ 114 - 84
pages/filecenter/filecenter.vue

@@ -15,37 +15,7 @@
     </view> -->
     <view v-if="!menushow" class="container">
       <view class="main">
-        <view class="fileArea" style="margin-top: 40px">
-          <view style="margin-top: 15px; margin-left: 10px" class="fileTitle"
-            >文件名称</view
-          >
-          <u-input
-            style="margin-top: 15px; border-color: #2a94ff"
-            v-model="fileName"
-            type="text"
-          ></u-input
-        ></view>
-        <view class="pickerArea">
-          <view class="btns">
-            <u-button
-              style="margin: 15px"
-              type="primary"
-              :text="fileType ? fileType : '选择文件类型'"
-              @click="pickershow = true"
-            ></u-button>
-            <u-button style="margin: 15px" type="primary" @click="searchFile"
-              >查询</u-button
-            >
-          </view>
-          <u-picker
-            :show="pickershow"
-            :columns="fileTypeList"
-            keyName="label"
-            @cancel="pickershow = false"
-            @confirm="selectFileType"
-          ></u-picker>
-        </view>
-        <view class="u-page">
+        <view style="margin-top: 40px">
           <u-subsection
             :list="sectionList"
             mode="button"
@@ -57,6 +27,46 @@
             active-color="#000"
             inactive-color="#000"
           ></u-subsection>
+        </view>
+        <view class="searchArea">
+          <view class="fileArea">
+            <view style="margin-top: 15px; margin-left: 10px" class="fileTitle"
+              >文件名称</view
+            >
+            <u-input
+              style="margin-top: 15px; margin-right: 15px"
+              v-model="fileName"
+              type="text"
+              class="fileInput"
+            ></u-input
+          ></view>
+          <view class="pickerArea">
+            <view class="btns">
+              <u-button
+                class="fileBtn"
+                style="margin: 15px"
+                type="primary"
+                :text="fileType ? fileType : '选择文件类型'"
+                @click="pickershow = true"
+              ></u-button>
+              <u-button
+                class="fileBtn"
+                style="margin: 15px"
+                type="primary"
+                @click="searchFile"
+                >查询</u-button
+              >
+            </view>
+            <u-picker
+              :show="pickershow"
+              :columns="fileTypeList"
+              keyName="label"
+              @cancel="pickershow = false"
+              @confirm="selectFileType"
+            ></u-picker>
+          </view>
+        </view>
+        <view class="u-page">
           <u-list>
             <u-list-item
               class="itemback"
@@ -72,13 +82,48 @@
                     <text class="text-style1">{{ item.fileName }}</text>
                   </view>
                 </view>
+                <view class="btnClass" style="margin-bottom: 30rpx">
+                  <u-button
+                    class="btn"
+                    type="primary"
+                    shape="circle"
+                    text="审批详情"
+                    @click="detailmodal(item)"
+                  ></u-button>
+                  <u-button
+                    class="btn"
+                    type="primary"
+                    shape="circle"
+                    text="提交"
+                    @click="commitmodal(item)"
+                  ></u-button>
+                  <u-button
+                    class="btn"
+                    type="primary"
+                    shape="circle"
+                    text="撤回"
+                    @click="retractmodal(item)"
+                  ></u-button>
+                  <u-button
+                    class="btn"
+                    type="primary"
+                    shape="circle"
+                    text="下载"
+                    @click="download(item)"
+                  ></u-button>
+                  <u-button
+                    class="btn"
+                    type="primary"
+                    shape="circle"
+                    text="删除"
+                    @click="showmodal(item)"
+                  ></u-button>
+                </view>
                 <view class="datacard laiyuan">
                   <view style="margin: 20rpx 20rpx">
                     <text class="text-style">{{ item.fileSource }}</text>
                   </view>
-                  <view style="margin: 20rpx 20rpx; font-size: small"
-                    >文件来源</view
-                  >
+                  <view class="text-info">文件来源</view>
                 </view>
                 <view class="datacard zhuangtai">
                   <view style="margin: 20rpx 20rpx">
@@ -86,64 +131,21 @@
                       item.bpmStatus_dictText
                     }}</text>
                   </view>
-                  <view style="margin: 20rpx 20rpx; font-size: small"
-                    >审批状态</view
-                  >
+                  <view class="text-info">审批状态</view>
                 </view>
                 <view class="datacard user">
                   <view style="margin: 20rpx 20rpx">
                     <text class="text-style">{{ item.createBy }}</text>
                   </view>
-                  <view style="margin: 20rpx 20rpx; font-size: small"
-                    >创建人</view
-                  >
+                  <view class="text-info">创建人</view>
                 </view>
                 <view class="datacard time">
                   <view style="margin: 20rpx 20rpx">
                     <text class="text-style">{{ item.createTime }}</text>
                   </view>
-                  <view style="margin: 20rpx 20rpx; font-size: small"
-                    >上传时间</view
-                  >
+                  <view class="text-info">上传时间</view>
                 </view>
               </view>
-              <view class="btnClass">
-                <u-button
-                  class="btn"
-                  type="primary"
-                  shape="circle"
-                  text="审批详情"
-                  @click="detailmodal(item)"
-                ></u-button>
-                <u-button
-                  class="btn"
-                  type="primary"
-                  shape="circle"
-                  text="提交"
-                  @click="commitmodal(item)"
-                ></u-button>
-                <u-button
-                  class="btn"
-                  type="primary"
-                  shape="circle"
-                  text="撤回"
-                  @click="retractmodal(item)"
-                ></u-button>
-                <u-button
-                  class="btn"
-                  type="primary"
-                  shape="circle"
-                  text="下载"
-                  @click="download(item)"
-                ></u-button>
-                <u-button
-                  class="btn"
-                  type="primary"
-                  shape="circle"
-                  text="删除"
-                  @click="showmodal(item)"
-                ></u-button>
-              </view>
             </u-list-item>
           </u-list>
           <!-- 审批详情 -->
@@ -250,8 +252,14 @@
               ></u--textarea>
             </view>
             <view class="button-container">
-              <u-button @click="cancelRetract" shape="circle">取消</u-button>
-              <u-button @click="confirmRetract" shape="circle" type="primary"
+              <u-button @click="cancelRetract" class="fileBtn" shape="circle"
+                >取消</u-button
+              >
+              <u-button
+                @click="confirmRetract"
+                class="fileBtn"
+                shape="circle"
+                type="primary"
                 >确认</u-button
               >
             </view>
@@ -650,6 +658,19 @@ export default {
 </script>
 
 <style scoped>
+.fileBtn {
+  background: linear-gradient(to right, #338afe, #07b4ff, #338afe);
+  border-radius: 5px;
+}
+.fileInput {
+  border: 1px solid #2a94ff !important;
+}
+.text-info {
+  margin: 20rpx 20rpx;
+  font-size: 14px;
+  font-weight: 500;
+  color: #657497;
+}
 .fileTitle {
   margin-right: 20px;
   line-height: 40px;
@@ -660,6 +681,12 @@ export default {
   flex-direction: row;
   justify-content: space-around;
 }
+.searchArea {
+  display: flex;
+  flex-direction: column;
+  background-color: #ffffff;
+  margin-bottom: 10rpx;
+}
 .btns {
   width: 100%;
   display: flex;
@@ -691,7 +718,7 @@ button {
 .itemback {
   padding: 20rpx;
   background-color: #ffffff;
-  margin-bottom: 5rpx;
+  margin-bottom: 10rpx;
   display: flex;
 }
 .btnClass {
@@ -700,6 +727,8 @@ button {
   margin-top: 20rpx;
 }
 .btn {
+  background: linear-gradient(to right, #338afe, #07b4ff, #338afe);
+  border-radius: 5px;
   border-radius: 10rpx;
   margin-right: 10rpx; /* 示例:添加一些右外边距,但确保它不会导致换行 */
 }
@@ -709,7 +738,8 @@ button {
 }
 .text-style {
   color: #3787fe;
-  font-weight: small;
+  font-size: 16px;
+  font-weight: bold;
 }
 .text-style1 {
   color: #000000;

Diff do ficheiro suprimidas por serem muito extensas
+ 1432 - 1706
pages/gasreport/components/gasImgIdentify.vue


+ 6 - 10
pages/history/history.vue

@@ -54,16 +54,7 @@
               type="primary"
               text="查询"
               @click="checkHistory"
-              style="
-                width: 100px;
-                background: linear-gradient(
-                  to right,
-                  rgb(53, 135, 254, 0.5),
-                  rgb(8, 179, 254, 0.5),
-                  rgb(53, 135, 254, 0.5)
-                );
-                border-radius: 5px;
-              "
+              class="btn"
             ></u-button>
           </div>
           <u-picker
@@ -617,6 +608,11 @@ export default {
 </script>
 
 <style lang="scss" scoped>
+.btn {
+  width: 80px;
+  background: linear-gradient(to right, #338afe, #07b4ff, #338afe) !important;
+  border-radius: 5px;
+}
 .u-button {
   border-radius: 5px;
   border: 1px solid #2299fe;

+ 29 - 5
pages/index/index.vue

@@ -44,27 +44,51 @@
         v-show="menus.device != null"
         text="设备中心"
         name="device"
-        icon="calendar"
+        :icon="
+          PageCur === 'device'
+            ? '/static/navIcon/device-active.png'
+            : '/static/navIcon/device.png'
+        "
       ></u-tabbar-item>
       <u-tabbar-item
         v-show="menus.warndata != null"
         text="预警分析"
         name="warndata"
-        icon="plus-circle"
+        :icon="
+          PageCur === 'warndata'
+            ? '/static/navIcon/yjfx-active.png'
+            : '/static/navIcon/yjfx.png'
+        "
       ></u-tabbar-item>
       <u-tabbar-item
         v-show="menus.filecenter != null"
         text="文件共享"
         name="filecenter"
-        icon="file-text"
+        :icon="
+          PageCur === 'filecenter'
+            ? '/static/navIcon/file-active.png'
+            : '/static/navIcon/file.png'
+        "
       ></u-tabbar-item>
       <u-tabbar-item
         v-show="menus.gasreport != null"
         text="瓦斯日报"
         name="gasreport"
-        icon="bell"
+        :icon="
+          PageCur === 'gasreport'
+            ? '/static/navIcon/gas-active.png'
+            : '/static/navIcon/gas.png'
+        "
+      ></u-tabbar-item>
+      <u-tabbar-item
+        text="我的"
+        name="user"
+        :icon="
+          PageCur === 'user'
+            ? '/static/navIcon/user-active.png'
+            : '/static/navIcon/user.png'
+        "
       ></u-tabbar-item>
-      <u-tabbar-item text="我的" name="user" icon="bell"></u-tabbar-item>
     </u-tabbar>
   </view>
 </template>

+ 68 - 83
pages/operation/operation.vue

@@ -5,6 +5,7 @@
         <div class="flcard">
           <div class="btns">
             <uni-datetime-picker
+              class="u-button"
               :show="dataShow"
               mode="datetime"
               @cancel="dataShow = false"
@@ -12,18 +13,19 @@
               v-model="StartTime"
             ></uni-datetime-picker>
             <uni-datetime-picker
+              class="u-button"
               :show="dataShow1"
               mode="datetime"
               @cancel="dataShow1 = false"
               @confirm="selectEndTime"
               v-model="EndTime"
             ></uni-datetime-picker>
-            <u-icon
-              size="30"
-              color="#3c9cff"
-              name="search"
+            <u-button
+              type="primary"
+              text="查询"
               @click="checkHistoryData"
-            ></u-icon>
+              class="btn"
+            ></u-button>
           </div>
         </div>
         <u-list :class="{ emptyhistory: historyData.length === 0 }">
@@ -33,40 +35,31 @@
               v-for="(item, index) in historyData"
               :key="index"
             >
-              <view>
-                <view class="content flcard">
-                  <view class="datacard user">
-                    <view style="margin: 20rpx 20rpx">
-                      <text class="text-style">{{ item.realname }}</text>
-                    </view>
-                    <view style="margin: 20rpx 20rpx; font-size: small"
-                      >用户</view
-                    >
-                  </view>
-                  <view class="datacard device">
-                    <view style="margin: 20rpx 20rpx">
-                      <text class="text-style">{{ item.devicename }}</text>
-                    </view>
-                    <view style="margin: 20rpx 20rpx; font-size: small"
-                      >操作设备</view
-                    >
+              <view class="time">
+                <view style="margin: 20rpx 30rpx">
+                  <text style="font-weight: bold">{{ item.createTime }}</text>
+                </view>
+              </view>
+              <view class="content flcard">
+                <view class="datacard user">
+                  <view style="margin: 20rpx 20rpx">
+                    <text class="text-style">{{ item.realname }}</text>
                   </view>
-                  <view class="datacard record">
-                    <view style="margin: 20rpx 20rpx">
-                      <text class="text-style">{{ item.strremark }}</text>
-                    </view>
-                    <view style="margin: 20rpx 20rpx; font-size: small"
-                      >操作记录</view
-                    >
+                  <view class="text-info">用户</view>
+                </view>
+                <view class="split"></view>
+                <view class="datacard device">
+                  <view style="margin: 20rpx 20rpx">
+                    <text class="text-style">{{ item.devicename }}</text>
                   </view>
-                  <view class="datacard time">
-                    <view style="margin: 20rpx 20rpx">
-                      <text class="text-style">{{ item.createTime }}</text>
-                    </view>
-                    <view style="margin: 20rpx 20rpx; font-size: small"
-                      >操作时间</view
-                    >
+                  <view class="text-info">操作设备</view>
+                </view>
+                <view class="split"></view>
+                <view class="datacard record">
+                  <view style="margin: 20rpx 20rpx">
+                    <text class="text-style">{{ item.strremark }}</text>
                   </view>
+                  <view class="text-info">操作记录</view>
                 </view>
               </view>
             </u-list-item>
@@ -183,6 +176,34 @@ export default {
 </script>
 
 <style>
+.u-button {
+  border-radius: 5px;
+  border: 1px solid #2299fe;
+  font-weight: bold;
+}
+.btn {
+  width: 80px;
+  background: linear-gradient(to right, #338afe, #07b4ff, #338afe) !important;
+  border-radius: 5px;
+}
+.content {
+  margin-top: 20rpx;
+  background-image: url("/static/operation/operateData.png");
+  background-size: 100% 100%;
+  background-repeat: no-repeat;
+  display: flex;
+  flex-direction: row;
+  justify-content: space-around;
+  align-items: center;
+}
+.split {
+  width: 2%;
+  height: 120rpx;
+  margin-right: 9%;
+  background-image: url("/static/operation/operateSplit.png");
+  background-size: 100% 100%;
+  background-repeat: no-repeat;
+}
 .emptyhistory {
   background: url("/static/empty.png") no-repeat;
   background-size: 100% 50%;
@@ -225,66 +246,30 @@ export default {
 }
 .text-style {
   color: #3787fe;
+  font-size: 16px;
   font-weight: bold;
+  text-align: center;
+}
+.text-info {
+  margin: 20rpx 20rpx;
+  font-size: 14px;
+  font-weight: 500;
+  color: #657497;
 }
-
 .itemback {
   padding: 20rpx;
   background-color: #ffffff;
   margin-bottom: 5rpx;
 }
 .datacard {
-  width: 48%;
-  margin: 1%;
+  width: 45%;
   float: left;
   height: 120rpx;
   border-radius: 10px;
 }
 .time {
-  background: url(/static/operation/operationTime.png),
-    linear-gradient(
-      to right,
-      rgba(55, 135, 254, 0.08),
-      rgba(4, 184, 255, 0.08),
-      rgba(60, 161, 237, 0.08)
-    );
-  background-size: auto 100%;
-  background-position: right;
-  background-repeat: no-repeat;
-}
-.record {
-  background: url(/static/operation/operationRecord.png),
-    linear-gradient(
-      to right,
-      rgba(55, 135, 254, 0.08),
-      rgba(4, 184, 255, 0.08),
-      rgba(60, 161, 237, 0.08)
-    );
-  background-size: auto 100%;
-  background-position: right;
-  background-repeat: no-repeat;
-}
-.user {
-  background: url(/static/operation/user.png),
-    linear-gradient(
-      to right,
-      rgba(55, 135, 254, 0.08),
-      rgba(4, 184, 255, 0.08),
-      rgba(60, 161, 237, 0.08)
-    );
-  background-size: auto 100%;
-  background-position: right;
-  background-repeat: no-repeat;
-}
-.device {
-  background: url(/static/operation/operationDevice.png),
-    linear-gradient(
-      to right,
-      rgba(55, 135, 254, 0.08),
-      rgba(4, 184, 255, 0.08),
-      rgba(60, 161, 237, 0.08)
-    );
-  background-size: auto 100%;
+  background: url(/static/operation/timeBg.png);
+  background-size: 100% 100%;
   background-position: right;
   background-repeat: no-repeat;
 }

+ 280 - 157
pages/user/people.vue

@@ -1,161 +1,176 @@
 <template>
-	<view>
-		<scroll-view scroll-y class="page">
-			  <!-- 头部logo-->
-		  <view class="UCenter-bg">
-		    <image :src="personalList.avatar" class="png round animation-slide-right margin-bottom-sm" mode="scaleToFill" :style="[{animationDelay: '0.1s'}]"></image>
-		    <image src="https://static.jeecg.com/upload/test/wave_1595818053612.gif" mode="scaleToFill" class="gif-wave"></image>
-		  </view>
-		  <view class="padding flex text-center text-grey bg-white shadow-warp">
-		    <view class="flex flex-sub flex-direction solid-right animation-slide-top" :style="[{animationDelay: '0.2s'}]">
-		      <view class="text-xl text-orange">{{personalList.username}}</view>
-			  <view class="margin-top-sm"><text class="cuIcon-people"></text> 用户</view>
-		    </view>
-		    
-		    <view class="flex flex-sub flex-direction animation-slide-top" :style="[{animationDelay: '0.2s'}]">
-		      <view class="text-xl text-green">{{personalList.post?personalList.post:'员工'}}</view>
-		      <view class="margin-top-sm"><text class="cuIcon-news"></text> 职务</view>
-		    </view>
-		  </view>
-		  <!-- 列表list-->
-		  <view class="cu-list menu card-menu margin-top-xl margin-bottom-xl shadow-lg radius">
-		   <!-- <view class="cu-item arrow animation-slide-bottom" :style="[{animationDelay: '0.1s'}]">
-		      <view class="content" >
-		        <text class="cuIcon-favorfill text-yellow"></text>
-		        <text class="text-grey">收藏</text>
-		      </view>
-		    </view>
-		    <view class="cu-item arrow animation-slide-bottom" :style="[{animationDelay: '0.2s'}]">
-		      <view class="content">
-		        <text class="cuIcon-redpacket_fill text-red"></text>
-		        <text class="text-grey">红包</text>
-		      </view>
-		    </view> -->
-			<view class="cu-item arrow animation-slide-bottom" :style="[{animationDelay: '0.3s'}]" @tap="scan">
-			  <view class="content">
-			    <text class="cuIcon-scan text-red"></text>
-			    <text class="text-grey">扫码</text>
-			  </view>
-			</view>
-			<!-- <navigator class="cu-item arrow animation-slide-bottom" :style="[{animationDelay: '0.4s'}]" url="/pages/user/location" hover-class="none">
-				<view class="content" >
-				    <text class="cuIcon-location text-cyan"></text>
-					<text class="text-grey">定位</text>
-				</view>
-			</navigator> -->
-			<navigator class="cu-item arrow animation-slide-bottom" url="/pages/user/userdetail" :style="[{animationDelay: '0.6s'}]">
-			     <view class="content">
-				    <text class="cuIcon-settingsfill text-cyan"></text>
-					<text class="text-grey">设置</text>
-			    </view>
-			</navigator>
-		   
-			<navigator class="cu-item arrow animation-slide-bottom" :style="[{animationDelay: '0.7s'}]" url="/pages/user/userexit" hover-class="none">
-				<view class="content" >
-				    <text class="cuIcon-exit text-cyan"></text>
-					<text class="text-grey">退出</text>
-				</view>
-			</navigator>
-		  </view>
-		  <view class="cu-tabbar-height"></view>
-		</scroll-view>
-	</view>
+  <view>
+    <scroll-view scroll-y class="page">
+      <!-- 头部logo-->
+      <view class="UCenter-bg">
+        <view class="avatar-box">
+          <view class="avatar"></view>
+        </view>
+      </view>
+      <view
+        class="padding flex text-center text-grey bg-white shadow-warp userinfo-box"
+      >
+        <view class="user1" :style="[{ animationDelay: '0.2s' }]">
+          <view class="usericon1"> </view>
+          <view class="username1">
+            <view class="text-xl" style="color: #3485fe">{{
+              personalList.username
+            }}</view>
+            <view class="text-info">用户</view>
+          </view>
+        </view>
+
+        <view class="user2" :style="[{ animationDelay: '0.2s' }]">
+          <view class="usericon2"> </view>
+          <view class="username2">
+            <view class="text-xl" style="color: #09bda0">{{
+              personalList.post ? personalList.post : "员工"
+            }}</view>
+            <view class="text-info">职务</view>
+          </view>
+        </view>
+      </view>
+      <!-- 列表list-->
+      <view
+        class="cu-list menu card-menu margin-top-xl margin-bottom-xl shadow-lg radius"
+      >
+        <view
+          class="cu-item arrow animation-slide-bottom"
+          :style="[{ animationDelay: '0.3s' }]"
+          @tap="scan"
+        >
+          <view class="content">
+            <text class="userSacll"></text>
+            <text class="text-grey">扫码</text>
+          </view>
+        </view>
+        <navigator
+          class="cu-item arrow animation-slide-bottom"
+          url="/pages/user/userdetail"
+          :style="[{ animationDelay: '0.6s' }]"
+        >
+          <view class="content">
+            <text class="userDetail"></text>
+            <text class="text-grey">设置</text>
+          </view>
+        </navigator>
+
+        <navigator
+          class="cu-item arrow animation-slide-bottom"
+          :style="[{ animationDelay: '0.7s' }]"
+          url="/pages/user/userexit"
+          hover-class="none"
+        >
+          <view class="content">
+            <text class="userExit"></text>
+            <text class="text-grey">退出</text>
+          </view>
+        </navigator>
+      </view>
+      <view class="cu-tabbar-height"></view>
+    </scroll-view>
+  </view>
 </template>
 
 <script>
-	import api from '@/api/api'
-	export default {
-		name: "people",
-		data() {
-			return {
-				personalList:{
-				  avatar:'',
-				  realname:'',
-				  username:'',
-				  post:''
-				},
-				  positionUrl:'/sys/position/list',
-				  departUrl:'/sys/user/userDepartList',
-				  userUrl:'/sys/user/queryById',
-				  postUrl:'/sys/position/queryByCode',
-				  userId:'',
-				  id:''
-			};
-		},
-		watch: {
-			cur: {
-				immediate: true,
-				handler() {
-					console.log('watch',this.cur)
-				    this.userId=this.$store.getters.userid;
-					this.load()
-				},
-			},
-		},
-		methods: {
-			scan(){
-				 console.log("进来了")
-				// #ifndef H5
-				uni.scanCode({
-				    success: function (res) {
-						console.log('条码res:' + res);
-				        console.log('条码类型:' + res.scanType);
-				        console.log('条码内容:' + res.result);
-				    }
-				});
-				// #endif
-				// #ifdef H5
-				this.$tip.alert("暂不支持")
-				// #endif
-			},
-			load(){
-				if(!this.userId){
-					
-					return;
-				}
-				this.$http.get(this.userUrl,{params:{id:this.userId}}).then(res=>{
-					console.log("res",res)
-					 if (res.data.success) {
-						let perArr = res.data.result
-				        let avatar=(perArr.avatar && perArr.avatar.length > 0)? api.getFileAccessHttpUrl(perArr.avatar):'/static/avatar_boy.png'
-						this.personalList.avatar =avatar
-						this.personalList.realname = perArr.realname
-						this.personalList.username = perArr.username
-						this.personalList.depart = perArr.departIds
-					    this.getpost(perArr.post)
-					}
-				}).catch(err => {
-					console.log(err);
-				});
-				
-			},
-			getpost(code){
-				if(!code||code.length==0){
-					this.personalList.post='员工'
-					return false;
-				}
-				this.$http.get(this.postUrl,{params:{code:code}}).then(res=>{
-					console.log("postUrl",res)
-					 if (res.data.success) {
-						this.personalList.post=res.data.result.name
-					}
-				}).catch(err => {
-					console.log(err);
-				});
-				
-			}
-		}
-	}
+import api from "@/api/api";
+export default {
+  name: "people",
+  data() {
+    return {
+      personalList: {
+        avatar: "",
+        realname: "",
+        username: "",
+        post: "",
+      },
+      positionUrl: "/sys/position/list",
+      departUrl: "/sys/user/userDepartList",
+      userUrl: "/sys/user/queryById",
+      postUrl: "/sys/position/queryByCode",
+      userId: "",
+      id: "",
+    };
+  },
+  watch: {
+    cur: {
+      immediate: true,
+      handler() {
+        console.log("watch", this.cur);
+        this.userId = this.$store.getters.userid;
+        this.load();
+      },
+    },
+  },
+  methods: {
+    scan() {
+      console.log("进来了");
+      // #ifndef H5
+      uni.scanCode({
+        success: function (res) {
+          console.log("条码res:" + res);
+          console.log("条码类型:" + res.scanType);
+          console.log("条码内容:" + res.result);
+        },
+      });
+      // #endif
+      // #ifdef H5
+      this.$tip.alert("暂不支持");
+      // #endif
+    },
+    load() {
+      if (!this.userId) {
+        return;
+      }
+      this.$http
+        .get(this.userUrl, { params: { id: this.userId } })
+        .then((res) => {
+          console.log("res", res);
+          if (res.data.success) {
+            let perArr = res.data.result;
+            let avatar =
+              perArr.avatar && perArr.avatar.length > 0
+                ? api.getFileAccessHttpUrl(perArr.avatar)
+                : "/static/user2.png";
+            this.personalList.realname = perArr.realname;
+            this.personalList.username = perArr.username;
+            this.personalList.depart = perArr.departIds;
+            this.getpost(perArr.post);
+          }
+        })
+        .catch((err) => {
+          console.log(err);
+        });
+    },
+    getpost(code) {
+      if (!code || code.length == 0) {
+        this.personalList.post = "员工";
+        return false;
+      }
+      this.$http
+        .get(this.postUrl, { params: { code: code } })
+        .then((res) => {
+          console.log("postUrl", res);
+          if (res.data.success) {
+            this.personalList.post = res.data.result.name;
+          }
+        })
+        .catch((err) => {
+          console.log(err);
+        });
+    },
+  },
+};
 </script>
 
 <style>
 .UCenter-bg {
-	/* #ifdef MP-WEIXIN */
-	background-image: url('/static/topnavbar.png');
-	/* #endif */
-	/* #ifndef MP-WEIXIN */
-	background-image: url('/static/blue.png');
-	/* #endif */
+  /* #ifdef MP-WEIXIN */
+  background-image: url("/static/topnavbar.png");
+  /* #endif */
+  /* #ifndef MP-WEIXIN */
+  background-image: url("/static/userBg.png");
+  /* #endif */
   background-size: cover;
   height: 400rpx;
   display: flex;
@@ -169,7 +184,81 @@
   font-weight: 300;
   text-shadow: 0 0 3px rgba(0, 0, 0, 0.3);
 }
+.avatar-box {
+  position: relative;
+  width: 250rpx;
+  height: 250rpx;
+  background-image: url("/static/user1.png");
+  background-size: 100% 100%;
+}
+.avatar {
+  position: absolute;
+  width: 100%;
+  height: 95%;
+  background-image: url("/static/user2.png");
+  background-size: 50% 50%;
+  background-repeat: no-repeat;
+  background-position: center;
+}
+.userinfo-box {
+  display: flex;
+  justify-content: space-around;
+  align-items: center;
+  padding: 20rpx;
+  background-color: #fff;
+  box-shadow: 0 2px 10px rgba(0, 0, 0, 0.1);
+}
 
+.user1 {
+  display: flex;
+  flex-direction: row;
+  background-image: url("/static/user3.png");
+  background-size: 100% 100%;
+  margin: 10px;
+  width: 48%;
+  height: 120rpx;
+}
+.usericon1 {
+  margin-left: 20rpx;
+  margin-top: 20rpx;
+  width: 30%;
+  height: 80%;
+  background-image: url("/static/usericon1.png");
+  background-size: 100% 100%;
+  margin-right: 20rpx;
+}
+.username1 {
+  display: flex;
+  flex-direction: column;
+  justify-content: center;
+}
+.user2 {
+  display: flex;
+  flex-direction: row;
+  background-image: url("/static/user4.png");
+  background-size: 100% 100%;
+  margin: 10px;
+  width: 48%;
+  height: 120rpx;
+}
+.usericon2 {
+  margin-left: 20rpx;
+  margin-top: 20rpx;
+  width: 30%;
+  height: 80%;
+  background-image: url("/static/usericon2.png");
+  background-size: 100% 100%;
+  margin-right: 20rpx;
+}
+.username2 {
+  display: flex;
+  flex-direction: column;
+  justify-content: center;
+}
+.text-info {
+  color: #8094ac;
+  font-weight: bold;
+}
 .UCenter-bg text {
   opacity: 0.8;
 }
@@ -179,25 +268,59 @@
   height: 200rpx;
 }
 
-.UCenter-bg .gif-wave{
+.UCenter-bg .gif-wave {
   position: absolute;
   width: 100%;
   bottom: 0;
   left: 0;
   z-index: 99;
-  mix-blend-mode: screen;  
-  height: 100rpx;   
+  mix-blend-mode: screen;
+  height: 100rpx;
 }
 
-map,.mapBox{
+map,
+.mapBox {
   left: 0;
   z-index: 99;
-  mix-blend-mode: screen;  
-  height: 100rpx;   
+  mix-blend-mode: screen;
+  height: 100rpx;
 }
 
-map,.mapBox{
+map,
+.mapBox {
   width: 750rpx;
   height: 300rpx;
 }
+
+.userSacll {
+  background-image: url("/static/userscall.png");
+  background-size: 100% 100%;
+  width: 36rpx;
+  height: 36rpx;
+  margin-right: 20rpx;
+  display: inline-block;
+  vertical-align: middle;
+}
+.userDetail {
+  background-image: url("/static/userdetail.png");
+  background-size: 100% 100%;
+  width: 36rpx;
+  height: 36rpx;
+  margin-right: 20rpx;
+  display: inline-block;
+  vertical-align: middle;
+}
+.userExit {
+  background-image: url("/static/userexit.png");
+  background-size: 100% 100%;
+  width: 36rpx;
+  height: 36rpx;
+  margin-right: 20rpx;
+  display: inline-block;
+  vertical-align: middle;
+}
+.text-grey {
+  color: #000;
+  font-weight: bold;
+}
 </style>

BIN
static/navIcon/device-active.png


BIN
static/navIcon/device.png


BIN
static/navIcon/file-active.png


BIN
static/navIcon/file.png


BIN
static/navIcon/gas-active.png


BIN
static/navIcon/gas.png


BIN
static/navIcon/user-active.png


BIN
static/navIcon/user.png


BIN
static/navIcon/yjfx-active.png


BIN
static/navIcon/yjfx.png


BIN
static/operation/operateData.png


BIN
static/operation/operateSplit.png


BIN
static/operation/timeBg.png


BIN
static/user1.png


BIN
static/user2.png


BIN
static/user3.png


BIN
static/user4.png


BIN
static/userBg.png


BIN
static/userdetail.png


BIN
static/userexit.png


BIN
static/usericon1.png


BIN
static/usericon2.png


BIN
static/userscall.png


Alguns ficheiros não foram mostrados porque muitos ficheiros mudaram neste diff