Merge remote-tracking branch 'origin/main'

AI识别算法开发
2023-12-12 17:17:45 +08:00 · 2023-12-12 17:17:35 +08:00
7 changed files with 131 additions and 94 deletions
--- a/god-ui/src/views/aiRecognition/bareSoilCover/index.vue
+++ b/god-ui/src/views/aiRecognition/bareSoilCover/index.vue
@ -39,7 +39,7 @@
          icon="el-icon-plus"
          size="mini"
          @click="handleAdd"
-          v-hasPermi="['aiRecognition:godUniversalElectricMeter:add']"
+
        >新增
        </el-button>
      </el-col>
@ -51,7 +51,7 @@
          size="mini"
          :disabled="single"
          @click="handleUpdate"
-          v-hasPermi="['aiRecognition:godUniversalElectricMeter:edit']"
+
        >修改
        </el-button>
      </el-col>
@ -63,7 +63,7 @@
          size="mini"
          :disabled="multiple"
          @click="handleDelete"
-          v-hasPermi="['aiRecognition:godUniversalElectricMeter:remove']"
+
        >删除
        </el-button>
      </el-col>
@ -74,7 +74,7 @@
          icon="el-icon-download"
          size="mini"
          @click="handleExport"
-          v-hasPermi="['aiRecognition:godUniversalElectricMeter:export']"
+
        >导出
        </el-button>
      </el-col>
@ -105,7 +105,7 @@
            type="text"
            icon="el-icon-edit"
            @click="handleUpdate(scope.row)"
-            v-hasPermi="['aiRecognition:godUniversalElectricMeter:edit']"
+
          >修改
          </el-button>
          <el-button
@ -113,7 +113,7 @@
            type="text"
            icon="el-icon-delete"
            @click="handleDelete(scope.row)"
-            v-hasPermi="['aiRecognition:godUniversalElectricMeter:remove']"
+
          >删除
          </el-button>
        </template>
--- a/god-ui/src/views/aiRecognition/godUniversalElectricMeter/index.vue
+++ b/god-ui/src/views/aiRecognition/godUniversalElectricMeter/index.vue
@ -39,7 +39,7 @@
          icon="el-icon-plus"
          size="mini"
          @click="handleAdd"
-          v-hasPermi="['aiRecognition:godUniversalElectricMeter:add']"
+
        >新增
        </el-button>
      </el-col>
@ -51,7 +51,7 @@
          size="mini"
          :disabled="single"
          @click="handleUpdate"
-          v-hasPermi="['aiRecognition:godUniversalElectricMeter:edit']"
+
        >修改
        </el-button>
      </el-col>
@ -63,7 +63,7 @@
          size="mini"
          :disabled="multiple"
          @click="handleDelete"
-          v-hasPermi="['aiRecognition:godUniversalElectricMeter:remove']"
+
        >删除
        </el-button>
      </el-col>
@ -74,7 +74,7 @@
          icon="el-icon-download"
          size="mini"
          @click="handleExport"
-          v-hasPermi="['aiRecognition:godUniversalElectricMeter:export']"
+
        >导出
        </el-button>
      </el-col>
@ -105,7 +105,7 @@
            type="text"
            icon="el-icon-edit"
            @click="handleUpdate(scope.row)"
-            v-hasPermi="['aiRecognition:godUniversalElectricMeter:edit']"
+
          >修改
          </el-button>
          <el-button
@ -113,7 +113,7 @@
            type="text"
            icon="el-icon-delete"
            @click="handleDelete(scope.row)"
-            v-hasPermi="['aiRecognition:godUniversalElectricMeter:remove']"
+
          >删除
          </el-button>
        </template>
--- a/god-ui/src/views/aiRecognition/highFormwork/index.vue
+++ b/god-ui/src/views/aiRecognition/highFormwork/index.vue
@ -39,7 +39,7 @@
          icon="el-icon-plus"
          size="mini"
          @click="handleAdd"
-          v-hasPermi="['aiRecognition:godUniversalElectricMeter:add']"
+
        >新增
        </el-button>
      </el-col>
@ -51,7 +51,7 @@
          size="mini"
          :disabled="single"
          @click="handleUpdate"
-          v-hasPermi="['aiRecognition:godUniversalElectricMeter:edit']"
+
        >修改
        </el-button>
      </el-col>
@ -63,7 +63,7 @@
          size="mini"
          :disabled="multiple"
          @click="handleDelete"
-          v-hasPermi="['aiRecognition:godUniversalElectricMeter:remove']"
+
        >删除
        </el-button>
      </el-col>
@ -74,7 +74,7 @@
          icon="el-icon-download"
          size="mini"
          @click="handleExport"
-          v-hasPermi="['aiRecognition:godUniversalElectricMeter:export']"
+
        >导出
        </el-button>
      </el-col>
@ -105,7 +105,7 @@
            type="text"
            icon="el-icon-edit"
            @click="handleUpdate(scope.row)"
-            v-hasPermi="['aiRecognition:godUniversalElectricMeter:edit']"
+
          >修改
          </el-button>
          <el-button
@ -113,7 +113,7 @@
            type="text"
            icon="el-icon-delete"
            @click="handleDelete(scope.row)"
-            v-hasPermi="['aiRecognition:godUniversalElectricMeter:remove']"
+
          >删除
          </el-button>
        </template>
--- a/god-ui/src/views/aiRecognition/intrusion/index.vue
+++ b/god-ui/src/views/aiRecognition/intrusion/index.vue
@ -39,7 +39,7 @@
          icon="el-icon-plus"
          size="mini"
          @click="handleAdd"
-          v-hasPermi="['aiRecognition:godUniversalElectricMeter:add']"
+
        >新增
        </el-button>
      </el-col>
@ -51,7 +51,7 @@
          size="mini"
          :disabled="single"
          @click="handleUpdate"
-          v-hasPermi="['aiRecognition:godUniversalElectricMeter:edit']"
+
        >修改
        </el-button>
      </el-col>
@ -63,7 +63,7 @@
          size="mini"
          :disabled="multiple"
          @click="handleDelete"
-          v-hasPermi="['aiRecognition:godUniversalElectricMeter:remove']"
+
        >删除
        </el-button>
      </el-col>
@ -74,7 +74,7 @@
          icon="el-icon-download"
          size="mini"
          @click="handleExport"
-          v-hasPermi="['aiRecognition:godUniversalElectricMeter:export']"
+
        >导出
        </el-button>
      </el-col>
@ -105,7 +105,7 @@
            type="text"
            icon="el-icon-edit"
            @click="handleUpdate(scope.row)"
-            v-hasPermi="['aiRecognition:godUniversalElectricMeter:edit']"
+
          >修改
          </el-button>
          <el-button
@ -113,7 +113,7 @@
            type="text"
            icon="el-icon-delete"
            @click="handleDelete(scope.row)"
-            v-hasPermi="['aiRecognition:godUniversalElectricMeter:remove']"
+
          >删除
          </el-button>
        </template>
--- a/god-ui/src/views/aiRecognition/personnelGathering/index.vue
+++ b/god-ui/src/views/aiRecognition/personnelGathering/index.vue
@ -39,7 +39,7 @@
          icon="el-icon-plus"
          size="mini"
          @click="handleAdd"
-          v-hasPermi="['aiRecognition:godUniversalElectricMeter:add']"
+
        >新增
        </el-button>
      </el-col>
@ -51,7 +51,7 @@
          size="mini"
          :disabled="single"
          @click="handleUpdate"
-          v-hasPermi="['aiRecognition:godUniversalElectricMeter:edit']"
+
        >修改
        </el-button>
      </el-col>
@ -63,7 +63,7 @@
          size="mini"
          :disabled="multiple"
          @click="handleDelete"
-          v-hasPermi="['aiRecognition:godUniversalElectricMeter:remove']"
+
        >删除
        </el-button>
      </el-col>
@ -74,7 +74,7 @@
          icon="el-icon-download"
          size="mini"
          @click="handleExport"
-          v-hasPermi="['aiRecognition:godUniversalElectricMeter:export']"
+
        >导出
        </el-button>
      </el-col>
@ -105,7 +105,7 @@
            type="text"
            icon="el-icon-edit"
            @click="handleUpdate(scope.row)"
-            v-hasPermi="['aiRecognition:godUniversalElectricMeter:edit']"
+
          >修改
          </el-button>
          <el-button
@ -113,7 +113,7 @@
            type="text"
            icon="el-icon-delete"
            @click="handleDelete(scope.row)"
-            v-hasPermi="['aiRecognition:godUniversalElectricMeter:remove']"
+
          >删除
          </el-button>
        </template>
--- a/god-ui/src/views/aiRecognition/regionalPersonnel/index.vue
+++ b/god-ui/src/views/aiRecognition/regionalPersonnel/index.vue
@ -1,91 +1,141 @@
 <template>
  <div class="app-container">
-    <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
-      <el-form-item label="监控类型" prop="reserveTwo">
-        <el-input v-model="queryParams.reserveTwo" placeholder="请输入监控类型" clearable @keyup.enter.native="handleQuery"/>
-      </el-form-item>
-      <el-form-item label="监控设备" prop="reserveSix">
-        <el-input v-model="queryParams.reserveSix" placeholder="请输入监控设备" clearable @keyup.enter.native="handleQuery"/>
-      </el-form-item>
-      <el-form-item>
-        <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
-        <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
-      </el-form-item>
-    </el-form>
+    <!--    <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">-->
+    <!--      <el-form-item label="" prop="reserveOne">-->
+    <!--        <el-input-->
+    <!--          v-model="queryParams.reserveOne"-->
+    <!--          placeholder="请输入"-->
+    <!--          clearable-->
+    <!--          @keyup.enter.native="handleQuery"-->
+    <!--        />-->
+    <!--      </el-form-item>-->
+    <!--      <el-form-item label="" prop="reserveTwo">-->
+    <!--        <el-input-->
+    <!--          v-model="queryParams.reserveTwo"-->
+    <!--          placeholder="请输入"-->
+    <!--          clearable-->
+    <!--          @keyup.enter.native="handleQuery"-->
+    <!--        />-->
+    <!--      </el-form-item>-->
+    <!--      <el-form-item label="" prop="reserveThree">-->
+    <!--        <el-input-->
+    <!--          v-model="queryParams.reserveThree"-->
+    <!--          placeholder="请输入"-->
+    <!--          clearable-->
+    <!--          @keyup.enter.native="handleQuery"-->
+    <!--        />-->
+    <!--      </el-form-item>-->
+    <!--      <el-form-item>-->
+    <!--        <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>-->
+    <!--        <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>-->
+    <!--      </el-form-item>-->
+    <!--    </el-form>-->

    <el-row :gutter="10" class="mb8">
      <el-col :span="1.5">
-        <el-button type="primary" plain icon="el-icon-plus" size="mini" @click="handleAdd"
+        <el-button
+          type="primary"
+          plain
+          icon="el-icon-plus"
+          size="mini"
+          @click="handleAdd"
+
        >新增
        </el-button>
      </el-col>
      <el-col :span="1.5">
-        <el-button type="success" plain icon="el-icon-edit" size="mini" :disabled="single" @click="handleUpdate"
+        <el-button
+          type="success"
+          plain
+          icon="el-icon-edit"
+          size="mini"
+          :disabled="single"
+          @click="handleUpdate"
+
        >修改
        </el-button>
      </el-col>
      <el-col :span="1.5">
-        <el-button type="danger" plain icon="el-icon-delete" size="mini" :disabled="multiple" @click="handleDelete"
+        <el-button
+          type="danger"
+          plain
+          icon="el-icon-delete"
+          size="mini"
+          :disabled="multiple"
+          @click="handleDelete"
+
+        >删除
        </el-button>
      </el-col>
      <el-col :span="1.5">
-        <el-button type="warning" plain icon="el-icon-download" size="mini" @click="handleExport"
+        <el-button
+          type="warning"
+          plain
+          icon="el-icon-download"
+          size="mini"
+          @click="handleExport"
+
        >导出
        </el-button>
      </el-col>
      <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
    </el-row>

-    <el-table v-loading="loading" :data="qyzyWorkRedioList" @selection-change="handleSelectionChange">
+    <el-table v-loading="loading" :data="godUniversalElectricMeterList" @selection-change="handleSelectionChange">
      <el-table-column type="selection" width="55" align="center"/>
      <el-table-column label="识别编号" align="center" prop="reserveOne"/>
-      <el-table-column label="监控类型" align="center" prop="reserveTwo"/>
-      <el-table-column label="监控视频" align="center" prop="reserveThree" :show-overflow-tooltip="true"/>
+      <el-table-column label="识别类型" align="center" prop="reserveTwo"/>
+      <el-table-column label="识别例图" align="center" prop="reserveThree">
+        <template slot-scope="scope">
+          <image-preview :src="scope.row.reserveThree" :width="50" :height="50"/>
+        </template>
+      </el-table-column>
      <el-table-column label="行为状态" align="center" prop="reserveFour"/>
      <el-table-column label="是否报警" align="center" prop="reserveFive"/>
-      <el-table-column label="上传设备" align="center" prop="reserveSix"/>
-      <el-table-column label="监控时间" align="center" prop="reserveSeven">
+      <el-table-column label="上传人" align="center" prop="reserveSix"/>
+      <el-table-column label="上传时间" align="center" prop="reserveSeven">
        <template slot-scope="scope">
          <span>{{ parseTime(scope.row.reserveSeven, '{y}-{m}-{d} {h}:{i}:{s}') }}</span>
        </template>
      </el-table-column>
-      <el-table-column label="备注" align="center" prop="remark"/>
      <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
        <template slot-scope="scope">
-          <el-button size="mini" type="text" icon="el-icon-edit" @click="handleUpdate(scope.row)"
+          <el-button
+            size="mini"
+            type="text"
+            icon="el-icon-edit"
+            @click="handleUpdate(scope.row)"
+
          >修改
          </el-button>
-          <el-button size="mini" type="text" icon="el-icon-delete" @click="handleDelete(scope.row)"
+          <el-button
+            size="mini"
+            type="text"
+            icon="el-icon-delete"
+            @click="handleDelete(scope.row)"
+
          >删除
          </el-button>
-          <el-button size="mini" type="text" icon="el-icon-video-camera" @click="playVideo(scope.row)"
-          >查看视频
-          </el-button>
        </template>
      </el-table-column>
    </el-table>

-    <pagination v-show="total > 0" :total="total" :page.sync="queryParams.pageNum" :limit.sync="queryParams.pageSize"
-                @pagination="getList"
+    <pagination
+      v-show="total>0"
+      :total="total"
+      :page.sync="queryParams.pageNum"
+      :limit.sync="queryParams.pageSize"
+      @pagination="getList"
    />

-    <!-- 添加或修改作业监控视频管理对话框 -->
+    <!-- 添加或修改AI识别算法开发对话框 -->
    <el-dialog :title="title" :visible.sync="open" width="500px" append-to-body>
      <el-form ref="form" :model="form" :rules="rules" label-width="80px">
-        <el-form-item label="监控类型" prop="reserveTwo">
+        <el-form-item label="识别类型" prop="reserveTwo">
          <el-input v-model="form.reserveTwo" placeholder="请输入识别类型"/>
        </el-form-item>
-        <el-form-item label="视频地址" prop="reserveThree" >
-          <el-input v-model="form.reserveThree" placeholder="请输入监控视频地址" :disabled="true"/>
-        </el-form-item>
-        <el-form-item label="视频上传">
-          <el-upload class="upload-demo" ref="uploadFile" action="" :on-preview="handlePreview"
-                     :on-remove="handleRemoveFiles" :on-change="handleChangeFiles" :before-upload="beforeUploadFiles"
-                     :file-list="fileList" :auto-upload="true" multiple
-          >
-            <el-button size="small" type="primary">上传视频</el-button>
-            <div slot="tip" class="el-upload__tip">只能上传mp4文件，且不超过100M</div>
-          </el-upload>
+        <el-form-item label="识别例图" prop="reserveThree">
+          <image-upload v-model="form.reserveThree"/>
        </el-form-item>
        <el-form-item label="行为状态" prop="reserveFour">
          <el-input v-model="form.reserveFour" placeholder="请输入行为状态"/>
@ -93,36 +143,23 @@
        <el-form-item label="是否报警" prop="reserveFive">
          <el-input v-model="form.reserveFive" placeholder="请输入是否报警"/>
        </el-form-item>
-        <el-form-item label="上传设备" prop="reserveSix">
+        <el-form-item label="上传人" prop="reserveSix">
          <el-input v-model="form.reserveSix" placeholder="请输入上传人"/>
        </el-form-item>
-        <el-form-item label="监控时间" prop="reserveSeven">
+        <el-form-item label="上传时间" prop="reserveSeven">
          <el-date-picker
            v-model="form.reserveSeven"
            type="datetime"
-            placeholder="请选择监控时间"
+            placeholder="请选择时间"
            format="yyyy-MM-dd HH:mm:ss ">
          </el-date-picker>
        </el-form-item>
-        <el-form-item label="备注" prop="remark">
-          <el-input v-model="form.remark" type="textarea" placeholder="请输入内容"/>
-        </el-form-item>
      </el-form>
      <div slot="footer" class="dialog-footer">
        <el-button type="primary" @click="submitForm">确 定</el-button>
        <el-button @click="cancel">取 消</el-button>
      </div>
    </el-dialog>
-
-    <el-dialog title :visible="isShow" width="600px" @close="closeDialog" class="videoBox">
-      <video
-        :src="videoUrl"
-        controls
-        autoplay
-        class="video"
-        width="100%"
-      ></video>
-    </el-dialog>
  </div>
 </template>

--- a/god-ui/src/views/aiRecognition/wearDetection/index.vue
+++ b/god-ui/src/views/aiRecognition/wearDetection/index.vue
@ -39,7 +39,7 @@
          icon="el-icon-plus"
          size="mini"
          @click="handleAdd"
-          v-hasPermi="['aiRecognition:godUniversalElectricMeter:add']"
+
        >新增
        </el-button>
      </el-col>
@ -51,7 +51,7 @@
          size="mini"
          :disabled="single"
          @click="handleUpdate"
-          v-hasPermi="['aiRecognition:godUniversalElectricMeter:edit']"
+
        >修改
        </el-button>
      </el-col>
@ -63,7 +63,7 @@
          size="mini"
          :disabled="multiple"
          @click="handleDelete"
-          v-hasPermi="['aiRecognition:godUniversalElectricMeter:remove']"
+
        >删除
        </el-button>
      </el-col>
@ -74,7 +74,7 @@
          icon="el-icon-download"
          size="mini"
          @click="handleExport"
-          v-hasPermi="['aiRecognition:godUniversalElectricMeter:export']"
+
        >导出
        </el-button>
      </el-col>
@ -105,7 +105,7 @@
            type="text"
            icon="el-icon-edit"
            @click="handleUpdate(scope.row)"
-            v-hasPermi="['aiRecognition:godUniversalElectricMeter:edit']"
+
          >修改
          </el-button>
          <el-button
@ -113,7 +113,7 @@
            type="text"
            icon="el-icon-delete"
            @click="handleDelete(scope.row)"
-            v-hasPermi="['aiRecognition:godUniversalElectricMeter:remove']"
+
          >删除
          </el-button>
        </template>
Author	SHA1	Message	Date
卢序振	30c9c7b591	Merge remote-tracking branch 'origin/main'	2023-12-12 17:17:45 +08:00
卢序振	9de4a2f2ea	AI识别算法开发	2023-12-12 17:17:35 +08:00