Merge branch 'master' of http://114.242.31.4:3000/zyz/vm_pro

src/api/app/appuser/index.ts

@@ -0,0 +1,74 @@
+import { AppUserModel, AppUserQueryParam } from '@/types'
+import request from '@/until/request'
+
+/**
+ * 获取AppUser列表
+ * @param data AppUserQueryParam
+ */
+// const QueryAppUserList = (data: AppUserQueryParam) =>
+//     request({
+//         url: '/AppUserAction/list/' + data.page + '/' + data.rows,
+//         method: 'get'
+// })
+
+    /**
+ * 获取AppUser列表
+ * @param data AppUserQueryParam
+ */
+ const QueryAppUserList = (data: AppUserQueryParam) =>
+ request({
+     url: '/AppUserAction/list',
+     method: 'post',
+     data: data
+ })
+
+/**
+* 新增AppUser
+* @param data AppUserModel
+*/
+const AddAppUser = (data: AppUserModel) =>
+    request({
+        url: '/AppUserAction/saveAppUser',
+        method: 'post',
+        data: data
+    })
+
+/**
+* 编辑AppUser
+* @param data AppUserModel
+*/
+const EditAppUser = (data: AppUserModel) =>
+    request({
+        url: '/AppUserAction/updateAppUser',
+        method: 'post',
+        data: data
+    })
+
+/**
+* 删除AppUser
+* @param  id number
+*/
+const DeleteAppUser = (id: number) =>
+    request({
+        url: '/AppUserAction/deleteAppUser/' + id,
+        method: 'get',
+    })
+
+/**
+* AppUser登陆
+* @param loginId string
+* @param loginPwd string
+*/
+const Login = (loginId: string, loginPwd: string) =>
+    request({
+        url: '/AppUserAction/loginAppUser/' + loginId + "/" + loginPwd,
+        method: 'get',
+    })
+
+export default {
+    QueryAppUserList,
+    AddAppUser,
+    EditAppUser,
+    DeleteAppUser,
+    Login
+}

src/api/app/dicconfigauth/index.ts

@@ -0,0 +1,51 @@
+import { DicConfigAuthModel, DicConfigAuthQueryParam } from '@/types'
+import request from '@/until/request'
+
+/**
+ * 获取DicConfigAuth列表
+ * @param data DicConfigAuthQueryParam
+ */
+const QueryDicConfigAuthList = (data: DicConfigAuthQueryParam) =>
+    request({
+        url: '/DicConfigAuthAction/list/' + data.page + '/' + data.rows,
+        method: 'get'
+    })
+
+/**
+* 新增DicConfigAuth
+* @param data DicConfigAuthModel
+*/
+const AddDicConfigAuth = (data: DicConfigAuthModel) =>
+    request({
+        url: '/DicConfigAuthAction/saveDicConfigAuth',
+        method: 'post',
+        data: data
+    })
+
+/**
+* 编辑DicConfigAuth
+* @param data DicConfigAuthModel
+*/
+const EditDicConfigAuth = (data: DicConfigAuthModel) =>
+    request({
+        url: '/DicConfigAuthAction/updateDicConfigAuth',
+        method: 'post',
+        data: data
+    })
+
+/**
+* 删除DicConfigAuth
+* @param  id number
+*/
+const DeleteDicConfigAuth = (id: number) =>
+    request({
+        url: '/DicConfigAuthAction/deleteDicConfigAuth/' + id,
+        method: 'get',
+    })
+
+export default {
+    QueryDicConfigAuthList,
+    AddDicConfigAuth,
+    EditDicConfigAuth,
+    DeleteDicConfigAuth,
+}

src/router/modules/constructionmanagement.ts

@@ -8,6 +8,10 @@ export default {
         title: '施工管理',
     },
     children: [{
+        path: '/appuser',
+        component: () => import('@/views/constructionmanagement/appuser/index.vue'),
+        meta: { title: '用户管理', icon: 'el-icon-eleme', }
+    },{
         path: '/constructionaccount',
         component: () => import('@/views/constructionmanagement/constructionaccount/index.vue'),
         meta: { title: '施工台账', icon: 'el-icon-eleme', }
@@ -26,5 +30,6 @@ export default {
         path: '/constructionassistant',
         component: () => import('@/views/constructionmanagement/constructionassistant/index.vue'),
         meta: { title: '施工助手', icon: 'el-icon-eleme', }
-    },]
+    },
+]
 }

src/types/api/app/appuser/index.ts

@@ -0,0 +1,25 @@
+import { PageQueryParam, PageResult } from '@/types/api/base';
+import { DicConfigAuthModel } from '../dicconfigauth';
+/**
+ * 内部用户查询声明
+ */
+export interface AppUserQueryParam extends PageQueryParam {
+    userName?: string;
+    loginId?:string;
+}
+/**
+* 内部用户声明
+*/
+export interface AppUserModel {
+    id:number,
+    userId:string,
+    userName:string,
+    loginId:string,
+    loginPwd:string,
+    highAuthFlag:string,
+    useFlag:string,
+    configAuthId:string,
+    createMan:string,
+    createTime:Date,
+    dicConfigAuthModel:DicConfigAuthModel,
+}

src/types/api/app/dicconfigauth/index.ts

@@ -0,0 +1,46 @@
+import { PageQueryParam, PageResult } from '@/types/api/base';
+/**
+ * 配置权限查询声明
+ */
+export interface DicConfigAuthQueryParam extends PageQueryParam {
+    authName?: string;
+}
+/**
+* 配置权限声明
+*/
+export interface DicConfigAuthModel {
+    id:number,
+    authId:string,
+    authName:string,
+    deviceSn:string,
+    stationCode:string,
+    lastVal:string,
+    ip1Port1:string,
+    ip2Port2:string,
+    ip3Port3:string,
+    ip4Port4:string,
+    domainNamePort:string,
+    dnType:string,
+    digitNum:string,
+    uintType:string,
+    setupDir:string,
+    wheelNum:string,
+    timeInterval:string,
+    workTemplate:string,
+    batAlarmVt:string,
+    batAlarmSoc:string,
+    aiThreshold:string,
+    cpuVersion:string,
+    tongxunVersion:string,
+    tianxianType:string,
+    tongxunWay:string,
+    networkRegTimeout:string,
+    pwmHz:string,
+    pwmDuty:string,
+    flashBright:string,
+    setupYear:string,
+    upWholeImgWeekRule:string,
+    ip1ExpandOn:string,
+    createMan:string,
+    createTime:Date,    
+}

src/types/api/app/index.ts

@@ -0,0 +1,2 @@
+export * from './appuser';
+export * from './dicconfigauth';

src/types/index.ts

@@ -9,4 +9,6 @@ export * from './api/base';
 export * from './common';
 
 export * from './api/downlinktask/';
-export * from './api/taicbqcfg';
+export * from './api/taicbqcfg';
+
+export * from './api/app';

src/views/constructionmanagement/appuser/index.vue

@@ -0,0 +1,315 @@
+<template>
+  <div>
+    <el-form ref="queryFormRef" :model="queryParams" :inline="true">
+      <el-form-item label="用户名称:">
+        <el-input v-model="queryParams.userName" placeholder="用户名称" width="120px" />
+      </el-form-item>
+      <el-form-item label="手机号码:">
+        <el-input v-model="queryParams.loginId" placeholder="用户名称" width="120px" />
+      </el-form-item>
+      <el-form-item>
+        <el-button type="primary" class="button" @click="queryList">查询用户</el-button>
+      </el-form-item>
+      <el-form-item>
+        <el-button type="primary" class="button" @click="handleAdd">新增用户</el-button>
+      </el-form-item>
+    </el-form>
+    <!-- <div class="wrapper"> -->
+    <el-table v-loading="loading" :data="state.tableData" border stripe style="width: 100%" :height="tableHeight"
+      highlight-current-row @current-change="handleCurrentRowChange"
+      :header-cell-style="{ background: '#606266', color: '#FFFFFF' }">
+      <el-table-column fixed type="index" width="50" align="center" />
+      <el-table-column fixed prop="userName" label="用户名称" header-align="center" width="120" />
+      <el-table-column prop="loginId" label="手机号码" header-align="center" width="120" />
+      <el-table-column label="管理员" header-align="center" align="center" width="100">
+        <template #default="scope">
+          <span v-if="scope.row.highAuthFlag === '0'" style="color:red;">✖</span>
+          <span v-if="scope.row.highAuthFlag === '1'" style="color:green;">✔</span>
+        </template>
+      </el-table-column>
+      <el-table-column label="当前状态" header-align="center" align="center" width="100">
+        <template #default="scope">
+          <el-tag :type="mapColorMap[scope.row.useFlag]">{{ UseStateMap[scope.row.useFlag] }}</el-tag>
+        </template>
+      </el-table-column>
+      <el-table-column prop="createMan" label="创建人" header-align="center" width="100" />
+      <el-table-column prop="createTime" label="创建时间" header-align="center" width="120" />
+      <el-table-column label="" align="left" width="120">
+        <template #default="scope">
+          <el-button type="text" @click="handleEdit(scope.row)">编辑</el-button>
+          <el-button type="text" @click="submitDeleteForm(scope.row)">删除</el-button>
+        </template>
+      </el-table-column>
+      <el-table-column fixed="right"></el-table-column>
+    </el-table>
+    <!-- </div> -->
+    <el-config-provider :locale="locale">
+      <el-pagination v-model:currentPage="queryParams.page" v-model:page-size="queryParams.rows"
+        :page-sizes="[10, 15, 20, 25, 100]" :small="state.small" :disabled="state.disabled"
+        :background="state.background" layout="total, sizes, prev, pager, next, jumper" :total="state.total"
+        style="text-align: center;margin-top: 10px;" @size-change="handleSizeChange"
+        @current-change="handleCurrentChange" />
+    </el-config-provider>
+
+    <el-dialog :title="dialog.title" v-model="dialog.visible" width="450px" draggable center>
+      <el-form ref="dataFormRef" :model="formData" label-width="100px" :rules="state.rules">
+        <el-form-item label="用户姓名:" prop="userName">
+          <el-input v-model="formData.userName" placeholder="用户名称" width="120px" />
+        </el-form-item>
+        <el-form-item label="手机号码:" prop="loginId">
+          <el-input v-model="formData.loginId" placeholder="手机号码" width="120px" minlength="11" maxlength="11" type='number'/>
+        </el-form-item>
+        <el-form-item label="登录密码:" prop="loginPwd">
+          <el-input v-model="formData.loginPwd" placeholder="登录密码" width="120px" show-password/>
+        </el-form-item>
+        <el-form-item label="管理员:">
+          <el-switch v-model="formData.highAuthFlag" inline-prompt="true" active-value="1" inactive-value="0" />
+        </el-form-item>
+        <el-form-item label="配置权限:">
+         <el-option v-model="formData.configAuthId" v-for="item in state.configAuthList" :key="item.authId" :label="item.authName" :value="item.authId" />
+        </el-form-item>
+        <el-form-item label="在用状态:">
+          <el-switch v-model="formData.useFlag" inline-prompt="true" active-value="1" inactive-value="0" />
+        </el-form-item>
+        <el-form-item>
+
+        </el-form-item>
+      </el-form>
+      <template #footer>
+        <span class="dialog-footer">
+          <el-button @click="cancel()">取消</el-button>
+          <el-button type="primary" @click="submitForm">确定</el-button>
+        </span>
+      </template>
+    </el-dialog>
+  </div>
+</template>
+
+<script lang="ts" setup>
+import { reactive, toRefs, toRef, ref, onMounted } from "vue";
+import { ElForm, ElMessage, ElMessageBox } from 'element-plus';
+import AppUserAction from "@/api/app/appuser";
+import DicConfigauthAction from "@/api/app/dicconfigauth";
+import { AppUserQueryParam, AppUserModel,DicConfigAuthQueryParam, DicConfigAuthModel, Dialog, PageResult } from '@/types';
+
+import zhCn from 'element-plus/lib/locale/lang/zh-cn';
+
+let locale = ref(zhCn)
+
+const queryFormRef = ref(ElForm); // 属性名必须和元素的ref属性值一致
+const dataFormRef = ref(ElForm); // 属性名必须和元素的ref属性值一致
+
+type mapStatee = Record<string, string>;
+const UseStateMap: mapStatee = {
+  0: '停用',
+  1: '使用中',
+};
+
+const mapColorMap: mapStatee = {
+  0: 'success',
+  1: 'danger',
+};
+
+const loading = ref(false)
+
+const state = reactive({
+  currentType: 0,
+  queryParams: { page: 1, rows: 10 } as AppUserQueryParam,
+  queryAuthParams:{page:1,rows:10} as DicConfigAuthQueryParam,
+  total: 0,
+  small: false,
+  background: false,
+  disabled: false,
+  dialog: {} as Dialog,
+  formData: {} as AppUserModel,
+  UseStateMap,
+  tableData: [] as AppUserModel[],
+  configAuthList:[] as DicConfigAuthModel[],
+  rules: {
+    userName: [
+      { required: true, message: "用户姓名不能为空", trigger: "blur" },
+      { min: 3, max: 15, message: "用户姓名长度不合法", trigger: "blur" },
+    ],
+    loginId: [
+            { required: true, message: "手机号码不能为空", trigger: "blur" },
+      { min: 11, max: 11, message: "手机号码长度不合法", trigger: "blur" },
+    ],
+    loginPwd: [
+      { required: true, message: "登陆密码不能为空", trigger: "blur" },
+      { min: 3, max: 20, message: "登陆密码长度不合法", trigger: "blur" },
+    ],
+  },
+});
+
+const {
+  queryParams,
+  queryAuthParams,
+  dialog,
+  formData,
+  tableData,
+  configAuthList,
+} = toRefs(state);
+
+const tableHeight = ref(document.documentElement.clientHeight - 250);
+const currentRow = ref()
+
+const handleCurrentRowChange = (val: AppUserModel | undefined) => {
+  currentRow.value = val
+}
+
+async function handleAdd() {
+  //queryAuthList();
+  state.currentType = 0;
+  state.formData = {} as AppUserModel;
+  state.dialog = {
+    title: '新增用户',
+    visible: true
+  };
+}
+
+async function handleEdit(row: any) {
+  //queryAuthList();
+  state.currentType = 1;
+  state.formData = row;
+  state.dialog = {
+    title: '编辑用户',
+    visible: true
+  };
+}
+
+const handleSizeChange = (val: number) => {
+  queryParams.value.rows = val;
+  queryList();
+};
+
+const handleCurrentChange = (val: number) => {
+  queryParams.value.page = val;
+  queryList();
+};
+
+const queryList = () => {
+  loading.value = true;
+  AppUserAction.QueryAppUserList(queryParams.value).then(result => {
+    if (result.status === 200) {
+      const { res, flag, error } = result.data;
+      if (flag === "1") {
+        const pageData = res as PageResult<AppUserModel[]>;
+        state.tableData = pageData.list;
+        state.total = pageData.total;
+      } else {
+        ElMessage.error(error);
+      }
+    }
+  }).catch(error => {
+    //请求失败时的操作     
+    console.log(error);
+  })
+  loading.value = false;
+};
+
+const submitForm = () => {
+  dataFormRef.value.validate((valid: any) => {  
+  if (state.currentType == 0) {
+    state.formData.createMan = localStorage.getItem("UserName") || "";
+    AppUserAction.AddAppUser(state.formData).then(result => {
+      if (result.status === 200) {
+        const { res, flag, error } = result.data;
+        if (flag === "1") {
+          ElMessage.success('新增成功');
+          cancel();
+          queryList();
+        } else {
+          ElMessage.error(error);
+        }
+      }
+    });
+  }
+  else {
+    AppUserAction.EditAppUser(state.formData).then(result => {
+      if (result.status === 200) {
+        const { res, flag, error } = result.data;
+        if (flag === "1") {
+          ElMessage.success('编辑成功');
+          cancel();
+          queryList();
+        } else {
+          ElMessage.error(error);
+        }
+      }
+    });
+  }
+  });
+};
+
+const submitDeleteForm = (row: any) => {
+  ElMessageBox.confirm(
+    ' 是否删除用户[' + row.userName + ']? ',
+    '提示',
+    {
+      cancelButtonText: '取消',
+      confirmButtonText: '确认',
+      type: 'warning',
+      center: true,
+    }
+  )
+    .then(() => {
+      AppUserAction.DeleteAppUser(row.id).then(result => {
+        if (result.status === 200) {
+          const { res, flag, error } = result.data;
+          if (flag === "1") {
+            ElMessage.success('删除成功');
+            queryList();
+          } else {
+            ElMessage.error(error);
+          }
+        }
+      });
+    })
+    .catch(() => {
+      ElMessage({
+        type: 'info',
+        message: '取消删除成功!',
+      })
+    })
+};
+
+const cancel = () => {
+  dataFormRef.value.resetFields();
+  state.formData = {} as AppUserModel;
+  state.dialog.visible = false;
+}
+
+const queryAuthList = () => {
+  DicConfigauthAction.QueryDicConfigAuthList(state.queryAuthParams).then(result => {
+    if (result.status === 200) {
+      console.log("1111111111111111111111111111111111111111111");
+      console.log(result);
+      
+      const { res, flag, error } = result.data;
+      if (flag != undefined && flag == 1) {
+        state.configAuthList = res as DicConfigAuthModel[];
+      } else {
+        ElMessage.error(error);
+      }
+    }
+  }).catch(error => {
+    //请求失败时的操作     
+    console.log(error);
+  })
+};
+
+onMounted(() => {
+  queryAuthList();
+  window.onresize = function () {
+    tableHeight.value = document.documentElement.clientHeight - 250
+  }
+
+  queryList();
+})
+</script>
+
+<style lang="scss" scoped>
+.button {
+  margin: 10px 0;
+}
+</style>

src/views/downlinktask/ttaskdown/index.vue

@@ -207,17 +207,17 @@ const handleCurrentRowChange = (val: TTaskDown | undefined) => {
 
 //任务类型
 const taskTypeMap = {
-  '1': "召测配置",
-  '2': "召测数据",
-  '3': "远程配置",
-  '4': "审核结果",
+  '1': "审核结果",
+  '2': "远程配置",
+  '3': "召测配置",
+  '4': "召测数据",
 };
 
 const taskTypeQueryMap = {
-  '1': "召测配置",
-  '2': "召测数据",
-  '3': "远程配置",
-  '4': "审核结果",
+  '1': "审核结果",
+  '2': "远程配置",
+  '3': "召测配置",
+  '4': "召测数据",
   '0': "全部",
 };
 

vite.config.ts

@@ -25,21 +25,25 @@ export default defineConfig({
             '@': path.resolve(__dirname, './src') // 设置别名
         }
     },
-    server: {
-        host: '0.0.0.0',
-        port: 6090,    //设置服务启动端口
-        // //open: true,  //设置服务启动时是否自动打开浏览器
-        // cors: true,    //默认启用并允许任何源
-        // //设置代理
-        // proxy: {
-        //     '/api': {
-        //         target: 'http://114.242.31.4:6090', //请求的域名地址
-        //         changeOrigin: true, //是否允许跨域代理
-        //         secure: false,
-        //         rewrite: (path) => path.replace(/^\/api/, '') // 重定向地址
-        //     }
-        // }
+    build:{
+        outDir:'dist',
+        assetsDir:'static'
     },
+    // server: {
+    //     host: '0.0.0.0',
+    //     port: 6090,    //设置服务启动端口
+    //     //open: true,  //设置服务启动时是否自动打开浏览器
+    //     cors: true,    //默认启用并允许任何源
+    //     //设置代理
+    //     proxy: {
+    //         '/api': {
+    //             target: 'http://114.242.31.4:6090', //请求的域名地址
+    //             changeOrigin: true, //是否允许跨域代理
+    //             secure: false,
+    //             rewrite: (path) => path.replace(/^\/api/, '') // 重定向地址
+    //         }
+    //     }
+    // },
     css: {
         preprocessorOptions: {
             scss: {
@@ -48,4 +52,4 @@ export default defineConfig({
             },
         },
     },
-})
+})