ming 3 jaren geleden
bovenliggende
commit
abb35090b1

+ 3 - 3
src/views/alarmManage/index.vue

@@ -70,7 +70,7 @@
               width:
                 (scope.row.totalGrade / allMaxData.totalNumMax) * 100 + '%',
             }"
-             style="min-width:27px!important"
+             style="min-width:35px!important"
             @click="goAlarmTotal(0, scope.row.siteName, scope.row.siteId)"
           >
             {{ scope.row.totalGrade }}
@@ -86,7 +86,7 @@
               width:
                 (scope.row.oneGrade / allMaxData.oneAlarmingMax) * 100 + '%',
             }"
-             style="min-width:27px!important"
+             style="min-width:35px!important"
             @click="goAlarmTotal(1, scope.row.siteName, scope.row.siteId)"
           >
             {{ scope.row.oneGrade }}
@@ -102,7 +102,7 @@
               width:
                 (scope.row.twoGrade / allMaxData.twoAlarmingMax) * 100 + '%'
             }"
-            style="min-width:27px!important"
+            style="min-width:35px!important"
             @click="goAlarmTotal(2, scope.row.siteName, scope.row.siteId)"
           >
             {{ scope.row.twoGrade }}

+ 6 - 7
src/views/siteManage/camera/dialogComponent.vue

@@ -41,7 +41,7 @@
           placeholder="请选择所属站点"
         >
           <el-option
-            v-for="item in siteList"
+            v-for="item in store.state.siteList"
             :key="item.value"
             :label="item.siteName"
             :value="item.id"
@@ -120,12 +120,9 @@ export default defineComponent({
 
     // open(): Dialog弹窗打开之前做的事
     const open = () => {
-      console.log('')
+      store.commit('publicSiteList')
       form.value = props.itemInfo.value
-      siteList.value = store.state.siteList
-      console.log('siteList.value')
-      console.log(siteList.value)
-      console.log('siteList.value')
+
     }
 
     // 关闭弹框
@@ -157,7 +154,7 @@ export default defineComponent({
       formInfo.value.validate((valid) => {
         if (valid) {
           // form.value.siteId =18
-           
+
           if (props.dialogTitle === '新增') {
             api.correspondDeviceAdd(form.value).then((requset) => {
               if (requset.status === 'SUCCESS') {
@@ -191,6 +188,8 @@ export default defineComponent({
     }
 
     return {
+      store,
+      // ...toRefs(state),
       closeDialog,
       dialogVisible,
       roleValid,

+ 2 - 2
src/views/systemManage/userManage/index.vue

@@ -53,9 +53,9 @@
         </div>
       </div>
 
-      <div class="right">
+      <!-- <div class="right">
         <el-button type="primary">导出</el-button>
-      </div>
+      </div> -->
     </div>
     <!-- 筛选end -->