回滚

resources/js/views/dashboard/index.vue

@@ -8,12 +8,51 @@
             <el-row :gutter="20">
               <el-col :span="6"><el-card shadow="always">用户数量<span style="margin-left: 12px;color: #606266;">{{ synthesizecount.usercount }}</span>个</el-card></el-col>
               <el-col :span="6"><el-card shadow="always">设备数量<span style="margin-left: 12px;color: #409EFF;">{{ synthesizecount.devicecount }}</span>个</el-card></el-col>
-              <el-col :span="6"><el-card shadow="always">报警数量<span style="margin-left: 12px;color: #E6A23C;">{{ synthesizecount.devicepolice }}</span>个</el-card></el-col>
+              <el-col :span="6"><el-card shadow="always">在线设备<span style="margin-left: 12px;color: green;">{{ synthesizecount.device_online }}</span>个</el-card></el-col>
+              <el-col :span="6"><el-card shadow="always">报警数量<span style="margin-left: 12px;color: #e50015;">{{ synthesizecount.device_alarm }}</span>个</el-card></el-col>
+              <el-col :span="6"><el-card shadow="always">未报警数量<span style="margin-left: 12px;color: green;">{{ synthesizecount.device_normal }}</span>个</el-card></el-col>
+              <el-col :span="6"><el-card shadow="always">设备故障<span style="margin-left: 12px;color: #5d5f5f;">{{ synthesizecount.device_offline }}</span>个</el-card></el-col>
               <el-col :span="6"><el-card shadow="always">今天报警次数<span style="margin-left: 12px;color: #F56C6C;">{{ synthesizecount.timedevicepolice }}</span>个</el-card></el-col>
             </el-row>
-            <el-row :gutter="50">
-              <el-col :span="8" style="margin-left:20px ;"><el-card shadow="always">未报警总数<span style="margin-left: 12px;color: #409EFF;">{{ synthesizecount.offdevice }}</span>个</el-card></el-col>
-              <el-col :span="8" style="float: right; margin-right: 25px;"><el-card shadow="always">设备在线率<span style="margin-left: 12px;color: #23E610;">{{ synthesizecount.deviceurt == 0 ? '1' : synthesizecount.deviceurt }}</span>%</el-card></el-col>
+            <el-row :align="'middle'">
+              <el-card class="box-card" style="margin-top:12px;height: 200px;">
+                <el-col :span="4" style="text-align: center;">
+                  <el-progress type="dashboard" :percentage="synthesizecount.percent_alarm" color="red"></el-progress>
+                  <el-tooltip class="item" effect="red" :content="synthesizecount.percent_alarm + '%'" placement="top-start">
+                    <p>当前报警率</p>
+                  </el-tooltip>
+                </el-col>
+                <el-col :span="4" style="text-align: center;">
+                  <el-progress type="dashboard" :percentage="synthesizecount.percent_online" color="green"></el-progress>
+                  <el-tooltip class="item" effect="green" :content="synthesizecount.percent_online + '%'" placement="top-start">
+                    <p>设备在线率</p>
+                  </el-tooltip>
+                </el-col>
+                <el-col :span="4" style="text-align: center;">
+                  <el-progress type="dashboard" :percentage="memory" :color="colors"></el-progress>
+                  <el-tooltip class="item" effect="dark" :content="memory + 'MB'" placement="top-start">
+                    <p>项目运行速度</p>
+                  </el-tooltip>
+                </el-col>
+                <el-col :span="4" style="text-align: center;">
+                  <el-progress type="dashboard" :percentage="base_path" :color="colors"></el-progress>
+                  <el-tooltip class="item" effect="dark" :content="base_path * 10 + 'MB'" placement="top-start">
+                    <p>项目容量</p>
+                  </el-tooltip>
+                </el-col>
+                <el-col :span="4" style="text-align: center;">
+                  <el-progress type="dashboard" :percentage="end_time" :color="colors"></el-progress>
+                  <el-tooltip class="item" effect="dark" :content="end_time + 'S'" placement="top-start">
+                    <p>访问接口速度</p>
+                  </el-tooltip>
+                </el-col>
+                <el-col :span="4" style="text-align: center;">
+                  <el-progress type="dashboard" :percentage="databas" :color="colors"></el-progress>
+                  <el-tooltip class="item" effect="dark" :content="databas + 'S'" placement="top-start">
+                    <p>访问数据库速度</p>
+                  </el-tooltip>
+                </el-col>
+              </el-card>
             </el-row>
           </div>
           <!-- 混合统计 -->

resources/js/views/user/index.vue

@@ -47,7 +47,17 @@
       </el-table-column>
       <el-table-column align="center" label="用户地址" width="340">
         <template slot-scope="scope">
-          <span>{{ scope.row.province }}-{{ scope.row.area }}-{{ scope.row.city }}</span>
+          <span>{{ scope.row.province }}<br>{{ scope.row.area }}<br>{{ scope.row.city }}</span>
+        </template>
+      </el-table-column>
+      <el-table-column align="center" label="手机号">
+        <template slot-scope="scope">
+          <span>{{ scope.row.phone_number }}</span>
+        </template>
+      </el-table-column>
+      <el-table-column align="center" label="角色">
+        <template slot-scope="scope">
+          <span>{{ scope.row.role_name }}</span>
         </template>
       </el-table-column>
       <el-table-column align="center" label="创建时间" width="170">
@@ -103,6 +113,14 @@
         <el-form-item label="邮箱" prop="email">
           <el-input v-model.number="upUserData.email"></el-input>
         </el-form-item>
+        <el-form-item label="手机号" prop="phone_number">
+          <el-input v-model.number="upUserData.phone_number"></el-input>
+        </el-form-item>
+        <el-form-item label="角色" prop="user_role">
+          <el-select v-model="upUserData.user_role_id" clearable class="filter-item" @change="selectOne">
+            <el-option v-for="item in user_roles" :key="item.id" :label="item.name" :value="item.id" />
+          </el-select>
+        </el-form-item>
         <el-form-item label="自定义标题" prop="title">
           <el-input v-model.number="upUserData.title"></el-input>
         </el-form-item>
@@ -152,7 +170,15 @@ export default {
         email: undefined,
         company: undefined,
         userid: undefined,
+        phone_number: undefined,
+        user_role_id: undefined,
       },
+      user_roles: [
+        { id: 1, name: '行业主管部门负责人' },
+        { id: 2, name: '燃气用户' },
+        { id: 3, name: '应急抢修人员' },
+        { id: 4, name: '村内“两员”' },
+      ],
       paper: undefined,
       dialogImageUrl: '', // 图片地址
       dialogVisible: false,