Forráskód Böngészése

add rule to user manager

stanley-king 4 éve
szülő
commit
809e0c39e9

+ 0 - 7
src/api/index.js

@@ -205,10 +205,3 @@ export const userDel = (params) => {
 export const editPwd = (params) => {
     return requestLoading(`${Prefix}/EditPwd`, 'post', params)
 }
-
-
-
-
-// export const AddCabinet = (alias,url,count) => {
-//     return requestLoading(`${Prefix}/index.php/api/AddCabinet?alias=${alias}&url=${url}&count=${count}`, 'get', {})
-// }

+ 11 - 30
src/pages/subPages/express.vue

@@ -42,12 +42,6 @@
                                             </el-dropdown-menu>
                                         </el-dropdown>
                                     </div>
-
-                                    <!--                    <div style="height:72px;">
-                      <el-row type="flex" align="middle" style="height:100%;">
-                        <el-tag effect="dark">箱子已{{v.status_text}}</el-tag>
-                      </el-row>
-                    </div>-->
                                     <div v-if="v.order_sn == ''">
                                         <div style="height:72px;display:flex;justify-content:center;align-items:center;">
                                             <h4>空闲中</h4>
@@ -55,31 +49,21 @@
                                     </div>
 
                                     <el-row type="flex" justify="space-between" v-if="v.order_sn != ''">
-                                        <!--                      <el-row type="flex" align="middle">
-                        <el-tag type="danger" effect="dark">{{v.status_text}}</el-tag>
-                      </el-row>-->
                                         <div style="height:72px;">
                                             <h4 class="info">
-                                                <div class="label">订单号:</div>
+                                                <div class="label">订单编号:</div>
                                                 <div class="value">{{v.order_sn}}</div>
-                                                <!-- <el-button style="margin-left:10px;" size="mini" type="primary">通知</el-button> -->
                                             </h4>
                                             <h4 class="info">
-                                                <div class="label">入柜日期:</div>
+                                                <div class="label">存件时间:</div>
                                                 <div class="value">{{v.enter_time}}</div>
                                             </h4>
                                             <h4 class="info">
-                                                <div class="label">存件时间:</div>
+                                                <div class="label">存箱时长:</div>
                                                 <div class="value">{{v.use_time}}</div>
                                             </h4>
                                         </div>
                                     </el-row>
-
-                                    <!--  <div style="height:72px;" v-if="v.box_status == 3">
-                                        <el-row type="flex" align="middle" style="height:100%;">
-                                            <el-tag type="info" effect="dark">{{v.status_text}}</el-tag>
-                                        </el-row>
-                    </div>-->
                                 </el-card>
                             </el-col>
                         </template>
@@ -96,11 +80,6 @@
                             </el-card>
                         </el-col>
                     </el-row>
-
-                    <!--  <el-row style="margin-top:10px;" type="flex" justify="end">
-              <el-pagination background layout="prev, pager, next" :total="30"></el-pagination>
-            </el-row>
-            -->
                 </div>
             </el-tab-pane>
         </template>
@@ -264,12 +243,14 @@ export default {
             });
         },
         addCabinet() {
-            let requrl = "";
-            let alias = "";
-            let number = "";
-            let login_key = "";
-            let count = "";
-            addCabinet(requrl, alias, number, login_key, count).then((res) => {
+            let requrl = this.ruleForm.requrl;
+            let alias = this.ruleForm.alias;
+            let number = this.ruleForm.number;
+            let login_key = this.ruleForm.login_key;
+            let count = this.ruleForm.count;
+			
+			console.log(requrl,alias,number,login_key,count);
+            addCabinet({url:requrl, alias:alias, number:number, login_key:login_key, count:count}).then((res) => {
                 console.log(res);
                 if (res && res.msg == "ok") {
                     this.getCabinetList();

+ 15 - 6
src/pages/subPages/status.vue

@@ -1,8 +1,8 @@
 <template>
 <el-container direction="vertical">
-    <el-header height="40px" style="border-bottom: 1px solid #eee">日志管理</el-header>
+    <el-header height="40px" style="border-bottom: 1px solid #eee">运营人员管理</el-header>
     <div style="margin:10px 0;">
-        <el-button icon="el-icon-plus" style="margin-left:10px;" type="primary" @click="addVisible = true">新增</el-button>
+        <el-button icon="el-icon-plus" v-show="if_add" style="margin-left:10px;" type="primary" @click="addVisible = true">新增</el-button>
         <el-input v-model="searchValue" placeholder="请输入" style="width:200px;margin-left:10px;" />
         <el-button style="margin-left:10px;" type="primary" @click="onSearch">搜索</el-button>
         <el-button style="margin-left:10px;" type="danger" @click="onReset">重置</el-button>
@@ -18,7 +18,6 @@
         <el-table-column align="center" prop="status_text" label="管理员状态"></el-table-column>
         <el-table-column align="center" label="操作">
             <template slot-scope="scope">
-                <!-- <el-button size="mini" type="info" style="margin-bottom:10px;" @click="onEditUser(scope.$index, scope.row)">修改密码</el-button> -->
                 <el-button size="mini" v-show="scope.row.is_del" type="danger" style="width:80px;margin-left:0;" @click="onDelUser(scope.$index, scope.row)">删除</el-button>
             </template>
         </el-table-column>
@@ -29,16 +28,23 @@
 
     <el-dialog title="新增" :visible.sync="addVisible" width="50%" @closed="onCloseAddDialog">
         <el-form :model="addForm" :rules="addRules" ref="addForm" label-width="120px" class="demo-ruleForm">
-            <el-form-item label="管理员名称" prop="name">
+            <el-form-item label="管理员名称:" prop="name">
                 <el-input v-model="addForm.name"></el-input>
             </el-form-item>
-            <el-form-item label="密码" prop="pwd">
+            <el-form-item label="密码:" prop="pwd">
                 <el-input v-model="addForm.pwd" type="password"></el-input>
             </el-form-item>
-            <el-form-item label="确认密码" prop="rePwd">
+            <el-form-item label="确认密码:" prop="rePwd">
                 <el-input v-model="addForm.rePwd" type="password"></el-input>
             </el-form-item>
+			<el-form-item label="权限:" prop="chkadm">
+				<el-radio-group v-model="addForm.chkadm">
+					<el-radio class="radio" :label="1">超级管理员</el-radio>
+					<el-radio class="radio" :label="2">普通管理员</el-radio>
+				</el-radio-group>			
+			</el-form-item>			
         </el-form>
+		<span>超级管理员具有增加管理员,删除其它管理员的权限。</span>
         <span slot="footer" class="dialog-footer">
             <el-button @click="onCloseAddDialog">取 消</el-button>
             <el-button type="primary" @click="onAddSubmit('addForm')">立即添加</el-button>
@@ -68,6 +74,7 @@ export default {
                 name: "",
                 pwd: "",
                 rePwd: "",
+				chkadm: 1
             },
             addRules: {
                 name: [{
@@ -118,6 +125,7 @@ export default {
                 if (res && res.msg == "ok") {
                     _self.total = res.data.total;
                     _self.tableData = [...res.data.rows];
+					_self.if_add = res.data.if_add;
                 }
             });
         },
@@ -148,6 +156,7 @@ export default {
                         username: this.addForm.name,
                         password: this.addForm.pwd,
                         repassword: this.addForm.rePwd,
+                        rule:this.addForm.chkadm
                     }).then((res) => {
                         console.log(res);
                         if (res && res.msg == "ok") {

+ 0 - 3
src/pages/subPages/view.vue

@@ -24,9 +24,6 @@
         <el-table-column align="center" prop="box_number" label="箱号"></el-table-column>
         <el-table-column align="center" prop="status_text" label="操作类型"></el-table-column>
         <el-table-column align="center" prop="datetime" label="操作日期"></el-table-column>
-        <!--      <el-table-column align="center" prop="pic" label="图片">
-        <el-image style="width:100%;height:80px;"></el-image>
-      </el-table-column> -->
     </el-table>
     <el-row style="margin-top:10px;" type="flex" justify="end">
         <el-pagination background layout="prev, pager, next" :total="total" :page-size="pageSize" @current-change="onPageChange" :current-page="pageNumber"></el-pagination>

+ 0 - 7
vue.config.js

@@ -1,11 +1,4 @@
-
-
-// const targetUrl = 'http://39.97.239.116:8080';
 const targetUrl = 'http://zngapi.hemadj.com:8080';
-// const targetUrl = 'http://192.168.1.200:8080';
-
-// const targetUrl = 'http://39.97.239.116:8080';
-// const targetUrl = 'http://api.zng.com:8080';
 
 module.exports = {
     publicPath:'./',