emm...

src/views/screen/official/terminalDataDialog.vue

@@ -376,7 +376,6 @@ export default {
       barData: [],
       barAxis: {},
       barYAxis: {},
-      barGrid: {},
       barLegend: {},
 
       personInOutBarData: [

src/views/zcustom/camera/index.vue

@@ -1,6 +1,6 @@
 <template>
   <div class="app-container">
-    <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="80px">
+    <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="100px">
       <el-form-item label="摄像头名称" prop="cameraName">
         <el-input
           v-model="queryParams.cameraName"
@@ -125,21 +125,19 @@
 
     <!-- 添加或修改摄像头对话框 -->
     <el-dialog :title="title" :visible.sync="open" :close-on-click-modal="false" width="800px" append-to-body>
-      <el-form ref="form" :model="form" :rules="rules" label-width="80px">
+      <el-form ref="form" :model="form" :rules="rules" label-width="100px">
         <el-form-item label="摄像头名称" prop="cameraName">
           <el-input v-model="form.cameraName" placeholder="请输入摄像头名称" />
         </el-form-item>
-        <el-form-item label="所属项目id" prop="projectId">
-          <el-input v-model="form.projectId" placeholder="请输入所属项目id" />
-        </el-form-item>
-        <el-form-item label="在线标志" prop="onlineFlag">
-          <el-input v-model="form.onlineFlag" placeholder="请输入在线标志" />
-        </el-form-item>
-        <el-form-item label="接入标志" prop="connectFlag">
-          <el-input v-model="form.connectFlag" placeholder="请输入接入标志" />
-        </el-form-item>
-        <el-form-item label="删除标志" prop="delFlag">
-          <el-input v-model="form.delFlag" placeholder="请输入删除标志" />
+        <el-form-item label="所属项目" prop="projectId">
+          <el-select v-model="form.projectId" placeholder="请选择">
+            <el-option
+              v-for="item in projectList"
+              :key="item.id"
+              :label="item.projectName"
+              :value="item.id">
+            </el-option>
+          </el-select>
         </el-form-item>
       </el-form>
       <div slot="footer" class="dialog-footer">
@@ -152,6 +150,7 @@
 
 <script>
 import { listCamera, getCamera, delCamera, addCamera, updateCamera } from "@/api/zcustom/camera";
+import { listProject } from '@/api/zcustom/project'
 
 export default {
   name: "Camera",
@@ -173,6 +172,7 @@ export default {
       total: 0,
       // 摄像头表格数据
       cameraList: [],
+      projectList: [],
       // 弹出层标题
       title: "",
       // 是否显示弹出层
@@ -222,6 +222,7 @@ export default {
   },
   created() {
     this.getList();
+    this.getPrjList()
   },
   methods: {
     /** 查询摄像头列表 */
@@ -233,6 +234,11 @@ export default {
         this.loading = false;
       });
     },
+    getPrjList() {
+      listProject().then(response => {
+        this.projectList = response.data.records;
+      });
+    },
     // 取消按钮
     cancel() {
       this.open = false;

src/views/zcustom/issue/index.vue

@@ -92,14 +92,18 @@
     <!-- 添加或修改上报问题对话框 -->
     <el-dialog :title="title" :visible.sync="open" :close-on-click-modal="false" width="800px" append-to-body>
       <el-form ref="form" :model="form" :rules="rules" label-width="80px">
-        <el-form-item label="问题描述" prop="description">
-          <el-input v-model="form.description" placeholder="请输入问题描述" />
-        </el-form-item>
-        <el-form-item label="所属项目id" prop="projectId">
-          <el-input v-model="form.projectId" placeholder="请输入所属项目id" />
+        <el-form-item label="所属项目" prop="projectId">
+          <el-select v-model="form.projectName" placeholder="请选择">
+            <el-option
+              v-for="item in projectList"
+              :key="item.id"
+              :label="item.projectName"
+              :value="item.projectName">
+            </el-option>
+          </el-select>
         </el-form-item>
-        <el-form-item label="删除标志" prop="delFlag">
-          <el-input v-model="form.delFlag" placeholder="请输入删除标志" />
+        <el-form-item label="问题描述" prop="description">
+          <el-input type="textarea" v-model="form.description" placeholder="请输入问题描述" />
         </el-form-item>
       </el-form>
       <div slot="footer" class="dialog-footer">
@@ -112,6 +116,7 @@
 
 <script>
 import { listIssue, getIssue, delIssue, addIssue, updateIssue } from "@/api/zcustom/issue";
+import { listProject } from '@/api/zcustom/project'
 
 export default {
   name: "Issue",
@@ -133,6 +138,7 @@ export default {
       total: 0,
       // 上报问题表格数据
       issueList: [],
+      projectList: [],
       // 弹出层标题
       title: "",
       // 是否显示弹出层
@@ -170,17 +176,24 @@ export default {
   },
   created() {
     this.getList();
+    this.getPrjList()
   },
   methods: {
     /** 查询上报问题列表 */
     getList() {
       this.loading = true;
       listIssue(this.queryParams).then(response => {
-        this.issueList =  response.data.records;
-        this.total = response.data.total;
+        console.log(response)
+        this.issueList =  response.data;
+        this.total = response.data.length;
         this.loading = false;
       });
     },
+    getPrjList() {
+      listProject().then(response => {
+        this.projectList = response.data.records;
+      });
+    },
     // 取消按钮
     cancel() {
       this.open = false;
@@ -192,6 +205,7 @@ export default {
         id: null,
         description: null,
         projectId: null,
+        projectName: null,
         status: "0",
         delFlag: null,
       };

src/views/zcustom/plan/index.vue

@@ -119,14 +119,21 @@
     <!-- 添加或修改工程计划对话框 -->
     <el-dialog :title="title" :visible.sync="open" :close-on-click-modal="false" width="800px" append-to-body>
       <el-form ref="form" :model="form" :rules="rules" label-width="80px">
-        <el-form-item label="所属项目id" prop="projectId">
-          <el-input v-model="form.projectId" placeholder="请输入所属项目id" />
+        <el-form-item label="所属项目" prop="projectId">
+          <el-select v-model="form.projectId" placeholder="请选择">
+            <el-option
+              v-for="item in projectList"
+              :key="item.id"
+              :label="item.projectName"
+              :value="item.id">
+            </el-option>
+          </el-select>
         </el-form-item>
         <el-form-item label="负责人" prop="head">
           <el-input v-model="form.head" placeholder="请输入负责人" />
         </el-form-item>
         <el-form-item label="具体内容" prop="content">
-          <editor v-model="form.content" :min-height="192"/>
+          <el-input type="textarea" v-model="form.content" :rows="12"/>
         </el-form-item>
         <el-form-item label="开始日期" prop="startTime">
           <el-date-picker clearable
@@ -155,6 +162,7 @@
 
 <script>
 import { listPlan, getPlan, delPlan, addPlan, updatePlan } from "@/api/zcustom/plan";
+import { listProject } from '@/api/zcustom/project'
 
 export default {
   name: "Plan",
@@ -176,6 +184,7 @@ export default {
       total: 0,
       // 工程计划表格数据
       planList: [],
+      projectList: [],
       // 弹出层标题
       title: "",
       // 是否显示弹出层
@@ -222,6 +231,7 @@ export default {
   },
   created() {
     this.getList();
+    this.getPrjList()
   },
   methods: {
     /** 查询工程计划列表 */
@@ -233,6 +243,11 @@ export default {
         this.loading = false;
       });
     },
+    getPrjList() {
+      listProject().then(response => {
+        this.projectList = response.data.records;
+      });
+    },
     // 取消按钮
     cancel() {
       this.open = false;

src/views/zcustom/platAppOrg/index.vue

@@ -3,7 +3,7 @@
     <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="80px">
       <el-form-item label="地区编码" prop="appOrg">
         <el-input
-          v-model="queryParams.appOrg"
+          v-model="queryParams.unitCode"
           placeholder="请输入地区编码"
           clearable
           @keyup.enter.native="handleQuery"
@@ -11,7 +11,7 @@
       </el-form-item>
       <el-form-item label="地区名称" prop="appName">
         <el-input
-          v-model="queryParams.appName"
+          v-model="queryParams.unitName"
           placeholder="请输入地区名称"
           clearable
           @keyup.enter.native="handleQuery"
@@ -62,8 +62,8 @@
           {{(scope.$index + 1) + ((queryParams.pageNum - 1) * queryParams.pageSize)}}
         </template>
       </el-table-column>
-      <el-table-column label="地区编码" align="center" prop="appOrg" />
-      <el-table-column label="地区名称" align="center" prop="appName" />
+      <el-table-column label="地区编码" align="center" prop="unitCode" />
+      <el-table-column label="地区名称" align="center" prop="unitName" />
       <el-table-column label="操作" align="center" fixed="right" class-name="small-padding fixed-width">
         <template slot-scope="scope">
           <el-button
@@ -95,14 +95,21 @@
     <!-- 添加或修改地区编码对话框 -->
     <el-dialog :title="title" :visible.sync="open" :close-on-click-modal="false" width="800px" append-to-body>
       <el-form ref="form" :model="form" :rules="rules" label-width="80px">
-        <el-form-item label="删除标志" prop="delFlag">
-          <el-input v-model="form.delFlag" placeholder="请输入删除标志" />
+        <el-form-item label="父地区" prop="parentUnitCode">
+          <el-select v-model="form.parentUnitCode" placeholder="请选择父地区">
+            <el-option
+              v-for="item in unitList"
+              :key="item.unitCode"
+              :label="item.unitName"
+              :value="item.unitCode">
+            </el-option>
+          </el-select>
         </el-form-item>
-        <el-form-item label="地区编码" prop="appOrg">
-          <el-input v-model="form.appOrg" placeholder="请输入地区编码" />
+        <el-form-item label="地区编码" prop="unitCode">
+          <el-input v-model="form.unitCode" placeholder="请输入地区编码" />
         </el-form-item>
-        <el-form-item label="地区名称" prop="appName">
-          <el-input v-model="form.appName" placeholder="请输入地区名称" />
+        <el-form-item label="地区名称" prop="unitName">
+          <el-input v-model="form.unitName" placeholder="请输入地区名称" />
         </el-form-item>
       </el-form>
       <div slot="footer" class="dialog-footer">
@@ -136,6 +143,7 @@ export default {
       total: 0,
       // 地区编码表格数据
       platAppOrgList: [],
+      unitList: [],
       // 弹出层标题
       title: "",
       // 是否显示弹出层
@@ -145,8 +153,9 @@ export default {
       queryParams: {
         pageNum: 1,
         pageSize: 10,
-        appOrg: null,
-        appName: null
+        parentUnitCode: null,
+        unitCode: null,
+        unitName: null
       },
       // 表单参数
       form: {},
@@ -158,10 +167,10 @@ export default {
         delFlag: [
           { required: true, message: "删除标志不能为空", trigger: "blur" }
         ],
-        appOrg: [
+        unitCode: [
           { required: true, message: "地区编码不能为空", trigger: "blur" }
         ],
-        appName: [
+        unitName: [
           { required: true, message: "地区名称不能为空", trigger: "blur" }
         ]
       }
@@ -169,6 +178,7 @@ export default {
   },
   created() {
     this.getList();
+    this.getListEx();
   },
   methods: {
     /** 查询地区编码列表 */
@@ -180,6 +190,11 @@ export default {
         this.loading = false;
       });
     },
+    getListEx() {
+      listPlatAppOrg().then(response => {
+        this.unitList = response.data.records;
+      });
+    },
     // 取消按钮
     cancel() {
       this.open = false;
@@ -190,8 +205,9 @@ export default {
       this.form = {
         id: null,
         delFlag: null,
-        appOrg: null,
-        appName: null
+        unitCode: null,
+        parentUnitCode: null,
+        unitName: null
       };
       this.resetForm("form");
     },

src/views/zcustom/project/index.vue

@@ -103,14 +103,15 @@
         <el-form-item label="项目名称" prop="projectName">
           <el-input v-model="form.projectName" placeholder="请输入项目名称" />
         </el-form-item>
-        <el-form-item label="所属单位id" prop="unitId">
-          <el-input v-model="form.unitId" placeholder="请输入所属单位id" />
-        </el-form-item>
-        <el-form-item label="接入标志" prop="connectFlag">
-          <el-input v-model="form.connectFlag" placeholder="请输入接入标志" />
-        </el-form-item>
-        <el-form-item label="删除标志" prop="delFlag">
-          <el-input v-model="form.delFlag" placeholder="请输入删除标志" />
+        <el-form-item label="所属单位" prop="unitId">
+          <el-select v-model="form.unitId" placeholder="请选择">
+            <el-option
+              v-for="item in platAppOrgList"
+              :key="item.unitCode"
+              :label="item.unitName"
+              :value="item.unitCode">
+            </el-option>
+          </el-select>
         </el-form-item>
       </el-form>
       <div slot="footer" class="dialog-footer">
@@ -123,6 +124,7 @@
 
 <script>
 import { listProject, getProject, delProject, addProject, updateProject } from "@/api/zcustom/project";
+import { listPlatAppOrg } from '@/api/zcustom/platAppOrg'
 
 export default {
   name: "Project",
@@ -144,6 +146,7 @@ export default {
       total: 0,
       // 工程项目表格数据
       projectList: [],
+      platAppOrgList: [],
       // 弹出层标题
       title: "",
       // 是否显示弹出层
@@ -181,6 +184,7 @@ export default {
   },
   created() {
     this.getList();
+    this.getUnitList()
   },
   methods: {
     /** 查询工程项目列表 */
@@ -192,6 +196,11 @@ export default {
         this.loading = false;
       });
     },
+    getUnitList() {
+      listPlatAppOrg().then(response => {
+        this.platAppOrgList =  response.data.records;
+      });
+    },
     // 取消按钮
     cancel() {
       this.open = false;